From 2f4638011d5ba045fd834675a2610d2d3f87be86 Mon Sep 17 00:00:00 2001 From: Phantastic-Swan Date: Wed, 25 Jun 2025 21:52:21 +0200 Subject: [PATCH] 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