From 9690843fd9e0c7a01f70d5c02c066e31dbd0342e Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 25 Feb 2019 16:24:51 +1000 Subject: [PATCH 01/14] Cleanup of numerous issues and oversights. --- code/game/area/Space Station 13 areas_vr.dm | 4 + maps/tether/tether-01-surface1.dmm | 510 +++--- maps/tether/tether-02-surface2.dmm | 449 ++--- maps/tether/tether-03-surface3.dmm | 1650 ++++++++++--------- maps/tether/tether-05-station1.dmm | 1448 ++++++++-------- maps/tether/tether-06-station2.dmm | 659 ++++---- maps/tether/tether-07-station3.dmm | 994 ++++++----- 7 files changed, 3039 insertions(+), 2675 deletions(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 330d703ac02..b41eba12d00 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -206,6 +206,10 @@ name = "\improper Weapons Testing Range" icon_state = "firingrange" +/area/rnd/research/researchdivision + name = "\improper Research Division" + icon_state = "research" + /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index b1a85421358..b5435e37b87 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -403,13 +403,52 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/mining_main/refinery) "aaS" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, -/area/tether/surfacebase/mining_main/refinery) +/area/maintenance/lower/mining_eva) +"aaT" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/alarm{ + pixel_y = 22; + target_temperature = 293.15 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) "aaU" = ( /turf/simulated/wall, /area/maintenance/lower/trash_pit) +"aaV" = ( +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) +"aaW" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/vacant_site) "aaX" = ( /obj/structure/plasticflaps, /obj/machinery/conveyor{ @@ -481,6 +520,26 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/mining_main/refinery) +"abf" = ( +/obj/machinery/door/airlock/maintenance/common{ + name = "Trash Pit Access"; + req_one_access = list(26,48) + }, +/obj/structure/catwalk, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) +"abg" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/machinery/alarm{ + pixel_y = 22; + target_temperature = 293.15 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) "abh" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/refinery) @@ -658,6 +717,23 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) +"abx" = ( +/obj/effect/floor_decal/industrial/loading{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 6 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "monotile" + }, +/area/security/checkpoint) "aby" = ( /obj/machinery/conveyor{ dir = 8; @@ -672,6 +748,26 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/mining_main/refinery) +"abA" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/security/checkpoint) +"abB" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/lower/solars) "abC" = ( /obj/structure/plasticflaps/mining, /obj/machinery/conveyor{ @@ -680,6 +776,19 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/mining_main/refinery) +"abD" = ( +/obj/structure/table/glass, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/rnd/xenobiology/xenoflora/lab_atmos) "abE" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -1058,6 +1167,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/eva) +"aci" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "acj" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -1131,6 +1253,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/uxstorage) +"aco" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/locker_room) "acp" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -1148,6 +1281,101 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"acr" = ( +/obj/structure/table/marble, +/obj/machinery/door/window{ + dir = 8; + req_one_access = list(25) + }, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "cafe"; + layer = 3.1; + name = "Cafe Shutters" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_dining) +"acs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/locker_room) +"act" = ( +/obj/machinery/door/airlock/maintenance/common{ + name = "Tram Maintenance Access" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_dining) +"acu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22 + }, +/turf/simulated/floor/tiled, +/area/rnd/hallway) +"acv" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Drone Bay" + }, +/obj/machinery/atmospherics/pipe/simple/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/atmos) +"acw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals_central1{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monofloor{ + dir = 1 + }, +/area/crew_quarters/visitor_laundry) "acx" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) @@ -1155,6 +1383,32 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/storage) +"acz" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + autoclose = 1; + dir = 2; + id_tag = null; + name = "Laundry"; + req_access = list() + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central1, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/monofloor, +/area/crew_quarters/visitor_laundry) "acA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1736,16 +1990,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) -"adO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/maintenance/lower/mining_eva) "adP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7233,13 +7477,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) -"asj" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "asl" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 @@ -10169,15 +10406,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora/lab_atmos) -"ayG" = ( -/obj/structure/table/glass, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/xenobiology/xenoflora/lab_atmos) "ayH" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor{ @@ -12232,14 +12460,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) -"aCG" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/locker_room) "aCH" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -12298,14 +12518,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/lower/solars) -"aCP" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/vacant_site) "aCQ" = ( /obj/structure/cable{ d1 = 1; @@ -12774,14 +12986,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/north_stairs_one) -"aEk" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Trash Pit Access"; - req_one_access = list(26,48) - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) "aEl" = ( /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ frequency = 1379; @@ -15423,15 +15627,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/processing) -"aLA" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/turf/simulated/floor/plating, -/area/vacant/vacant_site) "aLB" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ @@ -15821,20 +16016,6 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) -"aQK" = ( -/obj/effect/floor_decal/industrial/loading{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 6 - }, -/turf/simulated/floor/tiled{ - icon_state = "monotile" - }, -/area/security/checkpoint) "aQM" = ( /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled{ @@ -18328,15 +18509,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/maintenance/lower/solars) -"bht" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/maintenance/lower/solars) "bhw" = ( /obj/structure/cable{ d1 = 4; @@ -19818,20 +19990,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) -"brv" = ( -/obj/structure/table/marble, -/obj/machinery/door/window{ - dir = 8; - req_one_access = list(25) - }, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "cafe"; - layer = 3.1; - name = "Cafe Shutters" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_dining) "brw" = ( /obj/structure/window/reinforced, /obj/structure/table/glass, @@ -21303,23 +21461,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site/east) -"bAO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/locker_room) "bAP" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -21416,29 +21557,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) -"bBl" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/rnd/hallway) "bBy" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -22879,23 +22997,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/atmos) -"bRx" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Drone Bay" - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/atmos) "bRy" = ( /obj/machinery/door/airlock/glass_external/public, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -25785,14 +25886,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) -"cfM" = ( -/obj/effect/floor_decal/steeldecal/steel_decals_central1{ - dir = 1 - }, -/turf/simulated/floor/tiled/monofloor{ - dir = 1 - }, -/area/crew_quarters/visitor_laundry) "cfN" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled, @@ -25864,12 +25957,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) -"cgb" = ( -/obj/machinery/door/airlock/maintenance/common{ - name = "Tram Maintenance Access" - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/visitor_dining) "cge" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26054,31 +26141,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) -"cgw" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - autoclose = 1; - dir = 2; - id_tag = null; - name = "Laundry"; - req_access = list() - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central1, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/monofloor, -/area/crew_quarters/visitor_laundry) "cgz" = ( /obj/structure/cable/green{ d1 = 4; @@ -32471,7 +32533,7 @@ ars ars awc axf -bht +abB azr aBv azU @@ -33039,7 +33101,7 @@ amU amU amU axf -bhp +aaT azr bkd bmv @@ -34026,7 +34088,7 @@ apt aqf aSt arA -asj +abg asU atF arG @@ -34469,7 +34531,7 @@ aCX auu bvO byA -bBl +acu bEf bFS bHV @@ -34873,7 +34935,7 @@ akV anB akX aor -aLA +akX apw aqj aSP @@ -36731,7 +36793,7 @@ auz avw beQ bgd -ayG +abD atf blx aAZ @@ -38011,7 +38073,7 @@ auF auF atW atj -aAu +aci azI aah aah @@ -38878,7 +38940,7 @@ aBe aBe aBe aBe -bRx +acv aBe aIv aIB @@ -39394,7 +39456,7 @@ abn abn abn abT -adO +aaS abT akz alH @@ -40996,7 +41058,7 @@ azK aAA aBj avP -aCG +aco bse aAG aAG @@ -41374,8 +41436,8 @@ aah aah aar aaI -aaS -aaS +aaC +aaC abE abM acg @@ -41516,7 +41578,7 @@ aah aah aar aaI -aaS +aaC abb abh abM @@ -41658,7 +41720,7 @@ aah aah aar aaJ -aaS +aaC abc abG abL @@ -41710,7 +41772,7 @@ aCI aCI aCI aAG -bAO +acs aAG bgr bgr @@ -41800,7 +41862,7 @@ aah aah aar aaK -aaS +aaC abq abF abL @@ -42226,7 +42288,7 @@ aah aah aar aaI -aaS +aaC abs abO acP @@ -42368,7 +42430,7 @@ aah aah aar aaI -aaS +aaC abh abN abM @@ -42510,7 +42572,7 @@ aah aah aar aaJ -aaS +aaC abi abU abL @@ -42549,7 +42611,7 @@ atp auf atp aLp -aQK +abx aLJ bdV ayb @@ -42652,7 +42714,7 @@ aad aah aar aaM -aaS +aaC abt abQ abP @@ -42959,7 +43021,7 @@ awr ayq ajZ ahx -aCP +aaW alU amy alr @@ -43117,7 +43179,7 @@ atp auT awM aLJ -aQM +abA atp biv bhi @@ -43439,8 +43501,8 @@ cdd cjs ceM ceM -cfM -cgw +acw +acz ceM chQ chQ @@ -43954,7 +44016,7 @@ ajl aka ajl ajl -aEk +abf alY amR alr @@ -44231,7 +44293,7 @@ aah aaU abH agT -abH +aaV agT agT aaU @@ -44404,7 +44466,7 @@ apP apP aFc aFc -brv +acr lHO lHO lHO @@ -44550,7 +44612,7 @@ arm cfj cfz arm -cgb +act bdk cgt bdk diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 6b2a4a174b8..dad0b07c7d7 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -376,9 +376,9 @@ /obj/item/weapon/handcuffs/legcuffs/fuzzy, /obj/item/weapon/handcuffs/fuzzy, /obj/item/clothing/mask/balaclava, -/obj/item/clothing/gloves/combat{ - desc = "These gloves are insulated with rubber."; - name = "black insulated gloves" +/obj/item/clothing/gloves/black{ + desc = "They seem to be made of rubber-like material, though insulation quality is doubtful"; + name = "elastic black gloves" }, /obj/item/clothing/under/fluff/latexmaid, /turf/simulated/floor/tiled/techfloor, @@ -478,6 +478,9 @@ dir = 1 }, /obj/effect/floor_decal/rust, +/obj/machinery/alarm{ + pixel_y = 22 + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "bj" = ( @@ -1174,14 +1177,17 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/mining) "cU" = ( -/obj/structure/catwalk, -/obj/machinery/alarm{ - dir = 8; - icon_state = "alarm0"; - pixel_x = 24 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/mining) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/atrium_two) "cV" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 10 @@ -2616,22 +2622,25 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/north) "fQ" = ( -/obj/effect/floor_decal/techfloor{ +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor/hole/right{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-4" }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/alarm{ + pixel_y = 22 }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/north) +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_two) "fR" = ( /obj/effect/floor_decal/techfloor{ dir = 1 @@ -4636,15 +4645,21 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "kl" = ( -/obj/structure/railing{ - dir = 1 +/obj/machinery/door/airlock/maintenance/engi, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/techfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/gateway) "km" = ( /obj/item/toy/plushie/kitten{ desc = "An odd appearing, cryptic plush of a cat."; @@ -5354,21 +5369,24 @@ /turf/simulated/floor, /area/maintenance/substation/research) "lM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/engineering{ - name = "Science Substation"; - req_one_access = list(11,24,47) - }, -/obj/machinery/door/firedoor, /obj/structure/cable{ - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 }, -/turf/simulated/floor, -/area/maintenance/substation/research) +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor/plating, +/area/gateway) "lN" = ( /obj/machinery/atmospherics/pipe/simple/visible/supply{ dir = 6 @@ -5855,24 +5873,26 @@ /turf/simulated/floor, /area/maintenance/substation/research) "mM" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, /obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/obj/machinery/door/airlock/engineering{ - name = "Science Substation"; - req_one_access = list(11,24,47) - }, -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor, -/area/maintenance/substation/research) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/north) "mN" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/manifold/visible/supply{ @@ -6167,14 +6187,20 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "nj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 +/obj/structure/railing{ + dir = 1 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 +/obj/effect/floor_decal/techfloor{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/rnd/research/testingrange) +/obj/effect/floor_decal/rust, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/bar) "nk" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -7199,9 +7225,21 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/bar) "oX" = ( -/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/engineering{ + name = "Science Substation"; + req_one_access = list(11,24,47) + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor, -/area/maintenance/lower/bar) +/area/maintenance/substation/research) "oY" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -7958,12 +7996,15 @@ /turf/simulated/floor/tiled, /area/janitor) "qs" = ( -/obj/effect/floor_decal/corner_techfloor_grid{ - dir = 9 +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/floor_decal/corner_techfloor_grid/full{ + dir = 1 }, /obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/bar) +/area/maintenance/lower/south) "qt" = ( /obj/structure/railing{ dir = 8 @@ -8784,15 +8825,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) -"rS" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/effect/floor_decal/corner_techfloor_grid/full{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/maintenance/lower/south) "rT" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -15670,18 +15702,24 @@ /turf/simulated/wall, /area/maintenance/substation/tcomms) "Ex" = ( -/obj/machinery/door/airlock/maintenance/engi{ - name = "Telecomms Substation" - }, /obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plating, -/area/maintenance/substation/tcomms) +/obj/machinery/door/airlock/engineering{ + name = "Science Substation"; + req_one_access = list(11,24,47) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/substation/research) "Ey" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; @@ -16074,17 +16112,18 @@ name = "\improper Telecomms Lobby" }) "Fn" = ( -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" +/obj/effect/floor_decal/borderfloor{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/testingrange) "Fo" = ( /turf/simulated/floor/tiled, /area/tcomsat{ @@ -16155,21 +16194,10 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) "Fy" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Telecomms Access"; - req_one_access = list(61) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tcommsat/entrance{ - name = "\improper Telecomms Entrance" - }) +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/lower/bar) "Fz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -16213,27 +16241,13 @@ name = "\improper Telecomms Entrance" }) "FC" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/catwalk, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/hatch{ - name = "Telecomms Foyer"; - req_access = list(61); - req_one_access = list(12) - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tcomsat{ - name = "\improper Telecomms Lobby" - }) +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "FD" = ( /obj/structure/cable/green{ d1 = 4; @@ -16639,19 +16653,20 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "Gi" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1381; - icon_state = "door_locked"; - id_tag = "server_access_outer"; - locked = 1; - name = "Telecoms Server Access"; - req_access = list(61) - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/tcommsat/chamber) +/obj/structure/railing{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "Gj" = ( /obj/machinery/airlock_sensor{ frequency = 1381; @@ -17557,6 +17572,84 @@ temperature = 80 }, /area/tcommsat/chamber) +"HM" = ( +/obj/machinery/door/airlock/maintenance/engi{ + name = "Telecomms Substation" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/substation/tcomms) +"HN" = ( +/obj/structure/window/reinforced/full, +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"HO" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Telecomms Access"; + req_one_access = list(61) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tcommsat/entrance{ + name = "\improper Telecomms Entrance" + }) +"HP" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/hatch{ + name = "Telecomms Foyer"; + req_access = list(61); + req_one_access = list(12) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tcomsat{ + name = "\improper Telecomms Lobby" + }) +"HQ" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1381; + icon_state = "door_locked"; + id_tag = "server_access_outer"; + locked = 1; + name = "Telecoms Server Access"; + req_access = list(61) + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/tcommsat/chamber) "HT" = ( /obj/item/weapon/storage/box/glasses/pint, /obj/item/weapon/storage/box/glass_extras/straws, @@ -17947,21 +18040,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_two) -"Sv" = ( -/obj/machinery/door/airlock/maintenance/engi, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/gateway) "Sy" = ( /obj/structure/sign/poster, /turf/simulated/wall, @@ -18057,23 +18135,6 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/lower/bar) -"UX" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/tether/surfacebase/public_garden_two) "Vk" = ( /obj/structure/cable{ icon_state = "4-8" @@ -24629,7 +24690,7 @@ ac ac ac Kt -UX +fQ IB Mf Kt @@ -24913,7 +24974,7 @@ ae ae ae ae -Sv +kl ae ae ae @@ -24947,7 +25008,7 @@ li lC lZ mF -nj +Fn nP ol oZ @@ -25057,7 +25118,7 @@ bX cm ZO bX -cm +lM bX bX dP @@ -25815,7 +25876,7 @@ vW wz xl xM -xl +Gi xl xl zJ @@ -26367,7 +26428,7 @@ ln lJ mg mJ -nq +ln nq ot pi @@ -26509,7 +26570,7 @@ ln lK mh mK -nq +ln nq os pj @@ -26790,9 +26851,9 @@ ku il il lo -lM +oX ln -mM +Ex nr nS ou @@ -28331,7 +28392,7 @@ dV eD eW ap -fQ +mM ge ge ge @@ -30524,7 +30585,7 @@ rg rg ET Ff -Fy +HO FU ET ac @@ -31092,7 +31153,7 @@ Ez Ez EM EM -FC +HP EM EM Gw @@ -31229,7 +31290,7 @@ ac rg DQ Et -Ex +HM EB EH EM @@ -31595,7 +31656,7 @@ dG dG aG dY -fn +cU fG fY gj @@ -31801,7 +31862,7 @@ Ez Ez EL EM -Fn +HN FH Ga FR @@ -31872,7 +31933,7 @@ bO ad cx cy -cU +cy dh cy cy @@ -32344,7 +32405,7 @@ tu rO vP vP -sK +FC rg ac ac @@ -32761,7 +32822,7 @@ du of oV pG -qs +pG re rO sE @@ -33042,7 +33103,7 @@ du mB ne du -ee +mA ee ee gY @@ -33223,7 +33284,7 @@ ES Fd Fv FR -Gi +HQ FR GG GI @@ -33469,7 +33530,7 @@ mD nf du du -oX +Fy du du rg @@ -33743,7 +33804,7 @@ ef ef ef jZ -kl +nj id kQ ee @@ -33899,7 +33960,7 @@ du du du rg -rS +qs sL tB tB diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index cf62ffb1a46..fbab58df1b6 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -57,7 +57,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/random/trash_pile, /turf/simulated/floor/wood, /area/vacant/vacant_site2) "ak" = ( @@ -538,7 +537,6 @@ /area/vacant/vacant_site2) "bo" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/engi, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -546,6 +544,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/tiled/techfloor/grid, /area/vacant/vacant_site2) "bp" = ( @@ -2183,6 +2182,7 @@ layer = 3.3; name = "Public Access Shutter" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/gateway/prep_room) "ep" = ( @@ -3709,6 +3709,12 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/structure/closet/crate, +/obj/random/maintenance/medical, +/obj/random/maintenance/medical, +/obj/random/junk, +/obj/random/maintenance/medical, +/obj/random/maintenance/clean, /turf/simulated/floor/tiled/techfloor/grid, /area/vacant/vacant_site2) "gV" = ( @@ -4149,12 +4155,7 @@ /obj/effect/floor_decal/techfloor/hole{ dir = 8 }, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/medical, -/obj/random/junk, -/obj/random/maintenance/medical, -/obj/random/maintenance/medical, +/obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor/grid, /area/vacant/vacant_site2) "hI" = ( @@ -4304,7 +4305,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -4314,6 +4314,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 8 }, @@ -4325,10 +4326,10 @@ layer = 3.3; name = "Gateway Prep Shutter" }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -4336,13 +4337,13 @@ "hV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Unisex Restrooms" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/recreation_area_restroom) "hW" = ( @@ -4662,20 +4663,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) "iv" = ( +/obj/random/junk, /obj/machinery/alarm{ pixel_y = 22 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/tether/surfacebase/atrium_three) "iw" = ( /obj/machinery/firealarm{ @@ -4868,32 +4860,24 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) "iF" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 +/obj/structure/cable/cyan{ + d1 = 32; + d2 = 2; + icon_state = "32-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/camera/network/engineering{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/atrium_three) +/obj/machinery/door/firedoor/glass, +/obj/structure/lattice, +/turf/simulated/open, +/area/maintenance/engineering/pumpstation) "iG" = ( /obj/structure/cable{ d1 = 4; @@ -5119,7 +5103,6 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -5633,9 +5616,8 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) "jI" = ( -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/atrium_three) +/turf/simulated/wall, +/area/rnd/research/researchdivision) "jJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -6081,17 +6063,27 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) "ky" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) "kz" = ( @@ -6339,10 +6331,10 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Pool" }, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 8 }, @@ -6350,10 +6342,10 @@ "kV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -7688,10 +7680,10 @@ /turf/simulated/floor/tiled, /area/crew_quarters/pool) "nC" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Recreation Area" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/recreation_area) "nD" = ( @@ -8361,10 +8353,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ name = "Recreation Area" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/recreation_area) "oW" = ( @@ -8707,9 +8699,21 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/atrium_three) "pA" = ( -/obj/random/junk, -/turf/simulated/floor/plating, -/area/tether/surfacebase/atrium_three) +/obj/machinery/status_display{ + pixel_y = 30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "pB" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8859,7 +8863,7 @@ /obj/machinery/door/airlock/glass{ name = "Pool" }, -/obj/machinery/door/firedoor, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/pool) "pO" = ( @@ -9463,13 +9467,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/firedoor, /obj/machinery/door/airlock{ name = "Unisex Showers" }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_grid, /area/crew_quarters/recreation_area_restroom{ name = "\improper Recreation Area Showers" @@ -13360,25 +13364,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "xy" = ( -/turf/simulated/wall, -/area/rnd/research) -"xz" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 9 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, -/turf/simulated/floor/tiled, -/area/rnd/research) -"xA" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -13390,7 +13375,31 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"xz" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"xA" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "xB" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -13399,38 +13408,14 @@ dir = 1 }, /obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 1 + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) "xC" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"xD" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"xE" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -13439,8 +13424,8 @@ }, /obj/machinery/camera/network/research, /turf/simulated/floor/tiled, -/area/rnd/research) -"xF" = ( +/area/rnd/research/researchdivision) +"xD" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -13448,8 +13433,8 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"xG" = ( +/area/rnd/research/researchdivision) +"xE" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -13465,8 +13450,8 @@ dir = 9 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"xH" = ( +/area/rnd/research/researchdivision) +"xF" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -13481,8 +13466,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"xI" = ( +/area/rnd/research/researchdivision) +"xG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 }, @@ -13491,8 +13476,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"xJ" = ( +/area/rnd/research/researchdivision) +"xH" = ( /obj/machinery/newscaster{ pixel_x = 0; pixel_y = 30 @@ -13505,13 +13490,35 @@ }, /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled, -/area/rnd/research) -"xK" = ( +/area/rnd/research/researchdivision) +"xI" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/rnd/research) +/area/rnd/research/researchdivision) +"xJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"xK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "xL" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor{ @@ -13741,40 +13748,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "yi" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) "yj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"yk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"yl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -13785,8 +13770,8 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"ym" = ( +/area/rnd/research/researchdivision) +"yk" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -13799,28 +13784,28 @@ sortType = "Research" }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"yl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"ym" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "yn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/rnd/research) -"yo" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"yp" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -13834,7 +13819,27 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"yo" = ( +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"yp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "yq" = ( /obj/structure/table/glass, /obj/effect/floor_decal/borderfloor{ @@ -13996,6 +14001,18 @@ "yG" = ( /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"yH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/assembly/robotics) "yI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -14041,41 +14058,21 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "yN" = ( -/obj/machinery/alarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/railing{ dir = 8 }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/rnd/research) +/turf/simulated/open, +/area/rnd/research/researchdivision) "yO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/rnd/research) +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "yP" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/rnd/research) -"yQ" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/rnd/research) -"yR" = ( /obj/structure/railing{ dir = 4 }, @@ -14083,15 +14080,15 @@ dir = 1 }, /turf/simulated/open, -/area/rnd/research) -"yS" = ( +/area/rnd/research/researchdivision) +"yQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/rnd/research) -"yT" = ( +/area/rnd/research/researchdivision) +"yR" = ( /turf/simulated/floor/tiled, -/area/rnd/research) -"yU" = ( +/area/rnd/research/researchdivision) +"yS" = ( /obj/structure/cable/green{ d1 = 1; d2 = 4; @@ -14099,8 +14096,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"yV" = ( +/area/rnd/research/researchdivision) +"yT" = ( /obj/structure/cable/green{ d1 = 2; d2 = 4; @@ -14116,8 +14113,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"yW" = ( +/area/rnd/research/researchdivision) +"yU" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -14134,8 +14131,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"yX" = ( +/area/rnd/research/researchdivision) +"yV" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -14155,8 +14152,8 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"yY" = ( +/area/rnd/research/researchdivision) +"yW" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d1 = 4; @@ -14176,7 +14173,27 @@ name = "Front Desk" }, /turf/simulated/floor/tiled/steel_grid, -/area/rnd/research) +/area/rnd/research/researchdivision) +"yX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + icon_state = "extinguisher_closed"; + pixel_x = -30 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"yY" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "yZ" = ( /obj/structure/cable/green{ d1 = 4; @@ -14434,6 +14451,10 @@ }, /turf/simulated/wall, /area/crew_quarters/bar) +"zw" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/assembly/robotics) "zx" = ( /obj/structure/table/bench/wooden, /obj/machinery/light{ @@ -14448,59 +14469,39 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "zy" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) +/turf/simulated/open, +/area/rnd/research/researchdivision) "zz" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research) -"zA" = ( -/turf/simulated/open, -/area/rnd/research) -"zB" = ( /obj/structure/railing{ dir = 4 }, /turf/simulated/open, -/area/rnd/research) -"zC" = ( +/area/rnd/research/researchdivision) +"zA" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"zD" = ( +/area/rnd/research/researchdivision) +"zB" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"zE" = ( +/area/rnd/research/researchdivision) +"zC" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"zF" = ( +/area/rnd/research/researchdivision) +"zD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"zG" = ( +/area/rnd/research/researchdivision) +"zE" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -14517,7 +14518,27 @@ pixel_x = 32 }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"zF" = ( +/obj/machinery/computer/guestpass{ + dir = 4; + pixel_x = -28; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"zG" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "zH" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -14787,6 +14808,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "Ag" = ( @@ -14840,39 +14866,19 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "Al" = ( -/obj/machinery/computer/guestpass{ - dir = 4; - pixel_x = -28; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Am" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"An" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Ao" = ( +/area/rnd/research/researchdivision) +"Am" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Ap" = ( +/area/rnd/research/researchdivision) +"An" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -14882,16 +14888,16 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Aq" = ( +/area/rnd/research/researchdivision) +"Ao" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Ar" = ( +/area/rnd/research/researchdivision) +"Ap" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -14899,7 +14905,27 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"Aq" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"Ar" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/research/researchdivision) "As" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -15244,58 +15270,38 @@ /turf/simulated/floor/outdoors/grass/sif/virgo3b, /area/tether/surfacebase/outside/outside3) "AT" = ( -/obj/machinery/light{ - icon_state = "tube1"; - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) +/obj/structure/railing, +/turf/simulated/open, +/area/rnd/research/researchdivision) "AU" = ( -/obj/structure/railing, -/obj/structure/railing{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/research) -"AV" = ( -/obj/structure/railing, -/turf/simulated/open, -/area/rnd/research) -"AW" = ( /obj/structure/railing{ dir = 4 }, /obj/structure/railing, /turf/simulated/open, -/area/rnd/research) -"AX" = ( +/area/rnd/research/researchdivision) +"AV" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, -/area/rnd/research) -"AY" = ( +/area/rnd/research/researchdivision) +"AW" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"AZ" = ( +/area/rnd/research/researchdivision) +"AX" = ( /obj/structure/disposalpipe/sortjunction{ name = "RD Office"; sortType = "RD Office" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Ba" = ( +/area/rnd/research/researchdivision) +"AY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ @@ -15303,8 +15309,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Bb" = ( +/area/rnd/research/researchdivision) +"AZ" = ( /obj/machinery/light_switch{ pixel_x = 25 }, @@ -15325,7 +15331,31 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"Ba" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/machinery/camera/network/research{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"Bb" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "Bc" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -15680,46 +15710,22 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "BH" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/machinery/camera/network/research{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"BI" = ( -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"BJ" = ( /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"BK" = ( +/area/rnd/research/researchdivision) +"BI" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"BL" = ( +/area/rnd/research/researchdivision) +"BJ" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -15727,8 +15733,8 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) -"BM" = ( +/area/rnd/research/researchdivision) +"BK" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -15739,8 +15745,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"BN" = ( +/area/rnd/research/researchdivision) +"BL" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -15763,8 +15769,8 @@ sortType = "Robotics" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"BO" = ( +/area/rnd/research/researchdivision) +"BM" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -15781,8 +15787,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"BP" = ( +/area/rnd/research/researchdivision) +"BN" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -15803,8 +15809,8 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"BQ" = ( +/area/rnd/research/researchdivision) +"BO" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d1 = 4; @@ -15826,7 +15832,19 @@ req_access = list(47) }, /turf/simulated/floor/tiled/steel_grid, -/area/rnd/research) +/area/rnd/research/researchdivision) +"BP" = ( +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/mauve/bordercorner, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"BQ" = ( +/obj/machinery/light, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "BR" = ( /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -15993,23 +16011,21 @@ /turf/simulated/floor/plating, /area/maintenance/engineering/pumpstation) "Cb" = ( -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 8 +/obj/machinery/firealarm{ + dir = 1; + pixel_x = 0; + pixel_y = -25 }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ - dir = 8 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 }, -/obj/structure/cable/cyan{ - d1 = 32; - d2 = 2; - icon_state = "32-2" +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 }, -/obj/machinery/camera/network/engineering{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/maintenance/engineering/pumpstation) +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "Cc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -16187,34 +16203,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "Cq" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/mauve/bordercorner, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Cr" = ( -/obj/machinery/light, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Cs" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_x = 0; - pixel_y = -25 - }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Ct" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -16228,8 +16216,8 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Cu" = ( +/area/rnd/research/researchdivision) +"Cr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -16251,8 +16239,8 @@ icon_state = "pipe-c" }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Cv" = ( +/area/rnd/research/researchdivision) +"Cs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, @@ -16270,7 +16258,58 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"Ct" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + cell_type = /obj/item/weapon/cell/super; + dir = 8; + name = "west bump"; + pixel_x = -30 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"Cu" = ( +/obj/machinery/light_switch{ + pixel_x = 25 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"Cv" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "Cw" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -16606,32 +16645,18 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "CY" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) "CZ" = ( -/obj/machinery/light_switch{ - pixel_x = 25 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/recharge_station, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) "Da" = ( /turf/simulated/wall, /area/assembly/robotics) @@ -16805,6 +16830,29 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) +"Dq" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4; + icon_state = "extinguisher_closed"; + pixel_x = -30 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) "Dr" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -16858,32 +16906,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "Du" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Dv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Dw" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Dx" = ( /obj/machinery/recharge_station, /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -16898,7 +16920,63 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"Dv" = ( +/obj/structure/lattice, +/obj/structure/cable/green{ + icon_state = "32-4" + }, +/obj/machinery/atmospherics/pipe/zpipe/down/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/open, +/area/rnd/research/researchdivision) +"Dw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/rnd, +/turf/simulated/floor/tiled/steel_dirty, +/area/rnd/research/researchdivision) +"Dx" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "Dy" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -17149,28 +17227,6 @@ /turf/simulated/floor/tiled, /area/hydroponics) "DV" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - icon_state = "extinguisher_closed"; - pixel_x = -30 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"DW" = ( /obj/machinery/status_display{ pixel_x = 32; pixel_y = 0 @@ -17198,6 +17254,40 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/third_south) +"DW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "DX" = ( @@ -17242,64 +17332,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "Ea" = ( -/obj/structure/lattice, -/obj/structure/cable/green{ - icon_state = "32-4" - }, -/obj/machinery/atmospherics/pipe/zpipe/down/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/open, -/area/rnd/research) -"Eb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/rnd, -/turf/simulated/floor/tiled/steel_dirty, -/area/rnd/research) -"Ec" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"Ed" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -17308,8 +17340,8 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, -/area/rnd/research) -"Ee" = ( +/area/rnd/research/researchdivision) +"Eb" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -17322,8 +17354,8 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Ef" = ( +/area/rnd/research/researchdivision) +"Ec" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -17334,8 +17366,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/rnd/research) -"Eg" = ( +/area/rnd/research/researchdivision) +"Ed" = ( /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -17353,8 +17385,8 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/rnd/research) -"Eh" = ( +/area/rnd/research/researchdivision) +"Ee" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -17363,7 +17395,33 @@ }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"Ef" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"Eg" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"Eh" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "Ei" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -17535,52 +17593,35 @@ /turf/simulated/wall, /area/hydroponics) "Ez" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/hidden/steel, -/turf/simulated/floor/tiled, -/area/hallway/lower/third_south) -"EA" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/beige/bordercorner2{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, /turf/simulated/floor/tiled, -/area/hallway/lower/third_south) +/area/rnd/research/researchdivision) +"EA" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/mauve/bordercorner2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) "EB" = ( /obj/structure/cable/green{ d2 = 2; @@ -17640,6 +17681,15 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) +"EH" = ( +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/shuttle_pad) "EI" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -17668,62 +17718,6 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "EK" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/mauve/border{ - dir = 10 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, -/area/rnd/research) -"EL" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/turf/simulated/floor/tiled, -/area/rnd/research) -"EM" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/mauve/bordercorner2{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"EN" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"EO" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/mauve/border, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/mauve/bordercorner2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/research) -"EP" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 }, @@ -17736,7 +17730,37 @@ }, /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled, -/area/rnd/research) +/area/rnd/research/researchdivision) +"EL" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/rnd/research/researchdivision) +"EM" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "EQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17804,17 +17828,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) -"EV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/assembly/robotics) "EW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -20739,11 +20752,6 @@ }, /turf/simulated/floor/reinforced, /area/tether/surfacebase/shuttle_pad) -"JI" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) "JJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -20949,7 +20957,6 @@ dir = 1 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled/steel_grid, @@ -22374,7 +22381,6 @@ /area/tether/surfacebase/atrium_three) "Yz" = ( /obj/item/device/radio/intercom{ - broadcasting = 1; dir = 8; listening = 1; name = "Common Channel"; @@ -29272,9 +29278,9 @@ ac ac ac ac -xy -xy -xy +jI +jI +jI ac ac ac @@ -29376,7 +29382,7 @@ bh bh hf bh -iv +ir jz kn kS @@ -29414,9 +29420,9 @@ AS ac ac ac -xy -Ea -xy +jI +Dv +jI ac ac ac @@ -29547,19 +29553,19 @@ uq uq tB tB -xy -xy -xy -xy -xy -xy -xy -xy -xy -xy -Eb -xy -xy +jI +jI +jI +jI +jI +jI +jI +jI +jI +jI +Dw +jI +jI ac ac ac @@ -29689,19 +29695,19 @@ vt tU wx tB -xz -yi -yN -zy -Al -AT -BH -yi -CY -Du -Ec -EK -xy +pA +xJ +yo +yX +zF +Aq +Ba +Ct +Cv +Dx +EL +Ef +jI ac ac ac @@ -29831,18 +29837,18 @@ tU vQ wy wW -xA -yj -yO -yO -yO -yO -yO -yO -yO -yO -Ed -EL +xy +xK +yp +yp +yp +yp +yp +yp +yp +yp +Ea +Eg FN FN FN @@ -29973,18 +29979,18 @@ tU vR wz wW -xB -yk -yP -zz -zz -zz -BI -yT -yT -yT -Ee -EL +xz +yi +yN +yY +yY +yY +Bb +yR +yR +yR +Eb +Eg FO Gw Hi @@ -30115,18 +30121,18 @@ tU vS tU wX -xC -yk -yQ -zA -zA -AU -yT -yT -yT -Dv -Ef -EM +xA +yi +yO +zy +zy +Ar +yR +yR +yR +CY +Ec +Eh FO Gx Hj @@ -30257,18 +30263,18 @@ vu vS tU wW -xD -yk -yQ -zA -zA -AV -BJ -zE -zE -Dw -Eg -EN +xB +yi +yO +zy +zy +AT +BH +zC +zC +CZ +Ed +Ez FP Gy Hk @@ -30399,18 +30405,18 @@ vu vS tU wW -xE -yk +xC +yi +yP +zz +zz +AU +BI yR -zB -zB -AW -BK -yT -yT -yT -yT -EO +yR +yR +yR +EA FO Gz Hl @@ -30541,18 +30547,18 @@ vv vS tU wW -xF -yl -yS -zC -Am -AX -BL -Cq -CZ -Dx -Eh -EP +xD +yj +yQ +zA +zG +AV +BJ +BP +Cu +Du +Ee +EK FO GA Hm @@ -30683,14 +30689,14 @@ vu vS tU wW -xB -yk -yT -yT -An -AY -BK -Cr +xz +yi +yR +yR +Al +AW +BI +BQ Da Da Ei @@ -30825,14 +30831,14 @@ uW vT wA wY -xG -ym -yU -zD -Ao -AZ -BM -Cs +xE +yk +yS +zB +Am +AX +BK +Cb Da Dy Ej @@ -30938,9 +30944,9 @@ fh fh fh fh -iF -jI ky +pS +kx kZ lL mw @@ -30967,14 +30973,14 @@ tU vU wB wZ -xH -yn -yV -zE -Ap -zE -BN -Ct +xF +yl +yT +zC +An +zC +BL +Cq Db Dz Ek @@ -31109,14 +31115,14 @@ vw vV wC wZ -xI -yo -yW -zF -Aq -Ba -BO -Cu +xG +ym +yU +zD +Ao +AY +BM +Cr Dc DA El @@ -31251,14 +31257,14 @@ tE vW wD tE -xJ -yp -yX -zG -Ar -Bb -BP -Cv +xH +yn +yV +zE +Ap +AZ +BN +Cs Dd DB Em @@ -31393,14 +31399,14 @@ vx vX wE tE -xK -xK -yY -xy -xy -xy -BQ -xy +xI +xI +yW +jI +jI +jI +BO +jI Da DC En @@ -31546,9 +31552,9 @@ Cw Da Da Da -EV -FV -FV +yH +zw +zw Da HJ Ig @@ -33221,7 +33227,7 @@ ne ne ne lc -pA +iv pY qO gw @@ -33671,7 +33677,7 @@ zh zR Az Bp -Cb +iF CJ Dk DJ @@ -36248,7 +36254,7 @@ Jr Jv Jz JE -JI +EM JM IY IY @@ -36372,8 +36378,8 @@ BB Ck CS Do -DV -Ez +Dq +Do FA yG GO @@ -36390,7 +36396,7 @@ Js Js Jz JE -JI +EM JM IY IY @@ -36514,8 +36520,8 @@ yG Cl CT yG -yG vZ +yG FB Gl GO @@ -36532,7 +36538,7 @@ Jt Js Jz JE -JI +EM JM IY IY @@ -36656,8 +36662,8 @@ AM Cm CU CU +DV DW -EA FC Gm GW @@ -37389,7 +37395,7 @@ JM IY KI IR -Kv +EH KA KD Kv diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 41824b720a9..04112656be4 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -94,6 +94,22 @@ "aaq" = ( /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) +"aar" = ( +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + id_tag = "engine_electrical_maintenance"; + locked = 1; + name = "Electrical Maintenance"; + req_access = list(10) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "aas" = ( /obj/machinery/power/smes/buildable{ charge = 2e+006; @@ -158,6 +174,20 @@ }, /turf/simulated/floor, /area/engineering/engine_smes) +"aaB" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "SMES Access"; + req_access = list(11) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "aaC" = ( /obj/machinery/power/grid_checker, /obj/structure/cable{ @@ -173,6 +203,41 @@ "aaD" = ( /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) +"aaE" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + id_tag = "engine_electrical_maintenance"; + locked = 1; + name = "Electrical Maintenance"; + req_access = list(10) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) +"aaF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "SMES Access"; + req_access = list(11) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/techmaint, +/area/engineering/engine_smes) "aaG" = ( /obj/machinery/power/smes/buildable{ charge = 2e+007; @@ -307,6 +372,14 @@ "aaT" = ( /turf/simulated/wall, /area/hallway/station/atrium) +"aaU" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "SMES Access"; + req_access = list(11) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/engine_monitoring) "aaV" = ( /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/engi_wash) @@ -328,6 +401,11 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"aaY" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "aaZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -482,6 +560,18 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) +"abq" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + icon_state = "door_closed"; + id_tag = "engine_airlock_interior"; + locked = 0; + name = "Engine Airlock Interior"; + req_access = list(11) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/engineering/engine_airlock) "abr" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -491,20 +581,23 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "abs" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1379; + icon_state = "door_closed"; + id_tag = "engine_airlock_exterior"; + locked = 0; + name = "Engine Airlock Exterior"; + req_access = list(11) }, -/obj/machinery/door/airlock/hatch{ - icon_state = "door_locked"; - id_tag = "engine_electrical_maintenance"; - locked = 1; - name = "Electrical Maintenance"; - req_access = list(10) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_smes) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_grid, +/area/engineering/engine_airlock) "abt" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/yellow{ @@ -523,18 +616,16 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "abv" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "SMES Access"; - req_access = list(11) +/obj/structure/table/reinforced, +/obj/item/device/pipe_painter, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_smes) +/turf/simulated/floor/tiled, +/area/engineering/atmos/backup) "abw" = ( /obj/structure/cable{ d1 = 1; @@ -592,6 +683,21 @@ /obj/random/maintenance/medical, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"abB" = ( +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos/backup) "abC" = ( /turf/simulated/wall, /area/maintenance/station/eng_lower) @@ -604,20 +710,31 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) "abE" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 4 }, -/obj/machinery/door/airlock/hatch{ - icon_state = "door_locked"; - id_tag = "engine_electrical_maintenance"; - locked = 1; - name = "Electrical Maintenance"; - req_access = list(10) +/obj/effect/floor_decal/industrial/warning{ + dir = 1 }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_smes) +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the engine control room blast doors."; + id = "EngineEmitterPortWest2"; + name = "Engine Room Blast Doors"; + pixel_x = 25; + pixel_y = 0; + req_access = null; + req_one_access = list(11,24) + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos/backup) "abF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -687,23 +804,23 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) "abL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "SMES Access"; - req_access = list(11) +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d2 = 2; + icon_state = "0-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/engineering/engine_smes) +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) "abM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -835,12 +952,11 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "abY" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "SMES Access"; - req_access = list(11) +/obj/machinery/alarm{ + pixel_y = 22 }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_monitoring) +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "abZ" = ( /turf/simulated/wall/r_wall, /area/engineering/atmos/backup) @@ -894,6 +1010,15 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"aci" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/standard, +/obj/random/soap, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/engi_wash) "acj" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, @@ -914,6 +1039,18 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"aco" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/hallway/station/atrium) "acp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -942,6 +1079,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"acs" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/hallway/station/atrium) "act" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -966,6 +1109,17 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"acv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "acw" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1060,6 +1214,26 @@ "acL" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_smes) +"acM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/broken{ + icon_state = "pipe-b"; + dir = 4 + }, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "acN" = ( /obj/structure/cable/green{ d1 = 4; @@ -1329,6 +1503,24 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"adp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/rust, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor, +/area/vacant/vacant_restaurant_lower) "adq" = ( /obj/structure/cable/green{ d1 = 2; @@ -1616,12 +1808,54 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"adR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/hallway/station/atrium) "adS" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1 }, /turf/simulated/floor/tiled, /area/engineering/atmos/backup) +"adT" = ( +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "adU" = ( /obj/structure/cable/green{ d1 = 1; @@ -1668,6 +1902,17 @@ }, /turf/simulated/floor, /area/maintenance/substation/engineering) +"adX" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "adY" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8 @@ -1692,6 +1937,19 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"aec" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "aed" = ( /obj/effect/floor_decal/steeldecal/steel_decals10, /obj/effect/floor_decal/steeldecal/steel_decals10{ @@ -1704,6 +1962,13 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) +"aee" = ( +/obj/structure/disposalpipe/junction{ + icon_state = "pipe-j2"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "aef" = ( /obj/random/junk, /obj/random/trash, @@ -1732,6 +1997,36 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) +"aek" = ( +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/hallway/station/docks) +"ael" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8; + icon_state = "map" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/meter{ + frequency = 1443; + id = "dist_aux_meter"; + name = "Distribution Loop" + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/hallway/station/docks) "aem" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/space_heater, @@ -2035,6 +2330,12 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"aeF" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/hallway/station/docks) "aeG" = ( /obj/structure/cable{ d1 = 1; @@ -2049,6 +2350,11 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) +"aeI" = ( +/obj/machinery/door/airlock/multi_tile/glass, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/hallway/station/docks) "aeJ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/machinery/light{ @@ -2128,6 +2434,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"aeR" = ( +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/hallway/station/docks) "aeS" = ( /obj/structure/cable/green{ d1 = 1; @@ -2153,6 +2463,24 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"aeT" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) "aeU" = ( /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, @@ -2199,6 +2527,20 @@ /obj/item/clothing/head/helmet/space/void/pilot, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) +"aeZ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) "afa" = ( /obj/structure/cable/green{ d1 = 2; @@ -2218,6 +2560,21 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) +"afb" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pathfinder_office" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green, +/turf/simulated/floor/plating, +/area/tether/station/pathfinder_office) "afc" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 @@ -2279,6 +2636,20 @@ }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"afg" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) +"afh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/explorer_meeting) "afi" = ( /obj/machinery/camera/network/engine{ dir = 1 @@ -2328,6 +2699,12 @@ /obj/effect/floor_decal/corner/yellow/bordercorner2, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) +"afl" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "afm" = ( /obj/structure/cable/green{ d1 = 1; @@ -2350,9 +2727,30 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "afn" = ( -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor, -/area/maintenance/station/eng_lower) +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) +"afo" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "afp" = ( /obj/machinery/light{ dir = 8; @@ -2362,6 +2760,43 @@ /obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor, /area/engineering/storage) +"afq" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"afr" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "afs" = ( /obj/effect/floor_decal/rust, /obj/machinery/light{ @@ -2373,6 +2808,117 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/engineering/storage) +"aft" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"afu" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/status_display{ + layer = 4; + pixel_x = 32; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) +"afv" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/bridge) +"afw" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/bridge) +"afx" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "bridge blast"; + name = "Bridge Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/bridge) "afy" = ( /obj/structure/sign/deck1, /turf/simulated/shuttle/wall/voidcraft/green{ @@ -2389,6 +2935,19 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"afB" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "afC" = ( /turf/simulated/wall/r_wall, /area/hallway/station/atrium) @@ -2436,6 +2995,25 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"afG" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "afH" = ( /obj/structure/cable/green{ d1 = 4; @@ -2466,6 +3044,28 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"afK" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/bridge_hallway) "afL" = ( /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -2562,10 +3162,24 @@ /turf/simulated/floor/tiled, /area/engineering/workshop) "afV" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/bridge_hallway) "afX" = ( /obj/structure/cable/green{ d1 = 1; @@ -2605,15 +3219,6 @@ /obj/structure/sign/department/eng, /turf/simulated/wall/r_wall, /area/hallway/station/atrium) -"agd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "age" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -2674,11 +3279,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"agE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/hallway/station/atrium) "agF" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -2947,34 +3547,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_airlock) -"ahu" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1379; - icon_state = "door_closed"; - id_tag = "engine_airlock_interior"; - locked = 0; - name = "Engine Airlock Interior"; - req_access = list(11) - }, -/turf/simulated/floor/plating, -/area/engineering/engine_airlock) -"ahw" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1379; - icon_state = "door_closed"; - id_tag = "engine_airlock_exterior"; - locked = 0; - name = "Engine Airlock Exterior"; - req_access = list(11) - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel_grid, -/area/engineering/engine_airlock) "ahy" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "warning"; @@ -4075,7 +4647,6 @@ dir = 8 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/vehicle/train/engine, @@ -4387,29 +4958,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/explorer_prep) -"amX" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the engine control room blast doors."; - id = "EngineEmitterPortWest2"; - name = "Engine Room Blast Doors"; - pixel_x = 25; - pixel_y = 0; - req_access = null; - req_one_access = list(11,24) - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos/backup) "amY" = ( /obj/structure/table/reinforced, /obj/item/weapon/storage/firstaid/regular, @@ -4768,17 +5316,6 @@ }, /turf/simulated/shuttle/floor/black, /area/shuttle/excursion/tether) -"aoe" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/visible/supply, -/obj/machinery/atmospherics/pipe/simple/visible/scrubbers, -/turf/simulated/floor/tiled, -/area/engineering/atmos/backup) "aof" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Civilian Substation Bypass" @@ -5026,14 +5563,6 @@ dir = 1 }, /area/holodeck_control) -"aoW" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/device/pipe_painter, -/turf/simulated/floor/tiled, -/area/engineering/atmos/backup) "aoX" = ( /obj/structure/table/reinforced, /obj/item/stack/material/steel{ @@ -8393,37 +8922,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"ayF" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) -"ayG" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/hallway/station/docks) "ayK" = ( /obj/machinery/computer/rcon, /turf/simulated/floor/tiled/dark, @@ -8646,25 +9144,6 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) -"azv" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/blue/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/bridge_hallway) "azy" = ( /mob/living/simple_mob/animal/passive/dog/corgi/Ian, /turf/simulated/floor/carpet, @@ -10014,22 +10493,6 @@ }, /turf/simulated/floor/tiled, /area/bridge_hallway) -"aCr" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/bridge_hallway) "aCs" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 @@ -10474,12 +10937,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"aDI" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/standard, -/obj/random/soap, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/sleep/engi_wash) "aDJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, @@ -12134,7 +12591,6 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/pipe/simple/hidden/universal{ @@ -14476,17 +14932,6 @@ }, /turf/simulated/floor, /area/engineering/foyer) -"aYs" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2"; - pixel_y = 0 - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor, -/area/hallway/station/atrium) "aYt" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -14722,74 +15167,6 @@ /obj/machinery/telecomms/relay/preset/tether/station_mid, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/chief) -"bbd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) -"bbl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/cap/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) -"bbn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/glass, -/turf/simulated/floor/tiled/steel_grid, -/area/hallway/station/atrium) -"bbq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/rust, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) -"bbr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "bbs" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -14799,26 +15176,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bbw" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "bbx" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -14831,16 +15188,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) -"bbz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/atrium) "bbE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -16556,19 +16903,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/storage/tools) -"bkt" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "bkx" = ( /obj/structure/table/reinforced, /obj/item/stack/material/plasteel{ @@ -16602,26 +16936,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"bkA" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/machinery/status_display{ - layer = 4; - pixel_x = 32; - pixel_y = 0 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "bkC" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 8 @@ -16636,80 +16950,6 @@ /obj/structure/flora/pottedplant, /turf/simulated/floor/tiled/dark, /area/bridge) -"bkP" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/bridge) -"bkS" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/bridge) -"bld" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "bridge blast"; - name = "Bridge Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/bridge) "bll" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -16873,21 +17113,6 @@ }, /turf/simulated/floor/tiled, /area/storage/tools) -"bng" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/docks) "bnl" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9; @@ -17106,19 +17331,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_one) -"boB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8; - icon_state = "map" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/meter{ - frequency = 1443; - id = "dist_aux_meter"; - name = "Distribution Loop" - }, -/turf/simulated/floor, -/area/hallway/station/docks) "boH" = ( /obj/machinery/computer/transhuman/resleeving{ dir = 8 @@ -21086,18 +21298,6 @@ }, /turf/simulated/floor/carpet, /area/engineering/foyer) -"bYz" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/hallway/station/docks) -"bYC" = ( -/turf/simulated/floor, -/area/hallway/station/docks) -"bYD" = ( -/obj/machinery/door/airlock/multi_tile/glass, -/turf/simulated/floor, -/area/hallway/station/docks) "bYE" = ( /obj/machinery/recharge_station, /turf/simulated/floor/carpet, @@ -21123,13 +21323,6 @@ "bYP" = ( /turf/simulated/wall, /area/vacant/vacant_restaurant_lower) -"bYR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_lower) "bZc" = ( /obj/structure/table/reinforced, /obj/item/stack/rods{ @@ -21393,21 +21586,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/pathfinder_office) -"dvn" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/tether/station/explorer_meeting) "dxX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -21452,21 +21630,6 @@ /obj/machinery/photocopier, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"dYE" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, -/obj/structure/window/reinforced/polarized, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/tether/station/pathfinder_office) "edg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -21512,7 +21675,6 @@ /area/tether/station/explorer_meeting) "eAe" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/structure/closet/secure_closet/pilot, @@ -21608,18 +21770,6 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/tether/station/excursion_dock) -"ggi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/tether/station/explorer_meeting) "gUt" = ( /obj/structure/table/steel, /obj/item/clothing/head/pilot, @@ -21735,28 +21885,6 @@ }, /turf/simulated/floor/carpet, /area/hallway/station/atrium) -"jZN" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "hop_office" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/plating, -/area/tether/station/pathfinder_office) "kZI" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22012,28 +22140,6 @@ }, /turf/simulated/shuttle/plating, /area/shuttle/excursion/tether) -"nYc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "hop_office" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/tether/station/pathfinder_office) "nYp" = ( /obj/effect/floor_decal/industrial/outline/red, /obj/structure/closet/secure_closet/guncabinet/excursion, @@ -22244,24 +22350,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) -"sqC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "hop_office" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/tether/station/pathfinder_office) "sSn" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -22373,22 +22461,6 @@ /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/tether/station/explorer_prep) -"ugj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green, -/obj/structure/window/reinforced/polarized, -/turf/simulated/floor/plating, -/area/tether/station/pathfinder_office) "uoG" = ( /obj/structure/window/reinforced{ dir = 8 @@ -22445,25 +22517,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/station/excursion_dock) -"vEZ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, -/obj/structure/window/reinforced/polarized, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/tether/station/pathfinder_office) "vIv" = ( /obj/structure/table/bench/padded, /obj/item/device/radio/intercom{ @@ -22600,19 +22653,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"wSk" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/station/explorer_meeting) "wZn" = ( /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -27131,7 +27171,7 @@ aks aks aks alx -aoW +abv aoX aqK aqf @@ -27273,7 +27313,7 @@ aks aks aks alw -aoe +abB aoj aqI adS @@ -27415,7 +27455,7 @@ aks aks aks alz -amX +abE aol app aqa @@ -28301,7 +28341,7 @@ bZP bYl bYl bYj -bYz +aeF bZZ bty aBZ @@ -28443,7 +28483,7 @@ bYj bZS bZD bZm -bYz +aeF aAV btu bvu @@ -28585,7 +28625,7 @@ bZz bYl bZD bYj -bYz +aeF aAV btu aBZ @@ -28718,7 +28758,7 @@ aIO aVK alv bYk -bYR +bYl bYj bYj bYj @@ -28819,8 +28859,8 @@ aaa acL acL acL -abs -abE +aar +aaE abW adf adf @@ -28829,7 +28869,7 @@ adf adf alF aiM -ahu +abq aiM aiM aac @@ -28860,7 +28900,7 @@ aIO aVW alv bYm -bbl +acv bYj bZz bYj @@ -28869,7 +28909,7 @@ bYj bYl bYl bZk -bYD +aeI aBi btu aBZ @@ -29002,7 +29042,7 @@ aSB aVP alv bYl -bbd +acM bZk bYl bYl @@ -29011,7 +29051,7 @@ bZQ bYj bYj bYj -bYC +aeR aBi btu aBZ @@ -29144,7 +29184,7 @@ aXX aZn alv bYl -bbq +adp bZm bfF bYj @@ -29247,7 +29287,7 @@ aaz aaX abt abF -abY +aaU afM afL aib @@ -29255,7 +29295,7 @@ afL afi alF ajt -ahw +abs ajt aiM aac @@ -29285,9 +29325,9 @@ aSz alt alt alv -agE -bbn -agE +acs +adR +acs aws aws aws @@ -29428,7 +29468,7 @@ aoI aTE aoJ agR -bbw +adT ajK awp awP @@ -29570,7 +29610,7 @@ aUk bXG atH agQ -bbr +adX bdi bfG bgG @@ -29712,7 +29752,7 @@ bgC bXI aYa agT -bbr +adX bdq bfJ bgJ @@ -29813,8 +29853,8 @@ aac acL acL abf -abv -abL +aaB +aaF acd afP afP @@ -29854,7 +29894,7 @@ aUm aWd aXY aZq -bbz +aec bdn aws bgH @@ -29996,7 +30036,7 @@ bgE bXK aYc agV -aCe +aee bdu aws bgN @@ -30993,10 +31033,10 @@ agZ aim bdL bfQ -bha -bha -bkt -bng +afo +afq +aft +afB bha bha bqf @@ -31117,7 +31157,7 @@ apQ apQ als auz -aDI +aci aLl aET aaV @@ -31136,9 +31176,9 @@ acp bdW arf awZ -awZ -bkA -ayF +afr +afu +afG awZ azR aAo @@ -31235,7 +31275,7 @@ adh acj acj ack -afn +aaY adG ack aJs @@ -31280,7 +31320,7 @@ aaT awu awu awu -ayG +aek awu awu awu @@ -31414,7 +31454,7 @@ aRr aSO aUI aWj -aYs +aco aZP bbE bdZ @@ -31423,7 +31463,7 @@ bhg axD axZ bno -boB +ael bpz bqj awu @@ -31840,14 +31880,14 @@ aeO aeq afC afE -agd +afn ahF aio bed awz axc axc -bkP +afv aZV azm bpD @@ -31989,7 +32029,7 @@ beh awz axc axd -bkS +afw ayK azn azU @@ -32131,7 +32171,7 @@ beg awz axc axc -bkS +afw bcE azo azV @@ -32273,7 +32313,7 @@ beg awz axc axc -bkS +afw bkC azp azU @@ -32415,7 +32455,7 @@ bei awz axc axc -bkS +afw ayN azn azU @@ -32557,7 +32597,7 @@ beg awz axc axc -bkS +afw blS azq azU @@ -32699,7 +32739,7 @@ beg awz axc axc -bkS +afw bkE azr azW @@ -32841,7 +32881,7 @@ beg awz axc axc -bkS +afw ayQ azn azU @@ -32983,7 +33023,7 @@ bed awz axd axc -bld +afx bnB boH bpJ @@ -33102,7 +33142,7 @@ aad aad aad aad -ack +abY aaT aAc acn @@ -33553,7 +33593,7 @@ axg bjo bll ayU -azv +afK azZ bqU bsM @@ -33666,7 +33706,7 @@ aeo aaq aaq aau -afV +afg avK avN aad @@ -33808,7 +33848,7 @@ amF avG adB aaq -afV +afg avK avN aad @@ -33950,7 +33990,7 @@ amF avG adB aaq -afV +afg avK auH aad @@ -34096,7 +34136,7 @@ aap avK auF aad -acm +afl aaT aAp acp @@ -34126,7 +34166,7 @@ bpQ ayX aBt awI -aCr +afV aCY aDz bAz @@ -34802,7 +34842,7 @@ aaD avG tIi aaq -afV +afg avK auQ aad @@ -34944,7 +34984,7 @@ amL aob dbI aaq -afV +afg avK qgR aad @@ -35086,7 +35126,7 @@ aep aeu aev aau -afV +afg avK qgR aad @@ -36075,11 +36115,11 @@ akL bQQ adj amU -jZN +abL dDZ tpZ dDZ -ugj +afb uDP nks uzS @@ -36217,11 +36257,11 @@ akL bQQ adj amU -nYc +aeT ygn fpA pAD -vEZ +aeT uDP mId wrg @@ -36359,11 +36399,11 @@ akL awf adr amW -sqC +aeZ ygn jki qSW -dYE +aeZ uDP nks mtd @@ -37074,12 +37114,12 @@ aac aac aac nYM -dvn -ggi -ggi -ggi -ggi -wSk +afh +afh +afh +afh +afh +afh ash amg amg diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index c2928919a61..ae0daa76b9b 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -1835,15 +1835,12 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "cL" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/random/trash, +/obj/machinery/alarm{ + pixel_y = 22 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "cM" = ( /obj/effect/floor_decal/borderfloor/shifted{ icon_state = "borderfloor_shifted"; @@ -1988,14 +1985,15 @@ /turf/simulated/floor/tiled/dark, /area/security/recstorage) "cW" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "cX" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -2130,16 +2128,11 @@ /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) "dg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/extinguisher_cabinet{ pixel_x = 25; pixel_y = 0 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /turf/simulated/floor/tiled/dark, /area/chapel/chapel_morgue) "dh" = ( @@ -2228,15 +2221,14 @@ /turf/simulated/floor/tiled, /area/security/brig/visitation) "dm" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/dark, +/area/chapel/chapel_morgue) "dn" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -2303,6 +2295,13 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"dr" = ( +/obj/structure/table/steel, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_lower) "ds" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -2611,6 +2610,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/green, /turf/simulated/floor, /area/security/riot_control) +"dS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction/yjunction, +/obj/structure/catwalk, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) "dT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -2659,6 +2677,29 @@ }, /turf/simulated/floor/tiled/dark, /area/security/recstorage) +"dW" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/maintenance/station/eng_upper) +"dX" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/vacant/vacant_restaurant_upper) "dY" = ( /obj/machinery/light{ dir = 8 @@ -2705,6 +2746,83 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"ed" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/vacant/vacant_restaurant_upper) +"ee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"ef" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5; + icon_state = "intact" + }, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"eg" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/vacant/vacant_restaurant_upper) +"eh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/turf/simulated/floor, +/area/bridge/meeting_room) +"ei" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/turf/simulated/floor, +/area/bridge/meeting_room) +"ej" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/dark, +/area/storage/tech) "ek" = ( /obj/structure/cable/pink, /obj/machinery/power/apc{ @@ -2779,11 +2897,49 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"er" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) "es" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) +"et" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"eu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/port) "ev" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2821,6 +2977,22 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"ex" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/door/firedoor/glass/hidden/steel, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "ey" = ( /obj/structure/table/woodentable, /obj/item/device/flashlight/lamp{ @@ -2907,9 +3079,6 @@ }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, -/obj/machinery/alarm{ - pixel_y = 22 - }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "eI" = ( @@ -2919,6 +3088,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"eJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "eK" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -2936,6 +3113,46 @@ /obj/structure/lattice, /turf/space, /area/space) +"eN" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) +"eO" = ( +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/dark, +/area/ai_monitored/storage/eva) +"eP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled, +/area/tether/station/stairs_two) "eQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -2953,6 +3170,17 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"eR" = ( +/obj/effect/floor_decal/techfloor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/bluegrid, +/area/ai_upload) "eS" = ( /obj/effect/floor_decal/industrial/warning/corner{ icon_state = "warningcorner"; @@ -2971,6 +3199,48 @@ }, /turf/simulated/floor/tiled, /area/security/brig) +"eT" = ( +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/bridge/meeting_room) +"eU" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) +"eV" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) +"eW" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) "fc" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3437,13 +3707,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) -"go" = ( -/obj/effect/floor_decal/techfloor, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/bluegrid, -/area/ai_upload) "gp" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -5021,22 +5284,6 @@ "jL" = ( /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) -"jM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction/yjunction, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "jN" = ( /obj/structure/cable/green{ d1 = 4; @@ -5049,19 +5296,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/station/eng_upper) -"jO" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/station/eng_upper) "jP" = ( /obj/structure/cable/green{ d1 = 1; @@ -5340,13 +5574,6 @@ /obj/random/tech_supply, /turf/simulated/floor, /area/vacant/vacant_office) -"kD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/cap/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/vacant/vacant_office) "kF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -6068,13 +6295,6 @@ }, /turf/simulated/floor/tiled/dark, /area/storage/tech) -"mf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/storage/tech) "mg" = ( /obj/structure/cable/green{ d2 = 2; @@ -8444,14 +8664,6 @@ /obj/item/clothing/head/helmet/space/void/security, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"pF" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) "pG" = ( /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) @@ -8694,12 +8906,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/evahallway) -"qb" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "qc" = ( /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) @@ -8745,13 +8951,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) -"qj" = ( -/obj/machinery/light/small{ - dir = 4; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "qk" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -8799,22 +8998,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/hallway/station/port) -"qq" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "qr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -9311,31 +9494,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_restaurant_upper) -"qZ" = ( -/obj/machinery/atmospherics/pipe/cap/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) -"ra" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) "rb" = ( /obj/structure/disposalpipe/broken{ icon_state = "pipe-b"; @@ -9407,27 +9565,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/port) -"rf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/steeldecal/steel_decals5{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "rg" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -9816,20 +9953,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/hallway/station/port) -"rR" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/port) "rS" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -10176,21 +10299,6 @@ }, /turf/simulated/wall, /area/tether/station/stairs_two) -"sy" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "sz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -10428,13 +10536,6 @@ }, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"sV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "sW" = ( /obj/machinery/light/small{ dir = 1 @@ -10792,14 +10893,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"tF" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5; - icon_state = "intact" - }, -/turf/simulated/floor/tiled/dark, -/area/ai_monitored/storage/eva) "tG" = ( /obj/effect/decal/cleanable/dirt, /obj/random/powercell, @@ -12070,12 +12163,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/stairs_two) -"vO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/station/stairs_two) "vP" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -12325,12 +12412,6 @@ "wo" = ( /turf/simulated/wall/r_wall, /area/bridge/meeting_room) -"wp" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/vacant/vacant_restaurant_upper) "wq" = ( /obj/structure/table/rack, /obj/effect/floor_decal/borderfloor{ @@ -12894,7 +12975,6 @@ }, /obj/machinery/camera/network/medbay, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -14515,13 +14595,6 @@ /obj/machinery/door/airlock/maintenance/medical, /turf/simulated/floor, /area/hallway/secondary/escape/medical_escape_pod_hallway) -"zA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/bridge/meeting_room) "zB" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -17117,11 +17190,6 @@ /obj/structure/table/steel, /turf/simulated/floor/tiled/steel_dirty, /area/security/brig) -"GV" = ( -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/vacant/vacant_restaurant_upper) "GW" = ( /obj/structure/table/reinforced, /turf/simulated/floor, @@ -19014,7 +19082,6 @@ /area/security/brig) "Wi" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor, @@ -19409,12 +19476,6 @@ }, /turf/simulated/floor/plating, /area/security/brig) -"YH" = ( -/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor, -/area/vacant/vacant_office) "YK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/structure/disposalpipe/segment, @@ -19452,10 +19513,6 @@ /obj/random/maintenance/engineering, /turf/simulated/floor, /area/chapel/office) -"YW" = ( -/obj/random/trash, -/turf/simulated/floor, -/area/maintenance/station/sec_lower) "Za" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23920,16 +23977,16 @@ at FZ FZ FZ +at +dX +dX pd -pF -pF +dX +dX +dX pd -pF -pF -pF -pd -pF -pF +dX +dX pd aP aa @@ -24062,7 +24119,7 @@ Zr Zr FR DA -pd +at pG pG pG @@ -24204,7 +24261,7 @@ IX Yd Or XM -GV +Ln pG qk pG @@ -24346,7 +24403,7 @@ at JH JH at -pd +at pG qk qk @@ -24358,7 +24415,7 @@ ul qk vm qk -wp +eg aP aP ac @@ -24500,7 +24557,7 @@ pG qk pG pG -wp +eg aP aP aP @@ -24642,7 +24699,7 @@ um qk pG pG -wp +eg aP aP aP @@ -24757,7 +24814,7 @@ ac ac aP at -Mn +dr bf bf RS @@ -24909,7 +24966,7 @@ at aP aP lv -mf +ej mE nu nY @@ -24926,7 +24983,7 @@ qm qm sv tb -wp +eg aP aP aP @@ -25068,7 +25125,7 @@ ta ta tb tb -wp +eg aP aP aP @@ -25169,7 +25226,7 @@ at Fs UV at -YW +cL RS at at @@ -25210,7 +25267,7 @@ tb tb tb tb -wp +eg aP aP aP @@ -25352,7 +25409,7 @@ tb tb tb tb -wp +eg aP aP aP @@ -25627,7 +25684,7 @@ oI kJ pG ql -qZ +qY pG sv tb @@ -25636,7 +25693,7 @@ tb tb tb tb -wp +eg aP aP aP @@ -25769,7 +25826,7 @@ oJ kJ pH qm -ra +ed pG sv tb @@ -25778,7 +25835,7 @@ tb tb tb tb -wp +eg aP aP aP @@ -25920,7 +25977,7 @@ tb tb tb tb -wp +eg aP aP aP @@ -26062,7 +26119,7 @@ tb tb tb tb -wp +eg aP aP aP @@ -26487,7 +26544,7 @@ sw un uP vo -vO +eP sw ac ac @@ -26771,7 +26828,7 @@ te te te vq -vO +eP sw ac ac @@ -27046,9 +27103,9 @@ of oM oM pK -qq -rf -rR +qp +eu +rP sx sw sw @@ -27191,7 +27248,7 @@ pK qp re rS -sy +ex tf tI uo @@ -27333,7 +27390,7 @@ pK UU rg rT -sz +eJ sz sz sz @@ -27475,7 +27532,7 @@ pL qr rh rU -sA +eN sA tJ up @@ -28029,7 +28086,7 @@ ht hV hV aj -jM +dS ki kU lD @@ -28455,7 +28512,7 @@ fd cx fd aj -jO +dW kj kX lG @@ -29148,7 +29205,7 @@ RS at RS RS -bf +cW bf bf RS @@ -30052,11 +30109,11 @@ AN AN Bw yY -cL -cW -cW -cW -dm +eU +eV +eV +eV +eW yY ac ac @@ -31180,7 +31237,7 @@ wo wo wo wo -zA +eh zZ aP AF @@ -31288,7 +31345,7 @@ dE eG fr fV -go +eR dE hk hG @@ -31606,7 +31663,7 @@ wo yi yK wo -zD +ei zZ ac aP @@ -31745,7 +31802,7 @@ wm wO xq wo -yi +eT yK wo zD @@ -32276,8 +32333,8 @@ bz bV cj cF -cF dg +dm dG el bg @@ -32441,10 +32498,10 @@ Tl Uu oY pw -qb +er oY rF -qb +er oY tx ud @@ -32588,7 +32645,7 @@ oY rG qc oY -qc +eO qc qc qc @@ -33426,7 +33483,7 @@ Ll iY js Rl -kD +jx ls ma mB @@ -33854,14 +33911,14 @@ jx kd kG jx -YH +js mA nr nV oF oY pE -qj +et oY rN qc @@ -34007,7 +34064,7 @@ oY oY oY oY -sV +ee oY oY uL @@ -34150,7 +34207,7 @@ ac ac oY sW -tF +ef oY uM oY diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 7ab0ba1786c..fb845bcef7d 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -122,6 +122,14 @@ }, /turf/simulated/floor, /area/security/eva) +"an" = ( +/obj/machinery/door/airlock/maintenance/sec{ + name = "Security Airlock Access"; + req_access = list(1,2,18) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/security/eva) "ao" = ( /turf/simulated/wall/r_wall, /area/security/armory/blue) @@ -1473,6 +1481,20 @@ /obj/structure/closet/bombcloset/double, /turf/simulated/floor/tiled/dark, /area/security/armory/blue) +"cn" = ( +/obj/machinery/door/airlock/engineering{ + name = "Security Substation"; + req_one_access = list(1,11,24) + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/substation/security) "co" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1498,10 +1520,15 @@ }, /area/maintenance/cargo) "cq" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, +/obj/random/trash_pile, +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" + }, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor, -/area/security/breakroom) +/area/maintenance/station/sec_upper) "cr" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -1514,6 +1541,20 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"cs" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/camera/network/command, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor, +/area/maintenance/cargo) "ct" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -1538,6 +1579,12 @@ "cv" = ( /turf/simulated/wall/r_wall, /area/security/range) +"cw" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/security/breakroom) "cx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -1585,15 +1632,17 @@ /turf/simulated/floor, /area/maintenance/cargo) "cB" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/structure/cable/cyan{ + d2 = 2; + icon_state = "0-2" }, -/obj/structure/catwalk, -/obj/machinery/camera/network/command, -/turf/simulated/floor, -/area/maintenance/cargo) +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/turf/simulated/floor/bluegrid, +/area/ai) "cC" = ( /obj/structure/cable{ d1 = 4; @@ -1842,6 +1891,17 @@ }, /turf/simulated/floor/carpet, /area/security/breakroom) +"db" = ( +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ai) "dc" = ( /turf/simulated/floor/plating, /area/maintenance/station/ai) @@ -1849,6 +1909,37 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"de" = ( +/obj/machinery/door/airlock/glass_security{ + name = "Break Room"; + req_one_access = list(1,38) + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/wood, +/area/security/breakroom) +"df" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/ai) "dg" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -1930,6 +2021,36 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"dq" = ( +/obj/machinery/door/airlock/security{ + name = "Security Restroom"; + req_one_access = list(1,38) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/security/security_bathroom) +"dr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/catwalk, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "ds" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -1971,6 +2092,22 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"dx" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/catwalk, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "dy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/catwalk, @@ -2041,17 +2178,42 @@ /turf/simulated/floor, /area/maintenance/cargo) "dG" = ( -/obj/structure/cable/cyan{ +/obj/machinery/door/airlock/vault/bolted{ + req_access = list(53) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; d2 = 2; - icon_state = "0-2" + icon_state = "1-2" }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/bluegrid, -/area/ai) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/blast/regular{ + id = "VaultAc"; + name = "\improper Vault" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/button/remote/blast_door{ + id = "VaultAc"; + name = "Vault Blast Door"; + pixel_x = 0; + pixel_y = -32; + req_access = list(53); + req_one_access = list(53) + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/security/nuke_storage) "dH" = ( /obj/effect/landmark/start{ name = "AI" @@ -2181,6 +2343,25 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"dN" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light/small{ + icon_state = "bulb1"; + dir = 1 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/security/armory/blue) "dO" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -2195,6 +2376,20 @@ "dP" = ( /turf/simulated/wall, /area/security/security_bathroom) +"dQ" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/security/range) "dR" = ( /turf/simulated/wall/r_wall, /area/security/breakroom) @@ -2235,19 +2430,26 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "dX" = ( -/obj/structure/cable/cyan{ +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/techfloor{ - dir = 5 - }, -/obj/effect/floor_decal/techfloor/corner{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/ai) +/turf/simulated/floor/tiled, +/area/security/hallway) "dY" = ( /obj/machinery/door/airlock/hatch{ icon_state = "door_locked"; @@ -2441,6 +2643,21 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) +"eo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "ep" = ( /turf/simulated/wall, /area/security/security_lockerroom) @@ -2519,19 +2736,23 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "ew" = ( -/obj/effect/floor_decal/techfloor{ +/obj/effect/floor_decal/borderfloor{ dir = 8 }, -/obj/effect/floor_decal/techfloor{ - dir = 4 +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, -/obj/structure/cable/cyan{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/ai) +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/security/hallway) "ex" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -2620,6 +2841,27 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/security/observation) +"eE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 5 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/extinguisher_cabinet{ + dir = 8; + icon_state = "extinguisher_closed"; + pixel_x = 30 + }, +/turf/simulated/floor/tiled, +/area/security/hallway) "eF" = ( /obj/structure/cable/green{ d1 = 4; @@ -2673,6 +2915,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"eL" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor, +/area/maintenance/cargo) "eM" = ( /obj/structure/railing{ dir = 4 @@ -2773,7 +3025,6 @@ "eU" = ( /obj/structure/closet/crate, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/item/clothing/accessory/tie/horrible, @@ -2805,6 +3056,9 @@ /obj/random/maintenance/security, /obj/random/maintenance/clean, /obj/random/maintenance/clean, +/obj/structure/railing{ + dir = 8 + }, /turf/simulated/floor, /area/maintenance/station/sec_upper) "eX" = ( @@ -2831,6 +3085,26 @@ /obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/security/briefing_room) +"fa" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "fb" = ( /obj/machinery/light_switch{ dir = 4; @@ -4035,24 +4309,21 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/blue) "he" = ( -/obj/effect/floor_decal/borderfloorblack{ +/obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/light/small{ - icon_state = "bulb1"; +/obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/security/armory/blue) +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 2 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "hf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -4176,6 +4447,18 @@ /obj/random/cigarettes, /turf/simulated/floor, /area/maintenance/station/ai) +"ht" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "hu" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -4384,6 +4667,26 @@ }, /turf/simulated/floor/tiled, /area/security/eva) +"hO" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/quartermaster/foyer) "hP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -4499,14 +4802,16 @@ /turf/simulated/floor/tiled/dark, /area/security/armory/red) "hX" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + icon_state = "map-scrubbers"; + dir = 4 }, -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, -/area/security/range) +/area/hallway/station/upper) "hY" = ( /obj/structure/table/rack{ dir = 8; @@ -4522,12 +4827,24 @@ /turf/simulated/floor/tiled/dark, /area/security/eva) "hZ" = ( -/obj/machinery/door/airlock/maintenance/sec{ - name = "Security Airlock Access"; - req_access = list(1,2,18) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, -/turf/simulated/floor, -/area/security/eva) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "ia" = ( /obj/structure/table/rack{ dir = 1 @@ -4543,7 +4860,6 @@ "ic" = ( /obj/structure/catwalk, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor, @@ -5499,6 +5815,20 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"jm" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/upper) "jn" = ( /obj/machinery/newscaster/security_unit{ pixel_y = 32 @@ -5761,6 +6091,14 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"jJ" = ( +/obj/machinery/door/airlock{ + name = "Secondary Janitorial Closet"; + req_access = list(26) + }, +/obj/machinery/door/firedoor/border_only, +/turf/simulated/floor/tiled, +/area/maintenance/station/cargo) "jK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5801,6 +6139,16 @@ /obj/item/weapon/storage/box/donut, /turf/simulated/floor/carpet, /area/security/breakroom) +"jO" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/obj/machinery/alarm{ + dir = 1; + icon_state = "alarm0"; + pixel_y = -22 + }, +/turf/simulated/floor/tiled, +/area/maintenance/station/cargo) "jP" = ( /obj/structure/table/rack{ dir = 4 @@ -5874,26 +6222,16 @@ /turf/simulated/floor/tiled, /area/security/hallwayaux) "jV" = ( -/obj/machinery/door/airlock/glass_security{ - name = "Break Room"; - req_one_access = list(1,38) +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/alarm{ + dir = 4; + icon_state = "alarm0"; + pixel_x = -22; + pixel_y = 0 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/security/breakroom) +/turf/simulated/floor, +/area/maintenance/station/cargo) "jW" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -6006,6 +6344,22 @@ /obj/structure/sign/warning/secure_area, /turf/simulated/wall/r_wall, /area/security/armory/blue) +"kg" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "kh" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, @@ -6091,6 +6445,46 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/hallwayaux) +"ks" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/catwalk, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 25; + pixel_y = 0 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) +"kt" = ( +/obj/effect/floor_decal/rust, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/random/maintenance/security, +/obj/random/maintenance/security, +/obj/random/maintenance/clean, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) +"ku" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "kv" = ( /obj/structure/cable/green{ d1 = 4; @@ -6236,6 +6630,13 @@ /obj/item/weapon/book/manual/command_guide, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"kJ" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/random/trash_pile, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "kK" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -6358,7 +6759,6 @@ /area/maintenance/station/ai) "kR" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor, @@ -6386,12 +6786,33 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) +"kV" = ( +/obj/structure/railing{ + icon_state = "railing0"; + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "kW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) +"kX" = ( +/obj/structure/railing{ + icon_state = "railing0"; + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet, +/turf/simulated/floor, +/area/maintenance/station/sec_upper) "kY" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 10 @@ -7260,37 +7681,6 @@ /obj/structure/closet/wardrobe/red, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"mE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/security/hallway) -"mF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "mG" = ( /obj/structure/railing{ dir = 8 @@ -7511,50 +7901,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"nm" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled, -/area/security/hallway) -"nn" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/extinguisher_cabinet{ - dir = 8; - icon_state = "extinguisher_closed"; - pixel_x = 30 - }, -/turf/simulated/floor/tiled, -/area/security/hallway) "no" = ( /turf/simulated/wall, /area/security/hallway) @@ -9063,10 +9409,6 @@ "pM" = ( /turf/simulated/floor/tiled, /area/security/security_processing) -"pN" = ( -/obj/structure/closet, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) "pO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9124,13 +9466,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/hallway) -"pS" = ( -/obj/random/trash_pile, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" - }, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) "pT" = ( /obj/structure/railing, /turf/simulated/floor, @@ -10211,19 +10546,6 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/security/hallway) -"rC" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) "rD" = ( /obj/structure/cable/green{ d1 = 4; @@ -11515,7 +11837,6 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals7, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -11580,15 +11901,6 @@ /obj/machinery/vending/snack, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"tt" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor, -/area/maintenance/cargo) "tu" = ( /obj/machinery/conveyor{ dir = 1; @@ -13979,23 +14291,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"xh" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "xi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15210,23 +15505,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"yT" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) "yU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16666,42 +16944,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) -"Bf" = ( -/obj/machinery/door/airlock/vault/bolted{ - req_access = list(53) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/blast/regular{ - id = "VaultAc"; - name = "\improper Vault" - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/button/remote/blast_door{ - id = "VaultAc"; - name = "Vault Blast Door"; - pixel_x = 0; - pixel_y = -32; - req_access = list(53); - req_one_access = list(53) - }, -/turf/simulated/floor/tiled/dark, -/area/security/nuke_storage) "Bg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -17044,16 +17286,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"BB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled, -/area/hallway/station/upper) "BC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -17527,18 +17759,6 @@ }, /turf/simulated/floor/wood, /area/medical/psych) -"Cy" = ( -/obj/machinery/door/airlock{ - name = "Secondary Janitorial Closet"; - req_access = list(26) - }, -/turf/simulated/floor/tiled, -/area/maintenance/station/cargo) -"Cz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/floor_decal/rust, -/turf/simulated/floor/tiled, -/area/maintenance/station/cargo) "CA" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, @@ -26969,14 +27189,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/warden) -"RN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/railing{ - dir = 4 - }, -/obj/random/trash_pile, -/turf/simulated/floor, -/area/maintenance/cargo) "RT" = ( /obj/structure/toilet, /turf/simulated/floor/tiled/white, @@ -27055,16 +27267,6 @@ }, /turf/simulated/floor, /area/security/forensics) -"Tc" = ( -/obj/structure/railing{ - icon_state = "railing0"; - dir = 1 - }, -/obj/structure/railing{ - dir = 4 - }, -/turf/simulated/floor, -/area/maintenance/cargo) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -27294,9 +27496,6 @@ }, /turf/simulated/floor, /area/crew_quarters/heads/hos) -"UM" = ( -/turf/simulated/wall/r_wall, -/area/maintenance/cargo) "UO" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green, @@ -27387,20 +27586,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) -"Vk" = ( -/obj/effect/floor_decal/rust, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/random/maintenance/security, -/obj/random/maintenance/security, -/obj/random/maintenance/clean, -/turf/simulated/floor, -/area/maintenance/cargo) "Vn" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -27478,19 +27663,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai/foyer) -"Wc" = ( -/obj/machinery/door/airlock/engineering{ - name = "Security Substation"; - req_one_access = list(1,11,24) - }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; - pixel_x = 0 - }, -/turf/space, -/area/maintenance/substation/security) "Wj" = ( /obj/structure/grille, /obj/structure/window/reinforced/polarized{ @@ -27548,11 +27720,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai/foyer) -"XP" = ( -/obj/effect/floor_decal/rust, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/cargo) "XT" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -27612,7 +27779,6 @@ "YV" = ( /obj/machinery/computer/secure_data, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/wood, @@ -27624,24 +27790,6 @@ }, /turf/space, /area/space) -"Ze" = ( -/obj/machinery/door/airlock/security{ - name = "Security Restroom"; - req_one_access = list(1,38) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/security/security_bathroom) "ZM" = ( /obj/structure/table/woodentable, /obj/item/device/radio/off, @@ -27651,20 +27799,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/security/eva) -"ZP" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor, -/area/maintenance/station/sec_upper) -"ZT" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/random/trash_pile, -/turf/simulated/floor, -/area/maintenance/cargo) "ZY" = ( /turf/simulated/wall/r_wall, /area/security/security_lockerroom) @@ -32712,7 +32846,7 @@ xx xw zj xw -Bf +dG xw zj xw @@ -32957,7 +33091,7 @@ ab ab ao ao -he +dN hB hT ih @@ -33827,8 +33961,8 @@ fD ga lz mi -mE -nm +dX +ew lz lz lz @@ -33969,8 +34103,8 @@ QW lb lA mj -mF -nn +eo +eE nN nN fe @@ -34652,8 +34786,8 @@ ad aa aa Rg -ae -ae +cv +cv cv cv ai @@ -35515,7 +35649,7 @@ gk gR aw aE -hX +dQ bf ci bO @@ -35946,13 +36080,13 @@ in bt iR YT -cq -cq -cq -jV -cq -cq -cq +cw +cw +cw +de +cw +cw +cw dR le eX @@ -36250,7 +36384,7 @@ eX lC lC mH -rC +dx so tk uf @@ -36944,7 +37078,7 @@ dP dP dP dP -Ze +dq dP dP dP @@ -37381,7 +37515,7 @@ fc fc dw dw -dw +dr mR fc dw @@ -37506,16 +37640,16 @@ hQ bm bm bm -Wc +cn +af +af +af af af af af af af -UM -UM -UM af lL aI @@ -37540,8 +37674,8 @@ xP yG zA Av -BB -Ck +hX +hZ zD AA EX @@ -37645,7 +37779,7 @@ bc gZ ha hw -hZ +an dw fc dA @@ -37655,13 +37789,13 @@ jq qU qU aI -Vk -RN -ZT +kt +ku +kJ +aI +mR +kV aI -XP -Tc -iV aI aI aI @@ -37683,7 +37817,7 @@ yH zB Ay xX -Ck +jm AA Ec EY @@ -37788,23 +37922,23 @@ bc hb hb bc -pS +cq eW -pN -ZP +kg +ks Tp dy dw dw eI -nx -nx -nx -nx -nx -nx -Tc -iV +fc +fc +fc +fc +fc +fc +kX +aI ab ab ab @@ -37939,14 +38073,14 @@ dB aI aI aI -iV -iV -iV -iV -iV -nx -nx -iV +aI +aI +aI +aI +aI +fc +fc +aI ab ab ab @@ -38225,7 +38359,7 @@ ab ab ab ab -ab +iV iV iV mU @@ -38643,7 +38777,7 @@ gK gK gJ iV -cB +cs iV bY bY @@ -38808,7 +38942,7 @@ qp qX rH st -tt +eL up vc vS @@ -38965,7 +39099,7 @@ BH BH Ek Fe -Fe +jV Fe Hr Hr @@ -39103,7 +39237,7 @@ yQ zF AH AH -Cy +jJ AH El Ff @@ -39213,9 +39347,9 @@ gJ bY cF dj -dG -dX -ew +cB +db +df eO fg bY @@ -39239,13 +39373,13 @@ ur ve vU wA -xh +fa xR yQ zG AH BI -Cz +jO AH El Fg @@ -40091,9 +40225,9 @@ uw uw uw qr -xm -ya -yT +he +ht +hO zL AK BN From dace5851132b4701895d4b3d714796402420dab3 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 25 Feb 2019 16:56:07 +1000 Subject: [PATCH 02/14] Removed stray air alarm that was added on accident --- maps/tether/tether-05-station1.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 04112656be4..8fd23beffb7 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -3061,9 +3061,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 22 - }, /turf/simulated/floor/tiled, /area/bridge_hallway) "afL" = ( From 448cb6521f6dd90cb8adc0e1ae1e9f243bea1265 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 25 Feb 2019 17:08:07 +1000 Subject: [PATCH 03/14] Improved window tinting around asteroid --- maps/tether/tether-05-station1.dmm | 45 ++-- maps/tether/tether-07-station3.dmm | 413 +++++++++++++++-------------- 2 files changed, 240 insertions(+), 218 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 8fd23beffb7..9289bdd3a04 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -3177,6 +3177,28 @@ }, /turf/simulated/floor/tiled, /area/bridge_hallway) +"afW" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "ce_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "ce_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/chief) "afX" = ( /obj/structure/cable/green{ d1 = 1; @@ -13853,23 +13875,6 @@ /obj/item/weapon/rig/ce/equipped, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) -"aQc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/turf/simulated/floor, -/area/crew_quarters/heads/chief) "aQh" = ( /obj/structure/cable/green{ d1 = 4; @@ -27187,9 +27192,9 @@ aJn aLt aRb aRb -aQc -aQc -aQc +afW +afW +afW aRb aRb aRb diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index fb845bcef7d..2f08aef1e31 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -6957,6 +6957,36 @@ }, /turf/simulated/floor/tiled, /area/security/briefing_room) +"lj" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "hos_office" + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) "lk" = ( /obj/effect/floor_decal/techfloor{ dir = 8 @@ -7034,6 +7064,69 @@ }, /turf/simulated/floor, /area/maintenance/station/ai) +"lu" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "hos_office" + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) +"lv" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "hos_office" + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "hos_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/hos) +"lw" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "lawyer_blast" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "lawyer_blast" + }, +/turf/simulated/floor, +/area/lawoffice) "lx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/security{ @@ -7327,6 +7420,46 @@ "lY" = ( /turf/space, /area/shuttle/antag_space/north) +"lZ" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "cmooffice_b" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "cmooffice" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) +"ma" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "cmooffice_b" + }, +/obj/structure/window/reinforced/polarized{ + id = "cmooffice" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) +"mb" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "exam_room" + }, +/obj/structure/window/reinforced/polarized{ + id = "exam_room" + }, +/turf/simulated/floor/plating, +/area/medical/exam_room) "mc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -7681,6 +7814,32 @@ /obj/structure/closet/wardrobe/red, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"mE" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pr1_window_tint" + }, +/obj/structure/window/reinforced/polarized{ + id = "pr1_window_tint" + }, +/turf/simulated/floor/plating, +/area/medical/patient_a) +"mF" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pr2_window_tint" + }, +/obj/structure/window/reinforced/polarized{ + id = "pr2_window_tint" + }, +/turf/simulated/floor/plating, +/area/medical/patient_b) "mG" = ( /obj/structure/railing{ dir = 8 @@ -7696,6 +7855,32 @@ "mH" = ( /turf/simulated/wall/r_wall, /area/security/hallway) +"mI" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "pr3_window_tint" + }, +/obj/structure/window/reinforced/polarized{ + id = "pr3_window_tint" + }, +/turf/simulated/floor/plating, +/area/medical/patient_c) +"mJ" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized{ + dir = 10; + icon_state = "fwindow"; + id = "mrecovery-tint" + }, +/obj/structure/window/reinforced/polarized{ + id = "mrecovery-tint" + }, +/turf/simulated/floor/plating, +/area/medical/ward) "mK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -11608,19 +11793,6 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/tiled, /area/security/hallway) -"tc" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/lawoffice) "td" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -24504,19 +24676,6 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/medbay) -"Nw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "cmooffice_b" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) "Nx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -25077,17 +25236,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) -"Ov" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "cmooffice_b" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) "Ow" = ( /obj/structure/sign/nosmoking_1, /turf/simulated/wall, @@ -26809,50 +26957,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) -"QI" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "exam_room" - }, -/turf/simulated/floor/plating, -/area/medical/exam_room) -"QJ" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr1_window_tint" - }, -/turf/simulated/floor/plating, -/area/medical/patient_a) -"QK" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr2_window_tint" - }, -/turf/simulated/floor/plating, -/area/medical/patient_b) -"QL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr3_window_tint" - }, -/turf/simulated/floor/plating, -/area/medical/patient_c) "QM" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -26924,17 +27028,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward) -"QS" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "mrecovery-tint" - }, -/turf/simulated/floor/plating, -/area/medical/ward) "QT" = ( /obj/effect/landmark/map_data/virgo3b, /turf/space, @@ -27467,60 +27560,6 @@ }, /turf/simulated/floor/tiled, /area/security/hallwayaux) -"UH" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/crew_quarters/heads/hos) -"UO" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/crew_quarters/heads/hos) "US" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -27553,28 +27592,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_bathroom) -"Vb" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/crew_quarters/heads/hos) "Ve" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -31689,13 +31706,13 @@ aa ab ab je -UH -UO +lj +lu je je je -UH -Vb +lj +lv qc qv rd @@ -33266,9 +33283,9 @@ sT tP uJ vu -tc -tc -tc +lw +lw +lw vu uO zX @@ -33574,8 +33591,8 @@ Ix Me Me Me -Nw -Nw +lZ +lZ Me aa aa @@ -33718,7 +33735,7 @@ My MN Nx NO -Ov +ma aa aa aa @@ -33860,7 +33877,7 @@ Mz MO Ny NP -Ov +ma aa aa aa @@ -34002,7 +34019,7 @@ MA MP Nz NP -Ov +ma aa aa aa @@ -35714,7 +35731,7 @@ Qk QH QN QP -QS +mJ vt aa aa @@ -35856,7 +35873,7 @@ Ql Pu Pu QQ -QS +mJ vt vt aa @@ -35998,7 +36015,7 @@ Qm Pu Pu QQ -QS +mJ vt vt aa @@ -36140,7 +36157,7 @@ Qn Pu Pu QQ -QS +mJ vt vt vt @@ -36282,7 +36299,7 @@ Qo PP QO QR -QS +mJ vt vt vt @@ -36563,7 +36580,7 @@ OZ Pw PQ Qp -QI +mb vt vt vt @@ -36705,7 +36722,7 @@ Pa Px PR Qq -QI +mb vt vt vt @@ -36847,7 +36864,7 @@ Pb Py PS Qr -QI +mb vt vt vt @@ -36989,7 +37006,7 @@ Pc Pz PT Qs -QI +mb vt vt vt @@ -37273,7 +37290,7 @@ Pe PA PU Qt -QJ +mE vt vt vt @@ -37415,7 +37432,7 @@ Pf PB PV Qu -QJ +mE vt vt vt @@ -37557,7 +37574,7 @@ Pe PC PW Qv -QJ +mE vt vt vt @@ -37841,7 +37858,7 @@ Ph PD PX Qw -QK +mF vt vt vt @@ -37983,7 +38000,7 @@ Pi PE PY Qx -QK +mF vt vt vt @@ -38125,7 +38142,7 @@ Ph PF PZ Qy -QK +mF vt vt vt @@ -38409,7 +38426,7 @@ Pk PG Qa Qz -QL +mI vt vt vt @@ -38551,7 +38568,7 @@ Pl PH Qb QA -QL +mI vt vt vt @@ -38693,7 +38710,7 @@ Pk PI Qc QB -QL +mI vt vt vt From 845c385f8eb7c4c3be2694bcf956d8f4fc93a95d Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 25 Feb 2019 17:17:29 +1000 Subject: [PATCH 04/14] Fixed accidentally deleted floor decal in AI core --- maps/tether/tether-07-station3.dmm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 2f08aef1e31..885f2a6a24f 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1900,6 +1900,9 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, +/obj/effect/floor_decal/techfloor/corner{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "dc" = ( From 6fe87aa907bc4100182b772d34c7ad9a03333154 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Mon, 25 Feb 2019 18:13:31 +1000 Subject: [PATCH 05/14] Tinting in CMO office now adjusted for different buttons I did not realize were there --- maps/tether/tether-07-station3.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 885f2a6a24f..444ac01d5c8 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -7433,7 +7433,7 @@ }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "cmooffice" + id = "cmooffice_b" }, /turf/simulated/floor/plating, /area/crew_quarters/heads/cmo) @@ -7446,7 +7446,7 @@ id = "cmooffice_b" }, /obj/structure/window/reinforced/polarized{ - id = "cmooffice" + id = "cmooffice_b" }, /turf/simulated/floor/plating, /area/crew_quarters/heads/cmo) From 3038be70bec4f03d1709606e77c2bcb8dff94d35 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 26 Feb 2019 13:55:43 +1000 Subject: [PATCH 06/14] Added a missing air alarm to kitchen --- maps/tether/tether-03-surface3.dmm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index fbab58df1b6..7982864b65b 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -10145,6 +10145,11 @@ "rT" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/alarm{ + dir = 8; + icon_state = "alarm0"; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "rU" = ( From 1c7241ac01ef3e742b7e8ff4ff600a2e115d43d2 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Tue, 26 Feb 2019 17:50:13 +1000 Subject: [PATCH 07/14] Adds landmarks for lightsout event --- maps/tether/tether-01-surface1.dmm | 15 +++-- maps/tether/tether-02-surface2.dmm | 37 ++++++------ maps/tether/tether-03-surface3.dmm | 3 + maps/tether/tether-05-station1.dmm | 96 +++++++++++++++++------------- maps/tether/tether-06-station2.dmm | 63 +++++++++++--------- maps/tether/tether-07-station3.dmm | 14 ++++- 6 files changed, 135 insertions(+), 93 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index b5435e37b87..927fe081a64 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -1499,6 +1499,14 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/mining_main/eva) +"acJ" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) "acK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, @@ -7710,11 +7718,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) -"asX" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, -/turf/simulated/floor/tiled, -/area/hallway/lower/first_west) "asY" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -34515,7 +34518,7 @@ ako ako ako ako -asX +acJ atI arG aVu diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index dad0b07c7d7..3b8d905c786 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -8825,6 +8825,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/south) +"rS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/yellow/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable/cyan{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled, +/area/engineering/atmos/hallway) "rT" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -10446,22 +10465,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/atmos/hallway) -"uE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/yellow/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals5, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/engineering/atmos/hallway) "uF" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -28284,7 +28287,7 @@ pn pn pn tg -uE +rS vt tg tg diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7982864b65b..3e70ca73a8c 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -5687,6 +5687,9 @@ dir = 2 }, /obj/machinery/hologram/holopad, +/obj/effect/landmark{ + name = "lightsout" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/atrium_three) "jR" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 9289bdd3a04..1c6b31fbff8 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2637,10 +2637,10 @@ /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "afg" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/item/clothing/under/gladiator, +/obj/item/clothing/head/helmet/gladiator, +/turf/simulated/floor, +/area/tether/station/pathfinder_office) "afh" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -3219,6 +3219,10 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"afY" = ( +/obj/item/weapon/material/twohanded/spear/foam, +/turf/simulated/floor, +/area/tether/station/pathfinder_office) "afZ" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 @@ -3234,10 +3238,28 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"aga" = ( +/obj/item/weapon/storage/fancy/crayons{ + desc = "Special food for special warriors of the expedition force."; + name = "spearman ration" + }, +/turf/simulated/floor, +/area/tether/station/pathfinder_office) "agb" = ( /obj/structure/sign/department/eng, /turf/simulated/wall/r_wall, /area/hallway/station/atrium) +"agc" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) +"agd" = ( +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "age" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -21762,16 +21784,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/explorer_meeting) -"gcH" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/danger{ - dir = 1 - }, -/obj/machinery/meter, -/turf/simulated/floor/tiled, -/area/tether/station/excursion_dock) "gUt" = ( /obj/structure/table/steel, /obj/item/clothing/head/pilot, @@ -33708,7 +33720,7 @@ aeo aaq aaq aau -afg +agc avK avN aad @@ -33850,7 +33862,7 @@ amF avG adB aaq -afg +agc avK avN aad @@ -33992,7 +34004,7 @@ amF avG adB aaq -afg +agc avK auH aad @@ -34422,7 +34434,7 @@ aap avK auK axm -acm +agd abh aAt acp @@ -34703,7 +34715,7 @@ anX afI oVP aap -gcH +avK qgR aad axI @@ -34844,7 +34856,7 @@ aaD avG tIi aaq -afg +agc avK auQ aad @@ -34986,7 +34998,7 @@ amL aob dbI aaq -afg +agc avK qgR aad @@ -35128,7 +35140,7 @@ aep aeu aev aau -afg +agc avK qgR aad @@ -35691,11 +35703,11 @@ aad abV acP aad -aad -aad +hCe +hCe vQL -aad -aad +hCe +hCe aTU lMo nYM @@ -35833,11 +35845,11 @@ dkC acc acQ amU -aiv +hCe xcY afc wZn -nYM +hCe oaO wFb vUO @@ -35975,11 +35987,11 @@ akL oeg acV amU -aiv +hCe adO afe mcB -nYM +hCe fsu sbI sZd @@ -36547,7 +36559,7 @@ hCe pYE dlk ekp -nYM +hCe nma lue hJg @@ -36689,7 +36701,7 @@ hCe hCe hCe hCe -nYM +hCe jDS wLj cNq @@ -36827,11 +36839,11 @@ prz vUd tWI aeB -aiv -aac -aac -aac -nYM +hCe +afg +afY +aga +hCe uDP mFo mFo @@ -36969,11 +36981,11 @@ aiv aiv aiv aiv -aiv -aac -aac -aac -nYM +hCe +hCe +hCe +hCe +hCe qzk dMN mcn diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index ae0daa76b9b..05c55fdd842 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -3213,6 +3213,34 @@ /turf/simulated/floor/tiled, /area/bridge/meeting_room) "eU" = ( +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/machinery/camera/network/medbay{ + dir = 1 + }, +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled/white, +/area/hallway/secondary/escape/medical_escape_pod_hallway) +"eV" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/paper_bin{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/weapon/pen/blue{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/pen, +/obj/item/weapon/pen/red{ + pixel_x = 2; + pixel_y = 2 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/tether/station/public_meeting_room) +"eW" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_l" @@ -3222,7 +3250,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"eV" = ( +"eX" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, @@ -3231,7 +3259,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"eW" = ( +"eY" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_r" @@ -15192,14 +15220,6 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) -"As" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/camera/network/medbay{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/hallway/secondary/escape/medical_escape_pod_hallway) "At" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -17693,17 +17713,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/maintenance/evahallway) -"LT" = ( -/obj/structure/table/wooden_reinforced, -/obj/item/weapon/paper_bin{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/weapon/pen/blue, -/obj/item/weapon/pen, -/obj/item/weapon/pen/red, -/turf/simulated/floor/carpet/bcarpet, -/area/tether/station/public_meeting_room) "LW" = ( /obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, @@ -28103,7 +28112,7 @@ rY KI Ha RJ -LT +eV Pj ev vT @@ -28684,7 +28693,7 @@ xd zj vT Ad -As +eU AH AY Bp @@ -30109,11 +30118,11 @@ AN AN Bw yY -eU -eV -eV -eV eW +eX +eX +eX +eY yY ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 444ac01d5c8..7f3eea911fd 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -7981,6 +7981,18 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/sec_upper) +"mS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 6 + }, +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/tiled, +/area/security/hallwayaux) "mT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/catwalk, @@ -34541,7 +34553,7 @@ cr cR jx cR -iT +mS eD kN kE From 33f3a1a9e83808f4346f39706dd3092f53f5781b Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 1 Mar 2019 14:32:45 +1000 Subject: [PATCH 08/14] Added control panel for turrets in AI foyer --- maps/tether/tether-06-station2.dmm | 45 ++++++++++++--------- maps/tether/tether-07-station3.dmm | 65 +++++++++++++++--------------- 2 files changed, 58 insertions(+), 52 deletions(-) diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 05c55fdd842..9c6ecf3dc14 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -3079,6 +3079,11 @@ }, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/atmospherics/pipe/zpipe/up/supply, +/obj/machinery/turretid/stun{ + control_area = /area/ai/foyer; + name = "AI Core Access turret control"; + pixel_y = 30 + }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) "eI" = ( @@ -3241,6 +3246,20 @@ /turf/simulated/floor/carpet/bcarpet, /area/tether/station/public_meeting_room) "eW" = ( +/obj/machinery/turretid/stun{ + control_area = /area/ai_upload; + name = "AI Upload turret control"; + pixel_x = 0; + pixel_y = 30 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ai_upload_foyer) +"eX" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_l" @@ -3250,7 +3269,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"eX" = ( +"eY" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, @@ -3259,7 +3278,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"eY" = ( +"eZ" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_r" @@ -5525,20 +5544,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor, /area/ai_server_room) -"ks" = ( -/obj/machinery/turretid/stun{ - control_area = "\improper AI Upload Chamber"; - name = "AI Upload turret control"; - pixel_x = 0; - pixel_y = 30 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23; - pixel_y = 0 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ai_upload_foyer) "kt" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -30118,11 +30123,11 @@ AN AN Bw yY -eW -eX -eX eX eY +eY +eY +eZ yY ac ac @@ -31362,7 +31367,7 @@ il iT jp jY -ks +eW ll lQ jY diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 7f3eea911fd..49c2226d549 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2464,32 +2464,10 @@ /turf/simulated/floor/tiled/dark, /area/ai) "dZ" = ( -/obj/machinery/ai_slipper{ - icon_state = "motion0" - }, -/obj/machinery/turretid/stun{ - check_synth = 1; - name = "AI Chamber turret control"; - pixel_x = 30; - pixel_y = 24 - }, -/obj/machinery/flasher{ - id = "AI"; - pixel_x = -24; - pixel_y = 25 - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for the AI core maintenance door."; - id = "AICore"; - name = "AI Maintenance Hatch"; - pixel_x = 8; - pixel_y = -25; - req_access = list(16) - }, -/obj/machinery/light/small, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled/dark, -/area/ai) +/obj/structure/table/steel, +/obj/random/maintenance/clean, +/turf/simulated/floor, +/area/maintenance/station/ai) "ea" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -5481,10 +5459,33 @@ /turf/simulated/floor, /area/maintenance/station/ai) "iK" = ( -/obj/structure/table/steel, -/obj/random/maintenance, -/turf/simulated/floor, -/area/maintenance/station/ai) +/obj/machinery/ai_slipper{ + icon_state = "motion0" + }, +/obj/machinery/turretid/stun{ + check_synth = 1; + control_area = /area/ai; + name = "AI Chamber turret control"; + pixel_x = 30; + pixel_y = 24 + }, +/obj/machinery/flasher{ + id = "AI"; + pixel_x = -24; + pixel_y = 25 + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for the AI core maintenance door."; + id = "AICore"; + name = "AI Maintenance Hatch"; + pixel_x = 8; + pixel_y = -25; + req_access = list(16) + }, +/obj/machinery/light/small, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/dark, +/area/ai) "iL" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 6 @@ -39664,7 +39665,7 @@ bY cH dk dH -dZ +iK dk eQ fi @@ -40937,7 +40938,7 @@ aa aa aa bX -iK +dZ iX ib ib From 5ccb7de9da5e01a30dbaeb2d2c67528f05b56b96 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 1 Mar 2019 14:58:47 +1000 Subject: [PATCH 09/14] Secret wall access to construction area near AI core now --- maps/tether/tether-07-station3.dmm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 49c2226d549..456ba3877ff 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -2615,7 +2615,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/wall, +/turf/simulated/wall{ + can_open = 1 + }, /area/maintenance/station/ai) "en" = ( /obj/machinery/camera/network/security{ From f57d3a83305c87c56849c56f1215f499eac9ebf4 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Fri, 1 Mar 2019 15:16:34 +1000 Subject: [PATCH 10/14] Added additional folders to medical and cargo --- maps/tether/tether-06-station2.dmm | 27 ++-- maps/tether/tether-07-station3.dmm | 234 +++++++++++++++-------------- 2 files changed, 136 insertions(+), 125 deletions(-) diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index 9c6ecf3dc14..ad26839961d 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -3260,6 +3260,14 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) "eX" = ( +/obj/structure/table/steel, +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/item/weapon/folder/white, +/turf/simulated/floor/tiled/techfloor, +/area/medical/morgue) +"eY" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_l" @@ -3269,7 +3277,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"eY" = ( +"eZ" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8 }, @@ -3278,7 +3286,7 @@ /area/shuttle/large_escape_pod1/station{ base_turf = /turf/simulated/mineral/floor/vacuum }) -"eZ" = ( +"fa" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; icon_state = "propulsion_r" @@ -13515,13 +13523,6 @@ /obj/structure/sign/nosmoking_1, /turf/simulated/wall, /area/medical/morgue) -"xX" = ( -/obj/structure/table/steel, -/obj/effect/floor_decal/techfloor{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/medical/morgue) "xY" = ( /obj/structure/bed/chair/office/light{ dir = 8 @@ -29118,7 +29119,7 @@ vV ww xh xx -xX +eX yz uW zl @@ -30123,11 +30124,11 @@ AN AN Bw yY -eX -eY -eY eY eZ +eZ +eZ +fa yY ac ac diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 456ba3877ff..13c615bcbff 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -8019,6 +8019,20 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/cargo) +"mW" = ( +/turf/simulated/wall{ + can_open = 1 + }, +/area/security/brig) +"mX" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/sleeper) "mY" = ( /obj/effect/floor_decal/techfloor{ dir = 10 @@ -8044,6 +8058,32 @@ }, /turf/simulated/floor/bluegrid, /area/ai/foyer) +"nb" = ( +/obj/structure/table/standard, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/item/weapon/folder/yellow, +/obj/item/weapon/stamp/denied{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/weapon/stamp/cargo, +/turf/simulated/floor/tiled, +/area/quartermaster/office) +"nc" = ( +/obj/structure/table/glass, +/obj/item/weapon/folder/white, +/turf/simulated/floor/tiled/white, +/area/medical/reception) "nd" = ( /obj/structure/cable{ d1 = 1; @@ -8062,6 +8102,55 @@ }, /turf/simulated/floor/wood, /area/security/breakroom) +"nf" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/body_record_disk, +/obj/item/weapon/paper{ + desc = ""; + info = "Bodies designed on the design console must be saved to a disk, provided on the front desk counter, then placed into the resleeving console for printing."; + name = "Body Designer Note" + }, +/obj/item/device/sleevemate, +/obj/item/weapon/folder/white, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"ng" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/sleeper) +"nh" = ( +/obj/structure/table/standard, +/obj/item/weapon/hand_labeler, +/obj/item/weapon/stamp{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/weapon/hand_labeler, +/obj/item/weapon/folder/yellow, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "ni" = ( /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, @@ -8639,6 +8728,30 @@ }, /turf/simulated/floor, /area/security/security_processing) +"oh" = ( +/obj/structure/table/glass, +/obj/item/weapon/paper_bin, +/obj/item/weapon/clipboard, +/obj/item/weapon/pen, +/obj/machinery/camera/network/medbay{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/corner/pink/border{ + dir = 5 + }, +/obj/item/weapon/folder/white, +/turf/simulated/floor/tiled/white, +/area/medical/exam_room) "oi" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -12162,26 +12275,6 @@ /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/quartermaster/office) -"tC" = ( -/obj/item/weapon/stamp/denied{ - pixel_x = 4; - pixel_y = -2 - }, -/obj/structure/table/standard, -/obj/item/weapon/stamp/cargo, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/office) "tD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -19999,10 +20092,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) -"Gn" = ( -/obj/structure/table/glass, -/turf/simulated/floor/tiled/white, -/area/medical/reception) "Go" = ( /obj/machinery/door/window/eastleft{ req_one_access = list(5) @@ -20850,23 +20939,6 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/security_starboard) -"HM" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/item/weapon/storage/box/body_record_disk, -/obj/item/weapon/paper{ - desc = ""; - info = "Bodies designed on the design console must be saved to a disk, provided on the front desk counter, then placed into the resleeving console for printing."; - name = "Body Designer Note" - }, -/obj/item/device/sleevemate, -/turf/simulated/floor/tiled/white, -/area/medical/reception) "HN" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -22198,16 +22270,6 @@ /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/quartermaster/warehouse) -"JM" = ( -/obj/structure/table/standard, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/stamp{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/weapon/hand_labeler, -/turf/simulated/floor/tiled, -/area/quartermaster/storage) "JN" = ( /obj/structure/table/standard, /obj/machinery/cell_charger, @@ -22357,15 +22419,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/white, /area/medical/sleeper) -"Ka" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/sleeper) "Kb" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -22708,26 +22761,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"KD" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/medical/sleeper) "KE" = ( /obj/structure/cable/green{ d1 = 2; @@ -25821,29 +25854,6 @@ /obj/item/weapon/cane, /turf/simulated/floor/tiled/white, /area/medical/exam_room) -"Pc" = ( -/obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, -/obj/machinery/camera/network/medbay{ - dir = 8 - }, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/medical/exam_room) "Pd" = ( /turf/simulated/wall, /area/medical/patient_a) @@ -34739,7 +34749,7 @@ Gk Iy Jh JY -KD +ng Le LL Mf @@ -35019,7 +35029,7 @@ EG Fv Gl GU -HM +nf Iy Ji JZ @@ -35123,7 +35133,7 @@ bK cf cT jy -jk +mW jk jk jk @@ -35164,7 +35174,7 @@ GV HN Iy Jj -Ka +mX KG Lh Lh @@ -35266,7 +35276,7 @@ cf cT jy jk -jk +mW jk jk jk @@ -35299,7 +35309,7 @@ Bt Cc Dk EI -Gn +nc Fx GS GW @@ -37020,7 +37030,7 @@ Nk NI Og Ow -Pc +oh Pz PT Qs @@ -40843,7 +40853,7 @@ GK HA Ir IU -JM +nh zO ab ab @@ -41249,7 +41259,7 @@ qu qu rV sH -tC +nb uC vo wb From aee781392d1bf97297d75500d965545a2360b59b Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 2 Mar 2019 14:27:43 +1000 Subject: [PATCH 11/14] Fixes fulltile polarized windows being broken --- maps/tether/tether_things.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index ed292bf4272..ae53f57e6c3 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -1,7 +1,7 @@ /obj/structure/window/reinforced/polarized/full - dir = SOUTHWEST icon_state = "fwindow" maxhealth = 80 + fulltile = TRUE //Special map objects /obj/effect/landmark/map_data/virgo3b From b0c7b2e2a358b332a716195baecc4573fc3b8f1a Mon Sep 17 00:00:00 2001 From: Heroman Date: Sat, 2 Mar 2019 15:48:51 +1000 Subject: [PATCH 12/14] Fixed the fulltile polarized windows on the map --- maps/tether/tether-03-surface3.dmm | 134 ++--- maps/tether/tether-05-station1.dmm | 348 ++++++------ maps/tether/tether-06-station2.dmm | 244 ++++---- maps/tether/tether-07-station3.dmm | 857 ++++++++++++++--------------- maps/tether/tether_things.dm | 5 - 5 files changed, 746 insertions(+), 842 deletions(-) diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 3e70ca73a8c..2ab5d4a415f 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -17765,10 +17765,56 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "EM" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether/surface) +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/polarized/full{ + id = "rd_office" + }, +/turf/simulated/floor/plating, +/area/rnd/rdoffice) +"EN" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/polarized/full{ + id = "rd_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "rd_office" + }, +/turf/simulated/floor/plating, +/area/rnd/rdoffice) +"EO" = ( +/obj/structure/bed/chair/office/light{ + dir = 1 + }, +/obj/machinery/button/windowtint{ + id = "rd_office"; + pixel_x = 24; + pixel_y = 16 + }, +/obj/effect/landmark/start{ + name = "Research Director" + }, +/obj/machinery/button/remote/airlock{ + id = "RDdoor"; + name = "RD Office Door Control"; + pixel_x = 30; + pixel_y = 18 + }, +/turf/simulated/floor/tiled, +/area/rnd/rdoffice) +"EP" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced/polarized/full{ + id = "rd_office" + }, +/obj/structure/window/reinforced/polarized{ + id = "rd_office" + }, +/turf/simulated/floor/plating, +/area/rnd/rdoffice) "EQ" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -17836,6 +17882,11 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/assembly/robotics) +"EV" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether/surface) "EW" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -18435,12 +18486,6 @@ "FN" = ( /turf/simulated/wall, /area/rnd/rdoffice) -"FO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized/full, -/turf/simulated/floor/plating, -/area/rnd/rdoffice) "FP" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -19444,15 +19489,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/lino, /area/tether/surfacebase/bar_backroom) -"Hy" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized{ - dir = 8 - }, -/obj/structure/window/reinforced/polarized/full, -/turf/simulated/floor/plating, -/area/rnd/rdoffice) "Hz" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin{ @@ -19824,25 +19860,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/rdoffice) -"HZ" = ( -/obj/structure/bed/chair/office/light{ - dir = 1 - }, -/obj/machinery/button/windowtint{ - pixel_x = 24; - pixel_y = 16 - }, -/obj/effect/landmark/start{ - name = "Research Director" - }, -/obj/machinery/button/remote/airlock{ - id = "RDdoor"; - name = "RD Office Door Control"; - pixel_x = 30; - pixel_y = 18 - }, -/turf/simulated/floor/tiled, -/area/rnd/rdoffice) "Ia" = ( /obj/structure/table/glass, /obj/machinery/photocopier/faxmachine{ @@ -20350,13 +20367,6 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/shuttle_pad) -"IT" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced/polarized, -/obj/structure/window/reinforced/polarized/full, -/turf/simulated/floor/plating, -/area/rnd/rdoffice) "IU" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -29860,9 +29870,9 @@ Eg FN FN FN -Hy -Hy -Hy +EN +EN +EN FN FN ac @@ -29999,7 +30009,7 @@ yR yR Eb Eg -FO +EM Gw Hi Hz @@ -30141,14 +30151,14 @@ yR CY Ec Eh -FO +EM Gx Hj HA -HZ +EO Ik Iv -IT +EP ac ac ac @@ -30290,7 +30300,7 @@ HB Ia HC Iw -IT +EP ac ac ac @@ -30425,14 +30435,14 @@ yR yR yR EA -FO +EM Gz Hl HC HC HC Ix -IT +EP ac ac ac @@ -30567,7 +30577,7 @@ Cu Du Ee EK -FO +EM GA Hm HD @@ -30712,9 +30722,9 @@ Ei FN FN FN -FO -FO -FO +EM +EM +EM FN FN ac @@ -36262,7 +36272,7 @@ Jr Jv Jz JE -EM +EV JM IY IY @@ -36404,7 +36414,7 @@ Js Js Jz JE -EM +EV JM IY IY @@ -36546,7 +36556,7 @@ Jt Js Jz JE -EM +EV JM IY IY diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 1c6b31fbff8..0871a6ecd4c 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -805,11 +805,6 @@ /area/shuttle/excursion/tether) "abL" = ( /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d2 = 4; @@ -819,6 +814,9 @@ d2 = 2; icon_state = "0-2" }, +/obj/structure/window/reinforced/polarized/full{ + id = "pathfinder_office" + }, /turf/simulated/floor/plating, /area/tether/station/pathfinder_office) "abM" = ( @@ -2465,11 +2463,6 @@ /area/engineering/engine_monitoring) "aeT" = ( /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d2 = 4; @@ -2479,6 +2472,9 @@ d2 = 8; icon_state = "0-8" }, +/obj/structure/window/reinforced/polarized/full{ + id = "pathfinder_office" + }, /turf/simulated/floor/plating, /area/tether/station/pathfinder_office) "aeU" = ( @@ -2529,16 +2525,14 @@ /area/shuttle/excursion/tether) "aeZ" = ( /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" }, +/obj/structure/window/reinforced/polarized/full{ + id = "pathfinder_office" + }, /turf/simulated/floor/plating, /area/tether/station/pathfinder_office) "afa" = ( @@ -2562,17 +2556,15 @@ /area/tether/station/excursion_dock) "afb" = ( /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pathfinder_office" - }, /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ d2 = 4; icon_state = "0-4" }, /obj/structure/cable/green, +/obj/structure/window/reinforced/polarized/full{ + id = "pathfinder_office" + }, /turf/simulated/floor/plating, /area/tether/station/pathfinder_office) "afc" = ( @@ -3178,27 +3170,10 @@ /turf/simulated/floor/tiled, /area/bridge_hallway) "afW" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 1; - icon_state = "pdoor0"; - id = "englockdown"; - name = "Engineering Lockdown"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "ce_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "ce_office" - }, -/turf/simulated/floor, -/area/crew_quarters/heads/chief) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/excursion/tether) "afX" = ( /obj/structure/cable/green{ d1 = 1; @@ -3250,10 +3225,14 @@ /turf/simulated/wall/r_wall, /area/hallway/station/atrium) "agc" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/excursion/tether) +/obj/structure/grille, +/obj/structure/cable/green, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "ce_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/chief) "agd" = ( /obj/effect/landmark{ name = "lightsout" @@ -3313,6 +3292,121 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"agi" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "englockdown"; + name = "Engineering Lockdown"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized/full{ + id = "ce_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "ce_office" + }, +/turf/simulated/floor, +/area/crew_quarters/heads/chief) +"agj" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "hop_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "hop_office" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hop) +"agk" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "hop_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "hop_office" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hop) +"agl" = ( +/obj/structure/grille, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "hop_office" + }, +/obj/structure/window/reinforced/polarized{ + dir = 1; + id = "hop_office" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hop) +"agm" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/window/reinforced/polarized/full{ + id = "hop_office" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hop) +"agn" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/window/reinforced/polarized/full{ + id = "hop_office" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/hop) +"ago" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced/polarized/full{ + id = "library_window_tint" + }, +/turf/simulated/floor/plating, +/area/library) "agx" = ( /obj/structure/bed/chair/comfy/blue{ icon_state = "comfychair_preview"; @@ -13659,17 +13753,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) -"aNg" = ( -/obj/structure/grille, -/obj/structure/cable/green, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "ce_office" - }, -/turf/simulated/floor, -/area/crew_quarters/heads/chief) "aNo" = ( /obj/structure/cable/green{ d1 = 1; @@ -16739,54 +16822,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/bridge_hallway) -"bju" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hop_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "hop_office" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) -"bjz" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hop_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "hop_office" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) "bjC" = ( /obj/structure/table/reinforced, /obj/structure/cable/green{ @@ -16821,24 +16856,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"bjP" = ( -/obj/structure/grille, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hop_office" - }, -/obj/structure/window/reinforced/polarized{ - dir = 1; - id = "hop_office" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) "bjS" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -17413,23 +17430,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"boO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hop_office" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) "boU" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 32; @@ -17661,20 +17661,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"bpO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hop_office" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/hop) "bpQ" = ( /obj/structure/table/reinforced, /obj/item/weapon/paper_bin{ @@ -19410,16 +19396,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/carpet, /area/library) -"bCl" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/border_only, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "library_window_tint" - }, -/turf/simulated/floor/plating, -/area/library) "bDr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -27204,9 +27180,9 @@ aJn aLt aRb aRb -afW -afW -afW +agi +agi +agi aRb aRb aRb @@ -27486,7 +27462,7 @@ aFO aSC bds aLA -aNg +agc aYH aRV bcp @@ -27628,7 +27604,7 @@ aFL aSC aoq aLy -aNg +agc aYF aRX aSe @@ -27770,7 +27746,7 @@ aFO aSC aTK aLG -aNg +agc aYJ baA bcn @@ -27912,7 +27888,7 @@ aQv aSC aTJ aLC -aNg +agc aBg aTm bcr @@ -28196,7 +28172,7 @@ bZt aSC aTL aLH -aNg +agc aRV aQh aRV @@ -33720,7 +33696,7 @@ aeo aaq aaq aau -agc +afW avK avN aad @@ -33749,8 +33725,8 @@ awE awE awI awI -boO -bpO +agm +agn brj awI awI @@ -33862,7 +33838,7 @@ amF avG adB aaq -agc +afW avK avN aad @@ -33888,7 +33864,7 @@ bbT ber awF bhr -bju +agj blr bnL boN @@ -34004,7 +33980,7 @@ amF avG adB aaq -agc +afW avK auH aad @@ -34172,7 +34148,7 @@ acp bez awG axj -bjz +agk ayj ayX azy @@ -34314,7 +34290,7 @@ acp bez awG axj -bjz +agk blF ayX azz @@ -34456,7 +34432,7 @@ acp beE awG axj -bjz +agk ayl ayX azA @@ -34598,7 +34574,7 @@ acp beH awH bmM -bjP +agl aym bnZ boU @@ -34856,7 +34832,7 @@ aaD avG tIi aaq -agc +afW avK auQ aad @@ -34998,7 +34974,7 @@ amL aob dbI aaq -agc +afW avK qgR aad @@ -35140,7 +35116,7 @@ aep aeu aev aau -agc +afW avK qgR aad @@ -36314,9 +36290,9 @@ aAk aAk aAg aAg -bCl +ago bFC -bCl +ago bWN aAg aGL diff --git a/maps/tether/tether-06-station2.dmm b/maps/tether/tether-06-station2.dmm index ad26839961d..b0306f2d6b7 100644 --- a/maps/tether/tether-06-station2.dmm +++ b/maps/tether/tether-06-station2.dmm @@ -3268,34 +3268,50 @@ /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) "eY" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "chapel" }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) +/turf/simulated/floor/plating, +/area/chapel/office) "eZ" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/obj/structure/window/reinforced/polarized/full{ + id = "chapel" }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) +/turf/simulated/floor/plating, +/area/chapel/office) "fa" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_r" +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "interrogation" }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/large_escape_pod1/station{ - base_turf = /turf/simulated/mineral/floor/vacuum - }) +/obj/structure/window/reinforced/tinted{ + dir = 8; + icon_state = "twindow" + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/turf/simulated/floor, +/area/security/interrogation) +"fb" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "interrogation" + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/turf/simulated/floor, +/area/security/interrogation) "fc" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -3321,6 +3337,45 @@ "fd" = ( /turf/simulated/wall/r_wall, /area/security/interrogation) +"fe" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "interrogation" + }, +/obj/structure/window/reinforced/tinted{ + dir = 4; + icon_state = "twindow" + }, +/obj/structure/window/reinforced/tinted, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/turf/simulated/floor, +/area/security/interrogation) +"ff" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/disposalpipe/segment, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/hallway/station/starboard) +"fg" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/hallway/station/starboard) +"fh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) "fi" = ( /obj/machinery/alarm{ dir = 4; @@ -3387,6 +3442,15 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"fq" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) "fr" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/structure/window/reinforced{ @@ -3411,6 +3475,16 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload) +"fu" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/space, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/large_escape_pod1/station{ + base_turf = /turf/simulated/mineral/floor/vacuum + }) "fv" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -3481,16 +3555,6 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/station/sec_lower) -"fO" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "chapel" - }, -/turf/simulated/floor/plating, -/area/chapel/office) "fP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3506,17 +3570,6 @@ }, /turf/simulated/floor/lino, /area/chapel/office) -"fQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "chapel" - }, -/turf/simulated/floor/plating, -/area/chapel/office) "fR" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -4094,24 +4147,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"ha" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "chapel" - }, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 4; - icon_state = "twindow" - }, -/turf/simulated/floor, -/area/security/interrogation) "hc" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -6562,27 +6597,6 @@ /obj/machinery/status_display, /turf/simulated/wall, /area/hallway/station/starboard) -"mz" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" - }, -/turf/simulated/floor/plating, -/area/hallway/station/starboard) -"mA" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" - }, -/turf/simulated/floor/plating, -/area/hallway/station/starboard) "mB" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -17029,24 +17043,6 @@ }, /turf/simulated/floor/airless, /area/maintenance/station/sec_lower) -"Fj" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "chapel" - }, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/obj/structure/window/reinforced/tinted{ - dir = 8; - icon_state = "twindow" - }, -/turf/simulated/floor, -/area/security/interrogation) "Fq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -17979,20 +17975,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_cell_hallway) -"Of" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "chapel" - }, -/obj/structure/window/reinforced/tinted, -/obj/structure/window/reinforced/tinted{ - dir = 1 - }, -/turf/simulated/floor, -/area/security/interrogation) "Oj" = ( /obj/machinery/alarm{ dir = 8; @@ -28664,7 +28646,7 @@ fd Mp Sy Mp -Fj +fa En hY fd @@ -28806,7 +28788,7 @@ fd fK gb gE -Of +fb WL hZ fd @@ -28948,7 +28930,7 @@ fd fL gc Mp -ha +fe hw ia fd @@ -29655,7 +29637,7 @@ dy dY ey iH -fO +eY ge gI hc @@ -29797,7 +29779,7 @@ dz dZ ez fj -fO +eY gf gJ hd @@ -30081,7 +30063,7 @@ dB eb eB fl -fQ +eZ gh gL hf @@ -30124,11 +30106,11 @@ AN AN Bw yY -eY -eZ -eZ -eZ -fa +fh +fq +fq +fq +fu yY ac ac @@ -30223,7 +30205,7 @@ dC ec eC fm -fO +eY gi gM hg @@ -33075,7 +33057,7 @@ js kz js jx -mz +ff nm nP oA @@ -33217,7 +33199,7 @@ jt jx js NJ -mA +fg nn nR oB @@ -33785,7 +33767,7 @@ js kF jx Nh -mA +fg nl nU ot @@ -33927,7 +33909,7 @@ kd kG jx js -mA +fg nr nV oF diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 13c615bcbff..a84b1734e41 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1941,6 +1941,11 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/cable/cyan{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "dg" = ( @@ -6974,11 +6979,6 @@ icon_state = "0-2" }, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, /obj/machinery/door/blast/regular{ density = 0; dir = 1; @@ -6987,6 +6987,9 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, /obj/structure/window/reinforced/polarized{ dir = 8; id = "hos_office" @@ -7074,11 +7077,6 @@ /obj/machinery/door/firedoor/glass, /obj/structure/cable/green, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, /obj/structure/cable/green{ icon_state = "0-4" }, @@ -7090,6 +7088,9 @@ name = "Security Blast Doors"; opacity = 0 }, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" + }, /obj/structure/window/reinforced/polarized{ dir = 8; id = "hos_office" @@ -7098,41 +7099,28 @@ /area/crew_quarters/heads/hos) "lv" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, /obj/machinery/door/blast/regular{ density = 0; - dir = 1; + dir = 4; icon_state = "pdoor0"; - id = "security_lockdown"; + id = "brig_lockdown"; name = "Security Blast Doors"; opacity = 0 }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "hos_office" +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "sec_processing" }, /turf/simulated/floor, -/area/crew_quarters/heads/hos) +/area/security/security_processing) "lw" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "lawyer_blast" +/obj/structure/window/reinforced/polarized/full{ + id = "sec_processing" }, /turf/simulated/floor, -/area/lawoffice) +/area/security/security_processing) "lx" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/security{ @@ -7427,45 +7415,46 @@ /turf/space, /area/shuttle/antag_space/north) "lZ" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "cmooffice_b" +/obj/structure/cable/green, +/obj/structure/grille, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 1; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "cmooffice_b" + id = "hos_office" }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor, +/area/crew_quarters/heads/hos) "ma" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "cmooffice_b" +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, -/obj/structure/window/reinforced/polarized{ - id = "cmooffice_b" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/turf/simulated/floor, +/area/security/breakroom) "mb" = ( /obj/structure/grille, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "exam_room" +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, -/obj/structure/window/reinforced/polarized{ - id = "exam_room" - }, -/turf/simulated/floor/plating, -/area/medical/exam_room) +/turf/simulated/floor, +/area/security/forensics) "mc" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -7822,30 +7811,30 @@ /area/security/security_lockerroom) "mE" = ( /obj/structure/grille, +/obj/structure/cable/green, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr1_window_tint" +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/structure/window/reinforced/polarized{ - id = "pr1_window_tint" +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, -/turf/simulated/floor/plating, -/area/medical/patient_a) +/turf/simulated/floor, +/area/security/forensics) "mF" = ( /obj/structure/grille, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr2_window_tint" +/obj/structure/window/reinforced/polarized/full{ + id = "hos_office" }, -/obj/structure/window/reinforced/polarized{ - id = "pr2_window_tint" - }, -/turf/simulated/floor/plating, -/area/medical/patient_b) +/turf/simulated/floor, +/area/security/forensics) "mG" = ( /obj/structure/railing{ dir = 8 @@ -7862,31 +7851,47 @@ /turf/simulated/wall/r_wall, /area/security/hallway) "mI" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr3_window_tint" +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/structure/window/reinforced/polarized{ - id = "pr3_window_tint" +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 }, -/turf/simulated/floor/plating, -/area/medical/patient_c) +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "iaa-tint" + }, +/turf/simulated/floor, +/area/lawoffice) "mJ" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "mrecovery-tint" +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" }, -/obj/structure/window/reinforced/polarized{ - id = "mrecovery-tint" +/obj/structure/cable/green{ + icon_state = "0-4" }, -/turf/simulated/floor/plating, -/area/medical/ward) +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "iaa-tint" + }, +/turf/simulated/floor, +/area/lawoffice) "mK" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -8193,6 +8198,38 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"nm" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "iaa-tint" + }, +/turf/simulated/floor, +/area/lawoffice) +"nn" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "iaa-tint" + }, +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "iaa-tint" + }, +/turf/simulated/floor, +/area/lawoffice) "no" = ( /turf/simulated/wall, /area/security/hallway) @@ -8635,6 +8672,20 @@ /obj/structure/table/woodentable, /turf/simulated/floor/carpet, /area/security/breakroom) +"nZ" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/flora/pottedplant/stoutbush, +/obj/machinery/button/windowtint{ + id = "iaa-tint"; + pixel_x = 0; + pixel_y = -36 + }, +/obj/machinery/light_switch{ + pixel_x = 0; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/dark, +/area/lawoffice) "oa" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -8712,22 +8763,12 @@ /area/security/security_processing) "og" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "brig_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "sec_processing" +/obj/structure/window/reinforced/polarized/full{ + id = "iaa-tint" }, /turf/simulated/floor, -/area/security/security_processing) +/area/lawoffice) "oh" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, @@ -8851,6 +8892,14 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/cargo) +"oq" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "psych-tint" + }, +/turf/simulated/floor/plating, +/area/medical/psych) "or" = ( /obj/item/weapon/storage/laundry_basket, /turf/simulated/floor, @@ -8869,6 +8918,22 @@ /obj/structure/grille, /turf/space, /area/space) +"ou" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "surgeryobs"; + name = "Operating Theatre Privacy Shutters"; + opacity = 0 + }, +/obj/structure/window/reinforced/polarized/full{ + id = "surgeryobs1" + }, +/turf/simulated/floor/plating, +/area/medical/surgery) "ov" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -9185,6 +9250,14 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) +"oY" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "resleeving-tint" + }, +/turf/simulated/floor/plating, +/area/medical/resleeving) "oZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -9627,6 +9700,17 @@ /obj/random/maintenance/medical, /turf/simulated/floor, /area/maintenance/station/ai) +"pB" = ( +/obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "resleeving-tint" + }, +/turf/simulated/floor/plating, +/area/medical/resleeving) "pC" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -9635,15 +9719,16 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "pD" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/white/border, +/obj/machinery/button/windowtint{ + id = "surgeryobs1"; + pixel_y = -26 }, -/turf/simulated/floor, -/area/security/breakroom) +/obj/item/stack/nanopaste, +/turf/simulated/floor/tiled/white, +/area/medical/surgery) "pE" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -9725,6 +9810,14 @@ "pM" = ( /turf/simulated/floor/tiled, /area/security/security_processing) +"pN" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "surgeryobs2" + }, +/turf/simulated/floor/plating, +/area/medical/surgery2) "pO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9782,6 +9875,14 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/hallway) +"pS" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "cmooffice" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "pT" = ( /obj/structure/railing, /turf/simulated/floor, @@ -10284,15 +10385,17 @@ /turf/simulated/floor/tiled, /area/security/hallway) "qQ" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "sec_processing" +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "cmooffice_b" }, -/turf/simulated/floor, -/area/security/security_processing) +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "cmooffice_b" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "qR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10862,6 +10965,17 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/security/hallway) +"rC" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "cmooffice_b" + }, +/obj/structure/window/reinforced/polarized{ + id = "cmooffice_b" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "rD" = ( /obj/structure/cable/green{ d1 = 4; @@ -11924,6 +12038,14 @@ /obj/machinery/camera/network/security, /turf/simulated/floor/tiled, /area/security/hallway) +"tc" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "mrecovery-tint" + }, +/turf/simulated/floor/plating, +/area/medical/sleeper) "td" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -12204,6 +12326,14 @@ /obj/machinery/vending/snack, /turf/simulated/floor/tiled, /area/hallway/station/upper) +"tt" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "exam_room" + }, +/turf/simulated/floor, +/area/medical/sleeper) "tu" = ( /obj/machinery/conveyor{ dir = 1; @@ -12275,6 +12405,14 @@ /obj/machinery/status_display/supply_display, /turf/simulated/wall, /area/quartermaster/office) +"tC" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "pr1_window_tint" + }, +/turf/simulated/floor, +/area/medical/patient_a) "tD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13028,50 +13166,20 @@ /area/security/detectives_office) "uK" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" +/obj/structure/window/reinforced/polarized/full{ + id = "pr2_window_tint" }, /turf/simulated/floor, -/area/lawoffice) +/area/medical/patient_b) "uL" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" +/obj/structure/window/reinforced/polarized/full{ + id = "pr3_window_tint" }, /turf/simulated/floor, -/area/lawoffice) +/area/medical/patient_c) "uM" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -13106,27 +13214,16 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "uN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "security_lockdown"; - name = "Security Blast Doors"; - opacity = 0 - }, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "exam_room" }, -/turf/simulated/floor, -/area/lawoffice) +/obj/structure/window/reinforced/polarized{ + id = "exam_room" + }, +/turf/simulated/floor/plating, +/area/medical/exam_room) "uO" = ( /turf/simulated/wall/r_wall, /area/lawoffice) @@ -13920,15 +14017,16 @@ /turf/space/cracked_asteroid, /area/mine/explored/upper_level) "wf" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "lawyer_blast" +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "pr1_window_tint" }, -/turf/simulated/floor, -/area/lawoffice) +/obj/structure/window/reinforced/polarized{ + id = "pr1_window_tint" + }, +/turf/simulated/floor/plating, +/area/medical/patient_a) "wg" = ( /obj/effect/floor_decal/spline/plain{ icon_state = "spline_plain"; @@ -15304,19 +15402,16 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "yl" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/flora/pottedplant/stoutbush, -/obj/machinery/button/windowtint{ - id = "lawyer_blast"; - pixel_x = 0; - pixel_y = -36 +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "pr2_window_tint" }, -/obj/machinery/light_switch{ - pixel_x = 0; - pixel_y = -26 +/obj/structure/window/reinforced/polarized{ + id = "pr2_window_tint" }, -/turf/simulated/floor/tiled/dark, -/area/lawoffice) +/turf/simulated/floor/plating, +/area/medical/patient_b) "ym" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15788,6 +15883,17 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"yT" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "mrecovery-tint" + }, +/obj/structure/window/reinforced/polarized{ + id = "mrecovery-tint" + }, +/turf/simulated/floor/plating, +/area/medical/ward) "yU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16962,14 +17068,15 @@ /area/hallway/station/upper) "AA" = ( /obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "psych-tint" - }, /obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "pr3_window_tint" + }, +/obj/structure/window/reinforced/polarized{ + id = "pr3_window_tint" + }, /turf/simulated/floor/plating, -/area/medical/psych) +/area/medical/patient_c) "AB" = ( /obj/structure/table/woodentable, /obj/structure/plushie/ian{ @@ -20606,24 +20713,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) -"Hk" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "surgeryobs"; - name = "Operating Theatre Privacy Shutters"; - opacity = 0 - }, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "surgeryobs" - }, -/turf/simulated/floor/plating, -/area/medical/surgery) "Hl" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/borderfloorwhite{ @@ -21870,16 +21959,6 @@ /obj/item/device/radio/headset, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"Jg" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "resleeving-tint" - }, -/turf/simulated/floor/plating, -/area/medical/resleeving) "Jh" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -22378,19 +22457,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"JX" = ( -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "resleeving-tint" - }, -/turf/simulated/floor/plating, -/area/medical/resleeving) "JY" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -22592,17 +22658,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery) -"Kq" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/white/border, -/obj/machinery/button/windowtint{ - id = "surgeryobs"; - pixel_y = -26 - }, -/obj/item/stack/nanopaste, -/turf/simulated/floor/tiled/white, -/area/medical/surgery) "Kr" = ( /obj/structure/table/standard, /obj/item/weapon/storage/firstaid/surgery, @@ -23244,16 +23299,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) -"Lw" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "surgeryobs2" - }, -/turf/simulated/floor/plating, -/area/medical/surgery2) "Lx" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -24015,16 +24060,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) -"ME" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "cmooffice" - }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) "MF" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -25291,16 +25326,6 @@ /obj/structure/sign/nosmoking_1, /turf/simulated/wall, /area/medical/sleeper) -"Ox" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "mrecovery-tint" - }, -/turf/simulated/floor/plating, -/area/medical/sleeper) "Oy" = ( /obj/structure/cable/green{ d1 = 1; @@ -25327,16 +25352,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/sleeper) -"Oz" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "exam_room" - }, -/turf/simulated/floor, -/area/medical/sleeper) "OA" = ( /obj/structure/cable/green{ d1 = 1; @@ -25857,16 +25872,6 @@ "Pd" = ( /turf/simulated/wall, /area/medical/patient_a) -"Pe" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr1_window_tint" - }, -/turf/simulated/floor, -/area/medical/patient_a) "Pf" = ( /obj/structure/cable/green{ d1 = 1; @@ -25895,16 +25900,6 @@ "Pg" = ( /turf/simulated/wall, /area/medical/patient_b) -"Ph" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr2_window_tint" - }, -/turf/simulated/floor, -/area/medical/patient_b) "Pi" = ( /obj/structure/cable/green{ d1 = 1; @@ -25933,16 +25928,6 @@ "Pj" = ( /turf/simulated/wall, /area/medical/patient_c) -"Pk" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "pr3_window_tint" - }, -/turf/simulated/floor, -/area/medical/patient_c) "Pl" = ( /obj/structure/cable/green{ d1 = 1; @@ -27371,23 +27356,6 @@ }, /turf/simulated/floor/tiled/white, /area/security/security_bathroom) -"Tb" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor, -/area/security/forensics) "Td" = ( /obj/structure/cable/green{ d1 = 1; @@ -27561,20 +27529,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) -"UA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/security/forensics) "UC" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -27708,19 +27662,6 @@ }, /turf/simulated/floor/bluegrid, /area/ai/foyer) -"Wj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized{ - dir = 10; - icon_state = "fwindow"; - id = "hos_office" - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/security/forensics) "WB" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -31740,7 +31681,7 @@ je je je lj -lv +lZ qc qv rd @@ -31883,7 +31824,7 @@ nW TO oW ZM -UA +mb qw re sa @@ -32025,7 +31966,7 @@ nX nX oX Sc -Tb +mE qx rf sb @@ -32167,7 +32108,7 @@ Rq jM kv SP -Wj +mF qy rg sc @@ -32451,7 +32392,7 @@ eH ow Un cZ -UA +mb qz ri sd @@ -32593,7 +32534,7 @@ jM jM pa Sz -Tb +mE qA rj se @@ -32735,7 +32676,7 @@ oa ox ff pC -Wj +mF qB rk sf @@ -32876,7 +32817,7 @@ ZY ZY ZY av -pD +ma qd qC rl @@ -33311,9 +33252,9 @@ sT tP uJ vu -lw -lw -lw +nn +nn +nn vu uO zX @@ -33457,7 +33398,7 @@ wg wg xy yi -wf +og zY Bj Ca @@ -33599,7 +33540,7 @@ wh wh xz yj -wf +og zZ Bk BC @@ -33619,8 +33560,8 @@ Ix Me Me Me -lZ -lZ +qQ +qQ Me aa aa @@ -33741,7 +33682,7 @@ wh wM xA yk -wf +og Aa Bl Ca @@ -33763,7 +33704,7 @@ My MN Nx NO -ma +rC aa aa aa @@ -33882,7 +33823,7 @@ vy wh wh xB -yl +nZ uO Ab Bm @@ -33905,7 +33846,7 @@ Mz MO Ny NP -ma +rC aa aa aa @@ -34019,7 +33960,7 @@ rr sm sV tS -uK +mI vz wh Cu @@ -34047,7 +33988,7 @@ MA MP Nz NP -ma +rC aa aa aa @@ -34161,7 +34102,7 @@ rs lA DO tT -uL +mJ vA wh wh @@ -34309,7 +34250,7 @@ wh wM xE yk -wf +og Ae Bo Ca @@ -34445,13 +34386,13 @@ rt oz sY tV -uN +nm vC wh wh xF yo -wf +og Af Bp Cg @@ -34593,7 +34534,7 @@ wi wN xG yp -wf +og Aa Bq Ch @@ -34605,15 +34546,15 @@ Gk Gk Gk Ix -Jg -JX +oY +pB KC -Jg -Jg +oY +oY Me -ME +pS MT -ME +pS Me Me ab @@ -35003,14 +34944,14 @@ cV jk jk jk -og +lv oB pl pM qh fK rv -qQ +lw qP tX uR @@ -35145,14 +35086,14 @@ jk jk jk jk -og +lv oC pm Rs qi qN rw -qQ +lw pg tY uS @@ -35294,7 +35235,7 @@ DP nu qN rx -qQ +lw td pG mH @@ -35429,7 +35370,7 @@ cS jk jk jk -qQ +lw oE po pO @@ -35571,14 +35512,14 @@ cT jy jk jk -qQ +lw oF pp pP qi mz ry -qQ +lw tZ ua uU @@ -35714,12 +35655,12 @@ mH lD lD of -qQ -qQ -qQ +lw +lw +lw qk -qQ -qQ +lw +lw oA tg ub @@ -35751,7 +35692,7 @@ LO Nb LO NW -Ox +tc OU Pr PL @@ -35759,7 +35700,7 @@ Qk QH QN QP -mJ +yT vt aa aa @@ -35893,7 +35834,7 @@ LP Nc NF NZ -Ox +tc OV Ps PM @@ -35901,7 +35842,7 @@ Ql Pu Pu QQ -mJ +yT vt vt aa @@ -36043,7 +35984,7 @@ Qm Pu Pu QQ -mJ +yT vt vt aa @@ -36177,7 +36118,7 @@ MG Ne KI Ob -Ox +tc OX Pu PO @@ -36185,7 +36126,7 @@ Qn Pu Pu QQ -mJ +yT vt vt vt @@ -36319,7 +36260,7 @@ Jr Nf KI Oc -Ox +tc OY Pv PP @@ -36327,7 +36268,7 @@ Qo PP QO QR -mJ +yT vt vt vt @@ -36603,12 +36544,12 @@ Lp Nh KI Od -Oz +tt OZ Pw PQ Qp -mb +uN vt vt vt @@ -36750,7 +36691,7 @@ Pa Px PR Qq -mb +uN vt vt vt @@ -36887,12 +36828,12 @@ Lp Nj KI Of -Oz +tt Pb Py PS Qr -mb +uN vt vt vt @@ -37034,7 +36975,7 @@ oh Pz PT Qs -mb +uN vt vt vt @@ -37314,11 +37255,11 @@ Nm NK Oi OB -Pe +tC PA PU Qt -mE +wf vt vt vt @@ -37460,7 +37401,7 @@ Pf PB PV Qu -mE +wf vt vt vt @@ -37598,11 +37539,11 @@ No Kn Ok OD -Pe +tC PC PW Qv -mE +wf vt vt vt @@ -37722,21 +37663,21 @@ Av hX hZ zD -AA +oq EX -AA +oq zD -Hk -Hk +ou +ou II -Hk -Hk +ou +ou KU -Lw -Lw +pN +pN Mq -Lw -Lw +pN +pN KV Ol OE @@ -37863,7 +37804,7 @@ zB Ay xX jm -AA +oq Ec EY FN @@ -37882,11 +37823,11 @@ Np KV Om OF -Ph +uK PD PX Qw -mF +yl vt vt vt @@ -38005,7 +37946,7 @@ zC Az BD Cv -AA +oq Ed EZ Ef @@ -38028,7 +37969,7 @@ Pi PE PY Qx -mF +yl vt vt vt @@ -38144,10 +38085,10 @@ xb xR yJ zD -AA +oq BE -AA -AA +oq +oq Ee EZ FO @@ -38156,7 +38097,7 @@ Hn Ig IL JC -Kq +pD KV Lz Ma @@ -38166,11 +38107,11 @@ Nr KV Oo OH -Ph +uK PF PZ Qy -mF +yl vt vt vt @@ -38450,11 +38391,11 @@ Nt KV Oq OF -Pk +uL PG Qa Qz -mI +AA vt vt vt @@ -38596,7 +38537,7 @@ Pl PH Qb QA -mI +AA vt vt vt @@ -38734,11 +38675,11 @@ Mw Mw Os OJ -Pk +uL PI Qc QB -mI +AA vt vt vt diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index ae53f57e6c3..70d18fb4721 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -1,8 +1,3 @@ -/obj/structure/window/reinforced/polarized/full - icon_state = "fwindow" - maxhealth = 80 - fulltile = TRUE - //Special map objects /obj/effect/landmark/map_data/virgo3b height = 7 From b8835fdfca7936aef7973f2bce00629c01a6fe34 Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 3 Mar 2019 06:38:47 +1000 Subject: [PATCH 13/14] Standartizes tint tags + added missing cable --- maps/tether/tether-05-station1.dmm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 0871a6ecd4c..cb3c38bf172 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -3403,10 +3403,19 @@ /obj/structure/grille, /obj/machinery/door/firedoor/border_only, /obj/structure/window/reinforced/polarized/full{ - id = "library_window_tint" + id = "library_study" }, /turf/simulated/floor/plating, /area/library) +"agp" = ( +/obj/machinery/button/windowtint{ + id = "library_study"; + pixel_x = 26; + pixel_y = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet, +/area/library) "agx" = ( /obj/structure/bed/chair/comfy/blue{ icon_state = "comfychair_preview"; @@ -19764,15 +19773,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/bridge_hallway) -"bGj" = ( -/obj/machinery/button/windowtint{ - id = "library_window_tint"; - pixel_x = 26; - pixel_y = -26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet, -/area/library) "bGl" = ( /obj/machinery/firealarm{ dir = 1; @@ -36434,7 +36434,7 @@ aAg bBg aEL aFk -bGj +agp bHr aAg aac From 95ba120aea24f480a697e7a110e002f0920509ba Mon Sep 17 00:00:00 2001 From: Heroman Date: Sun, 3 Mar 2019 06:41:39 +1000 Subject: [PATCH 14/14] Tags and wire on z-7 --- maps/tether/tether-07-station3.dmm | 774 +++++++++++++++-------------- 1 file changed, 399 insertions(+), 375 deletions(-) diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index a84b1734e41..e5890a31886 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -3538,6 +3538,10 @@ pixel_x = 0; pixel_y = 24 }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, /area/security/forensics) "fK" = ( @@ -7865,7 +7869,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ - id = "iaa-tint" + id = "iaa_office" }, /turf/simulated/floor, /area/lawoffice) @@ -7888,7 +7892,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ - id = "iaa-tint" + id = "iaa_office" }, /turf/simulated/floor, /area/lawoffice) @@ -8214,7 +8218,7 @@ }, /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ - id = "iaa-tint" + id = "iaa_office" }, /turf/simulated/floor, /area/lawoffice) @@ -8222,11 +8226,11 @@ /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ - id = "iaa-tint" + id = "iaa_office" }, /obj/structure/window/reinforced/polarized{ dir = 8; - id = "iaa-tint" + id = "iaa_office" }, /turf/simulated/floor, /area/lawoffice) @@ -8676,7 +8680,7 @@ /obj/effect/floor_decal/spline/plain, /obj/structure/flora/pottedplant/stoutbush, /obj/machinery/button/windowtint{ - id = "iaa-tint"; + id = "iaa_office"; pixel_x = 0; pixel_y = -36 }, @@ -8765,7 +8769,7 @@ /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ - id = "iaa-tint" + id = "iaa_office" }, /turf/simulated/floor, /area/lawoffice) @@ -8896,7 +8900,7 @@ /obj/structure/grille, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "psych-tint" + id = "psych_office" }, /turf/simulated/floor/plating, /area/medical/psych) @@ -8919,21 +8923,13 @@ /turf/space, /area/space) "ou" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 8; - icon_state = "shutter0"; - id = "surgeryobs"; - name = "Operating Theatre Privacy Shutters"; - opacity = 0 +/obj/machinery/button/windowtint{ + id = "psych_office"; + pixel_x = 24; + range = 8 }, -/obj/structure/window/reinforced/polarized/full{ - id = "surgeryobs1" - }, -/turf/simulated/floor/plating, -/area/medical/surgery) +/turf/simulated/floor/carpet/blue, +/area/medical/psych) "ov" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -9253,11 +9249,19 @@ "oY" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 8; + icon_state = "shutter0"; + id = "surgeryobs"; + name = "Operating Theatre Privacy Shutters"; + opacity = 0 + }, /obj/structure/window/reinforced/polarized/full{ - id = "resleeving-tint" + id = "surgery_1" }, /turf/simulated/floor/plating, -/area/medical/resleeving) +/area/medical/surgery) "oZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -9702,12 +9706,9 @@ /area/maintenance/station/ai) "pB" = ( /obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "resleeving-tint" + id = "resleeving" }, /turf/simulated/floor/plating, /area/medical/resleeving) @@ -9719,16 +9720,37 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "pD" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/white/border, -/obj/machinery/button/windowtint{ - id = "surgeryobs1"; - pixel_y = -26 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 5 + }, +/obj/machinery/button/windowtint{ + dir = 8; + id = "resleeving"; + pixel_x = 28; + pixel_y = 8 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + dir = 8; + id = "MedicalResleeving"; + name = "Exit Button"; + pixel_x = 28; + pixel_y = -4 }, -/obj/item/stack/nanopaste, /turf/simulated/floor/tiled/white, -/area/medical/surgery) +/area/medical/resleeving) "pE" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, @@ -9812,12 +9834,15 @@ /area/security/security_processing) "pN" = ( /obj/structure/grille, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "surgeryobs2" + id = "resleeving" }, /turf/simulated/floor/plating, -/area/medical/surgery2) +/area/medical/resleeving) "pO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -9876,13 +9901,16 @@ /turf/simulated/floor/tiled, /area/security/hallway) "pS" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "cmooffice" +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/white/border, +/obj/machinery/button/windowtint{ + id = "surgery_1"; + pixel_y = -26 }, -/turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/obj/item/stack/nanopaste, +/turf/simulated/floor/tiled/white, +/area/medical/surgery) "pT" = ( /obj/structure/railing, /turf/simulated/floor, @@ -10388,14 +10416,10 @@ /obj/structure/grille, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "cmooffice_b" - }, -/obj/structure/window/reinforced/polarized{ - dir = 8; - id = "cmooffice_b" + id = "surgery_2" }, /turf/simulated/floor/plating, -/area/crew_quarters/heads/cmo) +/area/medical/surgery2) "qR" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -10969,10 +10993,7 @@ /obj/structure/grille, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "cmooffice_b" - }, -/obj/structure/window/reinforced/polarized{ - id = "cmooffice_b" + id = "cmo_office_int" }, /turf/simulated/floor/plating, /area/crew_quarters/heads/cmo) @@ -12039,13 +12060,42 @@ /turf/simulated/floor/tiled, /area/security/hallway) "tc" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "mrecovery-tint" +/obj/structure/bed/chair/office/light{ + dir = 4 }, -/turf/simulated/floor/plating, -/area/medical/sleeper) +/obj/effect/landmark/start{ + name = "Chief Medical Officer" + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the CMO's office."; + id = "cmodoor"; + name = "CMO Office Door Control"; + pixel_x = -8; + pixel_y = -36 + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "virologyquar"; + name = "Virology Emergency Lockdown Control"; + pixel_x = 0; + pixel_y = -28; + req_access = list(5) + }, +/obj/machinery/button/remote/blast_door{ + desc = "A remote control-switch for shutters."; + id = "medbayquar"; + name = "Medbay Emergency Lockdown Control"; + pixel_x = 0; + pixel_y = -36; + req_access = list(5) + }, +/obj/machinery/button/windowtint{ + id = "cmo_office_int"; + pixel_x = -6; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "td" = ( /obj/effect/floor_decal/borderfloor{ dir = 1; @@ -12406,13 +12456,15 @@ /turf/simulated/wall, /area/quartermaster/office) "tC" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "pr1_window_tint" +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/white/border, +/obj/machinery/button/windowtint{ + id = "surgery_2"; + pixel_y = -26 }, -/turf/simulated/floor, -/area/medical/patient_a) +/turf/simulated/floor/tiled/white, +/area/medical/surgery2) "tD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -13165,21 +13217,37 @@ /turf/simulated/wall/r_wall, /area/security/detectives_office) "uK" = ( -/obj/machinery/door/firedoor/glass, /obj/structure/grille, +/obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "pr2_window_tint" + id = "cmo_office_ext" }, -/turf/simulated/floor, -/area/medical/patient_b) +/obj/structure/window/reinforced/polarized{ + dir = 8; + id = "cmo_office_ext" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "uL" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "pr3_window_tint" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 4 }, -/turf/simulated/floor, -/area/medical/patient_c) +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/window/reinforced/polarized/full{ + id = "patient_room_c" + }, +/obj/structure/window/reinforced/polarized/full{ + id = "sec_processing" + }, +/turf/simulated/floor/tiled/white, +/area/medical/surgery_hallway) "uM" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -14017,16 +14085,19 @@ /turf/space/cracked_asteroid, /area/mine/explored/upper_level) "wf" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "pr1_window_tint" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 10 }, -/obj/structure/window/reinforced/polarized{ - id = "pr1_window_tint" +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/medical/patient_a) +/obj/machinery/button/windowtint{ + id = "cmo_office_ext"; + pixel_x = -20; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/heads/cmo) "wg" = ( /obj/effect/floor_decal/spline/plain{ icon_state = "spline_plain"; @@ -14672,6 +14743,17 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) +"xh" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "cmo_office_ext" + }, +/obj/structure/window/reinforced/polarized{ + id = "cmo_office_ext" + }, +/turf/simulated/floor/plating, +/area/crew_quarters/heads/cmo) "xi" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15405,13 +15487,10 @@ /obj/structure/grille, /obj/machinery/door/firedoor/glass, /obj/structure/window/reinforced/polarized/full{ - id = "pr2_window_tint" - }, -/obj/structure/window/reinforced/polarized{ - id = "pr2_window_tint" + id = "recovery_ward" }, /turf/simulated/floor/plating, -/area/medical/patient_b) +/area/medical/sleeper) "ym" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15884,15 +15963,31 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "yT" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/polarized/full{ - id = "mrecovery-tint" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/structure/window/reinforced/polarized{ - id = "mrecovery-tint" +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + desc = "A remote control switch for the medbay recovery room door."; + id = "MedicalRecovery"; + name = "Exit Button"; + pixel_x = -4; + pixel_y = 26 + }, +/obj/machinery/button/windowtint{ + id = "recovery_ward"; + pixel_x = 6; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, /area/medical/ward) "yU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17067,16 +17162,13 @@ /turf/simulated/floor/tiled, /area/hallway/station/upper) "AA" = ( -/obj/structure/grille, /obj/machinery/door/firedoor/glass, +/obj/structure/grille, /obj/structure/window/reinforced/polarized/full{ - id = "pr3_window_tint" + id = "patient_room_a" }, -/obj/structure/window/reinforced/polarized{ - id = "pr3_window_tint" - }, -/turf/simulated/floor/plating, -/area/medical/patient_c) +/turf/simulated/floor, +/area/medical/patient_a) "AB" = ( /obj/structure/table/woodentable, /obj/structure/plushie/ian{ @@ -17334,6 +17426,14 @@ }, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"Bf" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "patient_room_b" + }, +/turf/simulated/floor, +/area/medical/patient_b) "Bg" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -17676,6 +17776,14 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/upper) +"BB" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/polarized/full{ + id = "patient_room_c" + }, +/turf/simulated/floor, +/area/medical/patient_c) "BC" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -18149,6 +18257,68 @@ }, /turf/simulated/floor/wood, /area/medical/psych) +"Cy" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/pink/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/pink/bordercorner2{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 0; + pixel_y = 36 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_a"; + pixel_y = 26 + }, +/obj/machinery/camera/network/medbay{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/patient_a) +"Cz" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/pink/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/pink/bordercorner2{ + dir = 4 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_b"; + pixel_y = 26 + }, +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 0; + pixel_y = 36 + }, +/obj/machinery/camera/network/medbay{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/patient_b) "CA" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, @@ -19074,13 +19244,36 @@ /turf/simulated/floor/carpet/blue, /area/medical/psych) "Ej" = ( -/obj/machinery/button/windowtint{ - id = "psych-tint"; - pixel_x = 24; - range = 8 +/obj/structure/bed/chair{ + dir = 8 }, -/turf/simulated/floor/carpet/blue, -/area/medical/psych) +/obj/effect/floor_decal/borderfloorwhite{ + dir = 5 + }, +/obj/effect/floor_decal/corner/pink/border{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/pink/bordercorner2{ + dir = 4 + }, +/obj/machinery/button/windowtint{ + id = "patient_room_c"; + pixel_y = 26 + }, +/obj/machinery/light_switch{ + dir = 2; + name = "light switch "; + pixel_x = 0; + pixel_y = 36 + }, +/obj/machinery/camera/network/medbay{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/medical/patient_c) "Ek" = ( /obj/structure/cable{ d1 = 1; @@ -20199,6 +20392,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/reception) +"Gn" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "patient_room_a" + }, +/obj/structure/window/reinforced/polarized{ + id = "patient_room_a" + }, +/turf/simulated/floor/plating, +/area/medical/patient_a) "Go" = ( /obj/machinery/door/window/eastleft{ req_one_access = list(5) @@ -20713,6 +20917,17 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery_hallway) +"Hk" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "patient_room_b" + }, +/obj/structure/window/reinforced/polarized{ + id = "patient_room_b" + }, +/turf/simulated/floor/plating, +/area/medical/patient_b) "Hl" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/borderfloorwhite{ @@ -21028,6 +21243,17 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/security_starboard) +"HM" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "patient_room_c" + }, +/obj/structure/window/reinforced/polarized{ + id = "patient_room_c" + }, +/turf/simulated/floor/plating, +/area/medical/patient_c) "HN" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -21959,6 +22185,17 @@ /obj/item/device/radio/headset, /turf/simulated/floor/tiled/white, /area/medical/resleeving) +"Jg" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced/polarized/full{ + id = "recovery_ward" + }, +/obj/structure/window/reinforced/polarized{ + id = "recovery_ward" + }, +/turf/simulated/floor/plating, +/area/medical/ward) "Jh" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 9 @@ -22425,38 +22662,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/resleeving) -"JW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/obj/machinery/button/windowtint{ - dir = 8; - id = "resleeving-tint"; - pixel_x = 28; - pixel_y = 8 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - dir = 8; - id = "MedicalResleeving"; - name = "Exit Button"; - pixel_x = 28; - pixel_y = -4 - }, -/turf/simulated/floor/tiled/white, -/area/medical/resleeving) "JY" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 @@ -24194,43 +24399,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) -"MO" = ( -/obj/structure/bed/chair/office/light{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Chief Medical Officer" - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the CMO's office."; - id = "cmodoor"; - name = "CMO Office Door Control"; - pixel_x = -8; - pixel_y = -36 - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "virologyquar"; - name = "Virology Emergency Lockdown Control"; - pixel_x = 0; - pixel_y = -28; - req_access = list(5) - }, -/obj/machinery/button/remote/blast_door{ - desc = "A remote control-switch for shutters."; - id = "medbayquar"; - name = "Medbay Emergency Lockdown Control"; - pixel_x = 0; - pixel_y = -36; - req_access = list(5) - }, -/obj/machinery/button/windowtint{ - id = "cmooffice"; - pixel_x = -6; - pixel_y = -28 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) "MP" = ( /obj/structure/table/glass, /obj/item/weapon/paper_bin, @@ -24711,16 +24879,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) -"Nr" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/white/border, -/obj/machinery/button/windowtint{ - id = "surgeryobs2"; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/white, -/area/medical/surgery2) "Ns" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloorwhite, @@ -24917,20 +25075,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/maintenance/station/medbay) -"NO" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 10 - }, -/obj/machinery/button/windowtint{ - id = "cmooffice_b"; - pixel_x = -20; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/heads/cmo) "NP" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -25759,33 +25903,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/medical/ward) -"OX" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 4 - }, -/obj/machinery/button/remote/airlock{ - desc = "A remote control switch for the medbay recovery room door."; - id = "MedicalRecovery"; - name = "Exit Button"; - pixel_x = -4; - pixel_y = 26 - }, -/obj/machinery/button/windowtint{ - id = "mrecovery-tint"; - pixel_x = 6; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/white, -/area/medical/ward) "OY" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/medical, @@ -26162,37 +26279,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_a) -"PC" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/pink/bordercorner2{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 2; - name = "light switch "; - pixel_x = 0; - pixel_y = 36 - }, -/obj/machinery/button/windowtint{ - id = "pr1_window_tint"; - pixel_y = 26 - }, -/obj/machinery/camera/network/medbay{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/medical/patient_a) "PD" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, @@ -26235,37 +26321,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_b) -"PF" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/pink/bordercorner2{ - dir = 4 - }, -/obj/machinery/button/windowtint{ - id = "pr2_window_tint"; - pixel_y = 26 - }, -/obj/machinery/light_switch{ - dir = 2; - name = "light switch "; - pixel_x = 0; - pixel_y = 36 - }, -/obj/machinery/camera/network/medbay{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/medical/patient_b) "PG" = ( /obj/structure/table/glass, /obj/machinery/computer/med_data/laptop, @@ -26308,37 +26363,6 @@ }, /turf/simulated/floor/tiled/white, /area/medical/patient_c) -"PI" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorwhite{ - dir = 5 - }, -/obj/effect/floor_decal/corner/pink/border{ - dir = 5 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/pink/bordercorner2{ - dir = 4 - }, -/obj/machinery/button/windowtint{ - id = "pr3_window_tint"; - pixel_y = 26 - }, -/obj/machinery/light_switch{ - dir = 2; - name = "light switch "; - pixel_x = 0; - pixel_y = 36 - }, -/obj/machinery/camera/network/medbay{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/medical/patient_c) "PJ" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/medical{ @@ -33560,8 +33584,8 @@ Ix Me Me Me -qQ -qQ +uK +uK Me aa aa @@ -33703,8 +33727,8 @@ Me My MN Nx -NO -rC +wf +xh aa aa aa @@ -33843,10 +33867,10 @@ La LG Me Mz -MO +tc Ny NP -rC +xh aa aa aa @@ -33988,7 +34012,7 @@ MA MP Nz NP -rC +xh aa aa aa @@ -34405,7 +34429,7 @@ Df Df Ix Jf -JW +pD KB Ld LK @@ -34546,15 +34570,15 @@ Gk Gk Gk Ix -oY pB +pN KC -oY -oY +pB +pB Me -pS +rC MT -pS +rC Me Me ab @@ -35692,7 +35716,7 @@ LO Nb LO NW -tc +yl OU Pr PL @@ -35700,7 +35724,7 @@ Qk QH QN QP -yT +Jg vt aa aa @@ -35834,7 +35858,7 @@ LP Nc NF NZ -tc +yl OV Ps PM @@ -35842,7 +35866,7 @@ Ql Pu Pu QQ -yT +Jg vt vt aa @@ -35984,7 +36008,7 @@ Qm Pu Pu QQ -yT +Jg vt vt aa @@ -36118,15 +36142,15 @@ MG Ne KI Ob -tc -OX +yl +yT Pu PO Qn Pu Pu QQ -yT +Jg vt vt vt @@ -36260,7 +36284,7 @@ Jr Nf KI Oc -tc +yl OY Pv PP @@ -36268,7 +36292,7 @@ Qo PP QO QR -yT +Jg vt vt vt @@ -37255,11 +37279,11 @@ Nm NK Oi OB -tC +AA PA PU Qt -wf +Gn vt vt vt @@ -37401,7 +37425,7 @@ Pf PB PV Qu -wf +Gn vt vt vt @@ -37536,14 +37560,14 @@ LX IH Jz No -Kn +uL Ok OD -tC -PC +AA +Cy PW Qv -wf +Gn vt vt vt @@ -37667,17 +37691,17 @@ oq EX oq zD -ou -ou +oY +oY II -ou -ou +oY +oY KU -pN -pN +qQ +qQ Mq -pN -pN +qQ +qQ KV Ol OE @@ -37823,11 +37847,11 @@ Np KV Om OF -uK +Bf PD PX Qw -yl +Hk vt vt vt @@ -37969,7 +37993,7 @@ Pi PE PY Qx -yl +Hk vt vt vt @@ -38097,21 +38121,21 @@ Hn Ig IL JC -pD +pS KV Lz Ma Mt Ma -Nr +tC KV Oo OH -uK -PF +Bf +Cz PZ Qy -yl +Hk vt vt vt @@ -38391,11 +38415,11 @@ Nt KV Oq OF -uL +BB PG Qa Qz -AA +HM vt vt vt @@ -38537,7 +38561,7 @@ Pl PH Qb QA -AA +HM vt vt vt @@ -38675,11 +38699,11 @@ Mw Mw Os OJ -uL -PI +BB +Ej Qc QB -AA +HM vt vt vt @@ -38799,7 +38823,7 @@ AF BG Cx Du -Ej +ou Ef FT zD