From 0ccf3386c1c2953d3ae1e6c43a36045875052cca Mon Sep 17 00:00:00 2001 From: KandJX <83637364+YegorKandziuba@users.noreply.github.com> Date: Sat, 28 Oct 2023 20:26:33 +0300 Subject: [PATCH] Fix open mining closet and pollute virology (#1243) --- maps/sierra/z1-z5_sierra.dmm | 561 +++++++++++++++++++++++++---------- 1 file changed, 409 insertions(+), 152 deletions(-) diff --git a/maps/sierra/z1-z5_sierra.dmm b/maps/sierra/z1-z5_sierra.dmm index 64ff535ee328d..9d7375ff261b7 100644 --- a/maps/sierra/z1-z5_sierra.dmm +++ b/maps/sierra/z1-z5_sierra.dmm @@ -641,6 +641,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "aex" = ( @@ -1038,6 +1039,7 @@ pixel_x = -9 }, /obj/floor_decal/industrial/hatch/yellow, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "ahQ" = ( @@ -1296,7 +1298,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/catwalk_plated, /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -1306,7 +1307,7 @@ dir = 4; icon_state = "pipe-j2" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "akf" = ( /obj/structure/cable/cyan{ @@ -2299,6 +2300,7 @@ "arm" = ( /obj/floor_decal/corner/paleblue, /obj/machinery/vending/snack, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "arC" = ( @@ -2307,6 +2309,7 @@ pixel_x = -12 }, /obj/floor_decal/industrial/hatch/yellow, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "arG" = ( @@ -2601,6 +2604,9 @@ dir = 4; pixel_x = -24 }, +/obj/decal/cleanable/cobweb{ + dir = 4 + }, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "atF" = ( @@ -3012,8 +3018,7 @@ name = "Chemistry"; sort_type = "Chemistry" }, -/obj/catwalk_plated, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "awQ" = ( /obj/structure/cable/green{ @@ -3506,6 +3511,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "aAB" = ( @@ -5286,6 +5292,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology) "aNW" = ( @@ -6692,6 +6699,8 @@ "aXW" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "aYb" = ( @@ -15948,13 +15957,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/catwalk_plated, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "cxy" = ( /obj/structure/cable/green{ @@ -16243,7 +16251,9 @@ /obj/machinery/atmospherics/tvalve{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, +/turf/simulated/floor/plating, /area/medical/virology/atmos) "czG" = ( /obj/floor_decal/corner/paleblue/bordercorner{ @@ -16260,6 +16270,7 @@ /area/maintenance/seconddeck/forestarboard) "czJ" = ( /obj/structure/closet/l3closet/general, +/obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "czN" = ( @@ -16401,6 +16412,14 @@ /obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/white/monotile, /area/rnd/xenobiology/level1) +"cAm" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/decal/cleanable/cobweb{ + dir = 1 + }, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/techfloor/grid, +/area/medical/virology/atmos) "cAu" = ( /obj/machinery/computer/modular/preset/medical{ dir = 4 @@ -16863,6 +16882,8 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology) "cEd" = ( @@ -17357,6 +17378,8 @@ dir = 8 }, /obj/machinery/meter, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "cHJ" = ( @@ -18381,7 +18404,8 @@ /area/engineering/engine_room) "cOY" = ( /obj/machinery/atmospherics/binary/pump, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/medical/virology/atmos) "cPc" = ( /obj/structure/cable/green{ @@ -19330,6 +19354,14 @@ }, /turf/simulated/floor/carpet/green, /area/medical/mentalhealth/therapyroom) +"cWK" = ( +/obj/structure/bed/chair/office/green{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, +/area/medical/virology/lab) "cXj" = ( /obj/floor_decal/corner/yellow{ dir = 1 @@ -19361,11 +19393,7 @@ /obj/floor_decal/corner/green/border{ dir = 1 }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "cXt" = ( @@ -20648,6 +20676,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "dgc" = ( @@ -21368,6 +21397,7 @@ /area/maintenance/seconddeck/aftstarboard) "dlX" = ( /obj/machinery/atmospherics/unary/tank/air, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "dma" = ( @@ -21388,6 +21418,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/tcommsat/computer) +"dmd" = ( +/obj/structure/railing/mapped, +/obj/structure/table/rack, +/obj/random/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/firstdeck/aftstarboard) "dme" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/bluegrid, @@ -22436,7 +22472,8 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/tiled/white, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/medical/virology) "dux" = ( /obj/floor_decal/borderfloor{ @@ -22693,6 +22730,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "dvW" = ( @@ -23816,6 +23854,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "dDx" = ( @@ -24732,6 +24771,7 @@ /area/security/sierra/sergeant) "dLd" = ( /obj/structure/table/standard, +/obj/random/maintenance, /turf/simulated/floor/tiled/freezer, /area/medical/virology/lab) "dLe" = ( @@ -24863,6 +24903,7 @@ dir = 8; pixel_x = -24 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "dMC" = ( @@ -25720,6 +25761,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "dSU" = ( @@ -26015,6 +26057,10 @@ dir = 1; pixel_y = -24 }, +/obj/decal/cleanable/cobweb{ + dir = 1 + }, +/obj/random/maintenance, /turf/simulated/floor/tiled/freezer, /area/medical/virology/lab) "dVj" = ( @@ -27526,6 +27572,11 @@ /obj/machinery/floodlight, /turf/simulated/floor/plating, /area/maintenance/thirddeck/starboard) +"egr" = ( +/obj/structure/table/standard, +/obj/item/device/flashlight/lamp/green, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "egt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29311,7 +29362,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/expedition) "etS" = ( -/obj/structure/closet/toolcloset/excavation, +/obj/structure/closet/toolcloset/excavation{ + locked = 1 + }, /obj/floor_decal/borderfloor{ dir = 5 }, @@ -30665,22 +30718,16 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos) "eEA" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/floor_decal/corner/green{ + dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + dir = 10 }, -/turf/simulated/floor/plating, -/area/hallway/primary/firstdeck/aft) +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, +/area/medical/virology/lab) "eEC" = ( /obj/floor_decal/corner/darkblue, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -32205,18 +32252,12 @@ /turf/simulated/floor/plating, /area/maintenance/bridgedeck/aft) "eRj" = ( -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/firedoor, -/obj/wallframe_spawn/reinforced, -/obj/machinery/door/blast/regular/open{ - id_tag = "Biohazard"; - name = "Biohazard Shutter" +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/plating, -/area/rnd/development) +/area/medical/virology/atmos) "eRn" = ( /obj/structure/cable/green{ d1 = 1; @@ -33974,6 +34015,7 @@ /obj/floor_decal/corner/green/bordercorner2{ dir = 5 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "ffd" = ( @@ -39770,23 +39812,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/random/maintenance, /turf/simulated/floor/tiled/freezer, /area/medical/virology/lab) "fZp" = ( -/obj/machinery/door/firedoor, -/obj/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/item/taperoll/engineering/applied, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/airlock/multi_tile/maintenance{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/virology{ dir = 8 }, +/obj/wallframe_spawn/reinforced, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "fZy" = ( @@ -40994,6 +41037,7 @@ /obj/floor_decal/corner/green/bordercorner2{ dir = 8 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "gjE" = ( @@ -42016,6 +42060,8 @@ /obj/machinery/smartfridge/secure/virology{ req_access = null }, +/obj/decal/cleanable/cobweb2, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology/lab) "grI" = ( @@ -42030,6 +42076,7 @@ name = "south bump"; pixel_y = -24 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "grL" = ( @@ -43189,7 +43236,9 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/blast/regular, +/obj/machinery/door/blast/regular{ + id_tag = "vir_blast_window" + }, /turf/simulated/floor/plating, /area/medical/virology) "gDw" = ( @@ -43430,6 +43479,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "gFg" = ( @@ -43839,6 +43889,7 @@ "gHC" = ( /obj/floor_decal/corner/red, /obj/structure/table/standard, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "gHE" = ( @@ -45108,7 +45159,7 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/medical/virology) "gRR" = ( /turf/simulated/wall/r_wall/hull, @@ -45315,6 +45366,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "gTl" = ( @@ -45757,10 +45809,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -21 - }, /turf/simulated/floor/tiled, /area/crew_quarters/visitors) "gWy" = ( @@ -46372,7 +46420,11 @@ /area/hallway/primary/bridgedeck/center) "haP" = ( /obj/structure/table/standard, -/obj/random/tool, +/obj/item/deck/cards{ + pixel_y = 8; + pixel_x = 4 + }, +/obj/random/drinkbottle, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "haV" = ( @@ -48643,6 +48695,7 @@ dir = 1 }, /obj/machinery/light_construct/small, +/obj/random/maintenance, /turf/simulated/floor/tiled/freezer, /area/medical/virology/lab) "hvk" = ( @@ -48729,6 +48782,7 @@ dir = 4 }, /obj/machinery/meter, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "hvZ" = ( @@ -51951,6 +52005,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "hWb" = ( @@ -52240,6 +52295,7 @@ /obj/machinery/atmospherics/pipe/simple/visible{ dir = 10 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "hYX" = ( @@ -54735,7 +54791,7 @@ /area/maintenance/thirddeck/aftport) "itC" = ( /obj/structure/bed/chair/office/green, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/medical/virology/lab) "itG" = ( /obj/paint/nt_white, @@ -58312,6 +58368,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "iUO" = ( @@ -58885,6 +58942,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/engine_eva) +"iZZ" = ( +/obj/floor_decal/borderfloor, +/obj/floor_decal/corner/purple/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atm{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "jac" = ( /obj/structure/cable/cyan{ d1 = 2; @@ -59268,7 +59336,8 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/medical/virology/lab) "jdy" = ( /obj/structure/cable/green{ @@ -62862,6 +62931,7 @@ /obj/floor_decal/corner/green/bordercorner2{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "jHH" = ( @@ -63051,6 +63121,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "jJA" = ( @@ -63841,12 +63912,13 @@ /turf/simulated/floor/plating, /area/maintenance/seconddeck/forestarboard) "jQz" = ( -/obj/structure/railing/mapped{ +/obj/floor_decal/corner/green{ dir = 1 }, -/obj/structure/table/rack, -/turf/simulated/floor/plating, -/area/maintenance/firstdeck/aftstarboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, +/area/medical/virology/lab) "jQG" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -63988,6 +64060,10 @@ icon_state = "bordercolorcorner2"; dir = 9 }, +/obj/decal/cleanable/cobweb{ + dir = 4 + }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "jRN" = ( @@ -64380,7 +64456,8 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/medical/virology/lab) "jTO" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -65804,11 +65881,6 @@ /area/security/sierra/hallway/aft) "kdA" = ( /obj/machinery/door/firedoor, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" @@ -67246,6 +67318,7 @@ "kpb" = ( /obj/floor_decal/borderfloorblack, /obj/floor_decal/corner/green/border, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "kph" = ( @@ -68122,6 +68195,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/decal/cleanable/dirt, +/obj/machinery/button/blast_door{ + dir = 1; + pixel_y = -24; + id_tag = "vir_isol"; + name = "Virology isolator" + }, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "kvH" = ( @@ -69073,7 +69153,9 @@ /area/storage/tech) "kCD" = ( /obj/wallframe_spawn/reinforced/hull, -/obj/machinery/door/blast/regular, +/obj/machinery/door/blast/regular{ + id_tag = "vir_blast_window" + }, /turf/simulated/floor/plating, /area/medical/virology/lab) "kCE" = ( @@ -70840,6 +70922,7 @@ /area/maintenance/thirddeck/foreport) "kPX" = ( /obj/floor_decal/corner/paleblue, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "kQa" = ( @@ -72740,6 +72823,7 @@ dir = 1; pixel_y = -24 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "lfV" = ( @@ -74683,7 +74767,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/plating, /area/medical/virology/atmos) "lvu" = ( /obj/structure/closet/toolcloset, @@ -79768,6 +79852,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "mjf" = ( @@ -80827,7 +80912,9 @@ /area/storage/eva) "msF" = ( /obj/wallframe_spawn/reinforced/hull, -/obj/machinery/door/blast/regular, +/obj/machinery/door/blast/regular{ + id_tag = "vir_blast_window" + }, /turf/simulated/floor/plating, /area/medical/virology) "msI" = ( @@ -80957,7 +81044,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/medical/virology) "mtR" = ( /obj/structure/cable/green{ @@ -83039,6 +83126,7 @@ /obj/machinery/atmospherics/binary/pump{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "mJV" = ( @@ -85315,6 +85403,7 @@ "ncz" = ( /obj/random/closet, /obj/structure/railing/mapped, +/obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "ncG" = ( @@ -86445,6 +86534,7 @@ /obj/machinery/light_construct{ dir = 8 }, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "nlA" = ( @@ -86580,6 +86670,18 @@ /obj/structure/lattice, /turf/simulated/open, /area/space) +"nmP" = ( +/obj/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/white, +/area/medical/virology/lab) "nmS" = ( /obj/machinery/atmospherics/unary/vent_pump/tank{ dir = 8; @@ -86958,6 +87060,7 @@ "npK" = ( /obj/structure/bed/padded, /obj/item/bedsheet/green, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "npL" = ( @@ -88397,6 +88500,7 @@ /obj/floor_decal/corner/green/bordercorner2{ dir = 6 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "nAg" = ( @@ -89493,6 +89597,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "nJn" = ( @@ -90972,6 +91077,16 @@ }, /turf/simulated/floor/tiled/dark/monotile, /area/medical/sleeper) +"nYn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/medical/virology/lab) "nYD" = ( /turf/simulated/wall/r_wall/hull, /area/thruster/d1starboard) @@ -91401,6 +91516,7 @@ /obj/structure/railing/mapped{ dir = 1 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "obE" = ( @@ -92263,6 +92379,7 @@ dir = 1; pixel_y = -24 }, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "oif" = ( @@ -93610,6 +93727,11 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/security/sierra/brig) +"ore" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/techfloor/grid, +/area/medical/virology/atmos) "orf" = ( /obj/machinery/atmospherics/omni/filter{ tag_east = 2; @@ -93728,6 +93850,7 @@ "otk" = ( /obj/structure/closet/l3closet/virology, /obj/floor_decal/industrial/outline/yellow, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "otl" = ( @@ -96704,6 +96827,7 @@ /obj/structure/bed/chair/office/green{ dir = 4 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "oQE" = ( @@ -96943,6 +97067,7 @@ /turf/simulated/floor/wood/walnut, /area/crew_quarters/head_big) "oTc" = ( +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "oTm" = ( @@ -100374,6 +100499,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "prP" = ( @@ -100579,6 +100705,16 @@ "psN" = ( /turf/simulated/wall/r_wall/prepainted, /area/storage/airlock_canisters) +"psO" = ( +/obj/floor_decal/borderfloor, +/obj/floor_decal/corner/purple/border, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/floor_decal/borderfloor/corner2, +/obj/floor_decal/corner/purple/bordercorner2, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "psR" = ( /obj/structure/cable{ d1 = 4; @@ -100869,7 +101005,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/freezer, +/turf/simulated/floor/plating, /area/medical/virology/lab) "puV" = ( /obj/structure/railing/mapped{ @@ -102781,6 +102917,8 @@ /obj/floor_decal/corner/green/mono, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/constructable_frame/machine_frame, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology/lab) "pLk" = ( @@ -103674,6 +103812,13 @@ }, /turf/simulated/open, /area/quartermaster/hangar/upper) +"pSF" = ( +/obj/structure/railing/mapped{ + dir = 1 + }, +/obj/structure/bed/chair/padded/yellow, +/turf/simulated/floor/plating, +/area/maintenance/thirddeck/port) "pSP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -103689,7 +103834,8 @@ d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/medical/virology) "pST" = ( /obj/machinery/door/airlock/external{ @@ -105643,6 +105789,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "qij" = ( @@ -106918,6 +107065,7 @@ dir = 4 }, /obj/structure/table/rack, +/obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "qtr" = ( @@ -107302,6 +107450,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "qwJ" = ( @@ -108997,6 +109146,7 @@ dir = 8; pixel_x = 24 }, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "qLh" = ( @@ -109195,6 +109345,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "qMm" = ( @@ -109493,13 +109644,13 @@ /turf/simulated/floor/wood/walnut, /area/maintenance/firstdeck/foreport) "qOk" = ( -/obj/wallframe_spawn/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/wallframe_spawn/reinforced, /turf/simulated/floor/plating, /area/medical/virology/atmos) "qOn" = ( @@ -109547,8 +109698,8 @@ /obj/floor_decal/corner/purple/border{ dir = 4 }, -/obj/machinery/smartfridge{ - opacity = 1 +/obj/machinery/smartfridge/secure/medbay{ + req_access = list() }, /turf/simulated/floor/tiled/white, /area/rnd/misc_lab) @@ -110538,7 +110689,8 @@ "qWx" = ( /obj/wallframe_spawn/reinforced/hull, /obj/machinery/door/blast/regular{ - dir = 4 + dir = 4; + id_tag = "vir_blast_window" }, /turf/simulated/floor/plating, /area/medical/virology/lab) @@ -111754,6 +111906,7 @@ /obj/machinery/atmospherics/binary/pump/on{ name = "Air to Supply" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "reW" = ( @@ -113048,7 +113201,9 @@ "rqg" = ( /obj/wallframe_spawn/reinforced/hull, /obj/structure/disposalpipe/segment, -/obj/machinery/door/blast/regular, +/obj/machinery/door/blast/regular{ + id_tag = "vir_blast_window" + }, /turf/simulated/floor/plating, /area/medical/virology/lab) "rql" = ( @@ -113311,6 +113466,8 @@ name = "west bump"; pixel_x = -24 }, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology) "rsi" = ( @@ -114098,6 +114255,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "ryg" = ( @@ -114540,6 +114698,23 @@ }, /turf/simulated/floor/tiled/techfloor, /area/quartermaster/storage) +"rBp" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "rBx" = ( /obj/floor_decal/industrial/outline/yellow, /obj/machinery/field_generator, @@ -116167,6 +116342,7 @@ /obj/floor_decal/corner/green/border{ dir = 8 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "rOW" = ( @@ -116188,6 +116364,7 @@ /obj/machinery/light_construct{ dir = 8 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "rPc" = ( @@ -118986,6 +119163,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/decal/cleanable/cobweb{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/virology) "skl" = ( @@ -120218,7 +120398,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/catwalk_plated, +/turf/simulated/floor/plating, /area/hallway/primary/firstdeck/aft) "suB" = ( /obj/floor_decal/borderfloor{ @@ -121160,6 +121341,8 @@ /obj/floor_decal/corner/green/mono, /obj/floor_decal/industrial/outline/yellow, /obj/machinery/constructable_frame/machine_frame, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology/lab) "sBA" = ( @@ -122200,6 +122383,8 @@ dir = 8 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "sIr" = ( @@ -122215,15 +122400,12 @@ /obj/floor_decal/corner/green/border{ dir = 5 }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; +/obj/machinery/button/blast_door{ + id_tag = "vir_blast_window"; + name = "Virology windows"; + dir = 8; pixel_x = 24 }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "sIt" = ( @@ -122960,7 +123142,8 @@ /area/crew_quarters/heads/office/iaa) "sNM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/plating, /area/medical/virology/lab) "sNN" = ( /obj/structure/cable{ @@ -123133,8 +123316,8 @@ /obj/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/atm{ - pixel_y = 32 +/obj/structure/sign/chemistry{ + pixel_y = 24 }, /obj/floor_decal/borderfloor/corner2{ dir = 4 @@ -123874,6 +124057,7 @@ }, /obj/machinery/light/small, /obj/structure/table/rack, +/obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/firstdeck/aftstarboard) "sUI" = ( @@ -126271,7 +126455,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/catwalk_plated, +/turf/simulated/floor/plating, /area/hallway/primary/firstdeck/aft) "tpb" = ( /obj/floor_decal/steeldecal/steel_decals4{ @@ -130985,6 +131170,17 @@ /obj/floor_decal/corner/green/border{ dir = 4 }, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "uav" = ( @@ -131496,6 +131692,7 @@ /obj/machinery/atmospherics/portables_connector{ dir = 8 }, +/obj/decal/cleanable/cobweb2, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "uel" = ( @@ -131942,6 +132139,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/structure/bed/chair/padded/yellow{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/thirddeck/port) "ujN" = ( @@ -132065,6 +132265,7 @@ pixel_x = -5; pixel_y = 2 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "ukQ" = ( @@ -136479,6 +136680,8 @@ pixel_y = 32 }, /obj/machinery/recharger, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, /turf/simulated/floor/tiled/white, /area/medical/virology) "uUl" = ( @@ -137270,6 +137473,12 @@ sort_type = "Research and Development"; name = "Research and Development" }, +/obj/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/floor_decal/corner/purple/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "vaO" = ( @@ -137299,7 +137508,7 @@ name = "Scrubber to Waste"; dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/plating, /area/medical/virology/atmos) "vbe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -137890,6 +138099,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "veV" = ( @@ -138057,6 +138267,7 @@ "vfY" = ( /obj/structure/closet/wardrobe/virology_white, /obj/floor_decal/industrial/outline/yellow, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white/monotile, /area/medical/virology) "vgc" = ( @@ -138258,6 +138469,15 @@ }, /turf/simulated/floor/reinforced, /area/maintenance/fourthdeck/foreport) +"vhK" = ( +/obj/machinery/door/firedoor, +/obj/machinery/navbeacon/sierra/FD_forecentralhallway1, +/obj/floor_decal/industrial/hatch/yellow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/firstdeck/aft) "vhP" = ( /obj/machinery/seed_storage/garden, /obj/machinery/button/blast_door{ @@ -140975,6 +141195,7 @@ /obj/machinery/light_construct{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "vCI" = ( @@ -142267,6 +142488,7 @@ /obj/structure/bed/padded, /obj/item/bedsheet/blue, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "vNw" = ( @@ -143507,6 +143729,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "vWG" = ( @@ -146057,6 +146280,25 @@ }, /turf/simulated/floor/grass, /area/crew_quarters/garden_room) +"wqA" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/firstdeck/aft) "wqC" = ( /obj/item/device/flashlight/lamp/floodlamp/green, /obj/item/device/flashlight/lamp/floodlamp/green, @@ -146965,6 +147207,7 @@ }, /obj/item/bedsheet/green, /obj/machinery/light_construct, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/ward) "wyp" = ( @@ -147870,22 +148113,10 @@ /turf/simulated/floor/tiled/white/monotile, /area/rnd/office) "wIL" = ( -/obj/floor_decal/borderfloor{ - dir = 1 - }, -/obj/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, -/obj/structure/sign/chemistry{ - pixel_y = 24 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor, +/obj/machinery/navbeacon/sierra/FD_forecentralhallway2, +/obj/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/monotile, /area/hallway/primary/firstdeck/aft) "wIU" = ( /obj/floor_decal/borderfloor{ @@ -149200,6 +149431,8 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/hologram/holopad, +/obj/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/hallway/primary/firstdeck/aft) "wUr" = ( @@ -149396,7 +149629,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, +/obj/decal/cleanable/dirt, +/obj/random/maintenance, +/turf/simulated/floor/plating, /area/medical/virology/atmos) "wWb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -150502,8 +150737,6 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/hologram/holopad, -/obj/floor_decal/industrial/outline/yellow, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -151314,6 +151547,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/seconddeck/center) +"xkR" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/decal/cleanable/dirt, +/turf/simulated/floor/tiled/techfloor/grid, +/area/medical/virology/atmos) "xkX" = ( /obj/structure/table/rack, /obj/random/maintenance, @@ -154329,6 +154567,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology) "xJc" = ( @@ -155364,6 +155603,24 @@ }, /turf/simulated/open, /area/rnd/xenobiology/level1) +"xQZ" = ( +/obj/floor_decal/borderfloor{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/machinery/light/spot{ + dir = 1 + }, +/obj/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/floor_decal/corner/paleblue/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/firstdeck/aft) "xRa" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/heads/captain) @@ -155403,6 +155660,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/decal/cleanable/cobweb{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/medical/virology/atmos) "xRB" = ( @@ -156330,23 +156590,11 @@ /turf/simulated/floor/plating, /area/vacant/prototype/control) "xZc" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/catwalk_plated, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/bed/chair/padded/yellow{ + dir = 8 }, /turf/simulated/floor/plating, -/area/hallway/primary/firstdeck/aft) +/area/maintenance/thirddeck/port) "xZd" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -156856,6 +157104,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/decal/cleanable/cobweb{ + dir = 1 + }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "ycO" = ( @@ -157108,9 +157360,13 @@ /turf/simulated/floor/carpet/red, /area/crew_quarters/cafe/upper) "yei" = ( -/obj/structure/closet/emcloset, +/obj/structure/railing/mapped, +/obj/structure/bed/chair/padded/yellow{ + dir = 1; + icon_state = "chair_preview" + }, /turf/simulated/floor/plating, -/area/maintenance/firstdeck/aftstarboard) +/area/maintenance/thirddeck/port) "yel" = ( /obj/machinery/computer/ship/engines, /obj/structure/extinguisher_cabinet{ @@ -157863,6 +158119,7 @@ /obj/structure/bed/chair/office/green{ dir = 1 }, +/obj/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, /area/medical/virology/lab) "yka" = ( @@ -214677,10 +214934,10 @@ nGI riP sTh xfd -obB +pSF haP -haP -jAY +egr +yei gPE dpR mIO @@ -214881,7 +215138,7 @@ gPE gPE obB ujE -wtM +xZc jAY gPE mtR @@ -258270,11 +258527,11 @@ eME utn utn vNv -xAG +jQz eGe swA jJw -qhl +nmP grt qwC jHq @@ -258674,7 +258931,7 @@ hLJ uaW kCD ukG -bFk +cWK oie utn vCG @@ -258877,7 +259134,7 @@ uaW kCD huY xAG -eGe +eEA swA gFe veC @@ -259684,7 +259941,7 @@ uaW kCD pLg cXs -jdm +nYn jdm dSS cxR @@ -261308,7 +261565,7 @@ vaT qih dfT mTY -mTY +xkR ttc wgY fhm @@ -261503,14 +261760,14 @@ xCC xCC czE mJU -rEd +eRj cHz rEd hLX wVT oTc amx -amx +ore ttc dTZ aAB @@ -261712,7 +261969,7 @@ yko nBy grv cjH -cjH +cAm ttc nEx vJS @@ -300293,7 +300550,7 @@ uYw uYw wWV wWV -yei +xEA ncz nvX wNJ @@ -300698,7 +300955,7 @@ uYw wWV wWV czJ -aSx +dmd nvX wNJ wNJ @@ -300902,7 +301159,7 @@ wWV ufa ufa nvX -jQz +lYw fZy nsI gUV @@ -300923,7 +301180,7 @@ edi rhi eFv ucY -eEA +xTl mfx bBL atj @@ -301102,7 +301359,7 @@ uYw wWV wWV qJj -aSx +dmd nvX sUC fZy @@ -301304,9 +301561,9 @@ uYw wWV wWV wWV -aSx +dmd nvX -jQz +lYw fZy oYh gUV @@ -301932,8 +302189,8 @@ eNk eNk eNk eNk -bNJ -rjg +xQZ +rBp vaJ kdA hba @@ -302135,9 +302392,9 @@ eDJ aYH eNk wIL -rjg -aZX -eRj +wqA +vhK +fIj gIx sGZ uyI @@ -302338,7 +302595,7 @@ gEm mLQ pno awP -aZX +psO fIj fxV nib @@ -302742,7 +302999,7 @@ xHI cjp nSY vcA -aZX +iZZ fIj mBz mBz @@ -304559,7 +304816,7 @@ juu hJd cex nSY -xZc +rjg aZX nOV kIz