From 1dfd5aa59d35bb70316ffdfbb45e7403bc89f29d Mon Sep 17 00:00:00 2001 From: Tom <8881105+tf-4@users.noreply.github.com> Date: Thu, 29 Sep 2022 00:33:53 +0100 Subject: [PATCH] Icebox atmos mini re-piping (#70092) Having omni layer adapters everywhere is sin and a pain in the ass to work around. Moving them backward into the windows gives a little more room, too, without sacrificing functionality. Any other changes are just for freeing up space, really. There's no functionality really lost or gained here. There is certainly more to be done with this IMO but I'm not the best mapper and it's a start. --- .../map_files/IceBoxStation/IceBoxStation.dmm | 411 ++++-------------- 1 file changed, 91 insertions(+), 320 deletions(-) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index da9cf805e38..f1b133ee39d 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1022,10 +1022,6 @@ }, /turf/open/floor/iron, /area/station/tcommsat/computer) -"arZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/iron, -/area/station/maintenance/disposal/incinerator) "asa" = ( /obj/structure/table/wood, /obj/item/storage/crayons, @@ -3295,6 +3291,7 @@ /obj/machinery/atmospherics/components/trinary/filter/atmos/o2{ dir = 4 }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "baR" = ( @@ -4281,9 +4278,6 @@ /area/station/service/library) "bpR" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /turf/open/floor/iron, /area/station/engineering/atmos) "bpT" = ( @@ -5184,9 +5178,6 @@ /turf/open/floor/plating/snowed/icemoon, /area/station/cargo/drone_bay) "bCT" = ( -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -6053,9 +6044,6 @@ /area/station/science/xenobiology) "bOY" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 10 }, @@ -6130,7 +6118,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "bPw" = ( @@ -6712,15 +6699,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/medical/treatment_center) -"bYO" = ( -/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "bYS" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7962,9 +7940,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 10 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, @@ -8576,9 +8551,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "cAz" = ( @@ -10123,9 +10095,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 4 - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "cXX" = ( @@ -10151,9 +10120,6 @@ /area/station/security/detectives_office) "cYi" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/layer_manifold/pink/visible{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/line, /obj/effect/turf_decal/trimline/dark_red/line{ dir = 1 @@ -10161,6 +10127,9 @@ /obj/effect/turf_decal/trimline/dark_blue/mid_joiner{ dir = 1 }, +/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "cYo" = ( @@ -10952,9 +10921,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/service) "djU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "dkb" = ( @@ -11954,8 +11921,9 @@ /area/station/commons/storage/primary) "dAg" = ( /obj/machinery/light/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "N2 to Airmix" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -12507,9 +12475,6 @@ dir = 1; name = "Air Outlet Pump" }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 5 }, @@ -13504,9 +13469,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 @@ -14466,16 +14428,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/engineering/atmos) -"eoH" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "N2 to Airmix" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "eoJ" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -15942,11 +15894,11 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/aft) "eMr" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible{ + dir = 8 + }, /turf/open/floor/plating, /area/station/engineering/atmos) "eMu" = ( @@ -16549,8 +16501,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/port) "eVC" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 9 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) @@ -17331,7 +17283,6 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "fio" = ( @@ -21753,9 +21704,6 @@ /area/station/engineering/storage) "gBx" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, @@ -21779,10 +21727,10 @@ /area/station/engineering/storage/tech) "gCe" = ( /obj/effect/turf_decal/trimline/dark_green/corner, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 6 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "gCg" = ( @@ -22047,9 +21995,6 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 6 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 9 }, @@ -22428,16 +22373,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"gMm" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "N2 To Pure" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gMK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -24884,14 +24819,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/security/execution/transfer) -"hBi" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "CO2 to Pure" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hBr" = ( /obj/effect/turf_decal/tile/red/full, /obj/machinery/holopad, @@ -24973,8 +24900,9 @@ /obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "CO2 to Pure" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -25729,9 +25657,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, @@ -26241,22 +26166,6 @@ /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) -"hZm" = ( -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark_green/arrow_ccw, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "hZq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26971,10 +26880,9 @@ /turf/open/floor/iron, /area/station/security/prison/garden) "ijK" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "N2O to Pure" +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 1; + name = "O2 to Airmix" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -27499,14 +27407,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/mine/laborcamp) -"isd" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/engineering/atmos) "ise" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, @@ -27820,13 +27720,6 @@ /obj/structure/bookcase/random, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"iyx" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "iyE" = ( /obj/effect/spawner/structure/window/hollow/reinforced/end{ dir = 4 @@ -29499,8 +29392,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "N2O to Pure" }, /turf/open/floor/iron/cafeteria, /area/station/engineering/atmos) @@ -29744,7 +29638,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "jaS" = ( @@ -30009,7 +29902,7 @@ /area/station/engineering/supermatter/room) "jes" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/binary/pump/off/pink/visible{ +/obj/machinery/atmospherics/components/binary/pump{ dir = 4; name = "Exfiltrate to Port" }, @@ -31971,7 +31864,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "jLX" = ( @@ -33686,17 +33578,6 @@ /obj/effect/spawner/random/contraband/prison, /turf/open/floor/carpet/blue, /area/station/security/prison/work) -"klI" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/trimline/dark_green/line, -/obj/effect/turf_decal/trimline/dark_green/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/mix) "klX" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/public/glass{ @@ -34699,14 +34580,6 @@ /obj/item/storage/medkit/regular, /turf/open/floor/iron, /area/station/command/bridge) -"kBv" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/turf/open/floor/plating, -/area/station/engineering/atmos) "kBL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -35675,12 +35548,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"kQu" = ( -/obj/machinery/atmospherics/components/unary/passive_vent{ - dir = 8 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "kQz" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36878,8 +36745,8 @@ "liW" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /obj/machinery/light/directional/west, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "liY" = ( @@ -37300,9 +37167,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -37705,9 +37569,7 @@ "lwd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "lwi" = ( @@ -37765,10 +37627,7 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 1; - name = "O2 to Airmix" - }, +/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "lxU" = ( @@ -38705,10 +38564,10 @@ /turf/open/floor/wood, /area/station/commons/dorms) "lOI" = ( -/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer1{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "lOU" = ( @@ -39954,10 +39813,10 @@ /turf/open/floor/iron, /area/station/command/bridge) "mkG" = ( +/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "mld" = ( @@ -40501,7 +40360,6 @@ /obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 8 }, @@ -40795,8 +40653,9 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "N2 To Pure" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -41281,9 +41140,7 @@ /area/station/service/chapel) "mIk" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ - dir = 8 - }, +/obj/machinery/atmospherics/pipe/layer_manifold/yellow/visible, /turf/open/floor/plating, /area/station/engineering/atmos) "mIB" = ( @@ -41302,7 +41159,6 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "mIT" = ( @@ -41566,9 +41422,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 5 }, @@ -43476,9 +43329,7 @@ /turf/open/floor/iron/dark, /area/mine/laborcamp) "npJ" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "npL" = ( @@ -43516,10 +43367,7 @@ /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) "nqb" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "nqn" = ( @@ -46990,7 +46838,7 @@ /obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "oqf" = ( @@ -47525,9 +47373,8 @@ /area/station/ai_monitored/turret_protected/aisat/hallway) "oyX" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Plasma to Pure" +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible{ + dir = 4 }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -47640,9 +47487,6 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -47677,9 +47521,7 @@ /obj/effect/turf_decal/trimline/dark_green/arrow_ccw{ dir = 4 }, -/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "oAH" = ( @@ -47894,9 +47736,6 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 @@ -50771,9 +50610,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 @@ -51515,9 +51351,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 @@ -53138,9 +52971,6 @@ /obj/machinery/atmospherics/components/trinary/mixer/airmix{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, @@ -53699,7 +53529,7 @@ "qxo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 9 + dir = 1 }, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -53873,9 +53703,6 @@ /area/station/engineering/atmos) "qAT" = ( /obj/machinery/light/small/directional/south, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -57121,7 +56948,7 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/smart/simple/green/visible{ +/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, /turf/open/floor/plating, @@ -57626,8 +57453,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Plasma to Pure" }, /turf/open/floor/iron, /area/station/engineering/atmos) @@ -57939,9 +57767,6 @@ c_tag = "Atmospherics - South East"; dir = 6 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 1 }, @@ -59292,10 +59117,7 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/green/visible{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 1; - name = "O2 To Pure" - }, +/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) "skJ" = ( @@ -59776,9 +59598,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 }, @@ -60815,7 +60634,6 @@ /obj/structure/railing/corner{ dir = 8 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5, /turf/open/floor/iron, /area/station/engineering/atmos/storage) "sGJ" = ( @@ -64441,12 +64259,10 @@ /area/station/commons/toilet/locker) "tOy" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 1 - }, /obj/effect/turf_decal/trimline/dark_blue/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) "tOF" = ( @@ -64560,10 +64376,7 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "tQb" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/green/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/simple/green/visible, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "tQc" = ( @@ -65086,13 +64899,13 @@ /area/icemoon/underground/explored) "tZG" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible{ - dir = 8 - }, /obj/machinery/meter, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, +/obj/machinery/atmospherics/pipe/layer_manifold/pink/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "tZO" = ( @@ -66429,9 +66242,6 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -70970,11 +70780,6 @@ "vSi" = ( /turf/closed/wall, /area/mine/eva) -"vSl" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/plating, -/area/station/maintenance/disposal/incinerator) "vSo" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/structure/disposalpipe/sorting/mail{ @@ -71205,12 +71010,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/cargo/storage) -"vVO" = ( -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "vVP" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -71889,9 +71688,6 @@ /area/mine/laborcamp) "wgG" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -72268,9 +72064,6 @@ /obj/effect/turf_decal/trimline/dark_red/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 9 - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "wkZ" = ( @@ -74124,9 +73917,8 @@ /turf/open/floor/iron, /area/station/command/gateway) "wMe" = ( -/obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ + dir = 8 }, /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) @@ -75052,12 +74844,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"xaU" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 5 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/icemoon/surface/outdoors/nospawn) "xaV" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -75120,10 +74906,10 @@ "xbC" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, -/obj/machinery/atmospherics/pipe/smart/simple/violet/visible{ - dir = 8 - }, /obj/machinery/meter, +/obj/machinery/atmospherics/pipe/layer_manifold/violet/visible{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) "xbR" = ( @@ -75351,8 +75137,9 @@ dir = 1 }, /obj/item/radio/intercom/directional/north, -/obj/machinery/atmospherics/pipe/layer_manifold/pink/visible{ - dir = 4 +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Exfiltrate to Waste" }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) @@ -75733,10 +75520,6 @@ /obj/effect/turf_decal/trimline/dark_red/filled/warning{ dir = 4 }, -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 8; - name = "Exfiltrate to Waste" - }, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) "xkg" = ( @@ -76378,9 +76161,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ dir = 5 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, @@ -77145,13 +76925,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/entrance, /turf/open/floor/iron, /area/station/security/brig/upper) -"xHs" = ( -/obj/machinery/atmospherics/components/binary/pump/off{ - dir = 8; - name = "Exfiltrate to Waste" - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "xHx" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -77420,16 +77193,17 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/machinery/atmospherics/pipe/layer_manifold/general/visible{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump/off{ + dir = 1; + name = "O2 To Pure" }, /turf/open/floor/iron, /area/station/engineering/atmos) "xMh" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/bridge_pipe/cyan/visible, -/obj/machinery/atmospherics/pipe/bridge_pipe/orange/visible{ - dir = 8 +/obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ + dir = 4 }, /turf/open/floor/plating, /area/station/engineering/atmos) @@ -78896,9 +78670,6 @@ /obj/effect/turf_decal/trimline/dark_red/arrow_ccw{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/simple/pink/visible/layer5{ - dir = 4 - }, /obj/effect/turf_decal/trimline/dark_green/arrow_ccw, /obj/machinery/atmospherics/pipe/smart/simple/violet/visible/layer1{ dir = 4 @@ -184721,7 +184492,7 @@ wlZ jes qdx sIA -klI +rtt dgZ ffe bPn @@ -242036,7 +241807,7 @@ djU iRA kfQ pus -xaU +qCB qwF qwF qwF @@ -242289,7 +242060,7 @@ wSo vZt iHm rXe -xHs +hHN bJD pfa rsW @@ -242546,11 +242317,11 @@ hHN wAB jkW laV -vVO +hHN eBT qKK hpI -eVC +sEB bea afp eWQ @@ -242804,7 +242575,7 @@ fwq hHN lRR bpR -gMm +skx mzd mIk wMe @@ -243060,8 +242831,8 @@ cmJ rwC tyb nrA -bYO -eoH +flH +lxu dAg qxo eVC @@ -243578,7 +243349,7 @@ hQu eBT eqm hpI -eVC +sEB bea frD tln @@ -244090,7 +243861,7 @@ uYH shj qnO lxu -fQc +ijK qxo eVC qwF @@ -244590,7 +244361,7 @@ kyr dFp nJI hoV -ijK +oyX xfB khe oSX @@ -244598,7 +244369,7 @@ oyX xfB cHm xfB -hBi +oyX xfB jHQ xfB @@ -244606,7 +244377,7 @@ gBx rkm sEX hpI -eVC +sEB bea kfa qCn @@ -245104,13 +244875,13 @@ buo tEZ oFW qIC -isd +eMr cnq nVe xMh -isd +eMr cnq -kBv +nVe cnq eMr cnq @@ -245120,7 +244891,7 @@ kfs kfs oAl kfs -eVC +sEB qwF qwF qwF @@ -245377,7 +245148,7 @@ lOI pGQ wgG uQy -iyx +swu swu swu swu @@ -245634,7 +245405,7 @@ gtg cEw bCT kfs -kQu +sEB bln bln bln @@ -246917,15 +246688,15 @@ sEB sEB sEB hpI -hZm +loV +wvI +wvI +wvI +wvI +wvI +pwF wvI wvI -puf -puf -puf -vSl -puf -puf wvI pwF wvI @@ -247182,7 +246953,7 @@ mdQ xTu kJK qOk -arZ +nDq liW aLJ puf