From 396358854fd6aae2a4fdbe516cb9bfa0002ef7e1 Mon Sep 17 00:00:00 2001 From: Anuv Date: Thu, 22 Jun 2023 19:27:33 -0700 Subject: [PATCH] Minor things --- code/game/area/varadero.dm | 4 +- code/game/turfs/turf.dm | 2 +- maps/map_files/New_Varadero/New_Varadero.dmm | 329 ++++++++++++++----- 3 files changed, 255 insertions(+), 80 deletions(-) diff --git a/code/game/area/varadero.dm b/code/game/area/varadero.dm index 95ba88ec6fce..64793a4a4aa8 100644 --- a/code/game/area/varadero.dm +++ b/code/game/area/varadero.dm @@ -301,7 +301,7 @@ /area/varadero/interior_protected/caves/central name = "New Varadero - Grass Caves" icon_state = "deepcaves2" - minimap_color = MINIMAP_AREA_CAVES + minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/caves/digsite name = "New Varadero - Dig Site" @@ -314,7 +314,7 @@ /area/varadero/interior_protected/maintenance/south name = "New Varadero - Southern Maintenance" icon_state = "deepcaves4" - minimap_color = MINIMAP_AREA_CAVES + minimap_color = MINIMAP_AREA_CAVES /area/varadero/interior_protected/vessel name = "New Varadero - Unknown Vessel" diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 54cfdf6e34ea..6e98f4d7c065 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -500,7 +500,7 @@ var/area/A = get_area(src) switch(A.ceiling) if(CEILING_GLASS) - return "The ceiling above is glass. That's not going stop anything." + return "The ceiling above is glass. That's not going to stop anything." if(CEILING_METAL) return "The ceiling above is metal. You can't see through it with a camera from above, but that's not going to stop anything." if(CEILING_UNDERGROUND_ALLOW_CAS) diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 4c1d06a4fa04..6d4780448fc0 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -771,7 +771,10 @@ }, /area/varadero/interior_protected/vessel) "aCm" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/glass, +/obj/structure/machinery/door/airlock/almayer/engineering/glass{ + req_access = null; + req_one_access = null + }, /turf/open/floor/shiva{ dir = 8; icon_state = "yellowfull" @@ -1448,6 +1451,7 @@ /area/varadero/exterior/monsoon) "aVE" = ( /obj/structure/pipes/standard/manifold/hidden/green, +/obj/effect/decal/cleanable/blood/gibs, /turf/open/floor/shiva{ dir = 8; icon_state = "green" @@ -1965,6 +1969,13 @@ icon_state = "warnplate" }, /area/varadero/interior/cargo) +"blH" = ( +/obj/item/trash/candle, +/turf/open/floor/prison/chapel_carpet{ + dir = 1; + icon_state = "doubleside" + }, +/area/varadero/interior/chapel) "blT" = ( /obj/structure/closet/crate/construction, /obj/item/stack/sandbags_empty/half, @@ -2700,6 +2711,7 @@ /area/varadero/interior/medical) "bLm" = ( /obj/structure/closet/crate/supply, +/obj/effect/spawner/random/attachment, /turf/open/shuttle/elevator/grating, /area/varadero/interior/records) "bLp" = ( @@ -3285,6 +3297,7 @@ "cgp" = ( /obj/structure/surface/table, /obj/item/tool/kitchen/utensil/fork, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -3327,6 +3340,10 @@ default_name = "deep ocean" }, /area/varadero/exterior/eastocean) +"cgS" = ( +/obj/structure/largecrate/random/barrel/red, +/turf/open/shuttle/elevator/grating, +/area/varadero/interior/records) "chr" = ( /obj/structure/bed/stool{ icon_state = "stool_alt" @@ -3517,6 +3534,7 @@ /obj/structure/machinery/light{ dir = 8 }, +/obj/item/tool/wet_sign, /turf/open/floor{ icon_state = "white" }, @@ -3598,7 +3616,6 @@ /obj/structure/machinery/light/small{ dir = 1 }, -/obj/effect/landmark/corpsespawner/miner, /obj/effect/decal/cleanable/blood, /turf/open/floor{ icon_state = "white" @@ -3834,6 +3851,19 @@ default_name = "deep ocean" }, /area/varadero/exterior/pontoon_beach) +"cAr" = ( +/obj/item/lightstick/red/spoke/planted{ + pixel_x = 10; + pixel_y = 22; + indestructible = 1; + unacidable = 1; + layer = 4.1 + }, +/turf/open/gm/river/ocean{ + name = "deep ocean"; + default_name = "deep ocean" + }, +/area/varadero/exterior/farocean) "cAw" = ( /obj/structure/closet/secure_closet/cargotech, /turf/open/floor/shiva{ @@ -4870,6 +4900,18 @@ icon_state = "red" }, /area/varadero/interior/hall_N) +"dkB" = ( +/obj/structure/sink{ + pixel_y = 15 + }, +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/effect/decal/cleanable/vomit, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "dkH" = ( /obj/structure/machinery/storm_siren{ dir = 8; @@ -5476,7 +5518,6 @@ /area/varadero/exterior/lz2_near) "dJO" = ( /obj/structure/closet/secure_closet/security_empty, -/obj/item/storage/belt/shotgun, /obj/item/ammo_box/magazine/shotgun/buckshot, /obj/effect/landmark/objective_landmark/medium, /turf/open/floor/shiva{ @@ -6077,6 +6118,9 @@ dir = 4 }, /obj/effect/decal/cleanable/blood, +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_1_1" + }, /turf/open/floor/shiva{ icon_state = "redfull" }, @@ -6111,7 +6155,8 @@ /area/varadero/exterior/lz1_near) "efd" = ( /obj/structure/machinery/bot/medbot{ - name = "Dr. O" + name = "FOXYBOT 3000"; + desc = "A little medical robot. He looks somewhat traumatized." }, /turf/open/floor/prison/chapel_carpet, /area/varadero/interior/chapel) @@ -6636,6 +6681,10 @@ icon_state = "wred" }, /area/varadero/interior/medical) +"exT" = ( +/obj/item/storage/fancy/candle_box, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "eye" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -7843,6 +7892,13 @@ }, /turf/open/floor/wood, /area/varadero/interior/research) +"fle" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/shiva{ + dir = 8; + icon_state = "greenfull" + }, +/area/varadero/interior/hall_N) "flr" = ( /obj/item/clothing/head/helmet, /turf/open/floor/shiva{ @@ -8102,6 +8158,13 @@ }, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/monsoon) +"fxo" = ( +/obj/structure/pipes/standard/simple/hidden/green{ + dir = 4 + }, +/obj/item/trash/candle, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "fxR" = ( /obj/item/moneybag{ anchored = 1; @@ -8151,6 +8214,10 @@ }, /turf/open/shuttle/elevator/grating, /area/varadero/interior/hall_N) +"fyp" = ( +/obj/structure/window/framed/colony/reinforced, +/turf/open/floor/plating/icefloor, +/area/varadero/exterior/lz1_near) "fyP" = ( /obj/structure/surface/table/woodentable, /obj/item/device/flashlight/lamp/candelabra{ @@ -8245,6 +8312,9 @@ dir = 8 }, /obj/effect/decal/cleanable/blood/drip, +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_3_1" + }, /turf/open/floor/shiva{ icon_state = "wredfull" }, @@ -8421,13 +8491,13 @@ name = "exotic bedsheet"; pixel_x = -1 }, +/obj/item/ammo_magazine/rifle/m4ra, /turf/open/floor/wood, /area/varadero/interior/bunks) "fGE" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Requesitions Bay"; - req_access_txt = "100" + name = "\improper Underground Requesitions Bay" }, /turf/open/floor/shiva{ dir = 8; @@ -8939,6 +9009,7 @@ /obj/structure/surface/table/reinforced/prison, /obj/item/paper_bin, /obj/item/paper/research_notes, +/obj/item/storage/belt/shotgun, /turf/open/floor/shiva{ icon_state = "blue" }, @@ -9449,9 +9520,9 @@ }, /area/varadero/interior/medical) "gnN" = ( -/obj/item/tool/shovel, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +/obj/item/trash/candle, +/turf/open/floor/wood, +/area/varadero/interior/chapel) "gnZ" = ( /obj/effect/landmark/yautja_teleport, /turf/open/floor{ @@ -10198,6 +10269,13 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/open/gm/dirt, /area/varadero/interior_protected/caves/digsite) +"gOG" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/attachment, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "gOJ" = ( /obj/structure/surface/rack, /obj/item/tool/surgery/scalpel, @@ -10903,7 +10981,19 @@ /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/maintenance/south) "hpQ" = ( -/obj/structure/largecrate/random/mini/ammo, +/obj/structure/closet/crate/radiation, +/obj/item/stack/sheet/mineral/phoron/medium_stack{ + pixel_x = -5 + }, +/obj/item/stack/sheet/mineral/uranium/small_stack{ + pixel_y = -7; + pixel_x = 5 + }, +/obj/item/stack/sheet/mineral/lead{ + pixel_x = 2; + pixel_y = 6; + amount = 5 + }, /turf/open/shuttle/elevator, /area/varadero/interior/hall_N) "hqk" = ( @@ -11474,6 +11564,7 @@ pixel_x = 16; pixel_y = 24 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -11500,6 +11591,7 @@ /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -12337,8 +12429,7 @@ dir = 4 }, /obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Underground Men's Restroom"; - req_access_txt = "100" + name = "\improper Underground Men's Restroom" }, /turf/open/floor/plating, /area/varadero/interior/toilets) @@ -12607,7 +12698,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ dir = 1; name = "\improper Theta-V Breakroom"; - req_one_access = null + req_one_access = null; + req_access = null }, /turf/open/floor/shiva{ icon_state = "floor3" @@ -13067,7 +13159,6 @@ dir = 4 }, /obj/structure/surface/table, -/obj/item/device/flashlight, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -13213,6 +13304,7 @@ pixel_x = -5; pixel_y = 5 }, +/obj/effect/spawner/random/supply_kit, /turf/open/floor/shiva{ dir = 4; icon_state = "red" @@ -13686,14 +13778,12 @@ }, /area/varadero/interior/administration) "jbj" = ( -/obj/structure/pipes/standard/simple/hidden/green{ - dir = 4 - }, -/obj/effect/landmark/corpsespawner/doctor, -/turf/open/floor/shiva{ - icon_state = "floor3" +/obj/structure/surface/rack, +/obj/effect/spawner/random/tool, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" }, -/area/varadero/interior/medical) +/area/varadero/interior_protected/maintenance/south) "jbR" = ( /obj/item/device/flashlight/lamp/tripod{ pixel_x = 7; @@ -14419,6 +14509,12 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance/north) +"jCU" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/gm/dirt{ + icon_state = "desert3" + }, +/area/varadero/interior/maintenance/north) "jDO" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -16150,6 +16246,7 @@ }, /area/varadero/interior/maintenance/north) "kJu" = ( +/obj/effect/landmark/corpsespawner/colonist, /turf/open/floor/shiva{ dir = 4; icon_state = "multi_tiles" @@ -17170,6 +17267,12 @@ dir = 1 }, /area/varadero/interior/research) +"ltX" = ( +/obj/effect/decal/cleanable/vomit, +/turf/open/floor/shiva{ + icon_state = "redfull" + }, +/area/varadero/interior/medical) "lur" = ( /turf/open/floor/plating/icefloor{ icon_state = "asteroidplating" @@ -18632,6 +18735,7 @@ /area/varadero/interior_protected/caves/digsite) "mms" = ( /obj/structure/closet/secure_closet/miner, +/obj/item/clothing/accessory/storage/black_vest/brown_vest, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves) "mmv" = ( @@ -19223,6 +19327,13 @@ /obj/structure/prop/dam/truck/damaged, /turf/open/gm/dirt, /area/varadero/exterior/lz2_near) +"mDA" = ( +/obj/structure/surface/rack, +/obj/item/pizzabox/meat, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "mDD" = ( /obj/structure/ore_box, /turf/open/gm/dirt, @@ -19230,8 +19341,7 @@ "mDW" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; - name = "\improper Toilet Unit"; - req_access_txt = "100" + name = "\improper Toilet Unit" }, /turf/open/floor/plating, /area/varadero/interior/toilets) @@ -19629,6 +19739,10 @@ "mXc" = ( /obj/structure/surface/table/woodentable, /obj/item/reagent_container/food/drinks/bottle/holywater, +/obj/item/tool/lighter/random{ + pixel_x = -9; + pixel_y = 15 + }, /turf/open/floor/carpet, /area/varadero/interior/chapel) "mXo" = ( @@ -20147,6 +20261,7 @@ /obj/structure/machinery/alarm{ pixel_y = 24 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ dir = 1; icon_state = "green" @@ -20654,7 +20769,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ dir = 1; name = "\improper Underground Medical Laboratory"; - req_access_txt = "100" + req_access = null; + req_one_access = null }, /turf/open/floor/plating, /area/varadero/interior/medical) @@ -21328,6 +21444,8 @@ /area/varadero/interior/hall_SE) "oaG" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/green, +/obj/effect/landmark/corpsespawner/doctor, +/obj/effect/decal/cleanable/vomit, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -21873,6 +21991,13 @@ icon_state = "asteroidplating" }, /area/varadero/interior/electrical) +"osT" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/toolbox, +/turf/open/floor/plating/icefloor{ + icon_state = "asteroidplating" + }, +/area/varadero/interior_protected/maintenance/south) "osX" = ( /obj/structure/machinery/shower{ dir = 8 @@ -23597,8 +23722,8 @@ /obj/structure/machinery/door/airlock/almayer/medical/glass{ dir = 1; name = "\improper Underground Medical Laboratory"; - req_access_txt = "100"; - req_one_access = null + req_one_access = null; + req_access = null }, /turf/open/floor/plating, /area/varadero/interior/medical) @@ -23659,6 +23784,8 @@ "pxK" = ( /obj/structure/closet/secure_closet/personal, /obj/item/paper/research_notes, +/obj/item/paper/research_notes, +/obj/item/clothing/accessory/storage/black_vest/brown_vest, /turf/open/floor/wood, /area/varadero/interior/administration) "pxZ" = ( @@ -27392,7 +27519,8 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/medidoor{ dir = 1; name = "\improper Theta-V Research Laboratory"; - req_access_txt = "100" + req_one_access = null; + req_access = null }, /turf/open/floor/shiva{ icon_state = "floor3" @@ -28438,6 +28566,12 @@ /obj/item/storage/pouch/machete/full, /turf/open/floor/wood, /area/varadero/interior/security) +"swu" = ( +/obj/effect/landmark/corpsespawner/miner, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "swF" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -28480,7 +28614,7 @@ }, /area/varadero/exterior/lz1_near) "syA" = ( -/obj/effect/decal/cleanable/blood/oil, +/obj/effect/decal/cleanable/blood/oil/streak, /turf/open/gm/dirt{ icon_state = "desert3" }, @@ -29475,9 +29609,17 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"tkd" = ( +/obj/item/device/flashlight, +/turf/open/floor/shiva{ + dir = 1; + icon_state = "multi_tiles" + }, +/area/varadero/interior/electrical) "tkH" = ( /obj/structure/surface/table/reinforced/prison, /obj/effect/landmark/crap_item, +/obj/effect/spawner/random/supply_kit, /turf/open/floor/shiva{ dir = 5; icon_state = "blue" @@ -30057,6 +30199,12 @@ /obj/structure/machinery/photocopier, /turf/open/floor/wood, /area/varadero/interior/maintenance/north) +"tLY" = ( +/obj/structure/largecrate/random/barrel/white, +/turf/open/auto_turf/sand_white/layer1, +/area/varadero/exterior/eastbeach{ + lighting_use_dynamic = 1 + }) "tMx" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/item/key/cargo_train, @@ -31185,6 +31333,7 @@ pixel_x = 16; pixel_y = 24 }, +/obj/effect/decal/cleanable/blood, /turf/open/floor/shiva{ icon_state = "floor3" }, @@ -31208,6 +31357,10 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"uwj" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/open/gm/dirt, +/area/varadero/interior/maintenance/north) "uwu" = ( /obj/structure/closet/crate/secure, /obj/item/trash/chunk, @@ -31329,10 +31482,7 @@ /area/varadero/exterior/pontoon_beach) "uzP" = ( /obj/effect/landmark/objective_landmark/far, -/obj/structure/surface/table/reinforced/prison{ - dir = 1; - flipped = 1 - }, +/obj/structure/surface/table/reinforced/prison, /turf/open/floor/wood, /area/varadero/interior/hall_SE) "uAU" = ( @@ -31916,6 +32066,10 @@ icon_state = "yellow" }, /area/varadero/interior/cargo) +"uRj" = ( +/obj/item/tool/candle, +/turf/open/floor/carpet, +/area/varadero/interior/chapel) "uRL" = ( /obj/structure/platform_decoration/kutjevo{ dir = 1 @@ -32243,6 +32397,7 @@ /area/varadero/interior/hall_NW) "vbB" = ( /obj/structure/closet/secure_closet/engineering_personal, +/obj/item/clothing/accessory/storage/black_vest/brown_vest, /turf/open/floor/shiva{ icon_state = "multi_tiles" }, @@ -32491,6 +32646,14 @@ /area/varadero/exterior/lz1_near) "vjv" = ( /obj/structure/closet/crate/freezer/rations, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov, +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = -3 + }, +/obj/item/explosive/grenade/incendiary/molotov{ + pixel_x = 6 + }, /turf/open/floor{ icon_state = "freezerfloor" }, @@ -32620,6 +32783,11 @@ /area/varadero/interior/maintenance/north) "vpB" = ( /obj/structure/closet/crate/trashcart, +/obj/item/trash/ceramic_plate, +/obj/item/trash/popcorn, +/obj/item/trash/candy, +/obj/item/tool/crowbar, +/obj/item/tool/lighter/zippo, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/lz1_near) "vpF" = ( @@ -33212,8 +33380,7 @@ /area/varadero/interior/caves/north_research) "vGD" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ - name = "\improper Underground Visitor Entrance"; - req_access_txt = "100" + name = "\improper Underground Visitor Entrance" }, /turf/open/floor/plating, /area/varadero/interior/hall_SE) @@ -33238,6 +33405,12 @@ /obj/item/toy/beach_ball, /turf/open/auto_turf/sand_white/layer1, /area/varadero/exterior/pontoon_beach) +"vIz" = ( +/obj/effect/decal/cleanable/blood/gibs, +/turf/open/floor/shiva{ + icon_state = "floor3" + }, +/area/varadero/interior/mess) "vJT" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/shuttle/dropship/flight/lz1{ @@ -33284,9 +33457,11 @@ }, /area/varadero/interior_protected/caves) "vKy" = ( -/obj/item/tank/phoron, -/turf/open/gm/dirt, -/area/varadero/exterior/lz1_near) +/obj/effect/decal/cleanable/vomit, +/turf/open/floor{ + icon_state = "white" + }, +/area/varadero/interior/toilets) "vKD" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/tool/pen/blue/clicky, @@ -34991,8 +35166,7 @@ }, /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; - name = "\improper Underground Power Substation"; - req_access_txt = "100" + name = "\improper Underground Power Substation" }, /turf/open/floor/shiva{ icon_state = "floor3" @@ -35738,6 +35912,9 @@ /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood, /obj/effect/landmark/corpsespawner/colonist, +/obj/item/ammo_casing/shell{ + icon_state = "cartridge_1_1" + }, /turf/open/floor{ icon_state = "asteroidwarning" }, @@ -36583,7 +36760,6 @@ /area/varadero/interior/cargo) "xTh" = ( /obj/structure/closet/secure_closet/security, -/obj/effect/spawner/random/supply_kit, /turf/open/floor/shiva{ dir = 10; icon_state = "red" @@ -37124,8 +37300,7 @@ dir = 4 }, /obj/structure/machinery/door/airlock/almayer/generic{ - name = "\improper Underground Women's Restroom"; - req_access_txt = "100" + name = "\improper Underground Women's Restroom" }, /turf/open/floor/plating, /area/varadero/interior/toilets) @@ -39442,7 +39617,7 @@ yhP sOc yhP yhP -yhP +cAr sOc pGs pGs @@ -45814,7 +45989,7 @@ hyr vnm kSJ vQz -brX +fxo jZE vQz efd @@ -45995,7 +46170,7 @@ hyr hyr vnm kHE -oXf +uRj brX oXf jZE @@ -46009,7 +46184,7 @@ lzu nxW fZI maN -jbj +rsM aRc maN maN @@ -46509,7 +46684,7 @@ eaC rzh oCR hAg -gnN +lYr xVK lYr rzh @@ -46722,13 +46897,13 @@ hyr hyr hyr bLB -hfR +blH jZE mfa cSi poh uEE -cSq +gnN bLB xWY tam @@ -46873,7 +47048,7 @@ qFC kIJ cRx lYr -lYr +pZq rzh rCf lYr @@ -46907,7 +47082,7 @@ vnm hfR qpW fUN -oXf +exT oXf uEE cSq @@ -47224,7 +47399,7 @@ srr huF xfo aFo -vKy +lYr iSz lYr lYr @@ -47589,8 +47764,8 @@ xfo xfo aFo rzh -lYr itT +lYr khI cPT pbp @@ -47703,9 +47878,9 @@ ebr ebr ksX ksX -mPT -mPT -mPT +jbj +osT +gOG ksX ebr ebr @@ -47950,7 +48125,7 @@ aQq boI mbA miR -ahg +fyp aFo asx asx @@ -48240,7 +48415,7 @@ ghs cto cto tVX -mPT +mDA ksX ksX ksX @@ -49806,7 +49981,7 @@ wMw wMw wMw wMw -wMw +uBH cHY wMw rSA @@ -49987,7 +50162,7 @@ oZs wMw wMw jkK -uBH +wMw fnj wMw wMw @@ -50016,7 +50191,7 @@ tQz sjP gjw jZO -qUQ +ltX nSP tyT peA @@ -51815,7 +51990,7 @@ uLa uOQ mrF nRH -nRH +jCU fIT pGJ pGJ @@ -51999,7 +52174,7 @@ npB fIT iSW fIT -iSW +uwj hyr pJf fIT @@ -52007,7 +52182,7 @@ kIV hyr kMJ oMs -oMs +jWJ xWY hrG mos @@ -52186,11 +52361,11 @@ rnu rbd hyr oZA -hyr +htP cIV oMs oMs -lzu +fle oMs hca lzu @@ -52366,7 +52541,7 @@ fIT fIT bbS cZZ -hyr +htP ooe ukX cKa @@ -54215,7 +54390,7 @@ wno jCr iNE hLA -jCr +vIz jCr iNE jCr @@ -58601,7 +58776,7 @@ xvF wVf wVf mLt -nEZ +pJn xOo oCN wVf @@ -58618,7 +58793,7 @@ iyg epB skn kWB -kWB +cgS hPH lwK kWB @@ -58908,7 +59083,7 @@ fLS fLS fLS fLS -wxj +tLY vTC jRC fPX @@ -59716,7 +59891,7 @@ uXS uXS uXS tlG -hsx +eQZ rWx uXS sGo @@ -59834,7 +60009,7 @@ wOO oUO kCA tlT -cbq +tkd tlT oHU cbq @@ -60083,7 +60258,7 @@ jGz hsx rWx uXS -sGo +vKy eQZ iHm uXS @@ -60623,7 +60798,7 @@ kbQ kbQ eyt uXS -vzY +dkB qZr mDW tKw @@ -60806,7 +60981,7 @@ kbQ kbQ uXS vZv -sGo +swu uXS uAU qXM @@ -61811,7 +61986,7 @@ aOi jYB wEJ jYB -fLS +tHw ghJ ghJ ghJ