diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm index 1c971c26465..a0927b31421 100644 --- a/code/game/machinery/embedded_controller/airlock_program.dm +++ b/code/game/machinery/embedded_controller/airlock_program.dm @@ -210,6 +210,7 @@ "tag" = tag, "sigtype" = "command", "power" = "[power]", + "expand" = "[1]", ) post_signal(signal) diff --git a/code/game/machinery/suit_storage/suit_storage_prepared.dm b/code/game/machinery/suit_storage/suit_storage_prepared.dm index 4c91db73c27..00cb8bcafc1 100644 --- a/code/game/machinery/suit_storage/suit_storage_prepared.dm +++ b/code/game/machinery/suit_storage/suit_storage_prepared.dm @@ -24,8 +24,8 @@ boots_stored_TYPE = /obj/item/clothing/shoes/magboots /obj/machinery/suit_storage_unit/search_and_rescue - suit_stored_TYPE = /obj/item/clothing/suit/space/void/medical - helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/medical + suit_stored_TYPE = /obj/item/clothing/suit/space/void/exploration/alt + helmet_stored_TYPE = /obj/item/clothing/head/helmet/space/void/exploration/alt mask_stored_TYPE = /obj/item/clothing/mask/breath boots_stored_TYPE = /obj/item/clothing/shoes/magboots diff --git a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm index ba665cace6f..0b39402a8f4 100644 --- a/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary/vent_scrubber.dm @@ -62,6 +62,14 @@ var/radio_filter_out var/radio_filter_in +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power + name = "High power air scrubber" + power_rating = 15000 + scrub_volume = 5000 + expanded_power = 15000 + expanded_scrub = 5000 + scrub_boost = 100 + /obj/machinery/atmospherics/component/unary/vent_scrubber/Initialize(mapload) . = ..() if(isnull(siphoning)) diff --git a/code/modules/maps/overmap/planets/_virgo3b.dm b/code/modules/maps/overmap/planets/_virgo3b.dm index 543ccd7b8f5..11fa22c6c5b 100644 --- a/code/modules/maps/overmap/planets/_virgo3b.dm +++ b/code/modules/maps/overmap/planets/_virgo3b.dm @@ -1,8 +1,8 @@ /datum/atmosphere/planet/virgo3b base = list( - /datum/gas/nitrogen = 0.16, - /datum/gas/phoron = 0.72, + /datum/gas/nitrogen = 0.36, + /datum/gas/phoron = 0.52, /datum/gas/carbon_dioxide = 0.12, ) pressure_low = 82.4 diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index be531a988a8..0121fcb4dc4 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -12,7 +12,7 @@ circuit = /obj/item/circuitboard/tesla_coil - var/power_loss = 2 + var/power_loss = 1.2 var/input_power_multiplier = 1 var/zap_cooldown = 100 var/last_zap = 0 diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index a0b7de563be..564b6b3262a 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ diff --git a/maps/tether/engines/rust.dmm b/maps/tether/engines/rust.dmm index dc74eca6885..ed936695506 100644 --- a/maps/tether/engines/rust.dmm +++ b/maps/tether/engines/rust.dmm @@ -1257,7 +1257,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/blast/regular{ - id = "EngineEmitterPortWest"; + id = "EngineEmitterPortWest2"; name = "Engine Gas Storage" }, /turf/simulated/floor/tiled/steel_grid, @@ -1268,7 +1268,7 @@ icon_state = "1-2" }, /obj/machinery/door/blast/regular{ - id = "EngineEmitterPortWest"; + id = "EngineEmitterPortWest2"; name = "Engine Gas Storage" }, /obj/machinery/button/remote/blast_door{ diff --git a/maps/tether/levels/mining.dmm b/maps/tether/levels/mining.dmm index 93b16abbdda..5ed647eb006 100644 --- a/maps/tether/levels/mining.dmm +++ b/maps/tether/levels/mining.dmm @@ -1055,9 +1055,7 @@ /turf/simulated/floor/tiled, /area/outpost/mining_main/hangar) "As" = ( -/turf/simulated/mineral/floor/virgo3b{ - color = "#AAAAAA" - }, +/turf/simulated/open/virgo3b, /area/mine/explored) "Ay" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -1850,13 +1848,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/mine/explored) -"WM" = ( -/obj/effect/step_trigger/teleporter/to_underdark{ - dir = 4; - pixel_x = -16 - }, -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/mine/explored) "Xe" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -1940,10 +1931,6 @@ /obj/spawner/window/low_wall/borosillicate/full, /turf/simulated/floor/plating, /area/outpost/mining_main/secondary_gear_storage) -"ZF" = ( -/obj/effect/step_trigger/teleporter/from_mining, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/outpost/mining_main/passage) "ZO" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -26607,7 +26594,7 @@ OH us us us -ZF +us "} (128,1,1) = {" Se @@ -26801,7 +26788,7 @@ OH us us us -ZF +us "} (129,1,1) = {" Se @@ -26995,7 +26982,7 @@ mk us us us -ZF +us "} (130,1,1) = {" Se @@ -27189,7 +27176,7 @@ mk us us us -ZF +us "} (131,1,1) = {" Se @@ -27383,7 +27370,7 @@ OH us us us -ZF +us "} (132,1,1) = {" Se @@ -27577,7 +27564,7 @@ mk us us us -ZF +us "} (133,1,1) = {" Se @@ -27771,7 +27758,7 @@ OH us us us -ZF +us "} (134,1,1) = {" Se @@ -27965,7 +27952,7 @@ mk us us us -ZF +us "} (135,1,1) = {" Se @@ -28159,7 +28146,7 @@ OH us us us -ZF +us "} (136,1,1) = {" Se @@ -28353,7 +28340,7 @@ OH us us us -ZF +us "} (137,1,1) = {" Se @@ -37288,8 +37275,8 @@ OH OH OH jz -WM -WM +As +As SD OH OH @@ -37482,8 +37469,8 @@ OH OH OH jz -OH -OH +As +As SD OH OH diff --git a/maps/tether/levels/plains.dmm b/maps/tether/levels/plains.dmm index 5d5905c37ca..a71bc8e6ad4 100644 --- a/maps/tether/levels/plains.dmm +++ b/maps/tether/levels/plains.dmm @@ -87,11 +87,6 @@ "A" = ( /turf/unsimulated/wall/planetary/virgo3b, /area/tether/outpost/exploration_shed) -"B" = ( -/obj/effect/floor_decal/rust, -/obj/effect/step_trigger/teleporter/from_plains, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/outpost/exploration_shed) "D" = ( /mob/living/simple_mob/animal/passive/gaslamp, /turf/simulated/floor/outdoors/grass/sif/virgo3b, @@ -22845,7 +22840,7 @@ u b "} (118,1,1) = {" -B +O O E O @@ -23039,7 +23034,7 @@ u b "} (119,1,1) = {" -B +O O O O @@ -23233,7 +23228,7 @@ u b "} (120,1,1) = {" -B +O O O O @@ -23427,7 +23422,7 @@ u b "} (121,1,1) = {" -B +O O O O @@ -23621,7 +23616,7 @@ u b "} (122,1,1) = {" -B +O O O O @@ -23815,7 +23810,7 @@ u b "} (123,1,1) = {" -B +O O O O @@ -24009,7 +24004,7 @@ u b "} (124,1,1) = {" -B +O O O O @@ -24203,7 +24198,7 @@ u b "} (125,1,1) = {" -B +O O O O @@ -24397,7 +24392,7 @@ u b "} (126,1,1) = {" -B +O O m G diff --git a/maps/tether/levels/station1.dmm b/maps/tether/levels/station1.dmm index ab124ec4147..f6250238be8 100644 --- a/maps/tether/levels/station1.dmm +++ b/maps/tether/levels/station1.dmm @@ -916,9 +916,6 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/securiship/cockpit) -"bQ" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "bR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -1827,8 +1824,8 @@ "dA" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_science{ - name = "Exploration"; - req_one_access = list(19,43,67) + name = "Exploration Lobby"; + req_one_access = null }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -2140,12 +2137,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled, /area/engineering/engine_eva) -"ej" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ek" = ( /obj/machinery/vending/cola, /turf/simulated/floor/tiled, @@ -2562,9 +2553,6 @@ }, /turf/simulated/floor/tiled, /area/security/customs) -"eY" = ( -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) "eZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2769,9 +2757,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"fv" = ( -/turf/simulated/floor, -/area/constructionsite) "fw" = ( /obj/structure/table/standard, /obj/item/towel, @@ -3360,9 +3345,6 @@ }, /turf/simulated/floor/tiled/white, /area/shuttle/medivac/cockpit) -"gP" = ( -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "gQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -5957,12 +5939,6 @@ }, /turf/simulated/floor, /area/constructionsite) -"mh" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "mi" = ( /turf/simulated/floor/wood, /area/crew_quarters/heads/blueshield) @@ -6395,9 +6371,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/shield_gen) -"nd" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "ne" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -8125,11 +8098,6 @@ /obj/structure/bed/chair/bay/chair, /turf/simulated/floor/tiled/eris/dark/violetcorener, /area/shuttle/securiship/general) -"qE" = ( -/obj/structure/bookcase, -/obj/effect/debris/cleanable/cobweb, -/turf/simulated/floor/wood, -/area/maintenance/abandonedlibrary) "qF" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -9469,9 +9437,6 @@ }, /turf/simulated/floor, /area/vacant/vacant_restaurant_lower) -"ts" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/station/eng_lower) "tt" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/tether/elevator/two) @@ -9535,9 +9500,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"tB" = ( -/turf/simulated/floor/wood/broken, -/area/maintenance/abandonedlibrary) "tC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -10968,9 +10930,6 @@ }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) -"wL" = ( -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibrary) "wM" = ( /obj/spawner/window/low_wall/full/firelocks, /obj/effect/paint_stripe/sun, @@ -12322,9 +12281,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) -"zw" = ( -/turf/simulated/floor/plating, -/area/maintenance/abandonedlibraryconference) "zx" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12575,13 +12531,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/airlock/science{ - name = "Contraband and Security holdings"; - req_one_access = list(44) - }, /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/machinery/door/airlock/glass/security{ + name = "Exploration Security Station"; + req_one_access = list(38,63) + }, /turf/simulated/floor/tiled, /area/security/checkpoint/science) "Aa" = ( @@ -13340,9 +13296,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"BE" = ( -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "BF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -15137,6 +15090,12 @@ /obj/item/tank/oxygen, /obj/item/tank/oxygen, /obj/item/tank/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "Fa" = ( @@ -17128,9 +17087,6 @@ }, /turf/simulated/floor/tiled, /area/security/customs) -"Jh" = ( -/turf/simulated/floor, -/area/constructionsite) "Ji" = ( /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, @@ -19506,16 +19462,11 @@ "Om" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/purple/border, -/obj/structure/table/rack/shelf, /obj/structure/window/reinforced{ dir = 4; pixel_x = 3 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical/emt, -/obj/item/clothing/head/helmet/space/void/medical/emt, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "On" = ( @@ -20771,16 +20722,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "QO" = ( -/obj/structure/table/rack/shelf, /obj/structure/window/reinforced{ dir = 4; pixel_x = 3 }, -/obj/item/suit_cooling_unit, -/obj/item/clothing/mask/breath, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/void/medical/emt, -/obj/item/clothing/head/helmet/space/void/medical/emt, +/obj/machinery/suit_storage_unit/search_and_rescue, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "QP" = ( @@ -21058,10 +21004,6 @@ /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"Rx" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) "Ry" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -21148,9 +21090,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"RM" = ( -/turf/simulated/floor, -/area/maintenance/station/spacecommandmaint) "RN" = ( /turf/simulated/floor/tiled, /area/engineering/atmos/backup) @@ -21443,9 +21382,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/maintenance/abandonedlibrary) -"Sp" = ( -/turf/simulated/floor/carpet, -/area/maintenance/abandonedlibrary) "Sq" = ( /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 1 @@ -23991,9 +23927,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"Xn" = ( -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "Xo" = ( /obj/machinery/air_alarm{ dir = 1; @@ -25181,6 +25114,8 @@ pixel_x = -3; pixel_y = 7 }, +/obj/item/binoculars, +/obj/item/binoculars, /turf/simulated/floor/wood, /area/tether/exploration/crew) "ZI" = ( @@ -42879,7 +42814,7 @@ ng ng ng ng -Xn +ng eF ng ng @@ -44043,7 +43978,7 @@ GS ng ng ng -gP +ng xJ ng ng @@ -46715,7 +46650,7 @@ qx mI mI mI -bQ +iw qm sh Qy @@ -46911,7 +46846,7 @@ Qt mI ya qm -bQ +iw Qy FG NU @@ -47103,9 +47038,9 @@ vD bT wT mI -bQ +iw qm -bQ +iw Qy Qy Qy @@ -47132,7 +47067,7 @@ VO Do Xp zd -ej +dl Vc Ig RH @@ -47297,12 +47232,12 @@ hy nw tP mI -bQ +iw qm -bQ -bQ +iw +iw Ag -bQ +iw pb sh ZL @@ -47491,9 +47426,9 @@ yq yq NV mI -bQ +iw Wy -ej +dl dl Ox dl @@ -47546,7 +47481,7 @@ Ap Qg Qg Qg -fv +Qg Qg Qg LC @@ -47701,9 +47636,9 @@ zM Zk Md zM -Rx Ag -bQ +Ag +iw Fx sh cm @@ -47741,11 +47676,11 @@ aF Qg Qg Ji -fv +Qg Qg LC -Jh -fv +Qg +Qg Qg LC rF @@ -47884,7 +47819,7 @@ Zw Vp zM qm -bQ +iw zM Zw Zw @@ -47936,7 +47871,7 @@ Qg Qg Qg Qg -fv +Qg LC Qg Qg @@ -48078,7 +48013,7 @@ Zw Vp zM qm -bQ +iw zM Zw Zw @@ -48086,15 +48021,15 @@ zM zM zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw zM TA Zf @@ -48125,10 +48060,10 @@ bS Wp LC Si -Jh Qg Qg -fv +Qg +Qg Wp Qg LC @@ -48272,23 +48207,23 @@ Zw Vp zM qm -bQ +iw zM zM zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw Jm xB IW @@ -48326,9 +48261,9 @@ LC yH LC LC -fv -fv -fv +Qg +Qg +Qg LC Ap gf @@ -48466,19 +48401,19 @@ Zw Vp zM qm -bQ +iw zM zM -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw +iw +iw +iw +iw zM zM zM @@ -48660,13 +48595,13 @@ Zw Vp zM qm -bQ -bQ +iw +iw zM -bQ -bQ -bQ -bQ +iw +iw +iw +iw zM zM zM @@ -48707,7 +48642,7 @@ jj Qg LC Ap -fv +Qg Qg Qg LC @@ -48854,12 +48789,12 @@ Zw zM zM qm -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM zM Zw @@ -48898,17 +48833,17 @@ SK SK SK Uj -fv +Qg LC Pc Qg -fv +Qg Qg LC Qg aF Qg -fv +Qg LC Qg Qg @@ -49046,12 +48981,12 @@ mI Zw zM zM -bQ +iw qm -bQ -bQ -bQ -bQ +iw +iw +iw +iw zM zM zM @@ -49091,7 +49026,7 @@ Qg YM Qg Qg -fv +Qg Qg LC Fm @@ -49104,7 +49039,7 @@ LC zW LC LC -fv +Qg Qg Qg Qg @@ -49239,10 +49174,10 @@ Ph mI Vp zM -bQ +iw tm Nd -bQ +iw zM zM zM @@ -49291,9 +49226,9 @@ Bg ll Qg Qg -fv Qg -Jh +Qg +Qg Qg Qg Qg @@ -49433,7 +49368,7 @@ Qk Qk zM zM -bQ +iw qm zM zM @@ -49622,12 +49557,12 @@ DB DB zM xL -BE +iw mq iw zM zM -bQ +iw qm zM Zw @@ -49813,15 +49748,15 @@ ZZ ZZ DB DB -bQ +iw +jR +iw +iw +iw +iw jR -bQ -bQ -bQ -nd -mh zM -bQ +iw qm zM Zw @@ -49865,7 +49800,7 @@ lx lx lx AM -RM +cu bf bf bf @@ -50008,14 +49943,14 @@ ZZ DB zU zU -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM -bQ +iw qm zM zM @@ -50202,16 +50137,16 @@ ZZ DB bv YH -bQ -bQ +iw +iw ZA -bQ -bQ -bQ +iw +iw +iw Jm -bQ +iw qm -bQ +iw zM Zw UT @@ -50396,14 +50331,14 @@ ZZ DB aM aM -bQ -bQ -bQ -bQ -bQ -bQ +iw +iw +iw +iw +iw +iw zM -bQ +iw Wy hz zM @@ -50589,16 +50524,16 @@ ZZ ZZ DB DB -bQ +iw xI -bQ -bQ -bQ +iw +iw +iw Ag qK zM -bQ -bQ +iw +iw qm zM Zw @@ -50792,7 +50727,7 @@ sy xN xN xN -bQ +iw ga zM Zw @@ -51770,7 +51705,7 @@ Rk zM HM eC -ts +Dm uN au iB @@ -52212,7 +52147,7 @@ St zm Yr ey -zw +zm Gr Vp Vp @@ -52390,8 +52325,8 @@ PW PW EM Xc -eY -qE +cU +Pk CE nM Gh @@ -52584,11 +52519,11 @@ NN XG fz Hi -wL +CJ Pk Vg -qE -eY +Pk +cU vl CJ FS @@ -52777,17 +52712,17 @@ ui Th da fz -wL +CJ Xh cU Ts -wL +CJ Xk Cl Xk Xk Xh -wL +CJ jT iO iO @@ -53360,11 +53295,11 @@ ui pR fz Mt -eY -wL +cU +CJ pT -wL -eY +CJ +cU HK Lv So @@ -53554,15 +53489,15 @@ ui tn fz OV -tB +Xk KG -eY -qE +cU +Pk Xk Ef -wL +CJ pC -wL +CJ uq oh Sm @@ -53747,9 +53682,9 @@ vc ui eP fz -qE +Pk MG -eY +cU kr fS kf @@ -54336,9 +54271,9 @@ Go fc ZK LB -wL +CJ gE -wL +CJ tf jf Zw @@ -54529,8 +54464,8 @@ Ok oG SU ZK -Sp -wL +ja +CJ iI fR jf diff --git a/maps/tether/levels/station2.dmm b/maps/tether/levels/station2.dmm index 2552197e4c7..f33312e40cb 100644 --- a/maps/tether/levels/station2.dmm +++ b/maps/tether/levels/station2.dmm @@ -2131,7 +2131,8 @@ "ew" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/vault/bolted{ - req_access = list(53) + req_access = list(53); + id_tag = "vault_bolt" }, /obj/machinery/door/blast/regular{ id = "VaultAc"; @@ -4779,6 +4780,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/structure/railing, /turf/simulated/open, /area/engineering/foyer_mezzenine) "jN" = ( @@ -13871,9 +13873,6 @@ dir = 4 }, /obj/machinery/holopad, -/obj/structure/window/reinforced/polarized/full{ - id = "qm_office" - }, /turf/simulated/floor/wood, /area/quartermaster/qm) "Cg" = ( @@ -24725,7 +24724,9 @@ /area/maintenance/station/eng_upper) "YA" = ( /obj/effect/floor_decal/industrial/warning, -/obj/machinery/sheet_silo, +/obj/machinery/sheet_silo{ + obj_persist_static_id = "tether_silo" + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "YB" = ( diff --git a/maps/tether/levels/surface1.dmm b/maps/tether/levels/surface1.dmm index ce206030785..5049747f079 100644 --- a/maps/tether/levels/surface1.dmm +++ b/maps/tether/levels/surface1.dmm @@ -362,6 +362,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "alC" = ( @@ -472,6 +473,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "anu" = ( @@ -748,6 +750,10 @@ pixel_y = 30 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/rnd/external) "aub" = ( @@ -992,6 +998,9 @@ dir = 4 }, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aAt" = ( @@ -1175,8 +1184,11 @@ /turf/simulated/floor, /area/maintenance/substation/SurfMedsubstation) "aFc" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/pipe/simple/visible/cyan{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "aFF" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 @@ -1239,6 +1251,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "aGf" = ( @@ -1357,7 +1372,7 @@ /obj/effect/floor_decal/corner/red/border{ dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, /turf/simulated/floor/tiled, @@ -1529,15 +1544,15 @@ /area/engineering/atmos) "aMg" = ( /obj/structure/railing, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/grille, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "civ_airlock_pump" }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "aMH" = ( @@ -1672,6 +1687,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "aPo" = ( @@ -1725,6 +1743,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "aQU" = ( @@ -1824,7 +1845,7 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining_eva) "aTK" = ( -/obj/machinery/atmospherics/component/unary/freezer{ +/obj/machinery/atmospherics/portables_connector{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, @@ -2935,11 +2956,6 @@ }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside1) -"bCl" = ( -/obj/structure/railing, -/obj/structure/stairs/spawner/east, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralstairwell) "bDa" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2997,6 +3013,9 @@ locked = 1 }, /obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "bEE" = ( @@ -3234,6 +3253,9 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "bKD" = ( @@ -3260,6 +3282,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "bLb" = ( @@ -3382,6 +3407,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "bOD" = ( @@ -3450,6 +3476,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "bRm" = ( @@ -3955,6 +3982,7 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "cfT" = ( @@ -4307,6 +4335,7 @@ pixel_y = 24 }, /obj/map_helper/airlock/sensor/int_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "cnc" = ( @@ -4318,6 +4347,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "cni" = ( @@ -4651,6 +4683,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "cvo" = ( @@ -4974,6 +5009,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 6 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "cEJ" = ( @@ -5081,6 +5119,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "cHk" = ( @@ -5517,8 +5558,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "cSI" = ( -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "cSR" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -5661,6 +5706,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "cVF" = ( @@ -5760,9 +5808,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "cYI" = ( @@ -5844,15 +5890,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "dak" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "dal" = ( @@ -6048,6 +6092,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "diE" = ( @@ -6224,12 +6269,11 @@ /area/rnd/outpost/heating) "dmT" = ( /obj/structure/railing, -/obj/structure/grille, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "civ_airlock_pump" +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "dnl" = ( @@ -6551,6 +6595,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "dtJ" = ( @@ -6593,6 +6640,9 @@ /obj/item/radio/intercom{ pixel_y = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "dul" = ( @@ -6633,6 +6683,7 @@ /obj/machinery/door/airlock/maintenance/rnd{ name = "Science Maintenance" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/rnd/hallway) "dvX" = ( @@ -6875,6 +6926,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "dDz" = ( @@ -7037,6 +7091,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "dJe" = ( @@ -7322,6 +7377,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "dSa" = ( @@ -7360,10 +7416,6 @@ }, /turf/simulated/floor, /area/rnd/outpost/atmos) -"dSQ" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "dSV" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/atmos{ @@ -7380,6 +7432,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "dTk" = ( @@ -7783,6 +7838,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "edz" = ( @@ -7976,6 +8034,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "ejK" = ( @@ -8037,18 +8096,16 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1379; - id_tag = "rnd_s_airlock_pump" - }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled, /area/rnd/external) "elf" = ( @@ -8615,15 +8672,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/visitor_dining) -"eEA" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 - }, -/area/tether/surfacebase/old_tram) "eFC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -8910,6 +8958,9 @@ pixel_y = -40 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "ePJ" = ( @@ -9171,8 +9222,14 @@ /area/hallway/lower/first_west) "eYN" = ( /obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/vacant_site) +/area/maintenance/lower/solars) "eZk" = ( /obj/machinery/portable_atmospherics/canister/empty/nitrous_oxide, /obj/machinery/atmospherics/pipe/simple/visible/black, @@ -9215,7 +9272,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9226,6 +9282,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "eZZ" = ( @@ -9398,6 +9457,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "fez" = ( @@ -9721,12 +9783,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "fli" = ( -/obj/structure/catwalk, /obj/machinery/light/small{ dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/lower/mining_eva) "flx" = ( /obj/machinery/button/remote/blast_door{ id = "suckysucky"; @@ -9802,6 +9863,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "fmy" = ( @@ -10202,7 +10266,7 @@ "fyb" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/black/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "fyE" = ( @@ -10258,6 +10322,9 @@ /obj/machinery/airlock_sensor/phoron/airlock_exterior{ pixel_x = 25 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 1 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/storage/surface_eva/external) "fzG" = ( @@ -10341,6 +10408,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "fBj" = ( @@ -10427,6 +10497,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "fDv" = ( @@ -10503,6 +10574,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "fEX" = ( @@ -10569,6 +10643,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "fHf" = ( @@ -10627,6 +10704,7 @@ /obj/machinery/door/airlock/maintenance/common{ name = "Mining Maintenance Access" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/tether/surfacebase/lowernorthhall) "fHO" = ( @@ -10823,6 +10901,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "fNI" = ( @@ -11566,6 +11647,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "gft" = ( @@ -11702,9 +11784,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/machinery/atmospherics/component/binary/pump/high_power/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "giJ" = ( @@ -11874,8 +11954,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_8) "gkS" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/component/binary/pump{ + dir = 8; + target_pressure = 300 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "gld" = ( /obj/structure/cable/cyan{ icon_state = "4-8" @@ -12172,6 +12257,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gtS" = ( @@ -12215,7 +12301,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 5 }, /turf/simulated/floor/tiled, @@ -12527,6 +12613,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "gCh" = ( @@ -12708,6 +12797,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "gHK" = ( @@ -12748,6 +12838,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "gIa" = ( @@ -12815,6 +12906,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gJB" = ( @@ -12960,6 +13052,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "gNh" = ( @@ -13098,6 +13191,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "gQG" = ( @@ -13279,16 +13375,17 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "gYg" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 1 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled/techmaint, /area/storage/surface_eva/external) "gYo" = ( @@ -13373,6 +13470,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hdR" = ( @@ -13452,6 +13550,9 @@ dir = 1 }, /obj/structure/disposalpipe/junction/yjunction, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "hfw" = ( @@ -13847,9 +13948,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"hqx" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "hqz" = ( /obj/structure/sink{ dir = 4; @@ -14029,13 +14127,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost) -"htC" = ( -/obj/structure/railing, -/obj/machinery/camera/network/medbay{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/centralstairwell) "htG" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -14245,6 +14336,7 @@ /obj/machinery/door/airlock/maintenance/common, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "hCm" = ( @@ -14316,6 +14408,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hDY" = ( @@ -14328,19 +14423,15 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) -"hDZ" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/maintDorm2) "hEl" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/machinery/meter, /turf/simulated/floor/tiled, /area/engineering/atmos) "hEJ" = ( @@ -14480,14 +14571,10 @@ /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hHF" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 - }, /obj/structure/sign/fire{ pixel_y = 32 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/wall/prepainted/science, /area/rnd/external) "hHV" = ( /obj/structure/grille, @@ -14874,6 +14961,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/computer/timeclock/premade/west, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hQu" = ( @@ -14914,6 +15002,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "hQL" = ( @@ -14964,10 +15055,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"hSe" = ( -/obj/random/maintenance/cargo, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "hSi" = ( /obj/structure/table/rack, /turf/simulated/floor/plating, @@ -14993,6 +15080,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "hUQ" = ( @@ -15178,10 +15268,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) -"hYQ" = ( -/obj/effect/step_trigger/teleporter/to_mining, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/lowernortheva/external) "hYS" = ( /obj/machinery/light/small{ dir = 8 @@ -15443,6 +15529,7 @@ opacity = 0; open_layer = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "ihc" = ( @@ -15852,6 +15939,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central6{ pixel_y = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "iqq" = ( @@ -15948,6 +16036,7 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "iue" = ( @@ -16029,6 +16118,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "ixh" = ( @@ -16187,6 +16277,9 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "iAF" = ( @@ -16238,8 +16331,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost) "iCc" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "iCC" = ( /obj/effect/floor_decal/corner/lightorange{ dir = 5 @@ -16302,14 +16397,14 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "iDK" = ( /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva/external) -"iDS" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "iEF" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/visitor_laundry) @@ -16484,6 +16579,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "iKy" = ( @@ -16856,13 +16954,13 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, /obj/structure/railing{ dir = 8 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "iVi" = ( @@ -17298,6 +17396,9 @@ }, /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/xenoflora) "jge" = ( @@ -17348,8 +17449,13 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "jih" = ( -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenance) +/obj/spawner/window/low_wall/full/firelocks, +/obj/effect/paint_stripe/pipecyan, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/engineering/atmos) "jii" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm2) @@ -17588,6 +17694,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "jrG" = ( @@ -17681,6 +17788,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jum" = ( @@ -17804,6 +17914,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jxV" = ( @@ -17950,6 +18063,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jDD" = ( @@ -18433,6 +18547,7 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "jPR" = ( @@ -18442,6 +18557,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "jPU" = ( @@ -18463,6 +18579,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "jQg" = ( @@ -18742,6 +18861,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/external) "jYf" = ( @@ -19288,12 +19410,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ - dir = 4 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "krB" = ( @@ -19407,6 +19529,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/external) "ktx" = ( @@ -19597,6 +19722,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "kyA" = ( @@ -19706,6 +19832,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "kCk" = ( @@ -19889,7 +20018,9 @@ /obj/structure/cable{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "kFW" = ( @@ -19914,13 +20045,16 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/catwalk, /obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/research) "kHm" = ( @@ -20068,8 +20202,11 @@ /turf/simulated/floor/tiled, /area/storage/primary) "kMt" = ( -/turf/simulated/floor/tiled/steel_dirty, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/manifold/visible/black{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "kNh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -20158,13 +20295,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ dir = 1; pixel_y = -32 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "kQo" = ( @@ -20241,6 +20378,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) "kSj" = ( @@ -20544,6 +20682,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "kXM" = ( @@ -20649,16 +20788,16 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "kYD" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, /obj/machinery/light/small{ dir = 4 }, /obj/structure/railing{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/env_heat_pump{ + dir = 8 + }, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "kZg" = ( @@ -20739,14 +20878,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "lcn" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "lcF" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -20880,6 +21014,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "lgw" = ( @@ -20930,6 +21065,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lht" = ( @@ -21213,6 +21351,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "lpU" = ( @@ -21239,6 +21380,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "lqD" = ( @@ -21570,6 +21714,7 @@ pixel_x = 32 }, /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "lzC" = ( @@ -21757,6 +21902,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "lEH" = ( @@ -21933,6 +22079,9 @@ icon_state = "2-8" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "lMb" = ( @@ -22001,10 +22150,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/outpost) -"lOC" = ( -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) "lOQ" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -22471,6 +22616,9 @@ /area/crew_quarters/sleep/maintDorm2) "maF" = ( /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "maP" = ( @@ -22545,6 +22693,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/north_stairs_one) "mbw" = ( @@ -22565,6 +22716,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "mcw" = ( @@ -22618,8 +22770,16 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/cargostore/warehouse) "mdc" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_site) +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/yellow/border, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mdC" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -22627,6 +22787,9 @@ name = "Surface EVA" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/storage/surface_eva) "mdJ" = ( @@ -22726,14 +22889,16 @@ /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) "mgO" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 }, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/rnd/external) "mhp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -23196,7 +23361,10 @@ /turf/simulated/floor/tiled/steel_dirty, /area/tether/surfacebase/cargostore/warehouse) "mvN" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "mvO" = ( @@ -23550,20 +23718,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "mCS" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/component/binary/heat_pump{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mDJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -23696,10 +23855,9 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "mGD" = ( -/turf/simulated/mineral/floor/virgo3b{ - ignore_mapgen = 1 - }, -/area/tether/surfacebase/outside/outside1) +/obj/machinery/atmospherics/pipe/simple/hidden/universal, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "mGH" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23999,7 +24157,7 @@ "mOp" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/orange/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "mOC" = ( @@ -24065,6 +24223,9 @@ "mPG" = ( /obj/effect/floor_decal/rust, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "mPO" = ( @@ -24198,6 +24359,7 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "mSR" = ( @@ -24274,6 +24436,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "mWR" = ( @@ -24325,6 +24490,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "mXO" = ( @@ -24493,9 +24661,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) -"ndc" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside1) "ndW" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 @@ -24622,6 +24787,7 @@ /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "nhQ" = ( @@ -24667,6 +24833,7 @@ pixel_x = 26; pixel_y = -1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/external) "nis" = ( @@ -24676,6 +24843,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "njM" = ( @@ -24741,6 +24909,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "nkI" = ( @@ -24755,17 +24926,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) -"nkP" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/storage/surface_eva/external) "nkZ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -24842,6 +25002,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "nng" = ( @@ -25453,8 +25616,11 @@ /turf/simulated/floor/tiled, /area/crew_quarters/showers) "nGT" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/lowernortheva/external) "nHh" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -26743,6 +26909,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "owM" = ( @@ -26830,6 +26997,9 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "oyX" = ( @@ -27286,6 +27456,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "oPA" = ( @@ -27317,6 +27490,9 @@ locked = 1 }, /obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "oPM" = ( @@ -27725,6 +27901,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pby" = ( @@ -27733,6 +27912,7 @@ }, /obj/machinery/door/firedoor/glass, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/tether/surfacebase/north_stairs_one) "pcc" = ( @@ -27921,6 +28101,7 @@ locked = 1 }, /obj/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "pgI" = ( @@ -28152,16 +28333,6 @@ "pmc" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/maintDorm3) -"pms" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) "png" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -28244,6 +28415,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/maintenance/lower/solars) "poO" = ( @@ -28330,6 +28504,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "prE" = ( @@ -29399,6 +29574,9 @@ dir = 6 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "pUj" = ( @@ -29407,12 +29585,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"pUq" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/public_garden_maintenance) "pUN" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 @@ -29817,6 +29989,7 @@ icon_state = "1-2" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qev" = ( @@ -29939,6 +30112,9 @@ /obj/machinery/power/apc/south_mount, /obj/structure/cable, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qki" = ( @@ -29970,6 +30146,9 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "qlp" = ( @@ -30074,6 +30253,7 @@ id_tag = "northciv_airlock_outer"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/lowernortheva) "qoo" = ( @@ -30327,15 +30507,18 @@ "qtm" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qtD" = ( @@ -30367,8 +30550,15 @@ /turf/simulated/floor/wood, /area/vacant/vacant_bar) "quN" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenance) +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/lowernortheva) "quR" = ( /obj/structure/closet, /obj/random/drinkbottle, @@ -30727,13 +30917,20 @@ pixel_x = 25; pixel_y = -8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/lowernortheva) "qEb" = ( -/obj/structure/catwalk, -/obj/random/maintenance/clean, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/cyan{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "qEi" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -30761,6 +30958,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "qFl" = ( @@ -30843,6 +31043,9 @@ dir = 8; name = "Surface EVA" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/storage/surface_eva) "qJt" = ( @@ -30874,15 +31077,11 @@ /turf/simulated/floor, /area/tether/surfacebase/security/gasstorage) "qKh" = ( -/obj/structure/sign/nosmoking_2{ - pixel_x = -32 - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/lowernortheva) +/area/engineering/atmos) "qKp" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30971,6 +31170,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "qMv" = ( @@ -31183,6 +31383,9 @@ name = "package tagger - Void"; sort_tag = "Void" }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "qPU" = ( @@ -31390,6 +31593,9 @@ pixel_y = -24 }, /obj/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/atmospherics/pipe/vent{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/lowernortheva) "qVm" = ( @@ -32054,6 +32260,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "rnT" = ( @@ -32144,6 +32351,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "rsp" = ( @@ -32384,6 +32594,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "ryX" = ( @@ -32401,12 +32614,6 @@ /obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"rzR" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lowmedbaymaint) "rAy" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -32427,26 +32634,28 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "rAD" = ( /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, /obj/structure/sign/fire{ pixel_y = -32 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/storage/surface_eva/external) "rAF" = ( @@ -32458,6 +32667,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "rAY" = ( @@ -32553,6 +32765,7 @@ /obj/machinery/vending/wallmed_airlock{ pixel_x = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "rER" = ( @@ -33068,10 +33281,12 @@ name = "Research Division Access"; req_access = list(47) }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/hallway/lower/first_west) "rRn" = ( @@ -33463,13 +33678,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) -"saV" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "northciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/lowernortheva) "sbh" = ( /obj/machinery/air_alarm{ dir = 8; @@ -33792,8 +34000,11 @@ /turf/simulated/floor/plating, /area/maintenance/asmaint2) "sjS" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) +/obj/machinery/atmospherics/pipe/simple/visible/black{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "sjY" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -33945,6 +34156,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "snl" = ( @@ -33959,6 +34173,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "snX" = ( @@ -34105,12 +34320,19 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/showers) "sqw" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/external) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "sqG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -34179,6 +34401,9 @@ dir = 4 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "ssm" = ( @@ -34356,6 +34581,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernorthhall) "swt" = ( @@ -34542,6 +34770,7 @@ }, /obj/effect/floor_decal/borderfloor/cee, /obj/effect/floor_decal/industrial/danger/cee, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "sDd" = ( @@ -34606,6 +34835,7 @@ /area/tether/surfacebase/security/lowerhall) "sEn" = ( /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "sEW" = ( @@ -34637,6 +34867,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) "sGX" = ( @@ -34739,6 +34970,9 @@ pixel_y = 22 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/solars) "sLq" = ( @@ -34889,16 +35123,6 @@ /obj/item/reagent_containers/dropper, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) -"sOa" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "civ_airlock_scrubber" - }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/storage/surface_eva/external) "sOk" = ( /obj/structure/table/rack, /obj/machinery/door/window/eastright, @@ -34992,21 +35216,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "sRo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/rust, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/visible/black, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "sSa" = ( /obj/machinery/light/spot, /turf/simulated/floor/tiled/techfloor/grid/virgo3b, @@ -35155,8 +35370,15 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "sUU" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/public_garden_one) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) "sUX" = ( /obj/machinery/door/window/northright, /obj/effect/floor_decal/industrial/outline/yellow, @@ -35448,25 +35670,20 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "tdn" = ( -/turf/simulated/floor/tiled/techfloor/grid/virgo3b, -/area/tether/surfacebase/outside/outside1) -"tdu" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 }, -/obj/effect/floor_decal/corner/yellow/border{ +/turf/simulated/floor/tiled, +/area/engineering/atmos) +"tdu" = ( +/obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/yellow/bordercorner2{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 }, -/area/tether/surfacebase/old_tram) +/turf/simulated/floor/tiled, +/area/engineering/atmos) "tdD" = ( /obj/effect/floor_decal/rust, /obj/machinery/portable_atmospherics/canister/phoron, @@ -35890,8 +36107,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/maintDorm3) "ttR" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/simple/visible/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "ttV" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/metal/mait{ @@ -35909,6 +36132,9 @@ dir = 4 }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "twy" = ( @@ -35977,6 +36203,7 @@ dir = 8 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "tyN" = ( @@ -36007,9 +36234,6 @@ /obj/item/storage/fancy/markers, /turf/simulated/floor/plating, /area/crew_quarters/sleep/maintDorm1) -"tAe" = ( -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/tunnel) "tAB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -36063,6 +36287,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tCu" = ( @@ -36082,6 +36309,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tCv" = ( @@ -36224,6 +36452,7 @@ /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/zpipe/up/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "tEf" = ( @@ -36259,6 +36488,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tEH" = ( @@ -36497,6 +36729,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "tNc" = ( @@ -36825,6 +37060,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "tWp" = ( @@ -37057,11 +37293,7 @@ /turf/simulated/floor/tiled/techmaint, /area/holodeck_control) "ubB" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "rnd_s_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/mineral, /area/rnd/external) "ubM" = ( /obj/machinery/light/small{ @@ -37199,6 +37431,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "ufQ" = ( @@ -37712,12 +37947,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"uvN" = ( -/obj/machinery/atmospherics/component/unary/heater{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/atmos) "uwj" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -38009,10 +38238,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/crew_quarters/showers) -"uHx" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/maintenance/lower/xenoflora) "uHG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38101,6 +38326,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "uKW" = ( @@ -38155,6 +38383,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/storage/surface_eva) "uLV" = ( @@ -38278,6 +38509,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 6 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 4 + }, +/obj/map_helper/airlock/atmos/scrubber, /turf/simulated/floor/tiled, /area/rnd/external) "uOz" = ( @@ -38468,9 +38703,6 @@ ignore_mapgen = 1 }, /area/tether/surfacebase/outside/outside1) -"uWt" = ( -/turf/simulated/floor/plating, -/area/vacant/vacant_bar) "uWz" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/plating, @@ -38689,9 +38921,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -38699,6 +38928,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 4 }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/rnd/hallway) "vbT" = ( @@ -38902,16 +39132,15 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/processing) "vie" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 4 - }, -/obj/machinery/meter, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 8 }, +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "viB" = ( @@ -39703,6 +39932,7 @@ dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "vCj" = ( @@ -39838,6 +40068,9 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "vFy" = ( @@ -40299,6 +40532,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/research) "vPh" = ( @@ -40515,6 +40751,10 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "vTu" = ( @@ -40646,21 +40886,18 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/machinery/light_switch{ - pixel_y = 25 - }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1379; id_tag = "rnd_s_airlock_pump" }, /obj/map_helper/airlock/atmos/chamber_pump, +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 + }, /turf/simulated/floor/tiled, /area/rnd/external) "vXJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -41880,6 +42117,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/hallway) "wEY" = ( @@ -41926,11 +42164,10 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "wGt" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/steel_dirty/virgo3b{ - outdoors = 0 - }, -/area/tether/surfacebase/old_tram) +/obj/machinery/atmospherics/pipe/manifold/visible/cyan, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/engineering/atmos) "wGP" = ( /obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/corner/purple{ @@ -41984,24 +42221,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/lowernortheva) "wJB" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/machinery/air_alarm/east_mount, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wKf" = ( @@ -42059,7 +42291,7 @@ "wLI" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/white/border, -/obj/machinery/atmospherics/component/binary/pump/high_power/on, +/obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/floor/tiled, /area/engineering/atmos) "wLU" = ( @@ -42265,6 +42497,7 @@ /obj/machinery/fire_alarm/west_mount{ pixel_x = -24 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "wRB" = ( @@ -42526,6 +42759,9 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/hallway) "wXS" = ( @@ -42554,6 +42790,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "wYh" = ( @@ -42648,6 +42887,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "wZP" = ( @@ -42673,6 +42915,7 @@ icon_state = "1-4" }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xaC" = ( @@ -42700,6 +42943,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/research) "xbO" = ( @@ -42819,6 +43063,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "xgV" = ( @@ -43169,12 +43414,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xqC" = ( -/obj/structure/grille, -/obj/structure/railing{ - dir = 8 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, -/turf/simulated/floor/tiled/techmaint, -/area/rnd/external) +/turf/simulated/floor/plating, +/area/maintenance/lower/research) "xqE" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -43429,11 +43674,11 @@ /turf/simulated/floor/tiled/dark, /area/storage/surface_eva) "xxB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/research) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) "xxM" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light/small, @@ -43471,6 +43716,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "xyi" = ( @@ -43497,9 +43745,6 @@ /obj/item/radio, /turf/simulated/floor/tiled, /area/rnd/testingroom) -"xyG" = ( -/turf/simulated/floor/virgo3b, -/area/tether/surfacebase/outside/outside1) "xyK" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -43758,7 +44003,6 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/outpost/storage) "xHn" = ( -/obj/structure/grille, /obj/structure/railing{ dir = 4 }, @@ -43768,6 +44012,9 @@ frequency = 1379; id_tag = "northciv_airlock_pump" }, +/obj/structure/sign/nosmoking_2{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/lowernortheva) "xHo" = ( @@ -44270,11 +44517,17 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "ych" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/storage/surface_eva/external) "ycD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/spline/plain{ @@ -44551,9 +44804,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/external) "ylH" = ( @@ -59549,13 +59803,13 @@ elP elP elP aEl -gkS -aFc -aFc -aFc -aFc -sUU -aFc +eGo +eGo +eGo +eGo +eGo +eGo +eGo bre his his @@ -59565,7 +59819,7 @@ nLH kPz ikt jCv -jCv +ych fyZ wtA his @@ -59743,13 +59997,13 @@ elP elP elP aEl -aFc -sUU -aFc eGo eGo -aFc -gkS +eGo +eGo +eGo +eGo +eGo bre his his @@ -59937,9 +60191,9 @@ elP elP elP aEl -aFc -aFc -iCc +eGo +eGo +eGo eGo eGo eGo @@ -59950,7 +60204,7 @@ his isQ tXK qpi -sOa +qpi dmT cYq dTb @@ -60131,8 +60385,8 @@ elP elP elP aEl -aFc -aFc +eGo +eGo eGo eGo eGo @@ -60144,7 +60398,7 @@ his isQ tXK qpi -nkP +qpi aMg kFT eOM @@ -60325,13 +60579,13 @@ elP elP elP aEl -aFc eGo eGo -iCc eGo eGo -aFc +eGo +eGo +eGo bre his his @@ -60519,13 +60773,13 @@ elP elP elP aEl -gkS -aFc eGo eGo eGo -aFc -aFc +eGo +eGo +eGo +eGo bre ivS baG @@ -60713,13 +60967,13 @@ puQ aEl mkH aEl -sUU -aFc +eGo +eGo vAW fqB wuH -gkS -sUU +eGo +eGo bre ivS baG @@ -61733,10 +61987,10 @@ his his his his -fZN -fZN -fZN -fZN +his +his +his +his his his his @@ -61927,10 +62181,10 @@ his his his his -fZN -ubB -ubB -fZN +his +his +his +his his his his @@ -62123,7 +62377,7 @@ his his fZN hHF -sqw +fZN fZN his his @@ -62485,7 +62739,7 @@ eGv xOq pUj xOq -xOq +xxB xOq xOq vEz @@ -62513,7 +62767,7 @@ rki ksX jXH pgC -xvt +mgO uXC uXC uXC @@ -62644,11 +62898,11 @@ his rly aNj pRR -pUq ifV ifV ifV -jih +ifV +kaz cni bre bre @@ -62891,7 +63145,7 @@ ctQ rOR cbm kwE -qpe +sqw omk omk omk @@ -63062,16 +63316,16 @@ sua sua sua gzN -mdc +phe jTk -mdc +phe cfZ tIU lLU qMs dIB gHZ -dIB +eYN pvV qnR rJU @@ -63092,8 +63346,8 @@ aVp rJf gOa fZN -mgO -xqC +fZN +fZN fZN his his @@ -63253,13 +63507,13 @@ fLr kkn cqs phe -mdc -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe +phe tIU gHN gHN @@ -63279,7 +63533,7 @@ flx pFz rft jbN -qpe +sqw omk tOS aph @@ -63444,16 +63698,16 @@ oMb xOq fAY wGb -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe jTk -mdc phe -mdc -mdc +phe +phe +phe tIU oHb oHb @@ -63473,7 +63727,7 @@ vRZ ycJ rJU sUO -qpe +sqw aVW aVW aVW @@ -63618,7 +63872,7 @@ iTc eSi oiD rly -jih +kaz kaz rly ceM @@ -63642,12 +63896,12 @@ alC alC fae dvD -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe tIU tIU tIU @@ -63667,7 +63921,7 @@ gNF tBd cbm uQD -qpe +sqw aVW bUw aVW @@ -63813,7 +64067,7 @@ lfF oiD cni cni -quN +cmk xJL dBk qJd @@ -63835,12 +64089,12 @@ wbf fcZ fcZ wvB -mdc -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe cJi sua sua @@ -64028,13 +64282,13 @@ wXZ wGb jTk jTk -mdc -mdc phe -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe sua sua sua @@ -64221,19 +64475,19 @@ kYj jta fLr acR -mdc -mdc -mdc phe -mdc -mdc -mdc +phe +phe +phe +phe +phe +phe irV sua sua sua tIU -spN +sUU juN juN oln @@ -64417,17 +64671,17 @@ fLr sua sua sua -mdc -mdc -mdc -mdc -mdc +phe +phe +phe +phe +phe sua sua sua sua tIU -spN +sUU juN jFt jFt @@ -64612,16 +64866,16 @@ sua sua sua sua -mdc -mdc -mdc +phe +phe +phe guo sua sua sua sua tIU -spN +sUU juN bvO bvO @@ -64806,7 +65060,7 @@ sua sua sua sua -mdc +phe jTk jTk emA @@ -64815,7 +65069,7 @@ sua sua sua tIU -spN +sUU juN cLP cLP @@ -65009,7 +65263,7 @@ sua sua sua tIU -spN +sUU juN lvK bvO @@ -65025,7 +65279,7 @@ hJR oMB oMB fTb -qpe +sqw aVW aVW aVW @@ -65203,7 +65457,7 @@ sua sua sua tIU -spN +sUU juN cLP cLP @@ -65397,7 +65651,7 @@ sua sua sua tIU -spN +sUU juN bvO bvO @@ -65413,7 +65667,7 @@ bSX uEC bSX axa -qpe +sqw omk bLp bLp @@ -65591,7 +65845,7 @@ sua sua sua tIU -spN +sUU juN xcr xcr @@ -65610,7 +65864,7 @@ imB dDu dvR xaq -sBb +xqC bLp uCh uCh @@ -65765,7 +66019,7 @@ snl ibH bdi sBd -nGT +sBd rkZ fLr xAe @@ -65785,7 +66039,7 @@ sua sua sua tIU -spN +sUU juN xcr xcr @@ -65954,12 +66208,12 @@ mkS rfR pkY hzA -mvN -mvN -mvN -mvN -mvN -mvN +lZe +lZe +lZe +lZe +lZe +lZe lZe rey eeR @@ -66001,7 +66255,7 @@ fuf pTX dQJ opX -xxB +dQJ dQJ kGI dQJ @@ -66355,11 +66609,11 @@ oXQ vES rey oMr -uHx +oMr oMr mXi -iDS -iDS +bVo +bVo bVo tZw mga @@ -66549,7 +66803,7 @@ jMI uKU fLr iyH -iDS +bVo bVo huJ oMr @@ -66570,7 +66824,7 @@ tZw tZw tZw bLp -sRo +vOr uYR wrk pJV @@ -66759,9 +67013,9 @@ mNR tZw ggb hYH -iDS -iDS -iDS +bVo +bVo +bVo aCJ bLp fey @@ -67560,14 +67814,14 @@ iGi drN tFg mIF -qSU +hNQ bOd -qSU -qSU -aoc +nnD +nnD +sRo fDu mSt -hNQ +kMt tkj oSm pZm @@ -67575,7 +67829,7 @@ pZm pZm pZm vGE -ych +pYC sic vGE his @@ -67754,7 +68008,7 @@ moV oiY qAN oiY -oiY +qEb mPX tHp tHp @@ -67769,7 +68023,7 @@ pZm pZm pZm vGE -ych +pYC vMv vGE vGE @@ -67948,7 +68202,7 @@ qSU qSU qSU qSU -qSU +tdn qSU qSU qSU @@ -67963,16 +68217,16 @@ pZm pZm pZm vGE -ych +pYC wVw vGE dvi lJo mry -hqx -ych -ych -ych +pYC +pYC +pYC +pYC vGE his his @@ -68094,7 +68348,7 @@ jFz jFz jFz jFz -sEn +mvN sEn pby kSh @@ -68122,7 +68376,7 @@ qqd qqd mCf bLp -mCS +fey bLp uCh uCh @@ -68142,7 +68396,7 @@ qSU qSU qSU qSU -qSU +tdn pFp keb qZv @@ -68157,16 +68411,16 @@ oSm pZm pZm vGE -ych +pYC eGl vGE nTk -ych +pYC khn -ych -ych -hqx -ych +pYC +pYC +pYC +pYC vGE his his @@ -68316,7 +68570,7 @@ djJ lOQ lfi bLp -sRo +vOr bLp uCh uCh @@ -68336,7 +68590,7 @@ qSU qSU qSU qSU -qSU +tdn pkD pkD pkD @@ -68351,16 +68605,16 @@ oSm pZm pZm vGE -ych +pYC cWT vGE dvi -ych +pYC iZr -hqx -ych -ych -ych +pYC +pYC +pYC +pYC vGE his his @@ -68510,7 +68764,7 @@ eDq lOQ ucF vno -sRo +vOr bLp uCh uCh @@ -68530,7 +68784,7 @@ rga rga rga rga -rga +cSI bEs wKQ bEs @@ -68545,16 +68799,16 @@ oSm pZm pZm vGE -ych +pYC nYA vGE oQP -ych +pYC rEa nSb -hqx -ych -ych +pYC +pYC +pYC vGE his his @@ -68692,7 +68946,7 @@ tZw tZw ryX xTb -iDS +bVo rOS jEh hLB @@ -68724,7 +68978,7 @@ nqp dLW iua qSU -qSU +tdn nqp ldK eXL @@ -68739,7 +68993,7 @@ oSm vGE vGE vGE -ych +pYC ozq vGE vGE @@ -68849,10 +69103,10 @@ isQ nLH pMm nLH -eGP -eGP -eGP -eGP +jFz +fli +sBd +sBd wJB lho nwj @@ -68886,7 +69140,7 @@ uWW tZw ryX tZw -iDS +bVo rOS jEh hLB @@ -68918,7 +69172,7 @@ laB oSm eMp eMp -eMp +jih eMp oSm xQw @@ -68930,18 +69184,18 @@ lpU oSm oSm oSm -ych -ych +pYC +pYC xVh -ych -ych -ych +pYC +pYC +pYC ttV -ych +pYC crA -ych -ych -ych +pYC +pYC +pYC gju vGE his @@ -69023,7 +69277,7 @@ uXC ijH "} (127,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -69044,8 +69298,8 @@ jTS ykP fpK eGP -saV -qKh +eGP +eGP eGP jJw jJw @@ -69080,7 +69334,7 @@ uWW tZw ryX tZw -iDS +bVo rOS jEh hLB @@ -69110,10 +69364,10 @@ nsD plD hLP vTc -uvN -aTK -xlc xlc +aTK +qKh +olq eMp iEZ xDs @@ -69124,18 +69378,18 @@ jyB cst cst oSm -ych pYC -ych -ych pYC -ych +pYC +pYC +pYC +pYC jIl -ych +pYC nSb sYr tPg -ych +pYC gju vGE his @@ -69217,7 +69471,7 @@ ujj ujj "} (128,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -69238,7 +69492,7 @@ xtl bvK tNc eGP -xHn +quN xHn eGP eTu @@ -69319,7 +69573,7 @@ luN uTF oSm pYC -ych +pYC vGE vGE vGE @@ -69411,7 +69665,7 @@ osh qbg "} (129,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69499,8 +69753,8 @@ kgX lPH lPH cfb -qSU -qSU +hNQ +sjS qSU eMp aoc @@ -69512,8 +69766,8 @@ oui pgI pgI oSm -ych -ych +pYC +pYC vGE fVb dqk @@ -69523,8 +69777,8 @@ svy eif bxB ilY -uWt -sjS +dZL +dZL hfw yas dWg @@ -69605,7 +69859,7 @@ osh qbg "} (130,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69624,7 +69878,7 @@ wMH wMH wMH iDK -iDK +nGT qog geY ufe @@ -69675,7 +69929,7 @@ vny aqB oou sse -lcn +xbu xbu xbu tyn @@ -69693,7 +69947,7 @@ kgX agK fCg fVL -qSU +mCS qSU nqp eMp @@ -69706,8 +69960,8 @@ cUL oSm oSm oSm -ych -ych +pYC +pYC vGE vdG kfM @@ -69799,7 +70053,7 @@ osh qbg "} (131,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -69839,7 +70093,7 @@ nTv hWK rkE uyB -mvN +lZe wLp ioI cBT @@ -69881,14 +70135,14 @@ igQ ipX mcv sDb -qSU -qSU -lPH +lcn +lcn +gkS twr +iCc +nYu +nUw xOF -qSU -qSU -qSU iEU oSm nMw @@ -69901,7 +70155,7 @@ sXS sXS oSm fTt -ych +pYC vGE rdj dEy @@ -69911,7 +70165,7 @@ oBS cKH cKH kfM -uWt +dZL qun aqJ diV @@ -69993,7 +70247,7 @@ osh qbg "} (132,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70065,7 +70319,7 @@ cCq bLp bLp bLp -dSQ +mas pub bLp bLp @@ -70078,10 +70332,10 @@ bzF oQx vsp nUw -vJA -qSU +ttR qSU qSU +gkc qSU rOk eMp @@ -70094,8 +70348,8 @@ qfH luN uTF oSm -ych -ych +pYC +pYC vGE nrR mRH @@ -70105,7 +70359,7 @@ ygD pyc amW kfM -uWt +dZL kfM kfM vqX @@ -70187,7 +70441,7 @@ osh qbg "} (133,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70272,10 +70526,10 @@ qSU qSU qSU gkc -vJA -qSU -qSU -qSU +tdu +lcn +mGD +aFc qSU qSU eMp @@ -70288,7 +70542,7 @@ oui wwN wwN oSm -ych +pYC bmM vGE hfw @@ -70381,7 +70635,7 @@ osh qbg "} (134,1,1) = {" -hYQ +iDK iDK iDK iDK @@ -70482,17 +70736,17 @@ qwg oSm oSm oSm -ych -ttR +pYC +pYC vGE cCl cCl hfw -uWt +dZL wWb kfM -uWt -uWt +dZL +dZL dZL kfM kfM @@ -70575,7 +70829,7 @@ osh qbg "} (135,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -70659,8 +70913,8 @@ gja rMX tEe iuc -nUw -bPU +wGt +mdc cfw qwg qwg @@ -70674,22 +70928,22 @@ lZW thY stQ dVP -ych -ych -ych -ych +pYC +pYC +pYC +pYC vGE uqL cCl hfw kfM wWb -uWt +dZL kfM kfM kfM kfM -uWt +dZL hfw hfw hfw @@ -70769,7 +71023,7 @@ osh qbg "} (136,1,1) = {" -hYQ +iDK iDK iDK wMH @@ -70841,7 +71095,7 @@ rOS uCh uCh bLp -dSQ +mas pub bLp uCh @@ -70870,7 +71124,7 @@ aKB oSm dqb xDr -ych +pYC eBz vGE cCl @@ -71035,7 +71289,7 @@ rOS uCh uCh bLp -dSQ +mas fBj bLp uCh @@ -71236,7 +71490,7 @@ uCh bLp sZP ppA -pms +vUu cxs dLf qSU @@ -71265,7 +71519,7 @@ bxd uKS kwf csQ -kMt +bgm vqX oZY mRU @@ -71429,7 +71683,7 @@ bLp uCh bLp bLp -dSQ +mas wgQ oSm dBT @@ -71623,7 +71877,7 @@ bLp uCh uCh bLp -dSQ +mas vUu oSm vUe @@ -71653,7 +71907,7 @@ ppD uKS kwf xNq -kMt +bgm vqX vqX vqX @@ -71847,7 +72101,7 @@ uzS fDs kwf xNq -kMt +bgm pmc iQx bUa @@ -72429,7 +72683,7 @@ ppD jSj kwf xNq -kMt +bgm pmc lzW wne @@ -72623,7 +72877,7 @@ uzS lBd kwf fWO -kMt +bgm pmc jxE xNZ @@ -72817,7 +73071,7 @@ bxd jSj kwf xNq -kMt +bgm pmc pmc pmc @@ -73011,7 +73265,7 @@ gvB sqj kwf xNq -kMt +bgm jii mZE pjU @@ -73019,7 +73273,7 @@ npe pUR mCD vUS -hDZ +yhs vjj tSu wqT @@ -73213,7 +73467,7 @@ uHG dwF dwF mzX -hDZ +yhs pUR tSu wqT @@ -73399,7 +73653,7 @@ kwf kwf kwf fcm -kMt +bgm jii jii uPD @@ -73593,7 +73847,7 @@ pAF dkN kwf nvz -kMt +bgm jii ylH cjT @@ -73706,7 +73960,7 @@ xtx uMB hSy gbY -hSe +pbi jgC dyl saP @@ -73787,7 +74041,7 @@ sXj aFK kwf xNq -kMt +bgm jii mwQ maD @@ -73899,9 +74153,9 @@ lMb xtx cIA hSy -cSI +jgC xbO -hSe +pbi xtZ oVc xpO @@ -73981,7 +74235,7 @@ xVK vQH kwf xNq -kMt +bgm jii jii jii @@ -74095,7 +74349,7 @@ rPl hSy jgC edI -cSI +jgC rIZ bbo xpO @@ -74870,7 +75124,7 @@ iMm sQq sQq fJF -htC +fJF dlE dlE pRN @@ -75064,7 +75318,7 @@ muj uIE sQq nDL -bCl +nDL dlE bOD vLe @@ -75270,7 +75524,7 @@ uXk ruq mWX vdT -fli +iMe jDD cHG cdU @@ -75853,7 +76107,7 @@ naP fmy pDO jUZ -qEb +dJw aeX wOt bxQ @@ -76884,7 +77138,7 @@ his his uaU lgC -lOC +eJo uXC uXC qDA @@ -77015,7 +77269,7 @@ uFy eBH xtJ smX -rzR +bOD lwd jgC mxP @@ -77071,10 +77325,10 @@ his his his his -lOC eJo eJo -lOC +eJo +eJo srn eJo eJo @@ -77082,7 +77336,7 @@ fyK uXC fyK srn -lOC +eJo his his his @@ -77260,7 +77514,7 @@ eJo uXC uXC srn -lOC +eJo gFo his his @@ -77271,7 +77525,7 @@ srn eJo eJo fyK -ndc +uXC uXC uXC uXC @@ -77280,7 +77534,7 @@ eJo eJo eJo eJo -lOC +eJo eJo eJo uXC @@ -77414,7 +77668,7 @@ upn upn aAw aAw -eYN +qOj qOj qOj qOj @@ -77462,14 +77716,14 @@ uXC fyK eJo eJo -ndc +uXC uXC eJo eJo fyK srn eJo -lOC +eJo fyK eJo srn @@ -77645,7 +77899,7 @@ srn uXC uXC uXC -lOC +eJo eJo uXC fyK @@ -77653,7 +77907,7 @@ uXC eJo srn eJo -ndc +uXC uXC uXC eJo @@ -77670,7 +77924,7 @@ uXC eJo eJo srn -lOC +eJo eJo fyK uXC @@ -77842,10 +78096,10 @@ cgG cgG cgG fhP -tdn +mHr cgG cgG -tdn +mHr cgG cgG atJ @@ -77855,7 +78109,7 @@ fhP cgG fhP srn -tdn +mHr srn cgG atJ @@ -77869,7 +78123,7 @@ cgG fyK srn xee -tdn +mHr aFY fyK aFY @@ -77883,12 +78137,12 @@ aFY aFY aFY aFY -mGD -mGD -mGD uWf -mGD -mGD +uWf +uWf +uWf +uWf +uWf osh osh osh @@ -77954,50 +78208,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78028,33 +78282,33 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr fyK -tdn +mHr srn ijF srn @@ -78071,18 +78325,18 @@ aFY aFY fyK aFY -tdn +mHr aFY aFY aFY -tdn +mHr aFY -mGD +uWf fyK -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf pII osh osh @@ -78148,50 +78402,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78222,10 +78476,10 @@ csJ csJ csJ sxt -tdn +mHr ijF -tdn -tdn +mHr +mHr tQo tQo qeS @@ -78244,25 +78498,25 @@ tQo tQo tQo kTm -tdn mHr -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr srn ijF fyK -tdn +mHr isQ eJo xee aFY aFY aFY -tdn +mHr aFY -tdn +mHr fyK aFY aFY @@ -78271,13 +78525,13 @@ aFY aFY fyK aFY -mGD -mGD -tdn -mGD -tdn -mGD -mGD +uWf +uWf +mHr +uWf +mHr +uWf +uWf osh osh osh @@ -78452,26 +78706,26 @@ isQ eJo xee aFY -tdn +mHr aFY aFY fyK -tdn +mHr aFY -tdn +mHr aFY -tdn -tdn +mHr +mHr aFY aFY aFY -mGD -mGD +uWf +uWf fyK -mGD -mGD +uWf +uWf fyK -mGD +uWf osh osh osh @@ -78536,50 +78790,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78610,9 +78864,9 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr sSa tQo mAA @@ -78632,26 +78886,26 @@ lWm yhp xcL srn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr fyK srn -tdn +mHr fyK ijF -tdn +mHr isQ uXC xee aFY aFY fyK -tdn +mHr fyK aFY -tdn +mHr aFY fyK aFY @@ -78660,10 +78914,10 @@ aFY fyK aFY fyK -tdn -mGD -mGD -mGD +mHr +uWf +uWf +uWf uWf osh osh @@ -78730,50 +78984,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78804,13 +79058,13 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr ijF tQo aQV -eEA +wrE thm ufR sZU @@ -78821,18 +79075,18 @@ uQO tQo vEy thm -tdu +xmT dwq muw xcL -tdn -tdn -tdn +mHr +mHr +mHr srn mHr -tdn -tdn -tdn +mHr +mHr +mHr fyK fyK ijF @@ -78842,24 +79096,24 @@ pDZ fyK aFY aFY -tdn +mHr aFY aFY aFY aFY -tdn +mHr aFY aFY aFY aFY aFY -mGD -mGD +uWf +uWf fyK -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf osh osh osh @@ -78924,50 +79178,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -78998,13 +79252,13 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr tQo aQV -wGt +uoX thm uoX sZU @@ -79021,14 +79275,14 @@ tQo tQo iKy srn -tdn +mHr srn -tdn +mHr fyK -tdn +mHr srn -tdn -tdn +mHr +mHr fyK mHr uXC @@ -79039,22 +79293,22 @@ aFY aFY aFY aFY -tdn +mHr aFY aFY aFY aFY -tdn +mHr fyK aFY uWf -mGD -mGD -mGD +uWf +uWf +uWf ter -mGD -tdn -mGD +uWf +mHr +uWf osh osh osh @@ -79118,50 +79372,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79192,10 +79446,10 @@ csJ csJ csJ sxt -tdn +mHr ijF -tdn -tdn +mHr +mHr tQo aQV uoX @@ -79212,15 +79466,15 @@ thm myX xcL srn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr srn -tdn +mHr srn -tdn +mHr fyK srn ijF @@ -79229,26 +79483,26 @@ fyK pDZ aFY aFY -tdn +mHr aFY -tdn +mHr fyK aFY -tdn +mHr aFY fyK aFY aFY aFY aFY -tdn -mGD +mHr +uWf fyK -mGD -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf +uWf osh osh osh @@ -79312,50 +79566,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79386,9 +79640,9 @@ csJ csJ csJ sxt -tdn -tdn -tdn +mHr +mHr +mHr sSa tQo aQV @@ -79405,43 +79659,43 @@ thm thm uYO xcL -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr fyK -tdn -tdn -tdn +mHr +mHr +mHr ijF fyK isQ uXC pDZ aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY -tdn +mHr aFY aFY aFY -mGD -mGD -mGD +uWf +uWf +uWf fyK -mGD -tdn -mGD +uWf +mHr +uWf osh osh osh @@ -79630,11 +79884,11 @@ fyK fyK aFY fyK -mGD -mGD -mGD -mGD -mGD +uWf +uWf +uWf +uWf +uWf uWf osh osh @@ -79700,50 +79954,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79774,10 +80028,10 @@ csJ csJ csJ sxt -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr tQo tQo hvt @@ -79795,40 +80049,40 @@ tQo tQo iKy srn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr srn ijF fyK -tdn +mHr isQ srn pDZ aFY -tdn +mHr aFY -tdn -tdn +mHr +mHr aFY aFY fyK aFY aFY -tdn +mHr aFY aFY aFY -mGD -mGD -tdn -mGD -mGD -mGD +uWf +uWf +mHr +uWf +uWf +uWf osh osh osh @@ -79894,50 +80148,50 @@ uFC uFC uFC uFC -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr +mHr sxt csJ csJ @@ -79968,37 +80222,37 @@ csJ csJ csJ sxt -tdn -tdn +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn -tdn -tdn -tdn -tdn +mHr +mHr +mHr +mHr +mHr +mHr ijF -tdn -tdn +mHr +mHr srn -tdn -tdn +mHr +mHr mHr srn -tdn +mHr fyK -tdn +mHr srn ijF ijF -tdn -xyG +mHr +fyK fyK gIy srn @@ -80017,12 +80271,12 @@ fyK aFY aFY fyK -mGD -tdn -mGD -mGD +uWf +mHr +uWf +uWf kBj -mGD +uWf osh osh osh @@ -80182,7 +80436,7 @@ uEq uEq uEq uEq -tdn +mHr srn uEq srn @@ -80202,20 +80456,20 @@ aFY aFY aFY aFY -tdn +mHr aFY aFY aFY fyK aFY -tdn +mHr aFY aFY -mGD -mGD uWf -mGD -mGD +uWf +uWf +uWf +uWf pII osh osh @@ -80472,7 +80726,7 @@ qbg qbg onC emW -tAe +emW onC isQ kEx @@ -80665,8 +80919,8 @@ qbg (187,1,1) = {" qbg onC -tAe -tAe +emW +emW onC isQ kEx diff --git a/maps/tether/levels/surface2.dmm b/maps/tether/levels/surface2.dmm index 6be758fd195..792c4014828 100644 --- a/maps/tether/levels/surface2.dmm +++ b/maps/tether/levels/surface2.dmm @@ -132,6 +132,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "agl" = ( @@ -409,13 +412,6 @@ /obj/item/reagent_containers/glass/bottle/eznutrient, /turf/simulated/mineral/floor/virgo3b, /area/tether/surfacebase/outside/outside2) -"arf" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "arm" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -1304,15 +1300,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "aZT" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, @@ -2249,6 +2245,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/centralstairwell) "bKL" = ( @@ -2595,6 +2594,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "bVk" = ( @@ -2817,12 +2819,6 @@ }, /turf/simulated/floor/water/indoors, /area/tether/surfacebase/fish_farm) -"cep" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "cex" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/multi_tile/glass{ @@ -3000,14 +2996,19 @@ /area/maintenance/lower/north) "chj" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "chl" = ( @@ -3224,18 +3225,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"cmH" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "cmK" = ( /turf/simulated/floor/grass, /area/maintenance/lower/south) @@ -3473,29 +3462,17 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/armory) "cxu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/obj/machinery/bodyscanner{ - dir = 4 - }, -/obj/effect/floor_decal/corner_steel_grid{ +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/flora/pottedplant/orientaltree, +/obj/machinery/camera/network/medbay{ dir = 10 }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/status_display{ + level = 4; + pixel_y = -32 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/breakroom) "cxA" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -3616,11 +3593,13 @@ pixel_x = 24 }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/standard, -/obj/item/storage/single_use/mre/random, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, +/obj/machinery/disposal, +/obj/machinery/camera/network/medbay{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "cEd" = ( @@ -3654,8 +3633,18 @@ /turf/simulated/floor/outdoors/dirt/virgo3b, /area/tether/surfacebase/outside/outside2) "cFv" = ( -/turf/simulated/mineral/floor/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "cFG" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Substation - Research"; @@ -3753,10 +3742,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/structure/sign/poster{ pixel_y = 32 }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/body_scanconsole{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "cIl" = ( @@ -4053,6 +4047,7 @@ dir = 5 }, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "cST" = ( @@ -4704,6 +4699,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, +/obj/item/storage/single_use/mre/random, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "dtU" = ( @@ -4720,10 +4716,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "duD" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/area/maintenance/lower/south) "dvE" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -4786,10 +4784,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) -"dAG" = ( -/obj/structure/stairs/spawner/west, -/turf/simulated/floor/tiled/techfloor, -/area/chapel/main) "dBJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -5041,6 +5035,9 @@ /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/zpipe/down/aux{ + dir = 1 + }, /turf/simulated/open, /area/engineering/atmos) "dLp" = ( @@ -5958,6 +5955,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "etm" = ( @@ -6136,6 +6136,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "eBG" = ( @@ -6246,6 +6249,7 @@ opacity = 0; open_layer = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/engineering/atmos) "eEq" = ( @@ -6617,11 +6621,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/plating, /area/maintenance/substation/command) -"eUc" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) "eUq" = ( /obj/structure/table/standard, /obj/item/stock_parts/subspace/transmitter, @@ -6685,9 +6684,6 @@ /obj/structure/sign/poster{ pixel_x = -32 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "eWF" = ( @@ -7170,9 +7166,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) -"fmr" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "fmD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7257,6 +7250,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "fun" = ( @@ -7443,6 +7439,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "fAy" = ( @@ -7713,6 +7712,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "fKx" = ( @@ -7967,11 +7967,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/north) -"fQD" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/public_garden_maintenance/upper) "fQP" = ( /turf/simulated/shuttle/wall/voidcraft, /area/tether/surfacebase/old_shelter) @@ -8710,25 +8705,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "gpO" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 6 - }, -/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/uppersouthstairwell) "gqK" = ( /obj/structure/sign/deck/second, /turf/simulated/wall/r_wall/prepainted/science, @@ -9753,6 +9732,7 @@ "gYG" = ( /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "gYL" = ( @@ -9777,6 +9757,9 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "gZb" = ( @@ -9802,12 +9785,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "hag" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "hal" = ( @@ -9834,12 +9813,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/shuttle/floor/voidcraft, /area/tether/surfacebase/old_shelter) -"hbc" = ( -/obj/effect/floor_decal/techfloor, -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "hbM" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, @@ -9856,8 +9829,8 @@ dir = 2; icon_state = "pipe-c" }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -10287,8 +10260,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) "hvD" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/maintenance/lower/atmos) +/area/maintenance/lower/south) "hvF" = ( /obj/structure/bookcase, /turf/simulated/floor/wood, @@ -10421,6 +10398,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "hBi" = ( @@ -11137,20 +11117,11 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "iav" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/item/radio/intercom/department/medbay{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/obj/machinery/camera/network/medbay{ - dir = 10 +/obj/structure/sign/poster{ + pixel_y = -32 }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/area/tether/surfacebase/medical/uppersouthstairwell) "iaC" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -11173,6 +11144,7 @@ "ibp" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/structure/table/glass, +/obj/random/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "ibB" = ( @@ -11544,6 +11516,7 @@ /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "iri" = ( @@ -11560,6 +11533,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "irk" = ( @@ -12024,13 +12000,7 @@ /area/tether/surfacebase/security/outfitting/storage) "iEC" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/reagent_dispensers/water_cooler/full{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/breakroom) "iEH" = ( /obj/machinery/door/airlock/security{ @@ -12240,15 +12210,6 @@ /obj/machinery/camera/network/research, /turf/simulated/floor/wood, /area/rnd/breakroom) -"iLx" = ( -/obj/structure/table/standard, -/obj/structure/bedsheetbin, -/obj/random/soap, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) "iLA" = ( /obj/machinery/button/remote/blast_door{ id = "xenobiodiv1"; @@ -12355,22 +12316,15 @@ /area/tether/surfacebase/medical/resleeving) "iNF" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Medical Breakroom"; - sortType = "Medical Breakroom" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -12465,6 +12419,7 @@ /obj/structure/railing, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos) "iSt" = ( @@ -12495,8 +12450,15 @@ /area/tcommsat/computer) "iTp" = ( /obj/structure/catwalk, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "iTw" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -12676,6 +12638,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/engineering, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "jcA" = ( @@ -12825,6 +12788,9 @@ /area/engineering/atmos) "jhB" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/zpipe/up/aux{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "jhE" = ( @@ -12837,22 +12803,8 @@ /turf/simulated/floor/tiled/techfloor, /area/server) "jiF" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/turf/simulated/mineral, +/area/tether/surfacebase/medical/recoveryward) "jiV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13064,10 +13016,13 @@ /area/maintenance/lower/bar) "jra" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, -/obj/structure/table/standard, -/obj/random/medical, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "jri" = ( @@ -13585,8 +13540,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/evastorage) "jJe" = ( -/turf/simulated/floor/outdoors/grass/sif/virgo3b, -/area/tether/surfacebase/outside/outside2) +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "jKw" = ( /obj/structure/table/glass, /obj/machinery/fire_alarm/west_mount{ @@ -13605,17 +13564,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/patient_c) -"jLb" = ( -/obj/structure/catwalk, -/obj/effect/floor_decal/rust, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/north) "jLf" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14263,6 +14211,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "kmq" = ( @@ -14540,9 +14491,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"kyL" = ( -/turf/simulated/floor, -/area/maintenance/lower/north) "kzz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14589,9 +14537,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) -"kCm" = ( -/turf/simulated/floor, -/area/maintenance/lower/north) "kCZ" = ( /obj/machinery/door/airlock/security{ id_tag = "bathroomlock9"; @@ -14676,14 +14621,16 @@ /area/tether/surfacebase/surface_two_hall) "kHg" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/deck/cah/black{ pixel_x = 5; pixel_y = 29 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/flora/skeleton{ + name = "\proper Sheb" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "kHB" = ( @@ -15103,11 +15050,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "kWG" = ( -/obj/structure/railing{ - dir = 1 +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/supply, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "kWN" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -15267,6 +15221,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "lde" = ( @@ -15315,14 +15272,20 @@ /area/tether/surfacebase/security/interrogation) "lfa" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/table/glass, /obj/item/deck/cah, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "lfi" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/maintenance/lower/south) "lfl" = ( /obj/structure/cable{ @@ -15347,10 +15310,6 @@ /obj/structure/table/wooden_reinforced, /turf/simulated/floor/carpet/turcarpet, /area/bridge/meeting_room) -"lgE" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "lhm" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -15486,6 +15445,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "lpW" = ( @@ -15524,12 +15486,15 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/body_scanconsole{ - dir = 4 - }, /obj/effect/floor_decal/corner_steel_grid{ dir = 10 }, +/obj/machinery/bodyscanner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "lra" = ( @@ -15880,6 +15845,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lFn" = ( @@ -15969,6 +15937,9 @@ pixel_y = 22 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lIC" = ( @@ -16217,6 +16188,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "lSe" = ( @@ -16370,16 +16344,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) -"lYE" = ( -/obj/structure/bookcase/manuals/medical, -/obj/item/book/manual/resleeving, -/obj/item/book/manual/stasis, -/obj/item/book/manual/medical_diagnostics_manual{ - pixel_y = 7 - }, -/obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "lYP" = ( /turf/simulated/floor/plating, /area/vacant/vacant_bar_upper) @@ -16691,17 +16655,17 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/outside/outside2) "miX" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/camera/network/medbay{ - dir = 10 +/obj/structure/mirror{ + dir = 4; + pixel_x = -25 }, -/obj/machinery/status_display{ - level = 4; - pixel_y = -32 +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 }, -/obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) +/area/tether/surfacebase/medical/recoveryward) "mjL" = ( /obj/effect/floor_decal/corner/yellow{ dir = 1 @@ -17047,12 +17011,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/machinery/door/airlock{ + id_tag = "bathroomlock7"; + name = "Restroom" }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) @@ -17232,16 +17196,6 @@ /obj/landmark/spawnpoint/job/security_officer, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) -"mEJ" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/flora/skeleton{ - name = "\proper Sheb" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "mFl" = ( /obj/effect/floor_decal/corner_techfloor_grid, /obj/effect/floor_decal/corner_techfloor_grid{ @@ -17335,6 +17289,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/red, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "mKH" = ( @@ -17643,6 +17600,7 @@ "mUL" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "mUT" = ( @@ -18137,6 +18095,9 @@ req_access = list(61) }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "nmb" = ( @@ -18535,6 +18496,9 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "nxi" = ( @@ -18731,6 +18695,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "nIQ" = ( @@ -18945,14 +18912,9 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_slimepens) "nOX" = ( -/obj/machinery/door/airlock{ - id_tag = "bathroomlock7"; - name = "Restroom" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -19637,10 +19599,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) -"onI" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "ooX" = ( /obj/machinery/light/small{ dir = 1 @@ -19810,6 +19768,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "owe" = ( @@ -19836,6 +19797,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/entrance) "oxn" = ( @@ -20245,9 +20209,6 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/lower/south) "oPZ" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/stairs/spawner/south, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) @@ -20344,17 +20305,19 @@ /area/engineering/atmos) "oSY" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "oTC" = ( @@ -20592,18 +20555,8 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "pcj" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/holoplant, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/medical/recoveryward) "pcu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -20686,14 +20639,11 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) "phQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/south) +/turf/simulated/open, +/area/tether/surfacebase/public_garden_two) "phS" = ( /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/white/border/shifted, @@ -21214,6 +21164,7 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, /obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "pBY" = ( @@ -21439,6 +21390,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/table/standard, +/obj/structure/bedsheetbin, +/obj/random/soap, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "pLC" = ( @@ -21569,15 +21526,6 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "pRb" = ( -/obj/structure/mirror{ - dir = 4; - pixel_x = -25 - }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, @@ -21813,6 +21761,9 @@ /obj/structure/catwalk, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "pZt" = ( @@ -22332,10 +22283,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/north) -"qtM" = ( -/obj/machinery/camera/network/medbay, -/turf/simulated/open, -/area/tether/surfacebase/medical/centralstairwell) "qut" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/air_alarm{ @@ -22363,6 +22310,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "quR" = ( @@ -22394,6 +22344,9 @@ /obj/structure/cable/cyan{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "qvD" = ( @@ -23113,6 +23066,7 @@ }, /obj/machinery/atmospherics/pipe/simple/visible/supply, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "rcx" = ( @@ -23157,12 +23111,16 @@ /area/tether/surfacebase/medical/examroom) "rev" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Medical Breakroom"; + sortType = "Medical Breakroom" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) @@ -23346,6 +23304,9 @@ dir = 4 }, /obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rkD" = ( @@ -23579,7 +23540,20 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "rrk" = ( -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/maintenance/lower/south) "rrQ" = ( /obj/structure/table/steel, @@ -24147,6 +24121,9 @@ dir = 1 }, /obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "rRK" = ( @@ -24188,6 +24165,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "rTQ" = ( @@ -24774,6 +24752,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "soc" = ( @@ -24802,9 +24783,8 @@ /area/tcomsat) "spN" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/structure/table/glass, +/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "sqi" = ( @@ -24961,10 +24941,9 @@ /turf/simulated/floor/plating, /area/maintenance/readingrooms) "ssQ" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - icon_state = "freezer_1"; - set_temperature = 73; - use_power = 1 +/obj/machinery/atmospherics/component/binary/heat_pump{ + use_power = 1; + target_temp = 80 }, /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) @@ -25104,6 +25083,9 @@ dir = 1 }, /obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) "swP" = ( @@ -25240,6 +25222,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "sBb" = ( @@ -25311,6 +25296,9 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "sDf" = ( @@ -25764,11 +25752,9 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_slimepens) "sVc" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/public_garden_two) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "sVB" = ( /obj/structure/catwalk, /obj/machinery/fire_alarm/north_mount, @@ -26099,6 +26085,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "tju" = ( @@ -26134,15 +26123,12 @@ /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "tkx" = ( -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access" - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/medical/breakroom) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/lower/mining) "tlq" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ id = "ward_tint"; @@ -26182,6 +26168,7 @@ /obj/machinery/door/firedoor/glass, /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "tnO" = ( @@ -26391,6 +26378,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "twA" = ( @@ -27032,9 +27022,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/bathroom) -"uhr" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/atmos) "uhO" = ( /obj/machinery/air_alarm{ dir = 4; @@ -27079,6 +27066,9 @@ /obj/structure/cable/cyan{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/atmos) "uiV" = ( @@ -27196,12 +27186,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"unR" = ( -/obj/structure/bed/double/padded, -/obj/item/bedsheet/double, -/obj/structure/curtain/open/privacy, -/turf/simulated/floor/wood, -/area/vacant/vacant_bar_upper) "uoh" = ( /obj/structure/bed/chair{ dir = 1 @@ -27561,18 +27545,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/east_stairs_two) -"uDc" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/purple{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/asmaint2) "uDh" = ( /obj/structure/table/rack/shelf/steel, /obj/machinery/fire_alarm/west_mount{ @@ -27698,6 +27670,9 @@ /obj/machinery/camera/network/engineering{ dir = 4 }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/open, /area/engineering/atmos) "uFm" = ( @@ -27760,6 +27735,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/open, /area/rnd/staircase/secondfloor) "uGA" = ( @@ -28106,6 +28084,9 @@ /obj/structure/railing{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/south) "uTF" = ( @@ -28279,14 +28260,15 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light{ - dir = 4 - }, /obj/item/storage/box/cups{ pixel_x = 8; pixel_y = 8 }, /obj/item/storage/box/donkpockets, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "vbZ" = ( @@ -28535,9 +28517,9 @@ /turf/simulated/floor/tiled/steel_dirty, /area/maintenance/asmaint2) "vkz" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/lower/breakroom) "vkN" = ( @@ -28609,21 +28591,6 @@ /obj/item/reagent_containers/food/drinks/teapot, /turf/simulated/floor/wood, /area/maintenance/lower/atmos) -"voy" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/structure/sign/poster{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "voF" = ( /obj/machinery/holopad, /turf/simulated/floor/carpet/turcarpet, @@ -28717,12 +28684,6 @@ /obj/machinery/shieldgen, /turf/simulated/floor/plating, /area/engineering/atmos/storage) -"vqa" = ( -/obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/structure/table/standard, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/breakroom) "vqk" = ( /obj/structure/cable{ icon_state = "16-0" @@ -29069,6 +29030,7 @@ pixel_x = -5; pixel_y = 24 }, +/obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vDa" = ( @@ -29098,9 +29060,6 @@ /obj/structure/railing, /turf/simulated/open, /area/tether/surfacebase/medical/centralstairwell) -"vEo" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/bar) "vEx" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29225,6 +29184,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/random/maintenance/clean, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "vKx" = ( @@ -29306,9 +29266,21 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "vNL" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/power/apc/east_mount, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 6 }, +/obj/structure/flora/pottedplant/stoutbush, +/obj/structure/cable/green, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vOq" = ( @@ -29327,6 +29299,9 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/recoveryward) "vOs" = ( @@ -29549,10 +29524,6 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_two_hall) -"vZe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/maintenance/lower/south) "vZp" = ( /obj/machinery/door/blast/regular{ id = "xenobiodiv7"; @@ -29593,6 +29564,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/item/radio/intercom/department/medbay{ + dir = 4; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "waY" = ( @@ -29750,6 +29725,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/engineering/atmos) "weP" = ( @@ -29796,9 +29772,15 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wgc" = ( -/obj/machinery/fire_alarm/east_mount, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/bookcase/manuals/medical, +/obj/item/book/manual/medical_diagnostics_manual{ + pixel_y = 7 + }, +/obj/item/book/manual/stasis, +/obj/item/book/manual/resleeving, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/recoveryward) +/area/tether/surfacebase/medical/breakroom) "wgA" = ( /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, @@ -29932,14 +29914,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "wno" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/obj/structure/catwalk, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/plating, /area/maintenance/lower/south) "wnq" = ( @@ -29978,6 +29955,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcommsat/computer) "wqy" = ( @@ -30466,6 +30446,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/cyan{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "wFz" = ( @@ -30619,11 +30602,11 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tcomsat) -"wLg" = ( -/turf/simulated/floor/plating, -/area/maintenance/asmaint2) "wLo" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -30770,6 +30753,9 @@ /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "wSF" = ( @@ -31410,6 +31396,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/engineering/lower/lobby) "xqg" = ( @@ -32002,8 +31991,11 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside2) "xOk" = ( -/obj/machinery/door/airlock/maintenance/medical, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/reagent_dispensers/water_cooler/full{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "xOY" = ( /turf/simulated/floor, @@ -32147,9 +32139,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting) -"xSX" = ( -/turf/simulated/floor/plating, -/area/maintenance/lower/rnd) "xTm" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 9 @@ -33238,10 +33227,10 @@ fQP uUP fQP gbr -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33251,8 +33240,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -33263,23 +33252,23 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33432,49 +33421,49 @@ shS uBs hMi gEU -jJe -jJe fxm -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33626,55 +33615,55 @@ pMA bLg bLg krO -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -33820,31 +33809,31 @@ qip dlA haY sMR -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -33859,19 +33848,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34014,28 +34003,28 @@ gbr scM fQP gbr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34053,20 +34042,20 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34208,28 +34197,28 @@ vFJ vFJ vFJ vFJ -jJe fxm -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34254,19 +34243,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34401,28 +34390,28 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34451,23 +34440,23 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34594,28 +34583,28 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34652,16 +34641,16 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34788,27 +34777,27 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -34850,13 +34839,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -34981,27 +34970,27 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35047,10 +35036,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35175,25 +35164,25 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35242,10 +35231,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35369,24 +35358,24 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35437,10 +35426,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35563,24 +35552,24 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35632,10 +35621,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35758,23 +35747,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -35826,10 +35815,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -35952,23 +35941,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36020,10 +36009,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -36146,23 +36135,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36214,10 +36203,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -36340,23 +36329,23 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36409,9 +36398,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36534,22 +36523,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe +fxm bwy bwy bwy @@ -36603,9 +36592,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36728,22 +36717,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36797,9 +36786,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -36922,22 +36911,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -36991,9 +36980,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -37116,22 +37105,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37186,8 +37175,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -37310,22 +37299,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37380,10 +37369,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37504,22 +37493,22 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37574,10 +37563,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37698,21 +37687,21 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37768,10 +37757,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -37891,22 +37880,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -37962,11 +37951,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38085,22 +38074,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38156,11 +38145,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38279,22 +38268,22 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38350,11 +38339,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38473,21 +38462,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38544,11 +38533,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38667,21 +38656,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -38738,11 +38727,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -38861,21 +38850,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe +fxm bwy bwy bwy @@ -38933,10 +38922,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39057,19 +39046,19 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39127,10 +39116,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39250,20 +39239,20 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39321,10 +39310,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39444,20 +39433,20 @@ tXE vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39516,10 +39505,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39637,21 +39626,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -39710,10 +39699,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -39831,21 +39820,21 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -39904,10 +39893,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40025,20 +40014,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40099,10 +40088,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40219,20 +40208,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40293,10 +40282,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40373,10 +40362,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40413,20 +40402,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm lbt -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40487,10 +40476,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40566,14 +40555,14 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40607,20 +40596,20 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40682,10 +40671,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40758,20 +40747,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40801,19 +40790,19 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -40876,16 +40865,16 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ vFJ -jJe +fxm vFJ vFJ vFJ @@ -40952,20 +40941,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -40995,17 +40984,17 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41070,25 +41059,25 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41146,7 +41135,7 @@ vFJ vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -41156,20 +41145,20 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41189,14 +41178,14 @@ tXE tXE vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41265,26 +41254,26 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41339,8 +41328,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41354,17 +41343,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41382,12 +41371,12 @@ tXE (46,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41459,10 +41448,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41475,12 +41464,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41533,8 +41522,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41555,11 +41544,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41576,11 +41565,11 @@ tXE (47,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41670,11 +41659,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41727,8 +41716,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -41750,10 +41739,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41770,10 +41759,10 @@ tXE (48,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -41865,10 +41854,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41920,9 +41909,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -41946,10 +41935,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -41964,10 +41953,10 @@ tXE (49,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42059,10 +42048,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42114,9 +42103,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -42141,10 +42130,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42158,10 +42147,10 @@ tXE (50,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42254,10 +42243,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42307,10 +42296,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42337,9 +42326,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -42352,10 +42341,10 @@ tXE (51,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42448,10 +42437,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42501,10 +42490,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42532,9 +42521,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -42546,10 +42535,10 @@ tXE (52,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42642,10 +42631,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42695,9 +42684,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -42727,8 +42716,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -42740,10 +42729,10 @@ tXE (53,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42836,10 +42825,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -42888,10 +42877,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -42921,8 +42910,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -42934,10 +42923,10 @@ tXE (54,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43030,10 +43019,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43082,10 +43071,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43115,8 +43104,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43128,10 +43117,10 @@ tXE (55,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43225,9 +43214,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -43276,9 +43265,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43309,8 +43298,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43322,10 +43311,10 @@ tXE (56,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43419,9 +43408,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -43470,9 +43459,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43503,8 +43492,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43516,10 +43505,10 @@ tXE (57,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43613,17 +43602,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43664,9 +43653,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43697,8 +43686,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43710,10 +43699,10 @@ tXE (58,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -43808,22 +43797,22 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -43858,9 +43847,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -43891,8 +43880,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -43904,10 +43893,10 @@ tXE (59,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44003,22 +43992,22 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44051,10 +44040,10 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44085,8 +44074,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -44098,10 +44087,10 @@ tXE (60,1,1) = {" tXE vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -44205,14 +44194,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44245,9 +44234,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44279,8 +44268,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -44292,9 +44281,9 @@ tXE (61,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44400,19 +44389,19 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44439,9 +44428,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44472,9 +44461,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -44486,9 +44475,9 @@ tXE (62,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44600,18 +44589,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44633,9 +44622,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44666,9 +44655,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -44680,9 +44669,9 @@ tXE (63,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44800,14 +44789,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44827,9 +44816,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44859,10 +44848,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -44874,9 +44863,9 @@ tXE (64,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -44999,10 +44988,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45019,11 +45008,11 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -45053,10 +45042,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45068,9 +45057,9 @@ tXE (65,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45195,10 +45184,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45213,9 +45202,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45250,7 +45239,7 @@ nee nee nee nee -jJe +fxm vFJ vFJ vFJ @@ -45262,9 +45251,9 @@ tXE (66,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45391,10 +45380,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45407,9 +45396,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45444,7 +45433,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45456,9 +45445,9 @@ tXE (67,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45586,10 +45575,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -45601,8 +45590,8 @@ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -45638,7 +45627,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45650,9 +45639,9 @@ tXE (68,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -45782,21 +45771,21 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -45832,7 +45821,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -45845,8 +45834,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -45976,19 +45965,19 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -46026,7 +46015,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46039,8 +46028,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46169,17 +46158,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -46220,7 +46209,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46233,8 +46222,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46414,7 +46403,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46427,8 +46416,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46608,7 +46597,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46621,8 +46610,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46802,7 +46791,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -46815,8 +46804,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -46996,7 +46985,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47009,8 +46998,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47190,7 +47179,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47203,8 +47192,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47384,7 +47373,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47397,8 +47386,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47578,7 +47567,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47591,8 +47580,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -47772,7 +47761,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47784,9 +47773,9 @@ tXE (79,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -47966,7 +47955,7 @@ izs izs izs nee -jJe +fxm vFJ vFJ vFJ @@ -47978,9 +47967,9 @@ tXE (80,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -48160,9 +48149,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48172,9 +48161,9 @@ tXE (81,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -48354,9 +48343,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48366,8 +48355,8 @@ tXE (82,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48548,9 +48537,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48560,8 +48549,8 @@ tXE (83,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48742,9 +48731,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48754,8 +48743,8 @@ tXE (84,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -48936,9 +48925,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -48948,8 +48937,8 @@ tXE (85,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49130,9 +49119,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49143,7 +49132,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49324,9 +49313,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49337,7 +49326,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49352,7 +49341,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49518,9 +49507,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49531,7 +49520,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -49545,7 +49534,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49712,9 +49701,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49724,8 +49713,8 @@ tXE (89,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49739,8 +49728,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm wFz wFz wFz @@ -49906,9 +49895,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -49918,8 +49907,8 @@ tXE (90,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -49933,7 +49922,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -49948,7 +49937,7 @@ gcA rdu tto mkT -sVc +tto oPZ lKQ pCm @@ -50100,9 +50089,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50112,8 +50101,8 @@ tXE (91,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50127,7 +50116,7 @@ bwy bwy bwy bwy -jJe +fxm wFz wFz wFz @@ -50142,7 +50131,7 @@ gkc uGJ tto gLy -oYn +phQ oYn nnL pCm @@ -50294,9 +50283,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50305,8 +50294,8 @@ tXE "} (92,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50320,8 +50309,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm wFz wFz wFz @@ -50488,9 +50477,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50499,8 +50488,8 @@ tXE "} (93,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50514,9 +50503,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm wFz wFz wFz @@ -50566,7 +50555,7 @@ xJt xJt xJt xJt -uDc +xJt ctM ctM xJt @@ -50682,9 +50671,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50693,8 +50682,8 @@ tXE "} (94,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50705,12 +50694,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -50733,7 +50722,7 @@ ixp wcm rAZ wcm -fQD +rAZ rAZ fXN aUF @@ -50747,33 +50736,33 @@ jhE nkX vht hSr -iTp +hTu cZv -iTp -duD -iTp -iTp -iTp -iTp +hTu +cZv +hTu +hTu +hTu +hTu sdA -iTp -iTp -duD -iTp -iTp -iTp hTu -iTp -iTp +hTu +cZv +hTu +hTu +hTu +hTu +hTu +hTu dKt -duD -iTp -iTp -iTp -iTp -iTp +cZv +hTu +hTu +hTu +hTu +hTu +hTu hTu -iTp jqg jRP wFz @@ -50876,9 +50865,9 @@ izs izs izs nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -50888,8 +50877,8 @@ tXE (95,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -50898,13 +50887,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -50942,32 +50931,32 @@ npR fGw eRZ hjS -duD -iTp -iTp +cZv +hTu +hTu epY -iTp -iTp -iTp +hTu +hTu +hTu fsz hTu -iTp -iTp -iTp -iTp -iTp -duD -iTp -iTp +hTu +hTu +hTu +hTu +hTu +cZv +hTu +hTu fsz -iTp +hTu fsz -iTp -iTp -iTp -iTp -duD -iTp +hTu +hTu +hTu +hTu +cZv +hTu lfz jRP wFz @@ -51070,8 +51059,8 @@ nee nee nee nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51082,8 +51071,8 @@ tXE (96,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51091,14 +51080,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51141,26 +51130,26 @@ nzI bxo xeM osU -cmH +kSO wdg lBA -cmH +kSO qsa oEL biW kSO -cmH -cmH +kSO +kSO rsZ -cmH +kSO sZS -cmH +kSO fBg iJf hBF gho aoQ -iTp +hTu sve kqP jRP @@ -51264,8 +51253,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51276,8 +51265,8 @@ tXE (97,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51285,14 +51274,14 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51458,8 +51447,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51470,8 +51459,8 @@ tXE (98,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -51479,13 +51468,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51541,7 +51530,7 @@ veN cUl pwF ylZ -wLg +lvu oEd ylZ kSm @@ -51652,8 +51641,8 @@ nee izs izs nee -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -51665,7 +51654,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -51673,13 +51662,13 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm wFz wFz wFz @@ -51736,9 +51725,9 @@ tMO pwF kSm ixI -wLg -wLg -wLg +lvu +lvu +lvu gdE iHu hLa @@ -51846,9 +51835,9 @@ nee nee nee nee -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -51859,7 +51848,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -51867,11 +51856,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm fav fav fav @@ -51928,10 +51917,10 @@ pbv jii bUE pwF -wLg -wLg -wLg -wLg +lvu +lvu +lvu +lvu ixI jRP feD @@ -52039,10 +52028,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -52053,7 +52042,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -52061,11 +52050,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa bsm eIW @@ -52107,7 +52096,7 @@ pkL pkL viD kiI -xSX +kYf caQ mJS fwL @@ -52124,9 +52113,9 @@ wEh pwF glB ylZ -wLg +lvu vBU -wLg +lvu jRP cgg jRP @@ -52234,9 +52223,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -52247,7 +52236,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -52255,11 +52244,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa gXt ged @@ -52428,10 +52417,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -52440,8 +52429,8 @@ tXE (103,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52449,11 +52438,11 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm xYa fkm rZb @@ -52527,8 +52516,8 @@ jRP jRP jRP wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52623,10 +52612,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ tXE @@ -52634,8 +52623,8 @@ tXE (104,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -52644,10 +52633,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm fav nth rmF @@ -52690,8 +52679,8 @@ rGe xcr xcr jsJ -xSX -xSX +kYf +kYf mJS kEs gzB @@ -52721,9 +52710,9 @@ dOK yez jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -52818,17 +52807,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} (105,1,1) = {" tXE vFJ -jJe +fxm bwy bwy bwy @@ -52839,9 +52828,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm xYa xta dtu @@ -52884,7 +52873,7 @@ pkL pkL xcr xcr -xSX +kYf caQ mJS qwm @@ -52915,9 +52904,9 @@ gwx tvc jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53012,18 +53001,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} (106,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53035,7 +53024,7 @@ bwy bwy bwy bwy -jJe +fxm xYa aii skQ @@ -53109,9 +53098,9 @@ jRP wkn jRP wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53207,17 +53196,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} (107,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53273,7 +53262,7 @@ pkL xcr xcr eUG -xSX +kYf mJS akY aBA @@ -53401,18 +53390,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} (108,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -53595,9 +53584,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} @@ -53605,8 +53594,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -53663,7 +53652,7 @@ eCd eCd vdC xDK -xSX +kYf neA kix cFG @@ -53789,9 +53778,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ tXE "} @@ -53800,7 +53789,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -53855,9 +53844,9 @@ pkL xcr eCd eCd -xSX -xSX -xSX +kYf +kYf +kYf neA dNA bOF @@ -53984,8 +53973,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -53994,7 +53983,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -54049,9 +54038,9 @@ xcr xcr eCd dHP -xSX -xSX -xSX +kYf +kYf +kYf neA lfl iRG @@ -54178,8 +54167,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -54188,7 +54177,7 @@ tXE vFJ vFJ vFJ -jJe +fxm bwy bwy bwy @@ -54244,8 +54233,8 @@ eUG eCd qJh kYf -xSX -xSX +kYf +kYf wDT vQz neA @@ -54372,17 +54361,17 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm tXE "} (113,1,1) = {" tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54415,7 +54404,7 @@ lPT dpc tkd rWu -kCm +chK xUE gzA sYE @@ -54467,9 +54456,9 @@ wLH eCq ctv vMH -uhr +yeu crD -hvD +yeu vMH rgv iHY @@ -54490,8 +54479,8 @@ bwy wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54575,8 +54564,8 @@ uBb tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54609,7 +54598,7 @@ pwO oTC tkd rWu -kCm +chK xUE gzA pdg @@ -54632,7 +54621,7 @@ eUG eCd eCd fEl -xSX +kYf tIz jdi adx @@ -54651,19 +54640,19 @@ gYL ntm jaI uHS -wLg -wLg +lvu +lvu qAD lvu eCq -wLg +lvu wLH aVH ekL vMH -uhr -uhr -uhr +yeu +yeu +yeu vMH tJL mMJ @@ -54684,8 +54673,8 @@ wFz wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54769,8 +54758,8 @@ uBb tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54803,7 +54792,7 @@ uBU ngy tkd rWu -kCm +chK xUE gzA gzA @@ -54826,7 +54815,7 @@ eCd eCd eCd fEl -xSX +kYf tIz gcP qqB @@ -54855,17 +54844,17 @@ uQs dGK dGK alM -onI xRn -onI +xRn +xRn vMH dcg mMJ vMH qFt -uhr +yeu aDr -uhr +yeu vMH wFz wFz @@ -54879,7 +54868,7 @@ wFz wFz wFz wFz -jJe +fxm bwy bwy bwy @@ -54962,8 +54951,8 @@ uBb (116,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -54997,7 +54986,7 @@ uBU dUM tkd rWu -kCm +chK xUE tfu gzA @@ -55041,7 +55030,7 @@ cfb uHS lvu hgc -wLg +lvu pjh pjh pjh @@ -55051,14 +55040,14 @@ pjh pjh rRK ntX -onI +xRn vMH ust rrQ vMH btT -uhr -uhr +yeu +yeu iHY vMH wFz @@ -55073,8 +55062,8 @@ wFz wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -55156,8 +55145,8 @@ uBb (117,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -55209,8 +55198,8 @@ pOQ xbU wcp kIy -xSX -xSX +kYf +kYf eUG eUG eUG @@ -55245,7 +55234,7 @@ pVt pjh pjh oRy -onI +xRn vMH vMH vMH @@ -55258,8 +55247,8 @@ vMH vMH vMH vMH -onI -onI +xRn +xRn qJx iXe vMH @@ -55349,9 +55338,9 @@ uBb "} (118,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -55384,7 +55373,7 @@ tkd tkd tkd tkd -kCm +chK rWu xUE gzA @@ -55393,7 +55382,7 @@ gzA sYE xUE gXq -kCm +chK chK xbU jCJ @@ -55403,7 +55392,7 @@ rzZ xbU wcp kIy -xSX +kYf eUG eUG eUG @@ -55439,31 +55428,31 @@ jcK fWd pjh pVC -onI +xRn vMH rtZ aNo vMH ffO -uhr -uhr +yeu +yeu vMH pQj iVZ bsh -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn hLz jri nKr bsh uOu raZ -onI +xRn kim yas bwy @@ -55578,7 +55567,7 @@ bdR msN eeg dbW -kCm +chK rWu xUE gzA @@ -55586,7 +55575,7 @@ gzA xxJ sYE xUE -kCm +chK chK gzA xbU @@ -55597,7 +55586,7 @@ mRe xbU wcp kIy -xSX +kYf eUG eUG eUG @@ -55633,31 +55622,31 @@ oFb fWd pjh laP -onI +xRn vMH vMH vMH vMH -onI -onI -onI +xRn +xRn +xRn alM -onI +xRn xRn rPd -onI +xRn ozi -cep +rRK rRK jRs -onI -onI -onI -onI +xRn +xRn +xRn +xRn uTL -onI -onI -onI +xRn +xRn +xRn kim yas wFz @@ -55772,7 +55761,7 @@ lzF hKR uiV dbW -kCm +chK rWu xUE sYE @@ -55780,8 +55769,8 @@ sYE sYE sYE xUE -kyL -kCm +chK +chK snd xbU vYI @@ -55827,12 +55816,12 @@ bRO mgD pjh rPW -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn ozi rRK vMH @@ -55851,7 +55840,7 @@ vMH vMH vMH vMH -onI +xRn seB vMH wFz @@ -55966,7 +55955,7 @@ kNW jkL jIT dbW -kCm +chK rWu xUE xUE @@ -55981,7 +55970,7 @@ xbU qaV oiE xbU -xSX +kYf xDB amr fUb @@ -56020,13 +56009,13 @@ jap aEr wXZ pjh -uhr +yeu ntX -onI +xRn ayZ jRs -onI -onI +xRn +xRn jzp vMH vMH @@ -56038,7 +56027,7 @@ kTO vMH vMH mYS -uhr +yeu rny fmf kIC @@ -56160,7 +56149,7 @@ knU knU knU knU -kCm +chK opH fAH qtA @@ -56219,27 +56208,27 @@ xGk vKx xGk xGk -onI -onI +xRn +xRn eMe vMH dhc nqH erz yeu -uhr -uhr +yeu +yeu uPG vMH uva -uhr -lgE +yeu +rny fmf kIC kIC kIC vMH -onI +xRn tTc vMH wFz @@ -56357,7 +56346,7 @@ knU trr opH wmV -kWG +cVV bTH xUE epf @@ -56413,27 +56402,27 @@ gdv hwF oWy xGk -onI -onI +xRn +xRn btW vMH jSv nqH -uhr -uhr -uhr +yeu +yeu +yeu kDx nzP vMH -uhr -uhr +yeu +yeu rMv fmf kIC kIC kIC vMH -onI +xRn pzk vMH wFz @@ -56549,9 +56538,9 @@ lSe knU knU wjg -jLb +xrG wmV -kWG +cVV ioh xUE wEK @@ -56565,7 +56554,7 @@ pXi yiY fCy hKp -xSX +kYf kIy qvW eCd @@ -56607,8 +56596,8 @@ cJb hwF hwF xGk -uhr -onI +yeu +xRn jzp vMH vOs @@ -56616,7 +56605,7 @@ nqH aIP kDx ffO -uhr +yeu tpJ vMH wQB @@ -56627,7 +56616,7 @@ kIC kIC kIC vMH -onI +xRn syt vMH wFz @@ -56757,7 +56746,7 @@ uBd cLE nDD yiY -xSX +kYf wcp kYf kIy @@ -56801,7 +56790,7 @@ hWE rXq hwF xGk -uhr +yeu xRn vMH vMH @@ -56810,7 +56799,7 @@ gBu wvN cgx mOK -uhr +yeu vMH vMH vMH @@ -56822,7 +56811,7 @@ vMH vMH vMH xRn -onI +xRn vMH wFz wFz @@ -56995,10 +56984,10 @@ hWE cJb kTQ xGk -uhr -onI -onI -onI +yeu +xRn +xRn +xRn vMH vMH vMH @@ -57014,9 +57003,9 @@ kIC kIC kIC kIC -uhr -onI -onI +yeu +xRn +xRn vMH wFz wFz @@ -57145,9 +57134,9 @@ fFu sVL xpn yiY -xSX +kYf vqk -xSX +kYf kIy eCd eCd @@ -57189,16 +57178,16 @@ hWE cJb hwF xGk -uhr -onI -onI -onI +yeu +xRn +xRn +xRn hLz nKr nKr dtn vMH -uhr +yeu vMH nLj nLj @@ -57208,9 +57197,9 @@ kIC kIC kIC kIC -uhr -onI -onI +yeu +xRn +xRn vMH wFz wFz @@ -57339,9 +57328,9 @@ nFz wWD mLj wDn -xSX +kYf vuJ -xSX +kYf kIy epZ jdR @@ -57384,15 +57373,15 @@ cJb hwF xGk kqI -onI -onI -onI -onI -onI -onI +xRn +xRn +xRn +xRn +xRn +xRn wMT vMH -uhr +yeu cFa cFa cFa @@ -57477,8 +57466,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm uBb "} (129,1,1) = {" @@ -57586,7 +57575,7 @@ vMH vMH vMH vMH -uhr +yeu cFa dFL dFL @@ -57670,9 +57659,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm tXE "} (130,1,1) = {" @@ -57772,15 +57761,15 @@ cJb hwF xGk kqI -onI +xRn sxo vMH qgY qFQ ffO -uhr +yeu jPo -uhr +yeu cFa eBn eBn @@ -57864,8 +57853,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ tXE "} @@ -57966,11 +57955,11 @@ cJb baa xGk cwF -onI +xRn gUy vMH -uhr -uhr +yeu +yeu aIP uEH vMH @@ -57985,7 +57974,7 @@ cfY eBn cfY eBn -unR +cfY cFa wFz bwy @@ -58056,10 +58045,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ tXE "} @@ -58160,8 +58149,8 @@ cJb hwF xGk cwF -onI -hbc +xRn +ikB vMH sxe vgC @@ -58249,10 +58238,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ tXE @@ -58354,13 +58343,13 @@ cJb hwF xGk cwF -onI +xRn eUR dyu -uhr +yeu ffO asf -uhr +yeu vMH nLj cFa @@ -58441,10 +58430,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -58548,13 +58537,13 @@ cJb hwF xGk lAt -onI +xRn ixv vMH fiE -uhr -uhr -uhr +yeu +yeu +yeu vMH nLj cFa @@ -58634,9 +58623,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -58828,8 +58817,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59022,8 +59011,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59136,7 +59125,7 @@ rRh iqG fKt pBU -wno +rbK rbK vJr tjt @@ -59215,9 +59204,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -59229,9 +59218,9 @@ tXE "} (138,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -59260,7 +59249,7 @@ eks eks eks eks -eks +xUE xUE phg uvM @@ -59409,9 +59398,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -59424,8 +59413,8 @@ tXE (139,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59454,7 +59443,7 @@ mIX rke eWt mUL -xOk +hJZ hJZ kww hJZ @@ -59603,8 +59592,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59618,8 +59607,8 @@ tXE (140,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59647,8 +59636,8 @@ uBq dtz lfa kHg -mEJ -eks +iEC +hJZ hJZ aYa hJZ @@ -59755,26 +59744,26 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -59797,8 +59786,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -59813,8 +59802,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -59840,9 +59829,9 @@ azR jmA uEv uEv -nen -lYE -eks +wgc +iEC +xUE xUE bvU uvM @@ -59946,31 +59935,31 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -59991,8 +59980,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60007,8 +59996,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60034,13 +60023,13 @@ wWu bkP dPX dPX -nen +xOk iEC -eks +eoE sCb bHM sCb -kWG +cVV xUE sYE xbU @@ -60088,10 +60077,10 @@ rTA eEe gYG cRZ -tOr -tOr -iPR -fkn +sVc +sVc +wno +jJe fkn snw pmH @@ -60139,33 +60128,33 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ vFJ vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60185,8 +60174,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60201,8 +60190,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60227,10 +60216,10 @@ eks byl bkP ibp -ibp -nen -miX -eks +spN +cxu +iEC +ckW eCL cmO yhc @@ -60285,7 +60274,7 @@ ecI tOr tOr hVT -fkn +hvD qqM snw tOr @@ -60332,9 +60321,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60359,9 +60348,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60379,8 +60368,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60395,8 +60384,8 @@ tXE tXE vFJ vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60423,8 +60412,8 @@ eXv iIZ shc nen -vqa -eks +iEC +ckW ckW oiB bGd @@ -60479,7 +60468,7 @@ nhv mcX mcX mcX -fkn +hvD sku snw snw @@ -60526,7 +60515,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -60554,9 +60543,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60573,8 +60562,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60588,9 +60577,9 @@ tXE (145,1,1) = {" tXE vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60616,9 +60605,9 @@ pxm bkP cjR cjR -spN -jra -eks +nen +iEC +ckW ckW agZ ion @@ -60673,7 +60662,7 @@ bMb kUo glL mcX -fkn +hvD tUS snw nmb @@ -60719,8 +60708,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60750,9 +60739,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60766,9 +60755,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60782,8 +60771,8 @@ tXE (146,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -60809,7 +60798,7 @@ eks imh bkP nen -nen +jra rev iNF tkx @@ -60913,9 +60902,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -60945,9 +60934,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -60960,8 +60949,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -60976,8 +60965,8 @@ tXE (147,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61005,9 +60994,9 @@ hOc wDz chj oSY -jiF -eks +iEC scr +ckW cqh tos kyu @@ -61061,7 +61050,7 @@ lcp idy rTQ mcX -fkn +hvD tUS snw tOr @@ -61072,7 +61061,7 @@ snw dfA dfA snw -feb +rrk snw std std @@ -61107,9 +61096,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61140,9 +61129,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61153,9 +61142,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61169,9 +61158,9 @@ tXE "} (148,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61199,8 +61188,8 @@ boR waC vbK cDL -iav -eks +iEC +ckW ckW svv ckW @@ -61255,7 +61244,7 @@ gtR wOd wOd mcX -fkn +hvD cCy snw dXW @@ -61266,7 +61255,7 @@ snw snw snw snw -feb +rrk snw dfA dfA @@ -61301,9 +61290,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -61335,9 +61324,9 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -61346,10 +61335,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61363,8 +61352,8 @@ tXE "} (149,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61449,7 +61438,7 @@ tfp idy idy mcX -fkn +hvD ciL snw snw @@ -61495,8 +61484,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61530,20 +61519,20 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61557,8 +61546,8 @@ tXE "} (150,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61643,17 +61632,17 @@ tfp foH foH mcX -fkn -fkn +lfi +hag tna -fkn -fkn -fkn -fkn +hag +hag +hag +hag tna -fkn +hag jco -uMt +duD wSE snw dfA @@ -61689,8 +61678,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61725,18 +61714,18 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61752,7 +61741,7 @@ tXE (151,1,1) = {" tXE vFJ -jJe +fxm bwy bwy bwy @@ -61766,7 +61755,7 @@ bwy mAy mAy mAy -jJe +fxm eCv tCY yjH @@ -61837,7 +61826,7 @@ tfp bYv bYv mcX -fkn +hvD uth snw ism @@ -61883,8 +61872,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -61920,14 +61909,14 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -61946,8 +61935,8 @@ tXE (152,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -61959,8 +61948,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm eCv fSf dIs @@ -62031,7 +62020,7 @@ tfp dfA snw lSX -fkn +hvD tUS snw snw @@ -62078,8 +62067,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62115,11 +62104,11 @@ vFJ vFJ vFJ vFJ -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm vFJ vFJ vFJ @@ -62140,8 +62129,8 @@ tXE (153,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -62153,8 +62142,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm eCv ctt pXB @@ -62225,7 +62214,7 @@ tfp dfA snw avZ -fkn +hvD wRV snw dfA @@ -62272,8 +62261,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62335,7 +62324,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62348,7 +62337,7 @@ bwy bwy mAy mAy -jJe +fxm lFn lFn lFn @@ -62381,8 +62370,8 @@ fah mUT fah daS -dAG -dAG +dox +dox sYA fah mSY @@ -62419,7 +62408,7 @@ tfp dfA snw aYe -fkn +hvD tUS snw dfA @@ -62466,8 +62455,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62529,7 +62518,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62542,7 +62531,7 @@ bwy bwy mAy mAy -jJe +fxm hAs fjg bTU @@ -62613,7 +62602,7 @@ dfA dfA snw qxM -fkn +hvD tUS snw snw @@ -62660,9 +62649,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -62723,7 +62712,7 @@ tXE tXE vFJ vFJ -jJe +fxm bwy bwy bwy @@ -62735,8 +62724,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm hAs uTQ mIc @@ -62754,7 +62743,7 @@ nLH nOJ qyx ipR -pcj +uEI uEI liF gYw @@ -62855,8 +62844,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -62916,8 +62905,8 @@ tXE (157,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -62930,7 +62919,7 @@ bwy bwy mAy mAy -jJe +fxm hAs jBO aNi @@ -62947,8 +62936,8 @@ sIY rxm sQs uuj -rxm -voy +iav +uEI uEI liF gYw @@ -62972,7 +62961,7 @@ xZX tOr cmK ioL -rrk +aEs rlf tOr snw @@ -63001,10 +62990,10 @@ jZT jZT jZT jZT -jZT -jZT -jZT -jZT +kWG +iTp +iTp +cFv jZT qdO snw @@ -63049,8 +63038,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63110,8 +63099,8 @@ tXE (158,1,1) = {" tXE vFJ -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63123,8 +63112,8 @@ bwy bwy bwy mAy -jJe -jJe +fxm +fxm jXk jXk jXk @@ -63134,12 +63123,12 @@ qMz vCf ujn rYi -qtM +etM qsf jQW rTT xmy -rxm +gpO rXt rXt uDW @@ -63166,8 +63155,8 @@ snw fsS tOr snw -rrk -hag +aEs +rlf tOr xZX tSk @@ -63243,8 +63232,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63303,8 +63292,8 @@ tXE "} (159,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63318,7 +63307,7 @@ bwy bwy mAy mAy -jJe +fxm alC jKw jAo @@ -63362,7 +63351,7 @@ xZX snw tOr pmb -rrk +aEs snw xZX xZX @@ -63421,7 +63410,7 @@ pTA fhQ pYv jOP -jJe +fxm bwy bwy bwy @@ -63437,8 +63426,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63497,8 +63486,8 @@ tXE "} (160,1,1) = {" tXE -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63615,7 +63604,7 @@ cyp ouj yjT jOP -jJe +fxm bwy bwy bwy @@ -63630,8 +63619,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63691,8 +63680,8 @@ tXE "} (161,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63726,7 +63715,7 @@ whe mZm omx uEI -arf +uQP rMt pAU kMx @@ -63744,11 +63733,11 @@ shL qVF qVF sGi -rrk +aEs tOr -lfi +aEs tOr -rrk +aEs gvS sPt jrt @@ -63809,7 +63798,7 @@ yjT yjT yjT qIe -jJe +fxm bwy bwy bwy @@ -63824,8 +63813,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -63885,8 +63874,8 @@ tXE "} (162,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -63941,13 +63930,13 @@ fah snw tOr tOr -rrk +aEs jUY -phQ +doA maf -rrk +aEs jUY -rrk +aEs snw snw snw @@ -64003,7 +63992,7 @@ qIe scX scX qIe -jJe +fxm bwy bwy bwy @@ -64018,9 +64007,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -64079,8 +64068,8 @@ tXE "} (163,1,1) = {" uBb -jJe -jJe +fxm +fxm bwy bwy bwy @@ -64114,7 +64103,7 @@ pxA rga lZN uEI -arf +uQP rMt ylr vIt @@ -64142,7 +64131,7 @@ kXz tOr jUY tOr -rrk +aEs abF snw dfA @@ -64197,7 +64186,7 @@ qIe gPy gPy qIe -jJe +fxm bwy bwy bwy @@ -64212,7 +64201,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -64273,9 +64262,9 @@ tXE "} (164,1,1) = {" uBb -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64303,12 +64292,12 @@ wWc qcl oDp xay -eUc +hUI pxA vpG stt stt -arf +uQP rMt rMt rMt @@ -64319,7 +64308,7 @@ rMt rMt rMt rMt -arf +uQP fah ahi inU @@ -64330,12 +64319,12 @@ snw tOr vIG iHj -vZe +oPN cVu tOr tOr -lfi -rrk +aEs +aEs snw sNE snw @@ -64391,7 +64380,7 @@ fOm gPy gPy pQm -jJe +fxm bwy bwy bwy @@ -64406,7 +64395,7 @@ bwy bwy bwy bwy -jJe +fxm vFJ vFJ vFJ @@ -64467,9 +64456,9 @@ tXE "} (165,1,1) = {" tXE -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64494,10 +64483,10 @@ oEY lqt eEy vNL -rOp -rOp -rOp -hUI +eVD +eVD +lxQ +qpB pxA yeV hJZ @@ -64529,9 +64518,9 @@ iGQ fsU tOr fsU -rrk -rrk -rrk +aEs +aEs +aEs snw dfA snw @@ -64585,7 +64574,7 @@ wis eSc pvM pQm -jJe +fxm bwy bwy bwy @@ -64599,8 +64588,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm vFJ vFJ vFJ @@ -64662,9 +64651,9 @@ tXE (166,1,1) = {" tXE wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -64685,13 +64674,13 @@ fIx kUc sAb oEY -cxu +pxA myH -gpO -eVD -eVD -lxQ -qpB +pxA +pxA +pxA +pxA +pxA pxA xUE xUE @@ -64720,10 +64709,10 @@ bOp xjC sPt idB -rrk +aEs tOr -rrk -rrk +aEs +aEs snw snw snw @@ -64757,13 +64746,13 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz ndx dDB @@ -64779,7 +64768,7 @@ sNL gPy poo pQm -jJe +fxm bwy bwy bwy @@ -64792,9 +64781,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -64857,8 +64846,8 @@ tXE tXE wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -64879,13 +64868,13 @@ cUi oEY oEY oEY -pxA +miX nOX +gwS pxA -pxA -pxA -pxA -pxA +npE +thk +xly pxA gRB eeE @@ -64915,9 +64904,9 @@ fsU kXz hTV jUY -rrk +aEs maf -rrk +aEs snw wFz wFz @@ -64947,18 +64936,18 @@ wFz wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy -jJe -jJe +fxm +fxm ndx bnH ndx @@ -64973,7 +64962,7 @@ qIe pQm qIe qIe -jJe +fxm bwy bwy bwy @@ -64985,9 +64974,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65052,8 +65041,8 @@ tXE wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65076,10 +65065,10 @@ wyh pRb nGn edL -pxA -npE -thk -xly +pEs +jux +naz +biO pxA oGS uCO @@ -65096,20 +65085,20 @@ ydu fah uCO fah -vEo +nkd nxW aOU -vEo -vEo +nkd +nkd wkK snw -rrk -rrk -rrk +aEs +aEs +aEs kXz qkb jUY -rrk +aEs kXz tOr snw @@ -65128,20 +65117,20 @@ wFz wFz wFz wFz -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm wFz wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm wFz -jJe +fxm bwy bwy bwy @@ -65151,8 +65140,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm ndx sqq iZM @@ -65163,11 +65152,11 @@ ndx wUq iZM ndx -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -65178,9 +65167,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65265,15 +65254,15 @@ wFz wFz wFz pxA -gwS +rOp aKe mVl pLq hoH -pEs -jux -naz -biO +pxA +cBj +gcV +pxA pxA iue uCO @@ -65290,22 +65279,22 @@ ydu fah ooX reD -vEo +nkd nkd nxW nkd -vEo +nkd nkd aUm tOr -rrk +aEs tOr tOr gUe iHj oPN caT -rrk +aEs snw cFu cFu @@ -65321,21 +65310,21 @@ snw wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -65346,7 +65335,7 @@ bwy bwy bwy bwy -jJe +fxm ndx iOU apo @@ -65357,8 +65346,8 @@ ndx iOU apo ndx -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65372,9 +65361,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65459,15 +65448,15 @@ wFz wFz wFz pxA -rOp -wgc -rOp -iLx -rOp +tBO +pxA +vul +pxA +hCY pxA cBj gcV -pxA +xly pxA xAg uCO @@ -65484,26 +65473,26 @@ fah fah uCO fah -vEo +nkd nxW nxW lJC nxW -vEo +nkd snw lQq -rrk +aEs lDH aEs -rrk -rrk +aEs +aEs lDH -rrk +aEs iAL snw -jJe -jJe -jJe +fxm +fxm +fxm snw gCr snw @@ -65522,8 +65511,8 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65540,7 +65529,7 @@ bwy bwy bwy bwy -jJe +fxm ndx cGM cGM @@ -65551,8 +65540,8 @@ ndx cGM cGM ndx -jJe -jJe +fxm +fxm bwy bwy bwy @@ -65566,9 +65555,9 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm vFJ vFJ vFJ @@ -65653,15 +65642,15 @@ wFz wFz wFz pxA -tBO +gBM pxA -vul +tuv pxA -hCY +dtX pxA -cBj -gcV -xly +rtt +jwq +biO pxA nRA iNS @@ -65678,12 +65667,12 @@ mAy fah upb fah -fmr -vEo -vEo +nkd +nkd +nkd pYe -vEo -vEo +nkd +nkd snw gCr gCr @@ -65695,20 +65684,20 @@ snw gCr gCr snw -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -65734,18 +65723,18 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -65847,15 +65836,15 @@ wFz wFz wFz pxA -gBM pxA -tuv pxA -dtX pxA -rtt -jwq -biO +pxA +pxA +pxA +pxA +pxA +pxA pxA fah upb @@ -65872,37 +65861,37 @@ mAy mAy mAy fah -vEo +nkd nkd nxW izp -vEo -vEo +nkd +nkd fah -jJe -jJe +fxm +fxm oHZ -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -65932,10 +65921,10 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66040,16 +66029,16 @@ bwy wFz wFz wFz -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA -pxA +jiF +jiF +jiF +pcj +pcj +pcj +pcj +pcj +pcj +pcj pxA bwy bwy @@ -66066,37 +66055,37 @@ rnc vnb mAy fah -vEo +nkd nkd nxW riz -vEo +nkd pyd fah -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -66236,13 +66225,13 @@ bwy wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66267,30 +66256,30 @@ fah fah fah fah -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy bwy @@ -66428,12 +66417,12 @@ bwy bwy bwy bwy -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm bwy bwy bwy @@ -66458,32 +66447,32 @@ mAy wFz wFz wFz -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -66541,7 +66530,7 @@ xza xWR fKG vFJ -cFv +jOP jOP jOP vFJ @@ -66647,37 +66636,37 @@ bwy bwy bwy rnc -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -66842,35 +66831,35 @@ bwy bwy bwy bwy -jJe -jJe -jJe +fxm +fxm +fxm mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67037,34 +67026,34 @@ bwy bwy bwy bwy -jJe -jJe +fxm +fxm mAy mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67122,7 +67111,7 @@ azT wCU wCU fKG -cFv +jOP jOP vFJ vFJ @@ -67232,32 +67221,32 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy mAy mAy -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy -jJe -jJe +fxm +fxm mAy mAy mAy @@ -67318,7 +67307,7 @@ mAy fKG jOP jOP -cFv +jOP vFJ vFJ vFJ @@ -67426,7 +67415,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67434,19 +67423,19 @@ mAy mAy uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -67620,7 +67609,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67628,17 +67617,17 @@ mAy mAy uNr uNr -jJe -jJe -jJe -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm +fxm +fxm +fxm mAy -jJe -jJe +fxm +fxm mAy mAy mAy @@ -67814,7 +67803,7 @@ bwy bwy bwy bwy -jJe +fxm mAy mAy mAy @@ -67824,11 +67813,11 @@ mAy mAy mAy mAy -jJe -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm +fxm mAy mAy mAy @@ -68017,12 +68006,12 @@ mAy mAy mAy mAy -jJe -jJe -jJe -jJe +fxm +fxm +fxm +fxm mAy -jJe +fxm mAy mAy mAy @@ -68932,8 +68921,8 @@ tXE wFz wFz wFz -jJe -jJe +fxm +fxm bwy bwy bwy @@ -69127,9 +69116,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -69322,9 +69311,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy @@ -69517,9 +69506,9 @@ wFz wFz wFz wFz -jJe -jJe -jJe +fxm +fxm +fxm bwy bwy bwy diff --git a/maps/tether/levels/surface3.dmm b/maps/tether/levels/surface3.dmm index 4e18771f12c..545e244d7ae 100644 --- a/maps/tether/levels/surface3.dmm +++ b/maps/tether/levels/surface3.dmm @@ -209,6 +209,7 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "adP" = ( @@ -336,7 +337,7 @@ "afT" = ( /obj/structure/flora/pottedplant/unusual, /obj/machinery/fire_alarm/east_mount, -/obj/machinery/camera/network/research{ +/obj/machinery/camera/network/research/xenobio{ dir = 1 }, /turf/simulated/floor/wood, @@ -411,12 +412,11 @@ /area/tether/surfacebase/outside/outside3) "aiC" = ( /obj/structure/railing, -/obj/structure/grille, -/obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ - frequency = 1379; - id_tag = "southciv_airlock_pump" +/obj/structure/sign/nosmoking_2{ + pixel_y = 30 }, -/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/component/unary/env_heat_pump, +/obj/map_helper/airlock/atmos/chamber_temperature_adjuster, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "aiJ" = ( @@ -468,11 +468,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"akq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "akz" = ( /obj/structure/table/bench/steel, /obj/effect/floor_decal/borderfloor{ @@ -536,12 +531,6 @@ /obj/machinery/power/apc/east_mount, /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) -"amn" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/tether/surfacebase/medical/uppersouthstairwell) "amw" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -920,18 +909,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"avu" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 9 - }, -/obj/machinery/vending/medical{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "avK" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/orange{ @@ -1169,14 +1146,12 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "aCE" = ( -/obj/structure/table/rack, -/obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/medical/lite, -/obj/random/maintenance/medical, -/obj/random/toy, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "aCO" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/freezer, @@ -1230,13 +1205,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aDP" = ( -/obj/effect/floor_decal/techfloor{ - dir = 6 - }, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, /obj/random/maintenance/medical, /obj/structure/closet/firecloset, +/obj/effect/floor_decal/techfloor, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "aEt" = ( @@ -1363,10 +1335,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) -"aHd" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "aHg" = ( /obj/effect/floor_decal/industrial/loading{ dir = 4 @@ -1409,20 +1377,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "aHM" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "aIi" = ( /obj/structure/sign/nanotrasen, /turf/simulated/wall/prepainted/science, @@ -1557,7 +1519,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "aLt" = ( /obj/structure/table/wooden_reinforced, /obj/item/radio/phone, @@ -1627,14 +1589,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/techfloor{ + dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 +/obj/effect/floor_decal/techfloor/corner{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "aNO" = ( /obj/machinery/light{ dir = 8 @@ -1749,20 +1711,12 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aSf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 5 +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "aSh" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -1792,6 +1746,11 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/structure/table/steel, +/obj/item/defib_kit/loaded, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aSE" = ( @@ -1872,28 +1831,7 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"aUW" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - req_access = list(30,35,47,77); - req_one_access = list() - }, -/obj/machinery/door/window/brigdoor/southright{ - dir = 8; - req_access = list(30,35,47,77); - req_one_access = list() - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "aUY" = ( -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, -/obj/item/tool/wrench, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5) - }, /obj/machinery/air_alarm{ pixel_y = 25 }, @@ -1903,6 +1841,9 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "aVs" = ( @@ -1979,6 +1920,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "aZw" = ( @@ -2116,9 +2058,6 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "bcG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -2128,6 +2067,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bcW" = ( @@ -2217,6 +2157,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bfL" = ( @@ -2264,9 +2205,6 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "bgt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 9 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -2331,7 +2269,9 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bhB" = ( @@ -2343,15 +2283,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bhO" = ( -/obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/hallway/lower/third_south) "biu" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -2397,12 +2342,6 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bjO" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, /obj/item/radio/intercom/department/medbay{ dir = 8; pixel_x = -24 @@ -2411,6 +2350,12 @@ dir = 4 }, /obj/machinery/disposal, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 9 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "bkm" = ( @@ -2424,6 +2369,9 @@ dir = 10 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "blA" = ( @@ -2448,10 +2396,6 @@ /turf/simulated/floor/carpet, /area/library) "bmh" = ( -/obj/structure/closet/l3closet/scientist, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -2464,15 +2408,10 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "bmn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 10 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -2480,6 +2419,11 @@ dir = 6 }, /obj/machinery/camera/network/medbay, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 6 + }, +/obj/structure/table/steel, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "bmE" = ( @@ -2666,19 +2610,16 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "brh" = ( -/obj/machinery/camera/network/tether, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/camera/network/research, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "brA" = ( /turf/simulated/open, /area/rnd/staircase/thirdfloor) @@ -2774,23 +2715,6 @@ /obj/effect/paint_stripe/bottlegreen, /turf/simulated/floor/plating, /area/crew_quarters/bar) -"but" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled/steel_grid, -/area/rnd/xenobiology/xenoflora_storage) "buF" = ( /obj/item/storage/firstaid/o2{ pixel_x = 5; @@ -2871,9 +2795,6 @@ pixel_x = 5 }, /obj/structure/curtain/open/shower, -/obj/machinery/camera/network/research/xenobio{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "bww" = ( @@ -2882,13 +2803,6 @@ }, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"bwH" = ( -/obj/machinery/biogenerator, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "bxs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -2922,12 +2836,10 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "bxM" = ( /obj/structure/toilet{ dir = 8 @@ -2946,6 +2858,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "byD" = ( @@ -2959,18 +2872,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bzg" = ( -/obj/structure/window/reinforced, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) @@ -3035,11 +2938,8 @@ "bBk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "bBs" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -3049,6 +2949,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "bBD" = ( @@ -3143,15 +3047,14 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "bCF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "bCV" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -3287,12 +3190,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "bHT" = ( -/obj/machinery/chem_master, /obj/effect/floor_decal/borderfloorwhite, /obj/item/radio/intercom{ pixel_y = -28 }, /obj/effect/floor_decal/corner/orange/border, +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "bIe" = ( @@ -3376,16 +3280,17 @@ dir = 1; pixel_y = -28 }, +/obj/machinery/camera/network/research/xenobio{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "bLf" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Isolation to Waste" +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "bLy" = ( /turf/simulated/floor/tiled/steel_grid, /area/rnd/robotics) @@ -3639,15 +3544,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) -"bTv" = ( -/obj/structure/table/glass, -/obj/random/medical, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/item/tool/screwdriver, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "bTM" = ( /obj/structure/sign/directions/evac{ dir = 1 @@ -3890,6 +3786,9 @@ name = "Surface EVA" }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "caF" = ( @@ -3901,6 +3800,9 @@ /area/rnd/research_storage) "caI" = ( /obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "caX" = ( @@ -3961,6 +3863,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "cdd" = ( @@ -4012,7 +3915,7 @@ name = "Fire/Phoron Shelter" }, /turf/simulated/floor/tiled/techfloor/grid, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "ceB" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -4024,26 +3927,21 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "cfG" = ( /obj/effect/floor_decal/borderfloor{ - dir = 5 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 + dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "cfT" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, @@ -4231,6 +4129,9 @@ }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "ckA" = ( @@ -4240,6 +4141,7 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ckD" = ( @@ -4325,6 +4227,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "cou" = ( @@ -4430,17 +4335,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"csz" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "csF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4497,7 +4391,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ctR" = ( -/obj/machinery/botany/extractor, /obj/machinery/light{ dir = 8 }, @@ -4507,6 +4400,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ctU" = ( @@ -4528,7 +4423,7 @@ /obj/item/slime_scanner, /obj/item/multitool, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) @@ -4626,12 +4521,14 @@ /turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "cwf" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 +/obj/machinery/vending/medical{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "cwy" = ( /obj/machinery/door/airlock{ name = "Internal Affairs"; @@ -4854,14 +4751,26 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "cBN" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "cBT" = ( /obj/structure/table/steel, /obj/item/integrated_circuit_printer, @@ -4924,7 +4833,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, /turf/simulated/floor/tiled, @@ -4940,6 +4849,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "cDs" = ( @@ -4968,12 +4878,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery1) -"cEO" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "cEQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -5057,16 +4961,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"cGJ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "cGO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5117,13 +5011,14 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "cKI" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/steeldecal/steel_decals10{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/item/defib_kit/loaded, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "cKJ" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint_stripe/purplegray, @@ -5177,7 +5072,6 @@ /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/shuttle_pad) "cOu" = ( -/obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -5190,9 +5084,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -5600,14 +5493,22 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/tourbus/general) "dcU" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 1 }, -/obj/machinery/camera/network/research/xenobio{ - dir = 9 +/obj/structure/table/standard, +/obj/item/reagent_containers/food/drinks/teapot, +/obj/item/reagent_containers/food/drinks/tea{ + pixel_x = 9; + pixel_y = -6 }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_hallway) +/obj/item/reagent_containers/food/drinks/tea{ + pixel_x = -7; + pixel_y = 6 + }, +/turf/simulated/open, +/area/rnd/outpost/xenobiology/outpost_stairs) "dda" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -5634,19 +5535,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) -"ddu" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "ddX" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/zpipe/down{ @@ -5665,16 +5553,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/rnd/research_storage) -"dea" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "def" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/water/deep/pool, @@ -5712,6 +5590,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dia" = ( @@ -5787,12 +5668,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dln" = ( @@ -5820,7 +5704,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "dna" = ( /obj/machinery/newscaster{ pixel_y = 30 @@ -5977,12 +5861,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) -"drE" = ( -/obj/machinery/camera/network/research/xenobio{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/rnd/outpost/xenobiology/outpost_main) "drY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6209,16 +6087,10 @@ /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "dyy" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "dyJ" = ( /turf/simulated/wall/r_wall/prepainted/command, /area/crew_quarters/captain) @@ -6262,18 +6134,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "dzs" = ( -/obj/item/radio/intercom{ - dir = 1; - pixel_y = 24 - }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 5 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 1 + dir = 5 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "dAe" = ( /obj/structure/closet/hydrant{ pixel_y = -32 @@ -6355,13 +6228,14 @@ /turf/simulated/floor/plating, /area/hallway/lower/third_south) "dBH" = ( -/obj/machinery/botany/editor, /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "dBP" = ( @@ -6410,6 +6284,9 @@ id_tag = "southciv_airlock_outer"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "dCm" = ( @@ -6608,6 +6485,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "dIO" = ( @@ -6690,6 +6570,7 @@ "dLp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "dLw" = ( @@ -6986,6 +6867,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "dVr" = ( @@ -7043,6 +6925,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "dXD" = ( @@ -7080,13 +6963,6 @@ /obj/structure/cable/green, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) -"dXU" = ( -/obj/machinery/atmospherics/component/binary/pump{ - dir = 4; - name = "Port to Isolation" - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "dXZ" = ( /obj/machinery/light, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -7254,17 +7130,9 @@ /turf/simulated/floor/tiled, /area/teleporter/departing) "eet" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/flora/pottedplant/stoutbush, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, +/obj/effect/paint_stripe/babyblue, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "eez" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -7346,6 +7214,9 @@ name = "Surface EVA" }, /obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/tether/surfacebase/topairlock) "eha" = ( @@ -7356,6 +7227,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "eho" = ( @@ -7400,13 +7272,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "eiR" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "eiX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ejU" = ( @@ -7440,10 +7321,9 @@ /obj/machinery/power/apc/south_mount, /obj/random/maintenance/medical, /obj/random/maintenance/medical, -/obj/random/maintenance/clean, -/obj/random/maintenance/medical, /obj/structure/closet, /obj/effect/floor_decal/techfloor, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "elj" = ( @@ -7499,6 +7379,7 @@ dir = 1 }, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "enf" = ( @@ -7608,17 +7489,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"eqo" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "eqR" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -7824,18 +7694,10 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "evK" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "ewg" = ( /obj/machinery/photocopier, @@ -7858,6 +7720,7 @@ /obj/machinery/door/airlock/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ewD" = ( @@ -8160,7 +8023,7 @@ }, /obj/machinery/door/airlock/research{ name = "Research Department"; - req_access = list(7) + req_access = list(47) }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) @@ -8299,6 +8162,11 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/closet, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "eKA" = ( @@ -8355,12 +8223,12 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/obj/structure/closet/secure_closet/hydroponics{ + req_access = list(); + req_one_access = list(30,35,47,77) }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "eMK" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -8383,10 +8251,10 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eMY" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/full, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora_storage) "eNU" = ( /obj/machinery/air_alarm{ dir = 8; @@ -8415,11 +8283,18 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "eOE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/medical{ + name = "Medical Maintenance Access"; + req_access = list(5) + }, +/obj/machinery/door/firedoor/glass{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -8468,11 +8343,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "ePT" = ( -/obj/structure/flora/ausbushes/sunnybush, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/botany/extractor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "eQc" = ( /turf/simulated/wall/prepainted/science, /area/rnd/xenobiology/xenoflora) @@ -8722,12 +8597,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"eWa" = ( -/obj/structure/closet/l3closet/scientist, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "eWp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8760,16 +8629,6 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) -"eWA" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/xenobiology/xenoflora_storage) "eWB" = ( /obj/machinery/button/remote/blast_door{ dir = 8; @@ -8792,7 +8651,7 @@ /area/hallway/primary/starboard) "eXn" = ( /obj/machinery/vending/hydronutrients{ - dir = 8 + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -8826,15 +8685,6 @@ icon_state = "techmaint" }, /area/tether/surfacebase/security/upperhall) -"eZy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "eZH" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/prepainted/science, @@ -8971,21 +8821,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "fgp" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/light_switch{ - pixel_x = 25 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "fgP" = ( /obj/machinery/light{ dir = 4 @@ -9236,11 +9076,11 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "fnK" = ( -/obj/machinery/camera/network/research, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "fnZ" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -9280,12 +9120,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"fpW" = ( -/obj/structure/closet/firecloset, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "fqA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -9396,23 +9230,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"fuT" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/hole/right{ - dir = 4 - }, -/obj/machinery/shower{ - dir = 8; - pixel_x = -2 - }, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "fvy" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner, @@ -9607,13 +9424,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) -"fBW" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "fCh" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -9718,8 +9528,11 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "fEn" = ( -/turf/simulated/wall, -/area/tether/surfacebase/topairlock) +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "fEA" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -9835,7 +9648,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "fIr" = ( /obj/machinery/papershredder, /obj/effect/floor_decal/borderfloor, @@ -9912,12 +9725,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fJV" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "fKc" = ( /obj/structure/table/glass, /obj/machinery/light{ @@ -9943,9 +9755,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fKZ" = ( @@ -10137,6 +9947,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "fPc" = ( @@ -10149,15 +9960,8 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 1 - }, /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; - dir = 1; id = "MedbayFoyer"; name = "Medbay Doors Control"; pixel_x = -10; @@ -10178,6 +9982,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "fPn" = ( @@ -10304,6 +10111,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "fUa" = ( @@ -10435,15 +10243,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fWO" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/wood, +/area/tether/surfacebase/barbackmaintenance) "fWV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -10574,19 +10376,7 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "fZm" = ( -/obj/machinery/atmospherics/component/unary/heater{ - icon_state = "heater" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/civilian, /area/rnd/xenobiology/xenoflora_storage) "fZp" = ( /obj/structure/disposalpipe/segment{ @@ -10626,9 +10416,6 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "fZO" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - dir = 4 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, @@ -10638,10 +10425,22 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, +/obj/machinery/atmospherics/portables_connector, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/item/tool/wrench, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "fZS" = ( /obj/structure/lattice, +/obj/machinery/atmospherics/pipe/zpipe/down/aux{ + dir = 1 + }, /turf/simulated/open, /area/tether/surfacebase/barbackmaintenance) "gaD" = ( @@ -10657,6 +10456,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "gbb" = ( @@ -10772,15 +10572,29 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "gig" = ( -/obj/machinery/camera/network/research, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/structure/table/glass, +/obj/item/pipe_dispenser, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/mask/gas, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 + }, +/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "gjg" = ( /obj/structure/bed/chair{ dir = 8 @@ -10886,6 +10700,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "gmw" = ( @@ -11125,17 +10940,10 @@ dir = 1 }, /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "gtb" = ( /turf/simulated/wall/prepainted/security, /area/tether/surfacebase/security/iaa/officecommon) -"gtl" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "gty" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11400,17 +11208,18 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "gzy" = ( -/obj/machinery/light_switch{ - pixel_x = 25 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/medsec_maintenance) +/obj/machinery/reagentgrinder, +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "gzG" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "gzU" = ( @@ -11484,12 +11293,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gEL" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "gEQ" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11591,6 +11401,7 @@ }, /obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gKp" = ( @@ -11618,6 +11429,7 @@ "gKL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gLd" = ( @@ -11661,16 +11473,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"gMB" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "gMY" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/machinery/door/blast/regular{ @@ -11755,16 +11557,17 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/steeldecal/steel_decals6, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "gPL" = ( /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/camera/network/research{ +/obj/structure/closet/l3closet/scientist, +/obj/machinery/camera/network/research/xenobio{ dir = 1 }, -/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_decon) "gQS" = ( @@ -11814,7 +11617,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "gSM" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -11915,7 +11718,7 @@ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "gUM" = ( /obj/machinery/air_alarm{ dir = 4; @@ -11944,11 +11747,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) -"gWY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "gXa" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -12127,8 +11925,7 @@ icon_state = "0-8" }, /obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -12155,12 +11952,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"hbO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "hcd" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -12326,16 +12117,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hip" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/machinery/meter, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/light, +/obj/machinery/camera/network/civilian{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "hjV" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/machinery/power/apc/east_mount, @@ -12382,56 +12171,14 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "hkJ" = ( -/obj/structure/table/glass, -/obj/item/packageWrap, -/obj/item/hand_labeler, -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"hle" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "hmR" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -12451,6 +12198,12 @@ /obj/item/clothing/gloves/sterile/nitrile, /obj/item/clothing/gloves/sterile/nitrile, /obj/item/defib_kit/loaded, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hoA" = ( @@ -12462,6 +12215,9 @@ id_tag = "southciv_airlock_inner"; locked = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "hoE" = ( @@ -12596,10 +12352,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hsO" = ( -/obj/machinery/chem_master, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -12615,6 +12371,8 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 1 }, +/obj/structure/table/reinforced, +/obj/machinery/chemical_dispenser/full, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "hty" = ( @@ -12663,6 +12421,9 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "huZ" = ( @@ -12750,19 +12511,17 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "hyb" = ( -/obj/machinery/door/airlock/maintenance/medical{ - name = "Medical Maintenance Access"; - req_access = list(5) - }, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor/grid, -/area/tether/surfacebase/medical/triage) +/area/maintenance/lower/medsec_maintenance) "hyk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12841,6 +12600,12 @@ /obj/random/tetheraid, /obj/random/tetheraid, /obj/item/storage/secure/briefcase/ml3m_pack_med, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "hBL" = ( @@ -12871,13 +12636,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"hCH" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hDB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12903,12 +12661,6 @@ }, /turf/simulated/floor/water/pool, /area/triumph/surfacebase/sauna) -"hEA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "hEQ" = ( /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -13059,18 +12811,11 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "hLe" = ( -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/component/binary/pump{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "hLj" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -13173,13 +12918,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) -"hNC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hNS" = ( /obj/machinery/light, /obj/machinery/media/jukebox, @@ -13206,7 +12944,7 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "hPw" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -13284,13 +13022,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"hRu" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hRE" = ( /obj/effect/floor_decal/steeldecal/steel_decals6, /obj/structure/disposalpipe/segment{ @@ -13336,15 +13067,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "hTs" = ( -/obj/machinery/seed_extractor, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "hTV" = ( /obj/machinery/light/small, /obj/effect/floor_decal/techfloor, @@ -13358,6 +13092,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "hUG" = ( @@ -13448,16 +13183,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "hXb" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) -"hXr" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/machinery/meter, -/turf/simulated/floor/tiled, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "hXB" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -13515,21 +13244,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"hYE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "hYJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13595,17 +13309,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "ick" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "icq" = ( /obj/machinery/door/airlock/multi_tile/glass{ name = "Internal Affairs" @@ -13639,19 +13352,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "icV" = ( -/obj/structure/closet/secure_closet/hydroponics, -/obj/machinery/camera/network/civilian, /obj/effect/floor_decal/borderfloor{ dir = 5 }, /obj/effect/floor_decal/corner/lime/border{ dir = 5 }, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "idP" = ( @@ -13942,9 +13649,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "inl" = ( @@ -14013,27 +13717,12 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "ioX" = ( -/obj/structure/medical_stand, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 9 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/effect/floor_decal/techfloor{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/random/trash_pile, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "ioZ" = ( /obj/structure/table/marble, /obj/machinery/chemical_dispenser/catering/bar_alc{ @@ -14072,6 +13761,7 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "iqj" = ( @@ -14131,9 +13821,18 @@ /turf/simulated/floor/wood, /area/triumph/surfacebase/sauna) "irb" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "irO" = ( @@ -14227,6 +13926,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "iub" = ( @@ -14265,21 +13965,27 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iuy" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoflora Research"; + req_one_access = list(30,35,47,77) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "iuD" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/tiled/eris/cafe, @@ -14343,12 +14049,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"iwu" = ( -/obj/machinery/air_alarm{ - pixel_y = 25 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "iwC" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) @@ -14445,16 +14145,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "izr" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) "iBt" = ( @@ -14571,11 +14263,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "iDZ" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -14634,8 +14323,13 @@ /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_north_airlock) "iGh" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/crew_quarters/panic_shelter) +/obj/structure/table/glass, +/obj/item/storage/box/botanydisk, +/obj/item/storage/box/botanydisk, +/obj/item/material/minihoe, +/obj/item/reagent_containers/glass/bucket, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "iGD" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -14691,24 +14385,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "iIx" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/storage/box/masks, -/obj/machinery/air_alarm{ - dir = 4; - pixel_x = -22 +/obj/machinery/light_switch{ + pixel_x = 25 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/wood, +/area/maintenance/lower/medsec_maintenance) "iIJ" = ( /obj/structure/curtain/open/shower, /obj/machinery/shower{ @@ -14725,6 +14406,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "iIW" = ( @@ -14839,15 +14521,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"iLL" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "iLO" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -14897,15 +14570,15 @@ /area/tether/surfacebase/surface_three_hall) "iNx" = ( /obj/structure/railing, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/grille, -/obj/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "southciv_airlock_pump" }, +/obj/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/orange{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "iNJ" = ( @@ -14964,10 +14637,8 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "iOA" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/barbackmaintenance) "iOE" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/wood, @@ -14979,6 +14650,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "iOW" = ( @@ -15056,20 +14728,12 @@ /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/topairlock) "iRw" = ( -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/storage/box/syringes, -/obj/item/storage/box/gloves{ - pixel_x = 4; - pixel_y = 4 +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/meter, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "iRQ" = ( /obj/machinery/door/window{ dir = 4; @@ -15156,7 +14820,6 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "iTS" = ( @@ -15542,12 +15205,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "jeM" = ( /obj/machinery/fire_alarm/north_mount, /obj/machinery/vending/loadout/accessory, @@ -15728,15 +15388,7 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) -"jkg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) "jko" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -15799,6 +15451,9 @@ /obj/machinery/status_display{ pixel_x = -32 }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "jlw" = ( @@ -15872,12 +15527,12 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "jmm" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jnl" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -15979,7 +15634,7 @@ pixel_y = -10 }, /turf/simulated/wall/prepainted, -/area/tether/surfacebase/surface_three_hall) +/area/tether/surfacebase/barbackmaintenance) "jrv" = ( /obj/structure/bed/chair/sofa/brown/right{ dir = 1 @@ -16076,30 +15731,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) -"jtm" = ( -/obj/item/roller, -/obj/item/roller{ - pixel_y = 8 - }, -/obj/item/roller{ - pixel_y = 16 - }, -/obj/structure/table/glass, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "jtN" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -16148,13 +15779,13 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, /obj/structure/sign/fire{ pixel_y = -32 }, +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/topairlock) "jvB" = ( @@ -16165,13 +15796,8 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "jvD" = ( -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "medbayfoyer"; - name = "medbayfoyer" - }, -/obj/effect/paint_stripe/babyblue, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) +/turf/simulated/wall/prepainted/medical, +/area/maintenance/lower/medsec_maintenance) "jvH" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -16239,24 +15865,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_three) "jwU" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(); - req_one_access = list(30,35,47,77) - }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ +/obj/structure/disposalpipe/segment, +/obj/random/medical, +/obj/machinery/recharger, +/obj/structure/table/steel, +/obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "jxr" = ( /obj/effect/floor_decal/spline/plain{ dir = 1 @@ -16327,7 +15944,7 @@ /area/teleporter/departing) "jBw" = ( /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "jBy" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -16512,15 +16129,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "jGP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 - }, -/obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "jHu" = ( +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-4" }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -16534,6 +16151,7 @@ /obj/structure/railing{ dir = 1 }, +/obj/random/cutout, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "jIV" = ( @@ -16583,20 +16201,6 @@ /obj/structure/lattice, /turf/simulated/open, /area/hallway/primary/fore) -"jJW" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) "jKO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, @@ -16784,10 +16388,10 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "jQd" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/effect/paint_stripe/bottlegreen, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/tether/surfacebase/botanystorage) "jQZ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -16979,11 +16583,20 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "jWi" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "jWP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -17160,6 +16773,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "kdz" = ( @@ -17168,14 +16785,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"kdK" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "kdQ" = ( /obj/machinery/atmospherics/component/unary/engine, /turf/simulated/floor/tiled/techmaint, @@ -17235,7 +16844,6 @@ /turf/simulated/wall/r_wall/prepainted/command, /area/tether/surfacebase/surface_three_hall) "khZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -17245,6 +16853,12 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/obj/machinery/camera/network/medbay{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "kia" = ( @@ -17296,6 +16910,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/monofloor, /area/crew_quarters/bar) "kiZ" = ( @@ -17520,12 +17137,18 @@ /turf/simulated/floor/grass, /area/hydroponics) "kqR" = ( -/obj/machinery/door/window/brigdoor/southright{ - req_access = null; - req_one_access = list(30,35,47,77) +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/storage/box/syringes, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "krj" = ( /obj/machinery/light, /turf/simulated/floor/tiled/freezer/cold, @@ -17572,11 +17195,11 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ktl" = ( @@ -17814,15 +17437,9 @@ /area/tether/surfacebase/bar_backroom) "kCv" = ( /obj/machinery/holopad, -/obj/machinery/camera/network/research/xenobio{ - dir = 9 - }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) "kCR" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -17838,6 +17455,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "kDm" = ( @@ -17888,18 +17508,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) -"kFn" = ( -/obj/machinery/vending/hydronutrients{ - req_one_access = list(30,35,47,77) - }, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "kFx" = ( /turf/simulated/wall/shull, /area/shuttle/tourbus/general) @@ -18105,23 +17713,18 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "kOG" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora_storage) "kPZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -18366,22 +17969,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"kXW" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 8 - }, -/obj/machinery/vending/blood, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "kYg" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -18412,7 +17999,7 @@ icon_state = "pipe-j2" }, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) @@ -18442,19 +18029,6 @@ }, /turf/simulated/floor/tiled, /area/teleporter/departing) -"kZr" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/rnd/outpost/xenobiology/outpost_storage) "kZR" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -18532,17 +18106,17 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "lbF" = ( -/obj/effect/floor_decal/corner_steel_grid{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/landmark/spawnpoint/job/medical_doctor, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 1; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -18642,6 +18216,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "lgl" = ( @@ -18655,12 +18232,12 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "lgu" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/botany/editor, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "lgD" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/purcarpet, @@ -18976,27 +18553,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"lpk" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "lpH" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -19028,20 +18584,11 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/medical/storage) "lqQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/outside/outside3) "lrz" = ( /obj/machinery/librarycomp, /obj/structure/table/woodentable, @@ -19071,6 +18618,9 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "lsn" = ( @@ -19139,24 +18689,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "lth" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/power/apc/south_mount{ - req_access = list(67) - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/effect/floor_decal/borderfloorwhite/corner2, -/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/machinery/vending/blood, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/storage) "ltI" = ( /obj/item/stool/padded, /turf/simulated/floor/tiled/white, @@ -19242,21 +18777,14 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "lwr" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + icon_state = "1-8" }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "lwv" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -19320,11 +18848,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) -"lxQ" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "lxW" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -19351,8 +18874,20 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "lAa" = ( -/turf/simulated/wall/prepainted/civilian, -/area/vacant/vacant_shop) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "lAH" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall/prepainted/medical, @@ -19642,6 +19177,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "lJu" = ( @@ -19663,9 +19199,9 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "lJy" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/item/radio/intercom{ + dir = 1; + pixel_y = 24 }, /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -19673,8 +19209,16 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "lJJ" = ( /obj/machinery/fire_alarm/south_mount{ pixel_y = -24 @@ -19715,6 +19259,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "lLp" = ( @@ -19747,7 +19294,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/door/firedoor{ - dir = 1 + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) @@ -19790,6 +19337,9 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "lOu" = ( @@ -19961,6 +19511,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "lVY" = ( @@ -19968,18 +19519,21 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "lWj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 +/obj/structure/closet/secure_closet/hydroponics, +/obj/machinery/camera/network/civilian, +/obj/item/shovel/spade, +/obj/item/storage/belt/utility, +/obj/item/stack/material/sandstone{ + amount = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "lWn" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -19993,9 +19547,6 @@ req_one_access = list(35,28) }, /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "lWD" = ( @@ -20447,6 +19998,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "mjl" = ( @@ -20472,7 +20024,12 @@ /turf/simulated/floor/plating, /area/rnd/research_storage) "mjF" = ( -/obj/landmark/spawnpoint/job/medical_doctor, +/obj/machinery/vending/wallmed1{ + pixel_x = -30 + }, +/obj/structure/filingcabinet/chestdrawer{ + name = "Scan Records" + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "mkj" = ( @@ -20512,7 +20069,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mkR" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "mlC" = ( @@ -20536,6 +20106,7 @@ "mlP" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "mmA" = ( @@ -20581,16 +20152,9 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "mon" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, +/obj/structure/closet/l3closet/scientist, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "mow" = ( /obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, @@ -20682,6 +20246,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "msB" = ( @@ -21010,11 +20576,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) "mCv" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/orange{ + icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/southhall) "mCW" = ( /obj/structure/table/woodentable, /obj/item/flame/candle, @@ -21057,9 +20627,11 @@ /area/rnd/robotics) "mEK" = ( /obj/machinery/power/apc/south_mount, -/obj/structure/cable/green, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "mEP" = ( @@ -21254,19 +20826,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mKu" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "mKy" = ( @@ -21352,9 +20916,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "mLY" = ( -/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "mMd" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -21416,25 +20983,28 @@ /area/tether/surfacebase/security/lobby) "mNV" = ( /obj/structure/table/reinforced, +/obj/machinery/button/remote/airlock{ + name = "Vault Bolt controll"; + layer = 2.8 + }, /obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/folder/blue, /obj/item/folder/red, +/obj/item/folder/blue, /obj/item/pen/multi, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "mOi" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 10 +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "mOr" = ( /obj/machinery/gibber, /obj/machinery/light{ @@ -21541,6 +21111,7 @@ name = "Xenobotany"; sortType = "Xenobotany" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "mQM" = ( @@ -21626,6 +21197,7 @@ /obj/machinery/door/airlock{ name = "Game Room" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "mTf" = ( @@ -21743,7 +21315,7 @@ /area/rnd/outpost/xenobiology/outpost_decon) "mXz" = ( /turf/simulated/wall/r_wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "mXI" = ( /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) @@ -21827,6 +21399,7 @@ pixel_x = 24 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "naT" = ( @@ -21973,7 +21546,9 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "nff" = ( @@ -22163,30 +21738,11 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "nlx" = ( -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/admin) -"nlz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/admin) "nml" = ( /turf/simulated/open, /area/bridge/bridge_hallway) @@ -22214,10 +21770,6 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "nnn" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/medical_doctor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -22227,6 +21779,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/sleeper{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nno" = ( @@ -22300,6 +21858,7 @@ /obj/structure/cable/orange{ icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "npn" = ( @@ -22314,7 +21873,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nps" = ( -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "npQ" = ( @@ -22412,14 +21970,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "nsl" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/biogenerator, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "nsp" = ( /obj/structure/bed/chair{ dir = 4 @@ -22476,6 +22031,7 @@ /obj/structure/cable/orange{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ntl" = ( @@ -22515,6 +22071,7 @@ /obj/structure/cable/orange{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "ntE" = ( @@ -22544,33 +22101,11 @@ }, /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) -"nvE" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = -4 - }, -/obj/item/reagent_containers/glass/beaker/cryoxadone{ - pixel_x = 7; - pixel_y = 1 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "nvP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nvU" = ( @@ -22659,33 +22194,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "nxm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nyb" = ( +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/bottlegreen, /obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/tether/surfacebase/botanystorage) -"nyB" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "nyK" = ( /obj/structure/flora/pottedplant/stoutbush, /obj/effect/floor_decal/borderfloor{ @@ -22763,9 +22290,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, /obj/item/sleevemate, /obj/item/storage/box/nifsofts_medical{ pixel_x = 7; @@ -23252,6 +22776,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "nMQ" = ( @@ -23479,6 +23004,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nTK" = ( @@ -23650,7 +23181,16 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "nYN" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/table/steel, +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "nZi" = ( @@ -23686,25 +23226,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"oaE" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/machinery/meter, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "obf" = ( /obj/structure/extinguisher_cabinet{ pixel_y = 30 @@ -23875,6 +23396,7 @@ /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "oeS" = ( @@ -23897,24 +23419,6 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"ofn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "ofB" = ( /obj/structure/table/glass, /obj/structure/window/reinforced{ @@ -24099,10 +23603,13 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/phoron/airlock_exterior{ pixel_x = 25 }, +/obj/machinery/atmospherics/pipe/vent{ + dir = 1 + }, +/obj/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/topairlock) "okA" = ( @@ -24161,18 +23668,6 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) -"omw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "omJ" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -24255,8 +23750,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "onT" = ( -/turf/simulated/wall/r_wall/prepainted/science, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "oos" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 @@ -24426,21 +23922,15 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "otb" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = list(); - req_one_access = list(30,35,47,77) - }, /obj/effect/floor_decal/borderfloor{ - dir = 9 + dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 + dir = 1 }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 10 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -24458,10 +23948,7 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "otW" = ( -/obj/structure/sign/directions/engineering{ - dir = 10; - pixel_y = -10 - }, +/obj/structure/sign/directions/engineering, /turf/simulated/wall/prepainted, /area/tether/surfacebase/north_stairs_three) "oua" = ( @@ -24484,6 +23971,13 @@ /obj/structure/table/marble, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) +"ovx" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/staircase/thirdfloor) "ovP" = ( /obj/structure/bed/chair{ dir = 8 @@ -24501,6 +23995,7 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "owg" = ( @@ -24530,6 +24025,7 @@ }, /obj/machinery/door/airlock/glass_external/public, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "owF" = ( @@ -24548,6 +24044,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "oxs" = ( @@ -24617,12 +24116,6 @@ /obj/machinery/atmospherics/pipe/tank/air, /turf/simulated/floor/plating, /area/tether/surfacebase/topairlock) -"ozw" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "ozC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -24669,20 +24162,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/rnd/research_storage) -"oBc" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "oBv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -24747,8 +24226,6 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) "oDf" = ( -/obj/machinery/chemical_dispenser/full, -/obj/structure/table/reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, @@ -24758,6 +24235,8 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 5 }, +/obj/structure/table/reinforced, +/obj/machinery/chem_master, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oDl" = ( @@ -24771,6 +24250,9 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "oDC" = ( @@ -24840,10 +24322,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"oEG" = ( -/obj/machinery/holopad, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "oEM" = ( /obj/structure/closet/firecloset, /turf/simulated/shuttle/floor/black, @@ -24898,6 +24376,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "oGT" = ( @@ -25031,6 +24510,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "oKJ" = ( @@ -25145,13 +24625,6 @@ "oNi" = ( /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"oNq" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "oNP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25290,6 +24763,9 @@ /obj/effect/floor_decal/corner/lime/bordercorner2{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "oRD" = ( @@ -25333,11 +24809,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oSE" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "oSJ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -25345,16 +24821,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) -"oSY" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "oTr" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -25497,18 +24963,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) "oYs" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/glass/research{ - name = "Xenoflora Research"; - req_one_access = list(30,35,47,77) - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/effect/floor_decal/techfloor, +/obj/structure/closet/firecloset, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/turf/simulated/floor/tiled/techfloor/grid, +/area/maintenance/lower/medsec_maintenance) "oYS" = ( /obj/machinery/door/morgue{ name = "Private Study"; @@ -25582,6 +25042,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "paU" = ( @@ -25726,6 +25187,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/structure/sink{ + pixel_y = 22 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "pek" = ( @@ -26047,6 +25511,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "pkZ" = ( @@ -26105,10 +25570,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"pnr" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pnK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -26330,6 +25791,7 @@ /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ptc" = ( @@ -26399,21 +25861,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"pvf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pvn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -26433,8 +25880,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -26565,6 +26011,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "pAM" = ( @@ -26713,8 +26160,11 @@ /turf/simulated/open, /area/tether/surfacebase/surface_three_hall) "pDC" = ( -/obj/effect/paint_stripe/purplegray, /obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, /turf/simulated/floor/plating, /area/rnd/xenobiology/xenoflora_storage) "pDG" = ( @@ -27092,6 +26542,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "pPF" = ( @@ -27120,9 +26573,9 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" +/obj/map_helper/airlock/atmos/scrubber, +/obj/machinery/atmospherics/component/unary/vent_scrubber/high_power{ + dir = 1 }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/topairlock) @@ -27217,18 +26670,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"pRx" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 5 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/structure/closet/secure_closet/medical3, -/obj/item/soap/nanotrasen, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "pSv" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -27304,17 +26745,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "pVR" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/outdoors/grass/sif/virgo3b, +/area/tether/surfacebase/topairlock) "pWy" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled/dark, @@ -27326,9 +26758,6 @@ /turf/simulated/floor/tiled/dark, /area/rnd/research/testingrange) "pWN" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, /obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, @@ -27341,11 +26770,8 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, -/obj/machinery/vending/medical{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/wall/prepainted, +/area/maintenance/lower/medsec_maintenance) "pWS" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 @@ -27358,15 +26784,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"pWX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "pXd" = ( /obj/structure/table/glass, /obj/effect/floor_decal/spline/plain{ @@ -27435,18 +26852,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"pYn" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) "pYp" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Surface Civilian Substation Bypass" @@ -27569,6 +26974,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qbX" = ( @@ -27608,34 +27016,16 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "qcU" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/camera/network/research{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 5 }, +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) +"qdY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) -"qdY" = ( -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/camera/network/medbay{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "qei" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27691,12 +27081,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "qgC" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/table/rack, +/obj/random/toy, +/obj/random/maintenance/medical, +/obj/random/medical/lite, +/obj/random/maintenance/clean, +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/maintenance/lower/medsec_maintenance) "qgL" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -27831,7 +27223,6 @@ /area/tether/surfacebase/public_garden_three) "qkn" = ( /obj/structure/bed/chair/comfy, -/obj/machinery/camera/network/civilian, /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -27882,6 +27273,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "qlA" = ( @@ -27994,6 +27386,7 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "qoB" = ( @@ -28282,24 +27675,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/research_storage) -"qxA" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/machinery/recharger, -/obj/random/medical{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/machinery/vending/wallmed1{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "qxD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28326,9 +27701,6 @@ /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, -/obj/machinery/camera/network/research/xenobio{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_hallway) "qyj" = ( @@ -28527,6 +27899,7 @@ /obj/structure/disposalpipe/junction{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "qGh" = ( @@ -28569,22 +27942,6 @@ /obj/landmark/spawnpoint/job/xenobiologist, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) -"qIn" = ( -/obj/structure/table/standard{ - name = "plastic table frame" - }, -/obj/item/reagent_containers/glass/bucket, -/obj/item/material/minihoe, -/obj/item/storage/box/botanydisk, -/obj/item/storage/box/botanydisk, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) "qJG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -28803,7 +28160,7 @@ "qSA" = ( /obj/structure/sign/department/chapel, /turf/simulated/wall/prepainted, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "qTe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28868,6 +28225,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "qUd" = ( @@ -28936,8 +28294,7 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) + dir = 1 }, /turf/simulated/floor/plating, /area/shuttle/tourbus/general) @@ -28979,12 +28336,23 @@ /turf/simulated/floor/grass, /area/hydroponics) "qWk" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/component/binary/passive_gate{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 10 + }, +/obj/machinery/sleep_console{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "qWl" = ( /obj/structure/bookcase, /obj/item/book/manual/security_space_law, @@ -28999,13 +28367,14 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) "qWo" = ( -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 +/obj/machinery/door/window/brigdoor/southright{ + req_access = null; + req_one_access = list(30,35,47,77); + dir = 8 }, -/obj/machinery/camera/network/research, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "qWC" = ( @@ -29102,17 +28471,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ral" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 1 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "rav" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29223,6 +28590,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "rdd" = ( @@ -29323,18 +28693,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "rgg" = ( -/obj/structure/closet/secure_closet/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/lime/border{ dir = 4 }, -/obj/item/shovel/spade, -/obj/item/storage/belt/utility, -/obj/item/stack/material/sandstone{ - amount = 5 - }, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "rgh" = ( @@ -29469,7 +28834,7 @@ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "rkU" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 @@ -29518,17 +28883,12 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "rmG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) -"rnj" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/universal, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "rnF" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -29577,19 +28937,11 @@ /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/bar) "rqi" = ( -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/flora/pottedplant{ - icon_state = "plant-21" - }, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/area/tether/surfacebase/medical/admin) "rqm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -29608,14 +28960,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "rqu" = ( -/obj/effect/floor_decal/borderfloor/corner{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/bordercorner{ - dir = 8 +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rqV" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -29764,16 +29116,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "rvP" = ( -/obj/machinery/reagentgrinder, -/obj/structure/table/glass, +/obj/machinery/light{ + dir = 4 + }, /obj/effect/floor_decal/borderfloor{ - dir = 6 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/border{ - dir = 6 + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rwh" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -29818,6 +29171,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/machinery/honey_extractor, /turf/simulated/floor/grass, /area/hydroponics) "rwX" = ( @@ -29958,19 +29312,13 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "rDc" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -29982,15 +29330,13 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "rDo" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, +/obj/structure/window/reinforced{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "rDG" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -30013,6 +29359,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "rET" = ( @@ -30057,6 +29406,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "rGF" = ( @@ -30074,6 +29426,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) "rHx" = ( @@ -30302,10 +29655,11 @@ dir = 1; pixel_y = -24 }, +/obj/structure/medical_stand/anesthetic, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 1; + icon_state = "pipe-c" }, -/obj/structure/medical_stand/anesthetic, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "rPr" = ( @@ -30401,9 +29755,11 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "rQI" = ( -/obj/structure/flora/ausbushes/genericbush, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/steeldecal/steel_decals10, +/obj/landmark/spawnpoint/job/medical_doctor, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "rQN" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, @@ -30692,6 +30048,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "rYO" = ( @@ -30948,6 +30307,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "sgl" = ( @@ -31067,6 +30427,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "siR" = ( @@ -31105,13 +30466,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "siU" = ( -/obj/machinery/seed_storage/xenobotany{ - dir = 1 +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "siX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/medical{ @@ -31166,6 +30528,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "skn" = ( @@ -31240,6 +30605,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "snx" = ( @@ -31690,6 +31056,7 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 8 }, +/obj/machinery/seed_extractor, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "sBU" = ( @@ -31783,20 +31150,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "sEU" = ( -/obj/machinery/atmospherics/component/unary/freezer{ - icon_state = "freezer" - }, -/obj/effect/floor_decal/corner/green{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 9 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/carpet/bcarpet, +/area/tether/surfacebase/barbackmaintenance) "sFc" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -31805,6 +31163,11 @@ /obj/machinery/light_switch{ pixel_x = 25 }, +/obj/machinery/shower{ + dir = 8; + pixel_x = -2 + }, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "sFg" = ( @@ -31875,11 +31238,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "sGB" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/fire_alarm/south_mount{ + pixel_y = -24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -32002,10 +31367,9 @@ /turf/simulated/floor/wood, /area/library) "sKX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "sLb" = ( /obj/effect/floor_decal/spline/plain{ dir = 6 @@ -32084,25 +31448,10 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "sMI" = ( -/obj/item/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/table/glass, -/obj/machinery/recharger, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/turf/simulated/floor/wood, +/area/maintenance/lower/medsec_maintenance) "sNk" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled/techfloor, @@ -32182,18 +31531,10 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "sQe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/structure/disposalpipe/segment, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "sQg" = ( /obj/machinery/door/firedoor/glass, /obj/structure/disposalpipe/segment{ @@ -32225,7 +31566,6 @@ /area/tether/surfacebase/surface_three_hall) "sQo" = ( /obj/structure/lattice, -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ dir = 1 }, @@ -32235,33 +31575,25 @@ /obj/structure/cable/green{ icon_state = "32-1" }, -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 4 - }, /obj/structure/disposalpipe/down{ dir = 1 }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/open, /area/rnd/outpost/xenobiology/outpost_stairs) "sQL" = ( /turf/simulated/wall/prepainted/science, /area/rnd/staircase/thirdfloor) "sRl" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "sRp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32297,22 +31629,15 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "sSW" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 1 - }, +/obj/structure/medical_stand, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) -"sTj" = ( -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/grass, -/area/hydroponics) "sTo" = ( /obj/machinery/button/remote/airlock{ id = "barbackdoor"; @@ -32484,13 +31809,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/fore) "taq" = ( -/obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "taB" = ( @@ -32626,10 +31955,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) -"tdp" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "tdw" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -32739,12 +32064,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "tiw" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/meter, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "tjb" = ( /obj/effect/floor_decal/corner/beige{ dir = 10 @@ -32882,14 +32211,20 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "tns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 }, +/obj/structure/closet/secure_closet/hydroponics, +/obj/item/shovel/spade, +/obj/item/stack/material/sandstone{ + amount = 5 + }, +/obj/item/storage/belt/utility, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/tether/surfacebase/botanystorage) "tnx" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -33069,16 +32404,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"tuh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "tvl" = ( /obj/machinery/air_alarm{ pixel_y = 28 @@ -33116,14 +32441,11 @@ /turf/simulated/floor/tiled/dark, /area/bridge/bridge_hallway) "tvQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "twj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -33134,18 +32456,11 @@ /turf/simulated/floor/wood, /area/shuttle/tourbus/general) "txh" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -22 +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "txq" = ( /obj/item/radio/intercom/department/security{ dir = 4; @@ -33282,21 +32597,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tBR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/holopad, +/obj/machinery/smartfridge/drying_rack, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/area/rnd/xenobiology/xenoflora) "tCk" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -33351,7 +32654,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "tEa" = ( -/obj/structure/railing, /obj/machinery/light, /turf/simulated/open, /area/tether/surfacebase/medical/uppernorthstairwell) @@ -33374,19 +32676,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/captain) -"tFl" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/storage) "tFM" = ( /obj/structure/window/reinforced, /obj/effect/floor_decal/steeldecal/steel_decals6{ @@ -33461,6 +32750,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "tHQ" = ( @@ -33596,6 +32886,7 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/beehive, /turf/simulated/floor/grass, /area/hydroponics) "tLs" = ( @@ -33651,18 +32942,13 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "tMg" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/component/binary/passive_gate{ + dir = 8; + name = "Waste Purge Valve"; + target_pressure = 4500 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "tMl" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/dark, @@ -33673,9 +32959,15 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "tMA" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/botanystorage) "tMI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -33737,6 +33029,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "tOm" = ( @@ -33949,6 +33242,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "tTd" = ( @@ -34194,21 +33490,21 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "tXm" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/corner/mauve/full{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) -"tYC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) +"tYC" = ( +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/servicebackroom) "tYL" = ( /obj/structure/bed/chair/wood{ dir = 8 @@ -34222,9 +33518,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "tZe" = ( @@ -34367,6 +33661,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "uaI" = ( @@ -34478,18 +33775,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) -"ugO" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "ugQ" = ( /obj/machinery/air_alarm{ alarm_id = "pen_nine"; @@ -34528,11 +33813,18 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "uhL" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/disposal, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "uih" = ( /turf/simulated/wall/prepainted/command, /area/crew_quarters/captain) @@ -34608,11 +33900,6 @@ /obj/item/bone/skull{ name = "Yo'rick" }, -/obj/item/paper{ - desc = ""; - info = "The Silence Into Laughter program works to place hard working, studied, accomplished, hardworking, homebrewed, diplomaholding, or otherwise clowns and mimes into the workforce! The Head Clowncellor and the Director at Mime have finally worked together to bring this titan of a workers' union! If you have a background in silence or laughter, please apply at our exonet site at: https://forum.vore-station.net/viewforum.php?f=45"; - name = "Clowns and Mimes Wanted!" - }, /obj/machinery/camera/network/civilian{ dir = 4 }, @@ -34738,18 +34025,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/machinery/camera/network/research/xenobio, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "umH" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 +/obj/landmark/spawnpoint/job/medical_doctor, +/obj/effect/floor_decal/corner_steel_grid{ + dir = 5 }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -34788,10 +34073,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) -"uoL" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/tether/surfacebase/medical/uppernorthstairwell) "upe" = ( /obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ @@ -34831,6 +34112,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "upx" = ( @@ -34936,16 +34218,11 @@ /turf/simulated/wall/prepainted/civilian, /area/hydroponics) "urk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/structure/railing{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/open, +/area/tether/surfacebase/public_garden_three) "urz" = ( /obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, @@ -34973,6 +34250,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "urO" = ( @@ -35005,8 +34288,15 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/machinery/door/airlock/glass/research{ + name = "Xenoflora Research"; + req_one_access = list(30,35,47,77) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/area/rnd/xenobiology/xenoflora) "usd" = ( /obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ @@ -35015,11 +34305,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "usi" = ( -/obj/machinery/smartfridge/drying_rack, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "usw" = ( /obj/structure/table/standard, /obj/item/storage/box/syringes, @@ -35059,11 +34347,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "usU" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/rnd/xenobiology/xenoflora_storage) "usX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -35076,11 +34367,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "utB" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/turf/simulated/floor/tiled/steel_dirty/virgo3b, +/area/tether/surfacebase/outside/outside3) "utK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35094,6 +34385,7 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "uvj" = ( @@ -35320,9 +34612,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 1 }, -/obj/machinery/door/firedoor{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "uCB" = ( @@ -35345,9 +34634,12 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "uDD" = ( -/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "uDM" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/bluegrid, @@ -35457,6 +34749,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "uIN" = ( @@ -35523,25 +34816,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "uJT" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "uKK" = ( @@ -35675,6 +34957,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/admin) "uMB" = ( @@ -35719,8 +35002,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "uOn" = ( @@ -35806,11 +35092,17 @@ /turf/simulated/floor/tiled, /area/hallway/primary/port) "uRH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/machinery/vending/hydronutrients{ + req_one_access = list(30,35,47,77) + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "uRQ" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet, @@ -35906,26 +35198,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) -"uUT" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 1 - }, -/obj/landmark/spawnpoint/job/medical_doctor, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "uVb" = ( /obj/machinery/status_display{ pixel_x = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/secure_closet/medical3, +/obj/item/soap/nanotrasen, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/effect/floor_decal/borderfloorwhite{ - dir = 4 + dir = 5 }, /obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 + dir = 5 }, -/obj/structure/closet/secure_closet/medical3, -/obj/item/soap/nanotrasen, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "uVs" = ( @@ -36050,20 +35335,26 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uYD" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 4 +/obj/item/roller, +/obj/item/roller{ + pixel_y = 8 }, -/obj/landmark/spawnpoint/job/medical_doctor, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/item/roller{ + pixel_y = 16 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/light{ dir = 8 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/table/steel, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 }, /turf/simulated/floor/tiled/white, @@ -36157,11 +35448,17 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) @@ -36278,13 +35575,15 @@ /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) "vfe" = ( -/obj/machinery/botany/extractor, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/borderfloor/corner{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ +/obj/effect/floor_decal/corner/mauve/bordercorner{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "vfH" = ( @@ -36292,13 +35591,6 @@ /obj/item/paper_bin, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"vgg" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vgh" = ( /obj/machinery/fire_alarm/west_mount{ pixel_x = -26 @@ -36317,6 +35609,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/portable_atmospherics/hydroponics/soil, /turf/simulated/floor/grass, /area/hydroponics) "vhg" = ( @@ -36427,9 +35720,8 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) +/turf/simulated/wall/prepainted/science, +/area/rnd/xenobiology/xenoflora) "vkE" = ( /obj/structure/table/steel, /obj/item/paper_bin{ @@ -36550,13 +35842,6 @@ }, /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) -"vpN" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vqg" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -36583,8 +35868,20 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/bar) "vrb" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10, /obj/machinery/holopad, +/obj/item/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/random/medical{ + pixel_x = -4; + pixel_y = 5 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vrU" = ( @@ -36651,14 +35948,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/primary/port) -"vvl" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vvn" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -36696,6 +35985,9 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "vxb" = ( @@ -36711,7 +36003,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "vyj" = ( -/obj/machinery/chemical_dispenser/full, /obj/structure/table/reinforced, /obj/structure/sign/poster{ pixel_x = 32 @@ -36722,27 +36013,9 @@ /obj/effect/floor_decal/corner/orange/border{ dir = 6 }, +/obj/machinery/chem_master, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/chemistry) -"vyD" = ( -/obj/structure/window/reinforced, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/machinery/status_display{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "vyS" = ( /obj/structure/bed/chair{ dir = 8 @@ -36844,11 +36117,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"vBf" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint_stripe/babyblue, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/triage) "vBN" = ( /obj/machinery/computer/operating, /turf/simulated/floor/tiled/white, @@ -36958,14 +36226,10 @@ /obj/machinery/air_alarm{ pixel_y = 25 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/obj/spawner/window/low_wall/full/nogrille/firelocks, +/obj/effect/paint_stripe/purplegray, +/turf/simulated/floor/plating, +/area/rnd/xenobiology/xenoflora_storage) "vFb" = ( /obj/structure/table/glass, /obj/item/radio{ @@ -37248,6 +36512,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -37278,15 +36543,6 @@ /mob/living/simple_mob/animal/passive/chicken, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) -"vMH" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 8 - }, -/obj/machinery/recharger, -/obj/random/medical, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/triage) "vMR" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -37303,9 +36559,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "vNg" = ( @@ -37490,6 +36745,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "vRG" = ( @@ -37908,25 +37164,6 @@ "vZg" = ( /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) -"vZr" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "wan" = ( /obj/structure/disposalpipe/sortjunction{ dir = 4; @@ -38025,6 +37262,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "wcp" = ( @@ -38059,20 +37297,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"wcS" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "wcT" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/carpet, @@ -38242,6 +37466,7 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "wjd" = ( @@ -38341,6 +37566,7 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2{ dir = 4 }, +/obj/machinery/seed_storage/xenobotany, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "won" = ( @@ -38758,10 +37984,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks{ - id = "iaar"; - name = "iaar" - }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "wyP" = ( @@ -38805,18 +38027,6 @@ }, /turf/simulated/floor/carpet, /area/library) -"wzT" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "wzX" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -38833,13 +38043,15 @@ /turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/surgery2) "wAO" = ( -/obj/machinery/light, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, -/obj/structure/filingcabinet/chestdrawer{ - name = "Scan Records" +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -38858,19 +38070,15 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "wBv" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/cable/green, +/obj/machinery/power/apc/east_mount, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "wBV" = ( @@ -38878,7 +38086,7 @@ dir = 1 }, /obj/machinery/camera/network/research/xenobio{ - dir = 10 + dir = 1 }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) @@ -38955,6 +38163,9 @@ /obj/structure/cable/orange{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "wDq" = ( @@ -39106,6 +38317,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "wHu" = ( @@ -39126,7 +38338,7 @@ dir = 8 }, /turf/simulated/open, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "wJt" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -39196,7 +38408,7 @@ /area/rnd/workshop) "wLU" = ( /obj/structure/loot_pile/maint/trash, -/turf/simulated/floor/plating, +/turf/simulated/floor/wood, /area/maintenance/lower/medsec_maintenance) "wMm" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -39220,6 +38432,9 @@ name = "Medical Storage"; sortType = "Medical Storage" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "wNv" = ( @@ -39311,7 +38526,7 @@ /area/hydroponics) "wRs" = ( /obj/machinery/door/airlock/glass{ - req_one_access = list(19,43,67) + req_one_access = list(19,67) }, /obj/structure/cable{ icon_state = "1-2" @@ -39369,21 +38584,6 @@ /obj/structure/sign/department/xenolab, /turf/simulated/wall/prepainted/science, /area/rnd/outpost/xenobiology/outpost_hallway) -"wSx" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/primary/starboard) "wTy" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/north_stairs_three) @@ -39400,9 +38600,6 @@ /turf/simulated/floor/plating, /area/shuttle/tourbus/general) "wUf" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -39433,11 +38630,8 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall/prepainted/medical, /area/tether/surfacebase/medical/triage) "wVh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -39453,7 +38647,7 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "wVQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -39672,6 +38866,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "xdQ" = ( @@ -39756,11 +38951,14 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "xhp" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +/obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xhR" = ( /obj/machinery/light{ dir = 1 @@ -39870,14 +39068,11 @@ /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "xkN" = ( -/obj/effect/floor_decal/techfloor{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/lower/medsec_maintenance) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora_storage) "xlw" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -40063,19 +39258,17 @@ /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "xrg" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/item/reagent_containers/glass/bucket, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/tether/surfacebase/surface_three_hall) "xrE" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -40090,6 +39283,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/random/medical, +/obj/item/tool/screwdriver, +/obj/structure/table/steel, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "xrM" = ( @@ -40367,18 +39566,14 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "xxq" = ( -/obj/structure/bed/padded, -/obj/effect/floor_decal/techfloor{ - dir = 9 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/obj/machinery/status_display{ - pixel_y = 30 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/structure/closet/secure_closet/hydroponics{ + req_access = list(); + req_one_access = list(30,35,47,77) }, -/turf/simulated/floor/tiled/techfloor, -/area/crew_quarters/panic_shelter) +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora) "xxQ" = ( /obj/machinery/computer/rdconsole/robotics{ dir = 8 @@ -40506,6 +39701,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xCi" = ( @@ -40518,8 +39716,9 @@ /obj/effect/floor_decal/corner/mauve/border{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xCs" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -40622,23 +39821,13 @@ dir = 5 }, /turf/simulated/floor/tiled/techfloor, -/area/vacant/vacant_shop) +/area/tether/surfacebase/barbackmaintenance) "xDw" = ( /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "xDB" = ( /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) -"xFl" = ( -/obj/structure/sign/nosmoking_2{ - pixel_y = 30 - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/topairlock) "xFU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -40775,6 +39964,12 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) "xII" = ( @@ -40849,13 +40044,6 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) -"xJx" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/tether/surfacebase/outside/outside3) "xKc" = ( /obj/machinery/fire_alarm/east_mount, /obj/effect/floor_decal/borderfloor{ @@ -40878,17 +40066,14 @@ layer = 4; pixel_y = 32 }, -/obj/machinery/portable_atmospherics/canister/oxygen/prechilled, -/obj/machinery/atmospherics/portables_connector, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/door/window/brigdoor/southright{ - req_access = list(); - req_one_access = list(5,24) +/obj/machinery/atmospherics/component/binary/heat_pump{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) @@ -40951,6 +40136,12 @@ pixel_y = -40 }, /obj/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "xLl" = ( @@ -40965,9 +40156,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/barbackmaintenance) "xLS" = ( -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) +/obj/structure/closet/firecloset/full, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/barbackmaintenance) "xMN" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -41112,14 +40303,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xQJ" = ( -/obj/structure/closet, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, /obj/effect/floor_decal/techfloor{ - dir = 8 + dir = 9 }, +/obj/machinery/fire_alarm/west_mount{ + pixel_x = -24 + }, +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/structure/bed/padded, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/panic_shelter) "xQL" = ( @@ -41206,14 +40399,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "xSf" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/mauve{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "xSs" = ( /obj/machinery/light{ dir = 4 @@ -41336,16 +40526,8 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "xWL" = ( -/obj/structure/window/basic/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/structure/window/basic{ - dir = 8 - }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint_stripe/purplegray, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_first_aid) "xWN" = ( @@ -41493,11 +40675,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) @@ -41632,29 +40814,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) "ygy" = ( -/obj/effect/floor_decal/corner/mauve{ - dir = 6 +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora) +/area/rnd/xenobiology/xenoflora_storage) "ygY" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) -"yhk" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/orange{ - icon_state = "0-2" - }, -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/phoronlock{ - frequency = 1379; - scrub_id = "southciv_airlock_scrubber" - }, -/turf/simulated/floor/tiled/techmaint, -/area/tether/surfacebase/topairlock) "yhO" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -41667,6 +40845,9 @@ /obj/machinery/camera/network/medbay{ dir = 1 }, +/obj/structure/table/steel, +/obj/item/packageWrap, +/obj/item/hand_labeler, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "yhZ" = ( @@ -41689,16 +40870,6 @@ "yja" = ( /turf/simulated/wall/prepainted/civilian, /area/tether/surfacebase/barbackmaintenance) -"yjc" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora_storage) "yjJ" = ( /obj/spawner/window/low_wall/full/nogrille/firelocks, /obj/effect/paint_stripe/bottlegreen, @@ -41752,6 +40923,9 @@ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "ylC" = ( @@ -59268,7 +58442,7 @@ xiZ mcN oxB tAS -tAS +urk nFK wdH uLN @@ -59343,7 +58517,7 @@ jSF aAR aNO xDB -drE +xDB eto xDB xmi @@ -59549,7 +58723,7 @@ sQo pQk wAF wAF -jHZ +dcU qyl dOV xCK @@ -59708,7 +58882,7 @@ dRr qZR ndL dRr -dcU +dRr arO dRr dRr @@ -60321,7 +59495,7 @@ ogU ftd nQQ eMX -kZr +izr for oWB lgT @@ -62024,7 +61198,7 @@ wKZ dMn brA brA -fin +ovx wfe iXl eQn @@ -67109,7 +66283,7 @@ eGm eGm myj dPd -dPd +utB okq eGm eGm @@ -67299,7 +66473,7 @@ eGm eGm eGm eGm -fFk +pVR fFk fFk akS @@ -67493,8 +66667,8 @@ eGm eGm eGm eGm +pVR fFk -xFl aiC tYY urJ @@ -67687,8 +66861,8 @@ eGm eGm eGm eGm +pVR fFk -yhk iNx neW xLb @@ -67881,7 +67055,7 @@ qnw qnw eGm eGm -fFk +pVR fFk fFk odx @@ -67998,7 +67172,7 @@ hxW xQe qqn ekZ -hyt +jvD hyt hyt hyt @@ -68076,7 +67250,7 @@ fFk fFk fFk fFk -fEn +fFk hqw uqp huc @@ -68184,15 +67358,15 @@ eGm eGm hxW nKi -aCE gHJ -gzy +gHJ +gHJ wLU hxW eMK -xkN +qqn aDP -hyt +jvD uKK qTK ade @@ -68373,20 +67547,20 @@ bYs eGm eGm eGm -vBf -vBf -vBf -ncQ -ncQ -ncQ -ncQ -ncQ -ncQ -ncQ +eGm +eGm +eGm +hxW +qgC +gHJ +sMI +sMI +sMI +hxW hyb -ncQ -ncQ -ncQ +qqn +oYs +jvD tAn leN pPj @@ -68567,15 +67741,15 @@ bYs eGm eGm eGm -vBf -nvE -qdY -umH -kXW +eGm +eGm +eGm +hxW +gHJ +sMI sMI -qxA iIx -jtm +sMI pWN aNw hkJ @@ -68762,19 +67936,19 @@ gGi gGi gGi ncQ -iDI -hle -ryH -qgz -bCF -rmG -rmG -sQe -uRH +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ +ncQ eOE -omw +ncQ wUV -bLR +ncQ xZX vnq wUr @@ -68958,17 +68132,17 @@ cHD ncQ iDI khZ -nYN +uhL jGP vrb mjF nYN uYD -hEQ +cwf qJG jHu wAO -jvD +bLR rDc cAA mie @@ -69152,13 +68326,13 @@ tEa ncQ fZO bcG -cxO -tpu -oRj -hEQ -cxO +ryH +rQI +jmm +rQI +qgz lbF -hEQ +sRl vPr aIJ yhO @@ -69243,7 +68417,7 @@ lIJ lIJ iDb tDV -lIJ +fEn loy pdv pGm @@ -69342,17 +68516,17 @@ dOV dOV gGi cHD -uoL +cHD vKj bmn nxm -dAL -tpu -pmZ hEQ -dAL -lbF +cxO +tpu +oRj hEQ +qWk +tpu wMm oQR duF @@ -69435,7 +68609,7 @@ sgg dVi sgg sRR -owK +mCv ntv owK jFG @@ -69539,14 +68713,14 @@ uvB oIn ncQ xKh -nxm -vMH -uUT -bTv -mjF -cKI -nnn +bgt hEQ +dAL +tpu +pmZ +hEQ +nnn +umH ccI bfh gOY @@ -69735,8 +68909,8 @@ ncQ aUY bgt iSD -qgz -qgz +jwU +aCE xrE ghR aSy @@ -69752,7 +68926,7 @@ kLr lGe mIe gnX -kiZ +jWi pIo lRV dHP @@ -69792,7 +68966,7 @@ qEy jsq bRh qTX -woF +lAa rBT xYd oVB @@ -69946,7 +69120,7 @@ lAH hyt hyt kzD -kiZ +jWi pIo lRV lRV @@ -69986,7 +69160,7 @@ qEy qEy bRh qTX -woF +lAa iCu xYd lLy @@ -70140,7 +69314,7 @@ uTj fET nFz oho -kiZ +jWi pIo lRV aon @@ -70180,7 +69354,7 @@ jgu knh bRh qTX -woF +lAa rBT xYd xYd @@ -70528,7 +69702,7 @@ xzG xZS pZi oeS -dPz +hTs fVH lRV dHP @@ -70722,7 +69896,7 @@ oYg vVS elj bGk -kiZ +jWi vNH kTG kTG @@ -70762,7 +69936,7 @@ cbH sGH nMb dAN -sjh +bhO lQF mYh lff @@ -71110,7 +70284,7 @@ uTj fUX laF bGk -szv +xrg kuE siS owg @@ -71312,12 +70486,12 @@ fAs neE fAs gsY -pVR -pVR -ptF +jBw +jBw +jBw gRV jrd -lAa +yja aTx aQY aTx @@ -71506,12 +70680,12 @@ fAs hRM mHM qSA -sHq -sHq -ptF +xLS +xLS +jBw gUy -ptF -lAa +jBw +yja cTe eHz fEa @@ -71668,7 +70842,7 @@ eGm eGm wcw bYs -lqG +dPd jSJ jSJ jSJ @@ -71700,12 +70874,12 @@ bbe ukr gjZ jBw -pDy -pDy +iOA +iOA jBw dmb jBw -lAa +yja pFk eHz fEa @@ -71862,8 +71036,8 @@ dPd eGm kFF bYs +dPd lqG -avu bjO uXv siZ @@ -71877,9 +71051,9 @@ aHH wtZ nlx ogM -amn seh -lth +seh +fFS fFS bnV ykZ @@ -71931,9 +71105,9 @@ yja vun eez lYy -noU -jNp -dQk +sEU +fWO +aSf mlP fZS yja @@ -72056,8 +71230,8 @@ tZk eGm kFF bYs -lqG -iSZ +dPd +eet xIm nUc rsb @@ -72071,16 +71245,16 @@ uCx hbo nlx eBj -amn seh -rqi +seh +fFS fFS vjk urR bBk -pjB -pjB -pjB +eQc +eQc +ijD pjB pjB pjB @@ -72093,7 +71267,7 @@ aLn wIR rky fIl -lAa +yja maT vLc fEa @@ -72250,8 +71424,8 @@ tZk tZk kFF bYs -lqG -tFl +dPd +eet hBf sDe eAP @@ -72267,14 +71441,14 @@ caI tmV seh seh -jJW +fFS fFS eMD -wSx +cOu mon -pjB +fnK xxq -dea +ijD xQJ lsk sql @@ -72444,33 +71618,33 @@ tZk tZk eCd bYs -lqG +dPd eet hou tRu afz hJl eun -nUc +lth nUc adu unp olW fWV -uMB +rqi nps iTu iTu sSW fxY brh -wSx -ugO -pjB +cOu +lLp +lLp +lgu +ijD mwV lmA -lmA -lmA wUl cxt shZ @@ -72638,10 +71812,10 @@ tZk tZk eCd bYs -lqG +dPd +eet iSZ nUc -nUc afz hdj elR @@ -72653,17 +71827,17 @@ jhw wbQ kcM uMw -nlx -nlx +uMB +uMB rOz fxY bxG -wSx -mon -pjB +cOu +lLp +lLp +ePT +ijD lTa -tMA -hEA lmA hTV pjB @@ -72832,8 +72006,8 @@ tZk tZk eCd bYs -lqG -pRx +dPd +eet uVb kBG vSh @@ -72852,13 +72026,13 @@ hhO wCb fxY cfG -vZr -kOG -pjB +cOu +lLp +hck +kDm +ijD lKq lmA -hbO -lmA wfN pjB mvE @@ -73026,7 +72200,7 @@ tZk tZk eCd bYs -lqG +dPd lqG lqG lqG @@ -73045,14 +72219,14 @@ fxY fxY fxY fxY -eQc +cfG cOu -eQc -iGh +lLp +rrA +oWK +ijD ktJ lmA -hbO -lmA fBE pjB pjB @@ -73220,32 +72394,32 @@ tZk tZk eCd bYs -bYs -bYs -bYs -bYs -bYs dPd dPd -guv -xLS -cBN -eiR -guv -hRu -vgg -mkR -fBW -yiU -tdp -guv +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +dPd +eQc otb -lpk -jwU +cOu +lLp iGh +rDi +ijD wrI -oEG -hbO xNT kpb cxt @@ -73414,32 +72588,32 @@ tZk tZk tZk kvC -lUf -lUf -scG -bYs -bYs -bYs +lqQ +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -cwf -pWX -tns -guv -fnK -hXb -sRl -hCH -vpN -gEL -guv +dPd +dPd +dPd +dPd +dPd +dPd +eQc taq -vcz -fpW -iGh +cBN +lLp +rrA +oWK +ijD dVr -nsl -tYC hNv baR bak @@ -73611,29 +72785,29 @@ tZk eGm eGm eGm -scG -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -iwu -ozw -eZy -guv -iwu -eiR -utB -irb -eiR -eiR -guv +dPd +nGW bmh -vcz -eWa -iGh +cOu +lLp +kqR +gzy +ijD wDv -pYn -fuT eKr sFc cxt @@ -73805,32 +72979,32 @@ tZk eGm eGm eGm -wcw -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -guv -fnK -aHd -hYE -cGJ -urk -akq -hNC -oBc -iLL -wcS -oYs +dPd +nGW wUf ksc -kdK -ijD +lLp +tBR +nsl ijD ijD ijD ijD ijD -iGh wDv uSg rrx @@ -73998,27 +73172,27 @@ tZk tZk eGm eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -kFF -bYs -bYs dPd -onT -pDC -aUW -pDC -onT -guv -guv -guv -but -guv -guv -guv +nGW wnG -vcz -rqu -dBH +cOu +lLp +biA vfe dBH ctR @@ -74190,30 +73364,30 @@ tZk tZk tZk tZk -tZk eGm eGm -kFF -bYs -bYs +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm dPd -onT -mCv -mCv -mCv -onT -sEU -wzT -bzg -ofn -oaE -aHM -guv -pea +dPd +eQc +uRH vcz -lLp -lLp -lLp +dyy +eiR +aHM lLp lLp lLp @@ -74230,7 +73404,7 @@ mva tCB prj jZr -prj +uSd mbp rYa dKA @@ -74384,32 +73558,32 @@ tZk tZk tZk tZk -tZk eGm eGm -kFF -bYs -bYs -bYs -onT -cEO -eiR -eiR -onT -fZm -hXr -jQd -aSf -dXU -eWA -guv +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd +eQc pea dli bbg -bbg -bbg -bbg -bbg +gEL +gEL +sQe +sQe psA cWU jdA @@ -74578,34 +73752,34 @@ tZk tZk tZk tZk -tZk eGm eGm eGm -scG -bYs -bYs -onT -eiR -eiR -eiR -onT -yjc -lGr -iOA -lWj -gtl -qgC +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd guv vEE iuy -nyB eMY -lLp -lLp -hck -kDm -jdA +eMY +eMY +eMY +eMY +eMY +eMY jdA prj bes @@ -74775,31 +73949,31 @@ tZk tZk eGm eGm -dPd eGm -scG -bYs -onT -eiR -eiR -eiR -onT -qWo -eiR -kqR -tBR -oSE -ral +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd +dPd guv xCi -iuy -lLp -tiw -biA -lLp -rrA -oWK -jdA +irb +qdY +qdY +qdY +rmG +ick +fJV +eMY xhR prj wQV @@ -74970,20 +74144,20 @@ tZk eGm eGm eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +dPd dPd -kFF -bYs -onT -iwu -eiR -eiR -onT -eqo -nuD -jmm -pvf -oSE -vvl guv gig lwr @@ -74992,17 +74166,17 @@ xSf tvQ uDD mLY -rDi -jdA -uSd +yiU +eMY +prj kev -lgu -qWg -jkg -sTj -ePT -jWi -tmg +ikm +tRs +xSs +eFm +lal +hxw +prj elV geu ptE @@ -75165,39 +74339,39 @@ tZk eGm eGm eGm -kFF -bYs -onT -xLS -eiR -pnr -onT -evK -nuD -jmm -pvf +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm oSE qcU -eQc +guv lJy rDo -lLp -tiw +mOi +qWo xhp -lLp -rrA -oWK -jdA -uSd -prj -wQV -wpq -prj -prj -prj -hyk -uhL -fJV +cKI +rqu +usU +eMY +xSZ +yjJ +bBD +yjJ +xSZ +yjJ +bMg +yjJ +lWr +nyb bFS aoO bFS @@ -75359,39 +74533,39 @@ tZk tZk tZk eGm -kFF -bYs -onT -onT -onT -onT -onT -eqo -nuD -jmm -lqQ +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm bLf txh guv -pea -tiw -lLp -tiw -lLp -lLp +mkR +nuD +xkN +bzg +usi +hLe iRw -rvP -jdA -rQI -prj -ikm -tRs -xSs -eFm -lal -hxw -qFU -prj +lGr +eMY +uDV +oqa +eGZ +ugQ +xSZ +eUn +hLZ +kaq +jko +oRr bFS oEm eaa @@ -75553,39 +74727,39 @@ tZk tZk tZk tZk -eCd -bYs -dOV -dOV -dOV -bYs -guv -dyy -hip -vyD -nlz +tZk +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm +eGm tMg fgp -guv +evK dzs tiw ygy tXm -lLp -lLp +rvP +kOG siU -nGW -eQc -xSZ -yjJ -bBD -yjJ +wEu +fZm +uDV +aDG +iNJ +fxy xSZ -yjJ -bMg -yjJ -lWr -yjJ +gqH +qYU +qZj +iNJ +mEK bFS bsT bqs @@ -75748,38 +74922,38 @@ tZk tZk tZk tZk -kvC -kvC -kvC -szm -bYs -guv -guv -guv -guv -guv +tZk +tZk +eGm +eGm +eGm +eGm +eGm +eGm +eGm +kFF +ral +onT +hXb +hXb +hXb +hXb +pDC +wEu +wEu +wEu wEu -guv -guv -xCi -lLp -lLp -lLp -lLp -lLp -usi -nGW dOV uDV -oqa -eGZ -ugQ -xSZ -eUn -hLZ -kaq -jko -oRr +xvH +nLY +kvq +yjJ +fXX +qYU +nZm +vDg +bCF bFS vKs rFM @@ -75945,41 +75119,41 @@ tZk tZk tZk tZk -eCd -bYs -bYs -bYs -xJx -gWY -gWY -tuh -bYs -nGW -kFn -hTs -qIn -csz -xrg -hLe -bwH -nGW +tZk +tZk +tZk +eGm +eGm +eGm +kFF +dCz +dPd +dOV +dOV +dOV +dOV +dOV +dOV +dOV +dOV +dOV dOV uDV -aDG -iNJ -fxy -xSZ -gqH +gyl +aIw +hAD +yjJ +oML qYU -qZj -nyb -mEK -bFS +gxR +wwu +bCF bFS oVJ bqs bqs bqs +bqs aHu bqs iSb @@ -76140,36 +75314,36 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk +tZk +tZk +kvC +kvC +kvC +kvC +kvC +kvC +kvC +kvC kvC kvC szm -oNq -rnj -qWk -lxQ -bYs -nGW -nGW -nGW -nGW -nGW -nGW -nGW -nGW -nGW dOV uDV -xvH -nLY -kvq +nTo +aIw +sKb yjJ -fXX +uiX qYU -nZm -vDg +vzy +qbj sGB -ddu -bFS +xSZ +tYC qkn mxM ykO @@ -76336,33 +75510,33 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk eCd -bYs -bYs -bYs -dCz -bYs -dOV -dOV -dOV -dOV -dOV -dOV -dOV -dOV -dOV dOV uDV -gyl -aIw -hAD +tPS +bKH +euf yjJ -oML +tns qYU -gxR -wwu qYU -bhO +qYU +hip +xSZ bFS bFS bFS @@ -76531,35 +75705,35 @@ tZk tZk tZk tZk -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -kvC -ail +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +tZk +eCd dOV uDV -nTo -aIw -sKb -yjJ -uiX -qYU -vzy -qbj -usU -oSY -fWO -mOi uDV +uDV +uDV +xSZ +lWj +qYU +qYU +lPs +aMa +xSZ +dOV +dOV +dOV dOV dOV dOV @@ -76740,20 +75914,17 @@ tZk tZk eCd dOV -uDV -tPS -bKH -euf -yjJ -nTo -qYU -qYU -qYU -qYU +dOV +dOV +dOV +dOV +jQd +tMA +lPs lPs lPs aMa -uDV +xSZ dOV biw kvC @@ -76766,6 +75937,9 @@ kvC kvC kvC kvC +kvC +kvC +kvC tZk tZk tZk @@ -76932,22 +76106,19 @@ tZk tZk tZk tZk -eCd +tZk +kvC +kvC +kvC +ail dOV -uDV -uDV -uDV -uDV -xSZ +jQd icV rgg -ick -ick -gMB -gMB -gMB +rgg +rgg akk -uDV +xSZ dOV xCK tZk @@ -77022,6 +76193,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77126,17 +76300,14 @@ tZk tZk tZk tZk +tZk +tZk +tZk +tZk eCd dOV -dOV -dOV -dOV -dOV -uDV -uDV -uDV -uDV uDV +jQd uDV uDV uDV @@ -77216,6 +76387,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77321,13 +76495,10 @@ tZk tZk tZk tZk -kvC -kvC -kvC -szm -dOV -dOV -dOV +tZk +tZk +tZk +eCd dOV dOV dOV @@ -77410,6 +76581,9 @@ tZk tZk tZk tZk +tZk +tZk +tZk eGm eGm eGm @@ -77528,9 +76702,9 @@ kvC kvC kvC kvC -kvC -kvC -kvC +tZk +tZk +tZk tZk tZk tZk diff --git a/maps/tether/levels/underdark.dmm b/maps/tether/levels/underdark.dmm index 0682c61267f..d52b94fbb30 100644 --- a/maps/tether/levels/underdark.dmm +++ b/maps/tether/levels/underdark.dmm @@ -15,18 +15,6 @@ "f" = ( /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) -"g" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/floor/outdoors/dirt/virgo3b, -/area/mine/explored/underdark) -"h" = ( -/obj/item/newspaper{ - pixel_x = 4 - }, -/turf/simulated/floor/tiled/steel_dirty/virgo3b, -/area/mine/explored/underdark) "j" = ( /obj/effect/decal/remains/deer, /turf/simulated/mineral/floor/virgo3b{ @@ -48,10 +36,6 @@ }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) -"o" = ( -/obj/structure/railing, -/turf/simulated/floor/outdoors/dirt/virgo3b, -/area/mine/explored/underdark) "q" = ( /turf/simulated/mineral/floor/virgo3b, /area/mine/unexplored/underdark) @@ -75,10 +59,7 @@ /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "v" = ( -/obj/effect/step_trigger/teleporter/from_underdark{ - dir = 4; - pixel_x = -16 - }, +/obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/mine/explored/underdark) "w" = ( @@ -98,9 +79,6 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/structure/railing{ - dir = 8 - }, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "A" = ( @@ -120,6 +98,7 @@ /obj/machinery/power/apc/north_mount{ alarms_hidden = 1 }, +/obj/structure/railing, /turf/simulated/floor/outdoors/dirt/virgo3b, /area/mine/explored/underdark) "D" = ( @@ -35543,7 +35522,7 @@ k C u u -f +K P u u @@ -35734,10 +35713,10 @@ X X X k -o +f v v -K +f P T y @@ -35928,10 +35907,10 @@ X X X k -o -h -u -K +f +f +f +f P P P @@ -36124,7 +36103,7 @@ X k f z -g +f f f f diff --git a/maps/tether/tether.dm b/maps/tether/tether.dm index 1339aa52f5e..ed89fb68119 100644 --- a/maps/tether/tether.dm +++ b/maps/tether/tether.dm @@ -165,6 +165,8 @@ link_above = /datum/map_level/tether/station/surface_mid flags = LEGACY_LEVEL_STATION|LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_CONSOLES|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b + link_north = /datum/map_level/tether/mine + link_south = /datum/map_level/tether/plains // holomap_offset_x = TETHER_HOLOMAP_MARGIN_X // holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE*0 @@ -267,6 +269,8 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/floor/outdoors/rocks/virgo3b + link_below = /datum/map_level/tether/underdark + link_south = /datum/map_level/tether/station/surface_low /datum/map_level/tether/mine/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() @@ -294,6 +298,7 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b + link_above = /datum/map_level/tether/mine /datum/map_level/tether/underdark/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..() @@ -321,6 +326,7 @@ ) flags = LEGACY_LEVEL_CONTACT|LEGACY_LEVEL_PLAYER|LEGACY_LEVEL_SEALED base_turf = /turf/simulated/mineral/floor/virgo3b + link_north = /datum/map_level/tether/station/surface_low /datum/map_level/tether/plains/on_loaded_immediate(z_index, list/datum/callback/additional_generation) . = ..()