From 4e6473a5c179b20b544b6ef6aa7bde62b5aa3771 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 19:36:41 +0200 Subject: [PATCH 1/6] removed useless atmos meters, changed opaqueness of doors in engineering --- _maps/map_files/CogStation/CogStation.dmm | 124 +++++++++++----------- 1 file changed, 60 insertions(+), 64 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index dff21990c3..955d468c13 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -19426,9 +19426,9 @@ /turf/open/floor/plasteel, /area/security/office) "aQx" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engineering EVA"; - req_access_txt = "11" +/obj/machinery/door/airlock/engineering/glass{ + req_access_txt = "11"; + name = "Engineering EVA" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -30181,11 +30181,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bnO" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Thermo-Electric Generator"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 @@ -30360,11 +30355,6 @@ /turf/open/floor/plasteel, /area/science/server/compcore) "bog" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Thermo-Electric Generator"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 @@ -35363,10 +35353,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bzr" = ( -/obj/machinery/meter, -/turf/closed/wall, -/area/hallway/primary/aft) "bzs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -36248,10 +36234,7 @@ "bBn" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Thermo-Electric Generator Room"; - req_access_txt = "10" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 + req_access_txt = "11" }, /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/delivery, @@ -37905,9 +37888,9 @@ /turf/open/floor/carpet/green, /area/service/bar) "bES" = ( -/obj/machinery/door/airlock/engineering{ - name = "Hot Loop"; - req_one_access_txt = "10;24" +/obj/machinery/door/airlock/engineering/glass{ + req_access_txt = "11"; + name = "Hot Loop" }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -42468,8 +42451,8 @@ }, /obj/machinery/door/airlock/engineering/glass{ name = "Power Monitoring"; - req_access_txt = "10"; - dir = 4 + dir = 4; + req_one_access_txt = "10;24" }, /turf/open/floor/plasteel, /area/engineering/engine_smes) @@ -43502,9 +43485,9 @@ /area/hallway/primary/central) "bQJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Workshop"; - req_access_txt = "11" + req_one_access_txt = "10;24" }, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -45478,10 +45461,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/machinery/door/airlock/engineering{ - name = "Primary Tool Storage"; - req_access_txt = "11"; - dir = 4 +/obj/machinery/door/airlock/engineering/glass{ + dir = 8; + req_one_access_txt = "10;24"; + name = "Primary Tool Storage" }, /turf/open/floor/plasteel, /area/commons/storage/primary) @@ -48307,7 +48290,8 @@ /area/engineering/atmos) "cao" = ( /obj/machinery/power/compressor{ - dir = 4 + dir = 4; + comp_id = "incineratorturbine" }, /obj/structure/cable{ icon_state = "0-8" @@ -48920,7 +48904,7 @@ /obj/machinery/door/airlock/external{ dir = 4; name = "Atmospherics External Airlock"; - req_access_txt = "24" + req_access_txt = "13;24" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -50810,7 +50794,8 @@ }, /obj/machinery/door/airlock/external/glass{ name = "Mixing Chamber Access"; - req_one_access_txt = "10;24" + req_one_access_txt = "10;24"; + dir = 4 }, /obj/machinery/door/firedoor/heavy, /turf/open/floor/plating, @@ -50848,9 +50833,10 @@ /turf/closed/wall/r_wall, /area/engineering/secure_construction) "cfw" = ( -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Canister Storage"; - req_one_access_txt = "10;24" + req_access_txt = "11"; + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" @@ -51076,10 +51062,10 @@ dir = 4 }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/external{ - dir = 4; +/obj/machinery/door/airlock/external/glass{ + req_access_txt = "24"; name = "Atmospherics External Airlock"; - req_access_txt = "24" + dir = 4 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -53764,9 +53750,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/door/airlock/atmos{ +/obj/machinery/door/airlock/atmos/glass{ name = "Atmospherics Access"; - req_access_txt = "24" + req_access_txt = "24"; + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -54119,7 +54106,8 @@ "cmp" = ( /obj/machinery/door/airlock/engineering{ name = "Gravity Generator"; - req_access_txt = "11" + req_access_txt = "11"; + dir = 4 }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -54477,9 +54465,10 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "cmY" = ( -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ + req_access_txt = "11"; name = "Hot Loop"; - req_one_access_txt = "10;24" + dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 @@ -54550,9 +54539,10 @@ /turf/open/floor/plasteel, /area/cargo/qm) "cnh" = ( -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ + req_access_txt = "11"; name = "Cold Loop"; - req_access_txt = "10" + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" @@ -56204,7 +56194,7 @@ }, /obj/machinery/door/airlock/engineering{ name = "Warehouse"; - req_one_access_txt = "10;24"; + req_one_access_txt = "11;24"; dir = 4 }, /turf/open/floor/plasteel, @@ -57342,10 +57332,10 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Cold Loop"; - req_access_txt = "10"; - dir = 8 + dir = 4; + req_one_access_txt = "11;24" }, /turf/open/floor/plasteel, /area/engineering/teg/coldloop) @@ -66137,9 +66127,10 @@ /turf/open/floor/plasteel, /area/engineering/workshop) "cIs" = ( -/obj/machinery/door/airlock/atmos{ +/obj/machinery/door/airlock/atmos/glass{ + req_access_txt = "24"; name = "Atmospherics"; - req_access_txt = "24" + dir = 4 }, /obj/structure/cable{ icon_state = "4-8" @@ -66656,7 +66647,7 @@ /obj/machinery/door/airlock/external{ dir = 4; name = "Atmospherics External Airlock"; - req_access_txt = "24" + req_access_txt = "13;24" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -66796,8 +66787,9 @@ /turf/open/floor/plasteel/dark, /area/science/observatory) "cJC" = ( -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Gravity Generator"; + dir = 4; req_access_txt = "11" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -67204,7 +67196,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering/glass{ name = "Canister Storage"; - req_access_txt = "10" + req_one_access_txt = "11;24" }, /obj/structure/cable{ icon_state = "1-2" @@ -68043,6 +68035,10 @@ pixel_x = -24; pixel_y = -9 }, +/obj/machinery/computer/turbine_computer{ + dir = 4; + id = "incineratorturbine" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cMw" = ( @@ -68508,9 +68504,9 @@ /area/engineering/workshop) "cNu" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ +/obj/machinery/door/airlock/engineering/glass{ name = "Engineering Workshop"; - req_access_txt = "11" + req_one_access_txt = "10;24" }, /obj/structure/cable{ icon_state = "1-2" @@ -69484,8 +69480,8 @@ /area/cargo/sorting) "cPI" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Access"; req_one_access_txt = "10;24" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -69494,8 +69490,8 @@ /area/engineering/break_room) "cPJ" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Access"; req_one_access_txt = "10;24" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -110350,7 +110346,7 @@ bhT cMG cVq fui -bzr +bbh bcT bcT bcT @@ -111378,7 +111374,7 @@ bhT cIW cIZ cym -bzr +bbh bcT bcT bcT From 10b573f2c9737e5c3f139576ad7ffb82c6a0783f Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 19:47:33 +0200 Subject: [PATCH 2/6] set up atmos consoles and turbine SMES --- _maps/map_files/CogStation/CogStation.dmm | 226 +++++++++++++--------- 1 file changed, 136 insertions(+), 90 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 955d468c13..ff29e12e7d 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -29489,7 +29489,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/brown/visible, +/obj/machinery/atmospherics/pipe/manifold/brown/visible{ + dir = 4 + }, /turf/open/space/basic, /area/space/nearstation) "bmA" = ( @@ -35353,6 +35355,28 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"bzr" = ( +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -24; + pixel_y = 8 + }, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -40; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_x = -24; + pixel_y = -9 + }, +/obj/machinery/computer/turbine_computer{ + dir = 4; + id = "incineratorturbine" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "bzs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -48262,20 +48286,44 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cak" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ + pixel_x = -25; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/floor/plasteel, /area/engineering/atmos) "cal" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 }, +/obj/machinery/computer/atmos_control/tank/carbon_tank, /turf/open/floor/plasteel/dark/side{ dir = 1 }, /area/engineering/atmos) "cam" = ( -/obj/machinery/door/poddoor/incinerator_atmos_main{ - dir = 4 +/obj/machinery/power/compressor{ + dir = 4; + comp_id = "incineratorturbine" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" }, /turf/open/floor/engine/vacuum, /area/engineering/atmos) @@ -48289,17 +48337,10 @@ /turf/open/floor/engine/vacuum, /area/engineering/atmos) "cao" = ( -/obj/machinery/power/compressor{ - dir = 4; - comp_id = "incineratorturbine" - }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/plasteel, /area/engineering/atmos) "cap" = ( /obj/structure/cable{ @@ -51687,23 +51728,23 @@ /turf/open/floor/plasteel, /area/science/research) "chn" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold4w/orange/visible, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cho" = ( /turf/closed/wall/r_wall/rust, /area/maintenance/department/eva) "chp" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/atmos) "chq" = ( @@ -51756,9 +51797,6 @@ /turf/open/floor/plating, /area/maintenance/disposal) "chx" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -51861,16 +51899,16 @@ /turf/open/floor/plating, /area/engineering/teg/coldloop) "chL" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/closed/wall/r_wall, +/area/space) "chM" = ( -/obj/structure/cable{ - icon_state = "1-8" +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engineering/atmos) "chN" = ( @@ -67495,6 +67533,7 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/machinery/computer/atmos_control/tank/nitrous_tank, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -67532,6 +67571,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/computer/atmos_control/tank/toxin_tank, /turf/open/floor/plasteel, /area/engineering/atmos) "cLj" = ( @@ -67592,6 +67632,9 @@ }, /obj/effect/turf_decal/tile/red, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/obj/machinery/computer/atmos_control/tank/nitrogen_tank{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cLq" = ( @@ -68020,25 +68063,9 @@ /turf/open/floor/engine/vacuum, /area/engineering/atmos) "cMv" = ( -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -24; - pixel_y = 8 - }, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = -40; - pixel_y = 8 - }, /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = -24; - pixel_y = -9 - }, -/obj/machinery/computer/turbine_computer{ - dir = 4; - id = "incineratorturbine" - }, /turf/open/floor/plasteel, /area/engineering/atmos) "cMw" = ( @@ -68093,6 +68120,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, +/obj/machinery/computer/atmos_control/tank/oxygen_tank{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engineering/atmos) "cMB" = ( @@ -68136,6 +68166,9 @@ /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 9 }, +/obj/machinery/computer/atmos_control/tank/air_tank{ + dir = 1 + }, /turf/open/floor/plasteel/white/corner, /area/engineering/atmos) "cMF" = ( @@ -70673,10 +70706,6 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ - pixel_x = -25; - pixel_y = 7 - }, /turf/open/floor/plasteel, /area/engineering/atmos) "eEW" = ( @@ -70788,6 +70817,7 @@ /obj/machinery/atmospherics/pipe/manifold/brown/visible{ dir = 4 }, +/obj/machinery/computer/atmos_control/tank/mix_tank, /turf/open/floor/plasteel, /area/engineering/atmos) "eUF" = ( @@ -70877,6 +70907,10 @@ /obj/effect/turf_decal/tile/bar, /turf/open/floor/mineral/basaltstone_floor, /area/service/bar) +"fVM" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/space) "fWP" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/turf_decal/tile/bar{ @@ -71563,6 +71597,16 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) +"lVt" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) "lXh" = ( /obj/effect/turf_decal/loading_area{ dir = 8; @@ -71799,9 +71843,7 @@ /area/service/library) "ony" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/manifold/brown/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/layer_manifold, /turf/open/floor/plating, /area/engineering/atmos) "opd" = ( @@ -72018,9 +72060,7 @@ /area/commons/fitness) "qHL" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/brown/visible{ - dir = 6 - }, +/obj/machinery/atmospherics/pipe/simple/brown/visible, /turf/open/floor/plating, /area/engineering/atmos) "qMN" = ( @@ -72099,6 +72139,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"rsn" = ( +/obj/machinery/door/poddoor/incinerator_atmos_main{ + dir = 4 + }, +/turf/open/floor/engine/vacuum, +/area/space) "rso" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral, @@ -119060,9 +119106,9 @@ cww cbN cww aaU -aaa -aaa -aaa +fVM +rsn +fVM aaa anr aaa @@ -119317,9 +119363,9 @@ cww cge cww aaU -cak -cam -cak +cww +can +cww aaa anr aaa @@ -119575,9 +119621,9 @@ cbT cww cww cww -can +cam cww -aaa +chL anr aaa aaU @@ -119831,10 +119877,10 @@ bVX eKM bZQ cww -cww -cao -cww -cww +cLY +cap +cMt +cau anr aaa aaU @@ -120088,10 +120134,10 @@ bWG cRg cmL cww -cLY -cap -cMt -cau +cMb +caq +cMb +cww anr aaa aaU @@ -120344,11 +120390,11 @@ cpO bYP cMI cMH -cww -cMb -caq -cMb -cww +cLX +cMa +cMj +cMu +jiZ anr aaa aaU @@ -120601,11 +120647,11 @@ cLm cIs tyI cww -cLX -cMa -cMj -cMu -jiZ +cLm +cMb +cas +cMb +cMJ anr aaU aaU @@ -120858,10 +120904,10 @@ cpQ cfM cbU cww -cLm -cMb -cas -cMb +chM +cak +cao +bzr cMJ anr aaa @@ -121117,7 +121163,7 @@ mEa cLV chn eCy -chL +cwB cMv cMJ anr @@ -121374,7 +121420,7 @@ cgg cgx chp chx -chM +chx gDY mqE anr @@ -121622,7 +121668,7 @@ bRK bca bZI bZR -bfW +lVt qHL eTZ vcb From ba377490a8f3200e5c4405cba4b9b2503fadde89 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 20:04:59 +0200 Subject: [PATCH 3/6] fixed console and airlock layout in engineering, cleaned up the TEG room and piping --- _maps/map_files/CogStation/CogStation.dmm | 722 +++++++++------------- 1 file changed, 294 insertions(+), 428 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index ff29e12e7d..a31bfa26a2 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -19519,7 +19519,6 @@ /turf/open/floor/plasteel, /area/security/brig) "aQI" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/machinery/light_switch{ pixel_x = -24 @@ -19575,7 +19574,6 @@ /turf/open/floor/plasteel, /area/engineering/main) "aQQ" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /obj/machinery/meter, /turf/open/floor/plasteel, @@ -19584,7 +19582,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aQS" = ( /obj/effect/turf_decal/tile/neutral, @@ -19602,7 +19600,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aQU" = ( /obj/machinery/light_switch{ @@ -19631,7 +19629,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aQY" = ( /obj/structure/window/plasma/reinforced{ @@ -19691,7 +19689,10 @@ dir = 4; name = "gas to sauna" }, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/engineering/main) "aRd" = ( /obj/machinery/light, @@ -19808,12 +19809,11 @@ /turf/open/floor/plasteel/dark, /area/command/heads_quarters/hop) "aRp" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, /obj/machinery/meter, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aRq" = ( /obj/structure/grille, @@ -19826,7 +19826,6 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "aRr" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/main) @@ -19937,7 +19936,6 @@ /turf/closed/wall/r_wall, /area/engineering/substation) "aRG" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, /area/engineering/main) @@ -19957,10 +19955,6 @@ /obj/item/crowbar, /turf/open/floor/plating, /area/maintenance/port/central) -"aRJ" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/engineering/main) "aRK" = ( /obj/structure/sign/departments/holy{ pixel_y = -32 @@ -20049,7 +20043,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aRS" = ( /obj/effect/turf_decal/tile/neutral, @@ -20088,7 +20082,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aRW" = ( /turf/open/floor/plating, @@ -20122,7 +20116,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSc" = ( /obj/structure/disposalpipe/segment, @@ -20166,7 +20160,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSg" = ( /obj/machinery/power/apc{ @@ -20250,7 +20244,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSs" = ( /obj/machinery/light{ @@ -20310,7 +20304,7 @@ dir = 4; name = "hot loop to space" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSA" = ( /obj/structure/cable{ @@ -20356,29 +20350,24 @@ /turf/open/floor/mineral/basaltstone_floor, /area/service/bar) "aSE" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSF" = ( /turf/open/floor/engine, /area/engineering/secure_construction) "aSG" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, -/obj/machinery/light/small, /turf/open/floor/plasteel, /area/engineering/main) "aSH" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, -/obj/machinery/light/small, /turf/open/floor/plasteel, /area/engineering/main) "aSI" = ( @@ -20406,18 +20395,31 @@ /turf/open/floor/plasteel, /area/security/office) "aSK" = ( -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ + pixel_x = -25; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/turf/open/floor/plating, -/area/engineering/main) +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "aSL" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4; name = "cold loop to space" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSM" = ( /obj/structure/lattice/catwalk, @@ -20484,7 +20486,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aSU" = ( /obj/structure/reagent_dispensers/beerkeg, @@ -20567,7 +20569,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aTd" = ( /obj/structure/sign/warning{ @@ -20611,17 +20613,16 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aTj" = ( -/obj/machinery/light/small, /obj/structure/cable{ icon_state = "1-8" }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aTk" = ( /obj/structure/lattice/catwalk, @@ -20802,15 +20803,13 @@ }, /area/service/chapel/main) "aTC" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/machinery/light/small, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aTD" = ( /obj/effect/turf_decal/bot, @@ -20933,7 +20932,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aTR" = ( /obj/structure/table, @@ -20984,7 +20983,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/engineering/main) "aTX" = ( /obj/machinery/light{ @@ -21052,10 +21054,10 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aUf" = ( -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aUg" = ( /obj/structure/disposalpipe/segment, @@ -21142,11 +21144,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aUs" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, @@ -21159,7 +21157,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aUu" = ( /obj/effect/turf_decal/stripes/line{ @@ -21394,7 +21392,11 @@ icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/turf/open/floor/plasteel, /area/engineering/main) "aUV" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -21409,7 +21411,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aUX" = ( /obj/machinery/portable_atmospherics/scrubber, @@ -21658,7 +21660,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aVC" = ( /obj/structure/cable{ @@ -22318,7 +22320,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aWY" = ( /obj/effect/turf_decal/tile/red, @@ -22563,11 +22565,15 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "aXF" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ - name = "gas to hot loop" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/engineering/teg/hotloop) +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/workshop) "aXG" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/blue, @@ -22642,7 +22648,7 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "aXQ" = ( /obj/effect/spawner/structure/window/reinforced, @@ -23070,7 +23076,7 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "aYN" = ( /obj/effect/turf_decal/tile/yellow{ @@ -23191,7 +23197,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/engineering/main) "aZb" = ( /obj/structure/closet, @@ -24451,16 +24460,22 @@ icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plating, +/obj/structure/table/reinforced, +/obj/item/t_scanner, +/obj/item/analyzer, +/obj/item/radio/intercom{ + dir = 8; + name = "Station Intercom (Common)"; + pixel_x = 28 + }, +/turf/open/floor/plasteel, /area/engineering/main) "bbC" = ( /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 10 - }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plasteel, /area/engineering/main) "bbD" = ( /obj/structure/cable{ @@ -24805,22 +24820,11 @@ }, /turf/open/floor/plasteel/dark, /area/security/courtroom/jury) -"bcu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/item/radio/intercom{ - dir = 8; - name = "Station Intercom (Common)"; - pixel_x = 28 - }, -/turf/open/floor/engine, -/area/engineering/teg) "bcv" = ( /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bcw" = ( /obj/effect/spawner/structure/window/reinforced, @@ -24882,17 +24886,28 @@ /area/engineering/teg) "bcE" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plating, +/obj/machinery/power/apc{ + areastring = "/area/engineering/teg"; + dir = 4; + name = "Thermo-Electric Generator APC"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/table/reinforced, +/obj/item/radio, +/obj/item/grenade/chem_grenade/smart_metal_foam{ + pixel_x = 4 + }, +/turf/open/floor/plasteel, /area/engineering/main) "bcF" = ( -/obj/machinery/light/small{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bcG" = ( /obj/structure/lattice/catwalk, @@ -25309,13 +25324,16 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bdE" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, -/turf/open/floor/plating, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, +/turf/open/floor/plasteel, /area/engineering/main) "bdF" = ( /obj/effect/turf_decal/tile/purple{ @@ -25424,7 +25442,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/engineering/main) "bdP" = ( /obj/structure/cable{ @@ -25479,21 +25500,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/cargo/office) -"bdW" = ( -/obj/structure/table/reinforced, -/obj/item/analyzer, -/obj/item/t_scanner, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - areastring = "/area/engineering/teg"; - dir = 4; - name = "Thermo-Electric Generator APC"; - pixel_x = 24 - }, -/turf/open/floor/engine, -/area/engineering/teg) "bdX" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets, @@ -25626,14 +25632,6 @@ /obj/item/reagent_containers/food/snacks/muffin/berry, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) -"beq" = ( -/obj/structure/table/reinforced, -/obj/item/grenade/chem_grenade/smart_metal_foam{ - pixel_x = 4 - }, -/obj/item/radio, -/turf/open/floor/engine, -/area/engineering/teg) "ber" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, @@ -25664,10 +25662,10 @@ dir = 8; pixel_x = 26 }, -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/junction/yjunction{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bew" = ( /obj/structure/cable{ @@ -26234,18 +26232,21 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/office) "bfI" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/machinery/power/compressor{ + dir = 4; + comp_id = "incineratorturbine" }, -/turf/open/floor/engine, -/area/engineering/teg) +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/vacuum, +/area/engineering/atmos) "bfJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engineering/teg) +/turf/closed/wall/r_wall, +/area/space) "bfK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ @@ -26278,7 +26279,6 @@ }, /area/service/chapel/office) "bfM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/table, /obj/machinery/light_switch{ pixel_x = 24 @@ -26767,7 +26767,7 @@ /obj/machinery/atmospherics/components/binary/pump/on{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bgK" = ( /obj/effect/decal/cleanable/dirt, @@ -26830,7 +26830,7 @@ /obj/machinery/atmospherics/components/binary/pump{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bgS" = ( /obj/effect/turf_decal/tile/brown{ @@ -26933,7 +26933,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bhh" = ( /obj/machinery/status_display, @@ -27920,7 +27920,7 @@ /obj/structure/cable{ icon_state = "1-4" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bjr" = ( /obj/effect/spawner/structure/window/reinforced, @@ -28423,7 +28423,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/open/floor/plating, +/obj/machinery/portable_atmospherics/scrubber, +/turf/open/floor/plasteel, /area/engineering/main) "bkt" = ( /obj/effect/turf_decal/tile/green, @@ -28863,7 +28864,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "blq" = ( /obj/effect/turf_decal/tile/yellow{ @@ -29603,20 +29604,16 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bmK" = ( -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/structure/disposalpipe/segment{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 10 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bmL" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, @@ -29708,12 +29705,11 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bmT" = ( -/obj/machinery/light/small, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/engine, -/area/engineering/teg) +/turf/open/floor/plasteel, +/area/engineering/atmos) "bmU" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -30055,11 +30051,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bny" = ( -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bnz" = ( /obj/effect/turf_decal/plaque{ @@ -30183,7 +30175,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bnO" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, @@ -30206,7 +30197,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bnR" = ( /obj/effect/turf_decal/plaque{ @@ -30292,11 +30283,10 @@ /turf/open/floor/plasteel, /area/security/checkpoint/supply) "bnY" = ( -/obj/structure/sign/warning/fire, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bnZ" = ( /obj/structure/table/reinforced, @@ -30316,7 +30306,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bod" = ( /obj/structure/table/reinforced, @@ -30357,7 +30347,6 @@ /turf/open/floor/plasteel, /area/science/server/compcore) "bog" = ( -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 5 }, @@ -30515,13 +30504,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plating, -/area/engineering/main) -"bow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "box" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -30554,7 +30537,6 @@ /turf/open/floor/plating, /area/cargo/warehouse) "boD" = ( -/obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -30564,10 +30546,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1; - light_color = "#ffc1c1" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -30577,15 +30555,9 @@ /turf/open/floor/plasteel, /area/engineering/main) "boF" = ( -/obj/effect/turf_decal/delivery, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/main) +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/space) "boG" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/tile/blue{ @@ -30773,7 +30745,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bpc" = ( /obj/effect/decal/cleanable/dirt, @@ -30803,7 +30775,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bpf" = ( /turf/open/floor/plasteel, @@ -30823,7 +30795,12 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 9 }, -/turf/open/floor/plating, +/obj/machinery/portable_atmospherics/pump, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/turf/open/floor/plasteel, /area/engineering/main) "bph" = ( /obj/structure/table, @@ -31541,7 +31518,7 @@ dir = 1 }, /obj/structure/cable, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bqQ" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, @@ -31555,10 +31532,13 @@ /area/hallway/secondary/entry) "bqR" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bqS" = ( -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/engineering/main) "bqT" = ( /obj/machinery/computer/crew, @@ -31845,10 +31825,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/civilian) -"brz" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/plasteel, -/area/engineering/main) "brA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -31999,6 +31975,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/light, /turf/open/floor/plasteel, /area/engineering/main) "brP" = ( @@ -32364,10 +32341,27 @@ /turf/open/floor/plasteel/stairs/left, /area/service/hydroponics) "bsx" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/pump, +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -24; + pixel_y = 8 + }, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -40; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_x = -24; + pixel_y = -9 + }, +/obj/machinery/computer/turbine_computer{ + dir = 4; + id = "incineratorturbine" + }, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/atmos) "bsy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -33573,7 +33567,7 @@ /obj/machinery/light_switch{ pixel_y = -24 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bvw" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, @@ -33813,7 +33807,7 @@ /area/cargo/warehouse) "bvY" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bvZ" = ( /obj/effect/turf_decal/loading_area{ @@ -34150,7 +34144,7 @@ name = "Engine Room APC"; pixel_x = 24 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/main) "bwK" = ( /obj/machinery/camera{ @@ -35356,27 +35350,14 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "bzr" = ( -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -24; - pixel_y = 8 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = -40; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = -24; - pixel_y = -9 - }, -/obj/machinery/computer/turbine_computer{ - dir = 4; - id = "incineratorturbine" +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "bzs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -38046,14 +38027,15 @@ /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bFg" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/chair{ + dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/closed/wall/r_wall, -/area/engineering/engine_smes) +/turf/open/floor/plasteel, +/area/engineering/break_room) "bFh" = ( /obj/effect/turf_decal/tile/brown, /obj/machinery/light, @@ -39504,7 +39486,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bIq" = ( /turf/open/floor/plasteel/white, @@ -39718,9 +39700,6 @@ /turf/open/floor/plasteel, /area/engineering/engine_smes) "bIO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" @@ -39757,16 +39736,17 @@ /turf/open/floor/plasteel, /area/engineering/engine_smes) "bIR" = ( -/obj/machinery/computer/monitor, -/obj/machinery/airalarm{ - pixel_y = 24 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/cable/yellow, /turf/open/floor/plasteel, /area/engineering/engine_smes) "bIS" = ( /obj/machinery/modular_computer/console/preset/engineering, -/obj/structure/cable/yellow, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, /turf/open/floor/plasteel, /area/engineering/engine_smes) "bIT" = ( @@ -41075,9 +41055,6 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bLG" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" @@ -41895,6 +41872,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/engine_smes) "bNp" = ( @@ -43492,6 +43472,9 @@ /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/open/floor/plasteel, /area/engineering/break_room) "bQI" = ( @@ -45236,7 +45219,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 4 }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/engineering/teg) "bUo" = ( /obj/structure/grille, @@ -48285,26 +48268,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cak" = ( -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ - pixel_x = -25; - pixel_y = 7 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "cal" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -48315,18 +48278,15 @@ }, /area/engineering/atmos) "cam" = ( -/obj/machinery/power/compressor{ - dir = 4; - comp_id = "incineratorturbine" +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 6 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/engine/vacuum, -/area/engineering/atmos) +/turf/open/space/basic, +/area/space/nearstation) "can" = ( /obj/machinery/power/turbine{ dir = 8 @@ -48338,10 +48298,16 @@ /area/engineering/atmos) "cao" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/engine_smes) "cap" = ( /obj/structure/cable{ icon_state = "4-8" @@ -51351,9 +51317,6 @@ /turf/open/floor/plasteel, /area/cargo/warehouse) "cgu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, /obj/machinery/light/small{ dir = 1; light_color = "#ffc1c1" @@ -51373,9 +51336,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cgw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/cable{ icon_state = "1-2" }, @@ -51666,9 +51627,6 @@ /turf/open/floor/plasteel, /area/cargo/storage) "chg" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -51683,8 +51641,8 @@ /turf/closed/wall/r_wall, /area/tcommsat/computer) "chj" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 5 }, /obj/machinery/meter, /obj/structure/cable{ @@ -51692,12 +51650,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) -"chk" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/turf/closed/wall/r_wall, -/area/engineering/teg/hotloop) "chl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51765,12 +51717,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) -"chu" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/engineering/teg/hotloop) "chv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51837,9 +51783,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1 - }, /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "chF" = ( @@ -51898,19 +51841,12 @@ }, /turf/open/floor/plating, /area/engineering/teg/coldloop) -"chL" = ( -/turf/closed/wall/r_wall, -/area/space) "chM" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/machinery/door/poddoor/incinerator_atmos_main{ dir = 4 }, -/obj/machinery/power/smes, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) +/turf/open/floor/engine/vacuum, +/area/space) "chN" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/closed/wall/r_wall, @@ -52094,7 +52030,6 @@ /turf/open/floor/plasteel, /area/commons/storage/primary) "cid" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/table, /obj/machinery/light{ dir = 4; @@ -53257,7 +53192,6 @@ /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "ckz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/table, /obj/item/pipe_dispenser, /turf/open/floor/plasteel, @@ -54279,7 +54213,6 @@ /turf/open/floor/plasteel, /area/commons/cryopod) "cmG" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -54431,27 +54364,6 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) -"cmT" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/white/full, -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" - }, -/turf/open/floor/plasteel, -/area/engineering/workshop) "cmU" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -54732,9 +54644,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "cny" = ( @@ -54853,9 +54762,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/atmospherics/components/binary/valve/digital{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "cnL" = ( @@ -55046,9 +54952,6 @@ /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) "cof" = ( -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" @@ -55097,9 +55000,6 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cok" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 4 - }, /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "col" = ( @@ -55484,13 +55384,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"coT" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ - dir = 4 - }, -/obj/machinery/meter, -/turf/open/floor/plasteel, -/area/engineering/teg/hotloop) "coU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -55928,9 +55821,6 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 - }, /obj/machinery/portable_atmospherics/canister, /obj/machinery/light{ dir = 8 @@ -55938,9 +55828,6 @@ /turf/open/floor/plasteel, /area/engineering/teg/hotloop) "cpL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 9 - }, /obj/machinery/light{ dir = 4; light_color = "#c1caff" @@ -56333,10 +56220,14 @@ /obj/effect/turf_decal/tile/yellow{ dir = 1 }, -/obj/machinery/modular_computer/console/preset/engineering, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/computer/monitor, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, /turf/open/floor/plasteel, /area/engineering/break_room) "cqy" = ( @@ -57793,15 +57684,14 @@ dir = 4 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/modular_computer/console/preset/engineering, /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/door/firedoor/border_only{ - dir = 1; - name = "north facing firelock" +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Workshop"; + req_one_access_txt = "10;24" }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/engineering/workshop) "ctm" = ( @@ -58643,29 +58533,27 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "4-8" }, +/obj/effect/turf_decal/stripes/white/full, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/bin, /turf/open/floor/plasteel, /area/engineering/workshop) "cuM" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow, -/obj/structure/chair{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-8" }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engineering/workshop) "cuO" = ( @@ -58835,25 +58723,23 @@ /turf/open/floor/plasteel/freezer, /area/medical/virology) "cvg" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/machinery/power/smes, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, /turf/open/floor/plasteel, -/area/engineering/workshop) +/area/engineering/atmos) "cvh" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/obj/machinery/computer/rdconsole/production{ + dir = 8 }, /obj/effect/turf_decal/tile/yellow{ dir = 4 }, /obj/effect/turf_decal/tile/yellow, -/obj/machinery/computer/rdconsole/production{ - dir = 8 - }, /turf/open/floor/plasteel, /area/engineering/workshop) "cvj" = ( @@ -70907,10 +70793,6 @@ /obj/effect/turf_decal/tile/bar, /turf/open/floor/mineral/basaltstone_floor, /area/service/bar) -"fVM" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/space) "fWP" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/turf_decal/tile/bar{ @@ -71597,16 +71479,6 @@ }, /turf/open/floor/plasteel, /area/engineering/atmos) -"lVt" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/brown/visible{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) "lXh" = ( /obj/effect/turf_decal/loading_area{ dir = 8; @@ -72139,12 +72011,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"rsn" = ( -/obj/machinery/door/poddoor/incinerator_atmos_main{ - dir = 4 - }, -/turf/open/floor/engine/vacuum, -/area/space) "rso" = ( /obj/structure/table/wood, /obj/effect/turf_decal/tile/neutral, @@ -108579,8 +108445,8 @@ cok cok cdV bEK -bIQ -bLU +bIR +cao bQv bQC cuH @@ -108826,17 +108692,17 @@ cfK cgb cgw chj -aXF +chs chD cid bfM ckz cmG -coT +cok cpL cpZ -bFg -bIR +bEK +bIQ bLU bQy bQB @@ -109082,8 +108948,8 @@ cdV cdV cdV cdV -chk -chu +cfu +cdV cdV cdV cdV @@ -109092,7 +108958,7 @@ cmY cdV cdV cdV -bFg +bEK bIS bNo bQz @@ -109339,7 +109205,7 @@ aSb aTi aTW aUW -aZa +bzr bbC bcF bdO @@ -109610,7 +109476,7 @@ cqs cqG crt cdm -cmT +ctG cuL cvd cAp @@ -109860,8 +109726,8 @@ bbi bhc bUn bIp -bow -bqS +boD +bny aQC bxz bwP @@ -109869,7 +109735,7 @@ cBn cBH ctl cuM -cvg +cJk cBa cJk cNf @@ -110117,15 +109983,15 @@ bbt bha bme aWX -bow -bqS +boD +bny aQC cqu bwR cBx cBI ctG -ctG +aXF cvh cBm cJy @@ -110374,8 +110240,8 @@ bes bhc bmf bgR -bow -bqS +boD +bny bBE cqv bwR @@ -110632,7 +110498,7 @@ bjx bjx bnO boD -brz +bny bBn bnf bwR @@ -110886,7 +110752,7 @@ bdd bei bfv bjL -bmT +bjL bnY boE brO @@ -111145,8 +111011,8 @@ bfy bkf bkf bog -boF -bsx +bpb +bny bBn bnq bEW @@ -111390,8 +111256,8 @@ atF cJC atF atF -aRJ -aSK +bny +aRV aUf aVf ban @@ -111403,7 +111269,7 @@ bkp bni aVB bpb -bqS +bny bBE cqw bwR @@ -111663,7 +111529,7 @@ bpb bvv aQC cqx -bwP +bFg bQH cdj cdC @@ -111909,10 +111775,10 @@ aST aUt aUf baU -bcu -bdW -beq -bfI +aVf +aVf +bbi +bbi bkr blp aUe @@ -112161,20 +112027,20 @@ cmh cmp atF atF -bqS +bny aRV aTC aUf boa bcv +bcv aUf aUf -bfJ boa bcv bny bpb -bqS +bny aQC bQq cqI @@ -112418,7 +112284,7 @@ aus aus cmw atF -bqS +bny aTc aTQ aUU @@ -119106,9 +118972,9 @@ cww cbN cww aaU -fVM -rsn -fVM +boF +chM +boF aaa anr aaa @@ -119621,9 +119487,9 @@ cbT cww cww cww -cam +bfI cww -chL +bfJ anr aaa aaU @@ -120904,10 +120770,10 @@ cpQ cfM cbU cww -chM -cak -cao -bzr +cvg +aSK +bmT +bsx cMJ anr aaa @@ -121668,7 +121534,7 @@ bRK bca bZI bZR -lVt +cam qHL eTZ vcb From a4cd7ec57fb055960d19bbf79bb7e9a9f8239933 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 20:10:18 +0200 Subject: [PATCH 4/6] added tiny fans to some external airlocks (solars and engineering) as well as tweaked the size of one solars room --- _maps/map_files/CogStation/CogStation.dmm | 412 +++++++++++----------- 1 file changed, 200 insertions(+), 212 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index a31bfa26a2..52983ac762 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -2892,6 +2892,7 @@ name = "Starboard Bow Solar Exterior Airlock"; req_access_txt = "10;13" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) "agY" = ( @@ -4632,7 +4633,7 @@ "alb" = ( /obj/machinery/power/smes, /obj/structure/cable{ - icon_state = "0-4" + icon_state = "0-2" }, /turf/open/floor/plating, /area/maintenance/solars/starboard/fore) @@ -4647,12 +4648,6 @@ "ale" = ( /turf/closed/wall, /area/commons/dorms/blue) -"alf" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) "alg" = ( /obj/structure/frame/machine, /obj/item/circuitboard/computer/arcade/orion_trail, @@ -19160,6 +19155,7 @@ }, /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/engineering/main) "aPT" = ( @@ -19955,6 +19951,16 @@ /obj/item/crowbar, /turf/open/floor/plating, /area/maintenance/port/central) +"aRJ" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "aRK" = ( /obj/structure/sign/departments/holy{ pixel_y = -32 @@ -20079,11 +20085,11 @@ /turf/open/floor/plasteel, /area/security/office) "aRV" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ +/obj/machinery/door/poddoor/incinerator_atmos_main{ dir = 4 }, -/turf/open/floor/plasteel, -/area/engineering/main) +/turf/open/floor/engine/vacuum, +/area/space) "aRW" = ( /turf/open/floor/plating, /area/maintenance/port/central) @@ -20395,25 +20401,11 @@ /turf/open/floor/plasteel, /area/security/office) "aSK" = ( -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ - pixel_x = -25; - pixel_y = 7 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1 - }, /turf/open/floor/plasteel, -/area/engineering/atmos) +/area/engineering/main) "aSL" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4; @@ -22565,15 +22557,8 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "aXF" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/workshop) +/turf/closed/wall/r_wall, +/area/space) "aXG" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/blue, @@ -25632,6 +25617,18 @@ /obj/item/reagent_containers/food/snacks/muffin/berry, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) +"beq" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/engine_smes) "ber" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, @@ -26232,19 +26229,27 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/office) "bfI" = ( -/obj/machinery/power/compressor{ - dir = 4; - comp_id = "incineratorturbine" +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ + pixel_x = -25; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/terminal{ + dir = 1 }, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "0-2"; + pixel_y = 1 }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/engine/vacuum, +/turf/open/floor/plasteel, /area/engineering/atmos) "bfJ" = ( +/obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/space) "bfK" = ( @@ -29704,12 +29709,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/disposal) -"bmT" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "bmU" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -30050,9 +30049,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bny" = ( -/turf/open/floor/plasteel, -/area/engineering/main) "bnz" = ( /obj/effect/turf_decal/plaque{ icon_state = "L5" @@ -30555,9 +30551,14 @@ /turf/open/floor/plasteel, /area/engineering/main) "boF" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/space) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "boG" = ( /obj/machinery/space_heater, /obj/effect/turf_decal/tile/blue{ @@ -30738,15 +30739,6 @@ icon_state = "carpetsymbol" }, /area/commons/lounge/jazz) -"bpb" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "bpc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -31535,9 +31527,6 @@ /turf/open/floor/plasteel, /area/engineering/main) "bqS" = ( -/obj/machinery/light{ - dir = 1 - }, /turf/open/floor/plasteel, /area/engineering/main) "bqT" = ( @@ -31825,6 +31814,15 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/civilian) +"brz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "brA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -32340,28 +32338,6 @@ "bsw" = ( /turf/open/floor/plasteel/stairs/left, /area/service/hydroponics) -"bsx" = ( -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -24; - pixel_y = 8 - }, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = -40; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = -24; - pixel_y = -9 - }, -/obj/machinery/computer/turbine_computer{ - dir = 4; - id = "incineratorturbine" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "bsy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/disposalpipe/segment, @@ -35349,15 +35325,6 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) -"bzr" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "bzs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -37641,16 +37608,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) -"bEw" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/camera{ - c_tag = "Starboard Bow Solar Maintenance"; - dir = 1 - }, -/turf/open/floor/plating, -/area/maintenance/solars/starboard/fore) "bEx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -38026,16 +37983,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) -"bFg" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) "bFh" = ( /obj/effect/turf_decal/tile/brown, /obj/machinery/light, @@ -39735,12 +39682,6 @@ }, /turf/open/floor/plasteel, /area/engineering/engine_smes) -"bIR" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/engine_smes) "bIS" = ( /obj/machinery/modular_computer/console/preset/engineering, /obj/structure/cable{ @@ -48268,6 +48209,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"cak" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engineering/break_room) "cal" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -48278,15 +48229,11 @@ }, /area/engineering/atmos) "cam" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/brown/visible{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engineering/engine_smes) "can" = ( /obj/machinery/power/turbine{ dir = 8 @@ -48297,17 +48244,15 @@ /turf/open/floor/engine/vacuum, /area/engineering/atmos) "cao" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 }, /turf/open/floor/plasteel, -/area/engineering/engine_smes) +/area/engineering/workshop) "cap" = ( /obj/structure/cable{ icon_state = "4-8" @@ -48913,6 +48858,7 @@ name = "Atmospherics External Airlock"; req_access_txt = "13;24" }, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/engineering/atmos) "cbJ" = ( @@ -51650,6 +51596,12 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) +"chk" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "chl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51717,6 +51669,28 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) +"chu" = ( +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -24; + pixel_y = 8 + }, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -40; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_x = -24; + pixel_y = -9 + }, +/obj/machinery/computer/turbine_computer{ + dir = 4; + id = "incineratorturbine" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "chv" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51743,8 +51717,17 @@ /turf/open/floor/plating, /area/maintenance/disposal) "chx" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible, -/turf/open/floor/plasteel, +/obj/machinery/power/compressor{ + dir = 4; + comp_id = "incineratorturbine" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/vacuum, /area/engineering/atmos) "chy" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -51841,12 +51824,16 @@ }, /turf/open/floor/plating, /area/engineering/teg/coldloop) -"chM" = ( -/obj/machinery/door/poddoor/incinerator_atmos_main{ - dir = 4 +"chL" = ( +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/engine/vacuum, -/area/space) +/turf/open/floor/plasteel, +/area/engineering/atmos) +"chM" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/plasteel, +/area/engineering/atmos) "chN" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/closed/wall/r_wall, @@ -54364,6 +54351,16 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) +"cmT" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) "cmU" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -54999,9 +54996,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) -"cok" = ( -/turf/open/floor/plasteel, -/area/engineering/teg/hotloop) "col" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/yellow{ @@ -55384,6 +55378,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"coT" = ( +/turf/open/floor/plasteel, +/area/engineering/teg/hotloop) "coU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -58722,16 +58719,6 @@ "cvf" = ( /turf/open/floor/plasteel/freezer, /area/medical/virology) -"cvg" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/power/smes, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "cvh" = ( /obj/machinery/computer/rdconsole/production{ dir = 8 @@ -66601,6 +66588,7 @@ req_one_access_txt = "10;31" }, /obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/fans/tiny, /turf/open/floor/plasteel, /area/cargo/warehouse) "cJr" = ( @@ -108441,12 +108429,12 @@ cib cjs cky cmE -cok -cok +coT +coT cdV bEK -bIR -cao +cam +beq bQv bQC cuH @@ -108698,7 +108686,7 @@ cid bfM ckz cmG -cok +coT cpL cpZ bEK @@ -109205,7 +109193,7 @@ aSb aTi aTW aUW -bzr +brz bbC bcF bdO @@ -109727,7 +109715,7 @@ bhc bUn bIp boD -bny +bqS aQC bxz bwP @@ -109984,14 +109972,14 @@ bha bme aWX boD -bny +bqS aQC cqu bwR cBx cBI ctG -aXF +cao cvh cBm cJy @@ -110241,7 +110229,7 @@ bhc bmf bgR boD -bny +bqS bBE cqv bwR @@ -110498,7 +110486,7 @@ bjx bjx bnO boD -bny +bqS bBn bnf bwR @@ -111011,8 +110999,8 @@ bfy bkf bkf bog -bpb -bny +boF +bqS bBn bnq bEW @@ -111256,8 +111244,8 @@ atF cJC atF atF -bny -aRV +bqS +aSK aUf aVf ban @@ -111268,8 +111256,8 @@ bfF bkp bni aVB -bpb -bny +boF +bqS bBE cqw bwR @@ -111513,7 +111501,7 @@ ciT cJD cmu atF -bqS +chk aSL aUf aXh @@ -111525,11 +111513,11 @@ bbt bkq bnn boa -bpb +boF bvv aQC cqx -bFg +cak bQH cdj cdC @@ -112027,8 +112015,8 @@ cmh cmp atF atF -bny -aRV +bqS +aSK aTC aUf boa @@ -112038,9 +112026,9 @@ aUf aUf boa bcv -bny -bpb -bny +bqS +boF +bqS aQC bQq cqI @@ -112284,7 +112272,7 @@ aus aus cmw atF -bny +bqS aTc aTQ aUU @@ -114273,10 +114261,10 @@ ado aaa aaa aaU -aio +ahP alb -aKe -bEw +afh +bEy ahP bEB bGo @@ -114531,9 +114519,9 @@ aaa aaa aaU ahP -alf -afh -bEy +ahP +ahP +ahP ahP aiz aiz @@ -114787,11 +114775,11 @@ ado aaa aaa aaU -ahP -ahP -ahP -ahP -ahP +aaU +aaU +aaU +aaU +aaU aaU aaU aiz @@ -115043,10 +115031,10 @@ abj ado aaa aaa -aaU -aaU -aaU -aaU +aaa +aaa +aaa +aaa aaU aaU aaU @@ -118972,9 +118960,9 @@ cww cbN cww aaU -boF -chM -boF +bfJ +aRV +bfJ aaa anr aaa @@ -119487,9 +119475,9 @@ cbT cww cww cww -bfI +chx cww -bfJ +aXF anr aaa aaU @@ -120770,10 +120758,10 @@ cpQ cfM cbU cww -cvg -aSK -bmT -bsx +aRJ +bfI +chL +chu cMJ anr aaa @@ -121285,8 +121273,8 @@ cfT cgg cgx chp -chx -chx +chM +chM gDY mqE anr @@ -121534,7 +121522,7 @@ bRK bca bZI bZR -cam +cmT qHL eTZ vcb From 86111bd0868181379e6b1766f05d171c49e0957d Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 21:33:00 +0200 Subject: [PATCH 5/6] fixed invisible piping for the TEG and the orientation of one heater in atmos --- _maps/map_files/CogStation/CogStation.dmm | 377 +++++++++++----------- 1 file changed, 185 insertions(+), 192 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 52983ac762..1f81ed4d70 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -4648,6 +4648,28 @@ "ale" = ( /turf/closed/wall, /area/commons/dorms/blue) +"alf" = ( +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -24; + pixel_y = 8 + }, +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -40; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_x = -24; + pixel_y = -9 + }, +/obj/machinery/computer/turbine_computer{ + dir = 4; + id = "incineratorturbine" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "alg" = ( /obj/structure/frame/machine, /obj/item/circuitboard/computer/arcade/orion_trail, @@ -19951,16 +19973,6 @@ /obj/item/crowbar, /turf/open/floor/plating, /area/maintenance/port/central) -"aRJ" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/power/smes, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "aRK" = ( /obj/structure/sign/departments/holy{ pixel_y = -32 @@ -20085,11 +20097,15 @@ /turf/open/floor/plasteel, /area/security/office) "aRV" = ( -/obj/machinery/door/poddoor/incinerator_atmos_main{ - dir = 4 +/obj/structure/chair{ + dir = 1 }, -/turf/open/floor/engine/vacuum, -/area/space) +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/engineering/break_room) "aRW" = ( /turf/open/floor/plating, /area/maintenance/port/central) @@ -20604,7 +20620,7 @@ /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/main) "aTj" = ( @@ -20974,10 +20990,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/main) "aTX" = ( @@ -21048,9 +21064,6 @@ }, /turf/open/floor/plasteel, /area/engineering/teg) -"aUf" = ( -/turf/open/floor/plasteel, -/area/engineering/teg) "aUg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -21400,7 +21413,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/plasteel, @@ -22557,8 +22570,18 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "aXF" = ( -/turf/closed/wall/r_wall, -/area/space) +/obj/machinery/power/compressor{ + dir = 4; + comp_id = "incineratorturbine" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/engine/vacuum, +/area/engineering/atmos) "aXG" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/blue, @@ -24455,13 +24478,6 @@ }, /turf/open/floor/plasteel, /area/engineering/main) -"bbC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, -/turf/open/floor/plasteel, -/area/engineering/main) "bbD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24891,7 +24907,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/main) "bcG" = ( @@ -25426,10 +25442,10 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, /area/engineering/main) "bdP" = ( @@ -25485,6 +25501,18 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/cargo/office) +"bdW" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/engine_smes) "bdX" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets, @@ -25617,18 +25645,6 @@ /obj/item/reagent_containers/food/snacks/muffin/berry, /turf/open/floor/plasteel/dark, /area/command/heads_quarters/rd) -"beq" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/engine_smes) "ber" = ( /obj/effect/turf_decal/delivery, /obj/structure/disposalpipe/segment, @@ -26228,30 +26244,9 @@ }, /turf/open/floor/plasteel/dark, /area/service/chapel/office) -"bfI" = ( -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ - pixel_x = -25; - pixel_y = 7 - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "bfJ" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/space) +/turf/open/floor/plasteel, +/area/engineering/teg) "bfK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ @@ -29709,6 +29704,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/disposal) +"bmT" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "bmU" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -30049,6 +30053,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"bny" = ( +/turf/open/floor/plasteel, +/area/engineering/main) "bnz" = ( /obj/effect/turf_decal/plaque{ icon_state = "L5" @@ -30502,6 +30509,12 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, /area/engineering/main) +"bow" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "box" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 10 @@ -30533,11 +30546,15 @@ /turf/open/floor/plating, /area/cargo/warehouse) "boD" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/workshop) "boE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30739,6 +30756,12 @@ icon_state = "carpetsymbol" }, /area/commons/lounge/jazz) +"bpb" = ( +/obj/machinery/door/poddoor/incinerator_atmos_main{ + dir = 4 + }, +/turf/open/floor/engine/vacuum, +/area/space) "bpc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -31527,6 +31550,9 @@ /turf/open/floor/plasteel, /area/engineering/main) "bqS" = ( +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel, /area/engineering/main) "bqT" = ( @@ -31816,13 +31842,10 @@ /area/hallway/secondary/civilian) "brz" = ( /obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 + icon_state = "1-8" }, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/atmos) "brA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35325,6 +35348,10 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) +"bzr" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/space) "bzs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -48209,16 +48236,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) -"cak" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/engineering/break_room) "cal" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -48229,11 +48246,15 @@ }, /area/engineering/atmos) "cam" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plasteel, -/area/engineering/engine_smes) +/area/engineering/atmos) "can" = ( /obj/machinery/power/turbine{ dir = 8 @@ -48244,15 +48265,15 @@ /turf/open/floor/engine/vacuum, /area/engineering/atmos) "cao" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 6 }, -/turf/open/floor/plasteel, -/area/engineering/workshop) +/turf/open/space/basic, +/area/space/nearstation) "cap" = ( /obj/structure/cable{ icon_state = "4-8" @@ -51596,12 +51617,6 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) -"chk" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "chl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51670,24 +51685,22 @@ /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) "chu" = ( -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -24; - pixel_y = 8 +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ + pixel_x = -25; + pixel_y = 7 }, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = -40; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = -24; - pixel_y = -9 +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/computer/turbine_computer{ - dir = 4; - id = "incineratorturbine" +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -51717,18 +51730,11 @@ /turf/open/floor/plating, /area/maintenance/disposal) "chx" = ( -/obj/machinery/power/compressor{ - dir = 4; - comp_id = "incineratorturbine" +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/engine/vacuum, -/area/engineering/atmos) +/turf/open/floor/plasteel, +/area/engineering/engine_smes) "chy" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 10 @@ -51824,12 +51830,6 @@ }, /turf/open/floor/plating, /area/engineering/teg/coldloop) -"chL" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "chM" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -54351,16 +54351,6 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) -"cmT" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/brown/visible{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) "cmU" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -54996,6 +54986,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"cok" = ( +/turf/open/floor/plasteel, +/area/engineering/teg/hotloop) "col" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/yellow{ @@ -55379,8 +55372,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "coT" = ( -/turf/open/floor/plasteel, -/area/engineering/teg/hotloop) +/turf/closed/wall/r_wall, +/area/space) "coU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -70450,7 +70443,7 @@ /area/space/nearstation) "dpO" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on{ - dir = 4 + dir = 8 }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -108429,12 +108422,12 @@ cib cjs cky cmE -coT -coT +cok +cok cdV bEK -cam -beq +chx +bdW bQv bQC cuH @@ -108686,7 +108679,7 @@ cid bfM ckz cmG -coT +cok cpL cpZ bEK @@ -109193,8 +109186,8 @@ aSb aTi aTW aUW -brz -bbC +bmT +bcF bcF bdO aUW @@ -109448,12 +109441,12 @@ aQB aQT aSf aTj -aUf +bfJ aXP -aUf -aUf -aUf -aUf +bfJ +bfJ +bfJ +bfJ bgJ bcv bmK @@ -109704,8 +109697,8 @@ ceX aQC aQX aSr -aUf -aUf +bfJ +bfJ bhc bbi bbi @@ -109714,8 +109707,8 @@ bbi bhc bUn bIp -boD -bqS +bow +bny aQC bxz bwP @@ -109961,7 +109954,7 @@ ceK aQC aRc aSz -aUf +bfJ aVb aYi bbt @@ -109971,15 +109964,15 @@ bbt bha bme aWX -boD -bqS +bow +bny aQC cqu bwR cBx cBI ctG -cao +boD cvh cBm cJy @@ -110218,7 +110211,7 @@ aPP aPP aRp aSE -aUf +bfJ aVf aYj bbx @@ -110228,8 +110221,8 @@ bes bhc bmf bgR -boD -bqS +bow +bny bBE cqv bwR @@ -110475,7 +110468,7 @@ aPR aQI aRr aSG -aUf +bfJ aVf aZc bbz @@ -110485,8 +110478,8 @@ bfn bjx bjx bnO -boD -bqS +bow +bny bBn bnf bwR @@ -110989,7 +110982,7 @@ aQu aQQ aRG aSH -aUf +bfJ aWV aZt bbH @@ -111000,7 +110993,7 @@ bkf bkf bog boF -bqS +bny bBn bnq bEW @@ -111244,9 +111237,9 @@ atF cJC atF atF -bqS +bny aSK -aUf +bfJ aVf ban bbZ @@ -111257,7 +111250,7 @@ bkp bni aVB boF -bqS +bny bBE cqw bwR @@ -111501,9 +111494,9 @@ ciT cJD cmu atF -chk +bqS aSL -aUf +bfJ aXh baT bcd @@ -111517,7 +111510,7 @@ boF bvv aQC cqx -cak +aRV bQH cdj cdC @@ -111761,7 +111754,7 @@ cJI aRR aST aUt -aUf +bfJ baU aVf aVf @@ -112015,20 +112008,20 @@ cmh cmp atF atF -bqS +bny aSK aTC -aUf +bfJ boa bcv bcv -aUf -aUf +bfJ +bfJ boa bcv -bqS +bny boF -bqS +bny aQC bQq cqI @@ -112272,7 +112265,7 @@ aus aus cmw atF -bqS +bny aTc aTQ aUU @@ -118960,9 +118953,9 @@ cww cbN cww aaU -bfJ -aRV -bfJ +bzr +bpb +bzr aaa anr aaa @@ -119475,9 +119468,9 @@ cbT cww cww cww -chx -cww aXF +cww +coT anr aaa aaU @@ -120758,10 +120751,10 @@ cpQ cfM cbU cww -aRJ -bfI -chL +cam chu +brz +alf cMJ anr aaa @@ -121522,7 +121515,7 @@ bRK bca bZI bZR -cmT +cao qHL eTZ vcb From 2f4638011d5ba045fd834675a2610d2d3f87be86 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 21:52:21 +0200 Subject: [PATCH 6/6] this is why you first look and THEN commit. Fixed invisible TEG pipes for good --- _maps/map_files/CogStation/CogStation.dmm | 421 ++++++++++------------ 1 file changed, 200 insertions(+), 221 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 1f81ed4d70..fe16882c48 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -4648,28 +4648,6 @@ "ale" = ( /turf/closed/wall, /area/commons/dorms/blue) -"alf" = ( -/obj/machinery/button/door/incinerator_vent_atmos_main{ - pixel_x = -24; - pixel_y = 8 - }, -/obj/machinery/button/door/incinerator_vent_atmos_aux{ - pixel_x = -40; - pixel_y = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/button/ignition/incinerator/atmos{ - pixel_x = -24; - pixel_y = -9 - }, -/obj/machinery/computer/turbine_computer{ - dir = 4; - id = "incineratorturbine" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "alg" = ( /obj/structure/frame/machine, /obj/item/circuitboard/computer/arcade/orion_trail, @@ -19596,12 +19574,6 @@ /obj/machinery/meter, /turf/open/floor/plasteel, /area/engineering/main) -"aQR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "aQS" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -19973,6 +19945,9 @@ /obj/item/crowbar, /turf/open/floor/plating, /area/maintenance/port/central) +"aRJ" = ( +/turf/open/floor/plasteel, +/area/engineering/main) "aRK" = ( /obj/structure/sign/departments/holy{ pixel_y = -32 @@ -20097,15 +20072,11 @@ /turf/open/floor/plasteel, /area/security/office) "aRV" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/landmark/start/station_engineer, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 }, /turf/open/floor/plasteel, -/area/engineering/break_room) +/area/engineering/main) "aRW" = ( /turf/open/floor/plating, /area/maintenance/port/central) @@ -20135,8 +20106,8 @@ /area/command/bridge) "aSb" = ( /obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ + dir = 1 }, /turf/open/floor/plasteel, /area/engineering/main) @@ -20178,7 +20149,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, @@ -20262,12 +20233,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"aSr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "aSs" = ( /obj/machinery/light{ dir = 1; @@ -20417,11 +20382,15 @@ /turf/open/floor/plasteel, /area/security/office) "aSK" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/landmark/start/station_engineer, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/break_room) "aSL" = ( /obj/machinery/atmospherics/components/binary/valve/digital{ dir = 4; @@ -21064,6 +21033,9 @@ }, /turf/open/floor/plasteel, /area/engineering/teg) +"aUf" = ( +/turf/open/floor/plasteel, +/area/engineering/teg) "aUg" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -22570,18 +22542,11 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/command/nuke_storage) "aXF" = ( -/obj/machinery/power/compressor{ - dir = 4; - comp_id = "incineratorturbine" - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/door/poddoor/incinerator_atmos_main{ + dir = 4 }, /turf/open/floor/engine/vacuum, -/area/engineering/atmos) +/area/space) "aXG" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/blue, @@ -23205,8 +23170,8 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 10 }, /turf/open/floor/plasteel, /area/engineering/main) @@ -24478,6 +24443,13 @@ }, /turf/open/floor/plasteel, /area/engineering/main) +"bbC" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, +/turf/open/floor/plasteel, +/area/engineering/main) "bbD" = ( /obj/structure/cable{ icon_state = "1-2" @@ -24905,11 +24877,10 @@ /area/engineering/main) "bcF" = ( /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /turf/open/floor/plasteel, -/area/engineering/main) +/area/engineering/atmos) "bcG" = ( /obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, @@ -25502,17 +25473,18 @@ /turf/open/floor/plasteel, /area/cargo/office) "bdW" = ( +/obj/machinery/power/compressor{ + dir = 4; + comp_id = "incineratorturbine" + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/engineering/engine_smes) +/turf/open/floor/engine/vacuum, +/area/engineering/atmos) "bdX" = ( /obj/structure/table/wood, /obj/item/storage/box/donkpockets, @@ -26245,8 +26217,8 @@ /turf/open/floor/plasteel/dark, /area/service/chapel/office) "bfJ" = ( -/turf/open/floor/plasteel, -/area/engineering/teg) +/turf/closed/wall/r_wall, +/area/space) "bfK" = ( /obj/structure/table/wood, /obj/item/storage/fancy/candle_box{ @@ -29704,15 +29676,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/disposal) -"bmT" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 10 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "bmU" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -30053,9 +30016,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"bny" = ( -/turf/open/floor/plasteel, -/area/engineering/main) "bnz" = ( /obj/effect/turf_decal/plaque{ icon_state = "L5" @@ -30509,12 +30469,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, /area/engineering/main) -"bow" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/engineering/main) "box" = ( /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 10 @@ -30546,15 +30500,11 @@ /turf/open/floor/plating, /area/cargo/warehouse) "boD" = ( -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, /turf/open/floor/plasteel, -/area/engineering/workshop) +/area/engineering/main) "boE" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30757,11 +30707,25 @@ }, /area/commons/lounge/jazz) "bpb" = ( -/obj/machinery/door/poddoor/incinerator_atmos_main{ +/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ + pixel_x = -25; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 4 }, -/turf/open/floor/engine/vacuum, -/area/space) +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "bpc" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -31840,12 +31804,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/civilian) -"brz" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "brA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35349,9 +35307,15 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) "bzr" = ( -/obj/structure/sign/warning/fire, -/turf/closed/wall/r_wall, -/area/space) +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/engineering/workshop) "bzs" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -37635,6 +37599,15 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/secondary/service) +"bEw" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/engineering/main) "bEx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -48245,16 +48218,6 @@ dir = 1 }, /area/engineering/atmos) -"cam" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/power/smes, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plasteel, -/area/engineering/atmos) "can" = ( /obj/machinery/power/turbine{ dir = 8 @@ -48264,16 +48227,6 @@ }, /turf/open/floor/engine/vacuum, /area/engineering/atmos) -"cao" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/brown/visible{ - dir = 6 - }, -/turf/open/space/basic, -/area/space/nearstation) "cap" = ( /obj/structure/cable{ icon_state = "4-8" @@ -50760,9 +50713,6 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "cfr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -50789,9 +50739,6 @@ c_tag = "Engineering - Mixing Chamber"; dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /turf/open/floor/plating, /area/engineering/teg/hotloop) "cfu" = ( @@ -50859,7 +50806,7 @@ /turf/open/floor/engine/vacuum, /area/engineering/teg/hotloop) "cfC" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 }, /turf/open/floor/engine/vacuum, @@ -50873,8 +50820,8 @@ /turf/open/space/basic, /area/space/nearstation) "cfE" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 }, /turf/closed/wall/r_wall, /area/engineering/teg/hotloop) @@ -50882,6 +50829,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, /turf/open/floor/plating, /area/engineering/teg/hotloop) "cfG" = ( @@ -50895,14 +50845,14 @@ /turf/open/floor/plating, /area/engineering/storage/tech) "cfH" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/atmospherics/components/unary/outlet_injector/on, /turf/open/floor/engine/vacuum, /area/engineering/teg/hotloop) "cfI" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 }, /obj/machinery/sparker{ @@ -50913,12 +50863,6 @@ /obj/effect/decal/remains/human, /turf/open/floor/engine/vacuum, /area/engineering/teg/hotloop) -"cfJ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/turf/closed/wall/r_wall, -/area/engineering/teg/hotloop) "cfK" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 10 @@ -51617,6 +51561,16 @@ }, /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) +"chk" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/power/smes, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/engineering/atmos) "chl" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -51685,22 +51639,24 @@ /turf/open/floor/plasteel/dark, /area/engineering/teg/hotloop) "chu" = ( -/obj/machinery/embedded_controller/radio/airlock_controller/incinerator_atmos{ - pixel_x = -25; - pixel_y = 7 +/obj/machinery/button/door/incinerator_vent_atmos_main{ + pixel_x = -24; + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ +/obj/machinery/button/door/incinerator_vent_atmos_aux{ + pixel_x = -40; + pixel_y = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/button/ignition/incinerator/atmos{ + pixel_x = -24; + pixel_y = -9 }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1 +/obj/machinery/computer/turbine_computer{ + dir = 4; + id = "incineratorturbine" }, /turf/open/floor/plasteel, /area/engineering/atmos) @@ -51730,8 +51686,14 @@ /turf/open/floor/plating, /area/maintenance/disposal) "chx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 }, /turf/open/floor/plasteel, /area/engineering/engine_smes) @@ -51830,6 +51792,10 @@ }, /turf/open/floor/plating, /area/engineering/teg/coldloop) +"chL" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/r_wall, +/area/space) "chM" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, /turf/open/floor/plasteel, @@ -54351,6 +54317,16 @@ }, /turf/open/floor/plasteel, /area/science/robotics/lab) +"cmT" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/brown/visible{ + dir = 6 + }, +/turf/open/space/basic, +/area/space/nearstation) "cmU" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -54987,8 +54963,11 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cok" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/engineering/teg/hotloop) +/area/engineering/engine_smes) "col" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/yellow{ @@ -55372,8 +55351,8 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "coT" = ( -/turf/closed/wall/r_wall, -/area/space) +/turf/open/floor/plasteel, +/area/engineering/teg/hotloop) "coU" = ( /obj/machinery/computer/secure_data{ dir = 1 @@ -108153,8 +108132,8 @@ aye aaU ceR cff -cfp -cfC +cfo +cfA cfI cdV cgp @@ -108412,7 +108391,7 @@ cet cet cfr cfE -cfJ +cfu cdV cgu chg @@ -108422,12 +108401,12 @@ cib cjs cky cmE -cok -cok +coT +coT cdV bEK +cok chx -bdW bQv bQC cuH @@ -108679,7 +108658,7 @@ cid bfM ckz cmG -cok +coT cpL cpZ bEK @@ -108924,8 +108903,8 @@ cdt ceL ceT cdV -cfu cdV +cfu cdV cdV cdV @@ -109181,19 +109160,19 @@ cew ceM ceV aQz -aQR +aRJ aSb aTi aTW aUW -bmT -bcF -bcF +aZa +bbC +bbC bdO aUW bjq bmJ -aZa +bEw bqP aQC bEK @@ -109441,12 +109420,12 @@ aQB aQT aSf aTj -bfJ +aUf aXP -bfJ -bfJ -bfJ -bfJ +aUf +aUf +aUf +aUf bgJ bcv bmK @@ -109696,9 +109675,9 @@ ceO ceX aQC aQX -aSr -bfJ -bfJ +aSE +aUf +aUf bhc bbi bbi @@ -109707,8 +109686,8 @@ bbi bhc bUn bIp -bow -bny +boD +aRJ aQC bxz bwP @@ -109954,7 +109933,7 @@ ceK aQC aRc aSz -bfJ +aUf aVb aYi bbt @@ -109964,15 +109943,15 @@ bbt bha bme aWX -bow -bny +boD +aRJ aQC cqu bwR cBx cBI ctG -boD +bzr cvh cBm cJy @@ -110211,7 +110190,7 @@ aPP aPP aRp aSE -bfJ +aUf aVf aYj bbx @@ -110221,8 +110200,8 @@ bes bhc bmf bgR -bow -bny +boD +aRJ bBE cqv bwR @@ -110468,7 +110447,7 @@ aPR aQI aRr aSG -bfJ +aUf aVf aZc bbz @@ -110478,8 +110457,8 @@ bfn bjx bjx bnO -bow -bny +boD +aRJ bBn bnf bwR @@ -110982,7 +110961,7 @@ aQu aQQ aRG aSH -bfJ +aUf aWV aZt bbH @@ -110993,7 +110972,7 @@ bkf bkf bog boF -bny +aRJ bBn bnq bEW @@ -111237,9 +111216,9 @@ atF cJC atF atF -bny -aSK -bfJ +aRJ +aRV +aUf aVf ban bbZ @@ -111250,7 +111229,7 @@ bkp bni aVB boF -bny +aRJ bBE cqw bwR @@ -111496,7 +111475,7 @@ cmu atF bqS aSL -bfJ +aUf aXh baT bcd @@ -111510,7 +111489,7 @@ boF bvv aQC cqx -aRV +aSK bQH cdj cdC @@ -111754,7 +111733,7 @@ cJI aRR aST aUt -bfJ +aUf baU aVf aVf @@ -112008,20 +111987,20 @@ cmh cmp atF atF -bny -aSK +aRJ +aRV aTC -bfJ +aUf boa bcv bcv -bfJ -bfJ +aUf +aUf boa bcv -bny +aRJ boF -bny +aRJ aQC bQq cqI @@ -112265,7 +112244,7 @@ aus aus cmw atF -bny +aRJ aTc aTQ aUU @@ -118953,9 +118932,9 @@ cww cbN cww aaU -bzr -bpb -bzr +chL +aXF +chL aaa anr aaa @@ -119468,9 +119447,9 @@ cbT cww cww cww -aXF +bdW cww -coT +bfJ anr aaa aaU @@ -120751,10 +120730,10 @@ cpQ cfM cbU cww -cam +chk +bpb +bcF chu -brz -alf cMJ anr aaa @@ -121515,7 +121494,7 @@ bRK bca bZI bZR -cao +cmT qHL eTZ vcb