From bbd3e9cf1660a37fea4eb35391bd9bcf0b9f228f Mon Sep 17 00:00:00 2001 From: esainane Date: Tue, 26 Oct 2021 13:32:40 +1300 Subject: [PATCH] Use Passive Vents for waste output in Space (#62239) --- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 4 +- .../map_files/Deltastation/DeltaStation2.dmm | 41 +++--- .../map_files/IceBoxStation/IceBoxStation.dmm | 38 +++--- _maps/map_files/KiloStation/KiloStation.dmm | 26 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 39 +++--- _maps/map_files/tramstation/tramstation.dmm | 127 ++++++++++-------- .../atmospherics/atmos_mapping_helpers.dm | 3 - .../unary_devices/outlet_injector.dm | 6 - 8 files changed, 136 insertions(+), 148 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 7843f65feb2..4a9327265ec 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -2538,7 +2538,9 @@ }, /area/ruin/space/derelict/atmospherics) "lO" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste, +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{ + name = "engine outlet injector" + }, /turf/open/floor/engine/air{ initial_gas_mix = "o2=20000;n2=80000;TEMP=293.15" }, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index e37c13f0405..dea6d11f651 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -32662,12 +32662,12 @@ /turf/open/floor/plating, /area/maintenance/port) "ecg" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 1 }, -/turf/open/floor/plating/airless, -/area/medical/virology) +/turf/open/space, +/area/space/nearstation) "ech" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -43628,13 +43628,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/maintenance/starboard/fore) -"hgm" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ - dir = 8 - }, -/turf/open/space, -/area/engineering/atmos/upper) "hgo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -46856,14 +46849,12 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, -/turf/open/floor/plating/airless, -/area/maintenance/disposal/incinerator) +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "hZL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -80584,12 +80575,12 @@ /turf/open/floor/iron, /area/security/brig) "rOc" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 }, -/obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/engineering/supermatter/room) +/area/space/nearstation) "rOx" = ( /obj/structure/rack, /obj/item/storage/belt/utility, @@ -82066,12 +82057,12 @@ /turf/open/floor/iron, /area/cargo/miningoffice) "slH" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 8 }, +/obj/structure/lattice, /turf/open/space, -/area/engineering/atmos) +/area/space/nearstation) "slQ" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -130874,8 +130865,8 @@ aaa aaa aad aaa -hgm -hgm +slH +slH iqM lef rMV diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 28ce35e6214..1b872d35adb 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -9411,24 +9411,18 @@ dir = 8 }, /turf/open/floor/plating/snowed/icemoon, -/area/maintenance/disposal/incinerator) +/area/icemoon/surface/outdoors) "bJN" = ( /turf/closed/wall, /area/science/xenobiology) "bJP" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /turf/open/floor/plating/snowed/icemoon, -/area/maintenance/disposal/incinerator) +/area/icemoon/surface/outdoors) "bJS" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /turf/open/floor/plating/icemoon, /area/maintenance/disposal/incinerator) -"bJV" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ - dir = 1 - }, -/turf/open/floor/plating/snowed/icemoon, -/area/maintenance/disposal/incinerator) "bJW" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible{ dir = 4 @@ -25182,11 +25176,11 @@ /turf/open/floor/wood/parquet, /area/service/bar/atrium) "jeE" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, /turf/open/floor/plating/snowed/icemoon, -/area/engineering/supermatter/room) +/area/icemoon/surface/outdoors) "jeJ" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -29871,7 +29865,7 @@ "lGj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/plating/snowed/icemoon, -/area/engineering/supermatter/room) +/area/icemoon/surface/outdoors) "lGS" = ( /obj/structure/rack, /obj/effect/spawner/random/maintenance/three, @@ -31754,11 +31748,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/machinery/atmospherics/components/binary/valve/digital/on{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pressure_valve/on{ dir = 4; name = "Output Release" }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/engineering/supermatter/room) "mEr" = ( @@ -42314,7 +42308,7 @@ }, /area/science/research) "sfD" = ( -/obj/machinery/atmospherics/components/binary/valve/digital{ +/obj/machinery/atmospherics/components/binary/pressure_valve/on{ name = "Waste Release" }, /turf/open/floor/iron, @@ -43765,11 +43759,11 @@ /turf/open/floor/iron, /area/maintenance/starboard/fore) "sOq" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 8 }, /turf/open/floor/plating/snowed/icemoon, -/area/engineering/atmos) +/area/icemoon/surface/outdoors) "sOs" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/abandoned, @@ -85315,17 +85309,17 @@ lpW iaV lBH lGj +lGj +lGj +lGj +lGj +lGj jeE boP boP boP boP boP -boP -boP -boP -boP -boP gQb gQb gQb @@ -91728,7 +91722,7 @@ bJP bJP bJP bJP -bJV +jeE boP boP boP diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index c31b9d9979e..cb597efe3d0 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -27158,13 +27158,12 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "daZ" = ( -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/stripes/box, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 8 }, -/turf/open/floor/plating/airless, -/area/maintenance/disposal/incinerator) +/turf/open/space/basic, +/area/space/nearstation) "dbl" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ @@ -45291,7 +45290,7 @@ /obj/structure/lattice, /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /turf/open/space/basic, -/area/maintenance/disposal/incinerator) +/area/space/nearstation) "jXU" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -69646,13 +69645,12 @@ /turf/open/floor/iron, /area/engineering/break_room) "sUB" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 8 }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating/airless, -/area/engineering/supermatter/room) +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "sVj" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -70926,12 +70924,12 @@ /turf/open/floor/iron, /area/maintenance/disposal/incinerator) "tvH" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, -/obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/engineering/atmos) +/area/space/nearstation) "tvJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b486adb090d..26189fe730d 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -10946,11 +10946,12 @@ /turf/open/floor/iron/showroomfloor, /area/maintenance/starboard/secondary) "cpN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 8 }, -/turf/open/floor/plating/airless, -/area/maintenance/disposal/incinerator) +/turf/open/space, +/area/space/nearstation) "cpQ" = ( /obj/structure/table/wood, /obj/item/reagent_containers/glass/beaker{ @@ -35058,12 +35059,12 @@ /turf/open/floor/iron, /area/command/gateway) "kuD" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, -/obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/engineering/atmos) +/area/space/nearstation) "kuJ" = ( /obj/machinery/door/airlock{ name = "Central Emergency Storage" @@ -35937,9 +35938,10 @@ /turf/open/floor/carpet, /area/service/chapel) "kKv" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste, -/turf/open/floor/plating/airless, -/area/engineering/supermatter/room) +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent, +/turf/open/space/basic, +/area/space/nearstation) "kKA" = ( /obj/effect/spawner/random/maintenance, /obj/effect/turf_decal/bot_white, @@ -57620,12 +57622,12 @@ /turf/open/floor/iron, /area/construction/storage_wing) "suP" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 1 }, /turf/open/space/basic, -/area/medical/virology) +/area/space/nearstation) "suX" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/warning{ @@ -66817,11 +66819,12 @@ /turf/open/floor/carpet, /area/service/library) "vIJ" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 4 }, -/turf/open/floor/plating/airless, -/area/science/xenobiology) +/obj/structure/lattice, +/turf/open/space/basic, +/area/space/nearstation) "vJt" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/west, @@ -67071,12 +67074,12 @@ /turf/open/floor/engine, /area/science/misc_lab/range) "vNT" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, /turf/open/space, -/area/engineering/atmos) +/area/space/nearstation) "vNU" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/carpet, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 588295a6f93..63f228cb5a8 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -6609,6 +6609,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "aMX" = ( @@ -12009,6 +12010,7 @@ /obj/structure/girder, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "cJQ" = ( @@ -12687,12 +12689,12 @@ /turf/open/floor/iron, /area/security/checkpoint/supply) "cTH" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, -/obj/structure/lattice/catwalk, /turf/open/space/basic, -/area/engineering/atmos) +/area/space/nearstation) "cTK" = ( /obj/structure/railing{ dir = 8 @@ -13568,6 +13570,7 @@ dir = 5 }, /obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "djC" = ( @@ -15005,11 +15008,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/engineering/supermatter/room) -"dMl" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/plating/airless, -/area/maintenance/disposal/incinerator) "dMm" = ( /obj/effect/turf_decal/trimline/yellow/warning, /obj/effect/turf_decal/trimline/neutral/filled/corner{ @@ -22331,11 +22329,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/command/heads_quarters/hop) -"grQ" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/turf/open/floor/plating/airless, -/area/engineering/supermatter/room) "grR" = ( /obj/effect/turf_decal/siding/thinplating/corner{ dir = 1 @@ -25613,13 +25606,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai) -"hFV" = ( -/obj/effect/turf_decal/sand/plating, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating/airless, -/area/mine/explored) "hGc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30890,6 +30876,7 @@ "jEq" = ( /obj/structure/disposalpipe/junction/yjunction, /obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "jEz" = ( @@ -31027,13 +31014,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "jHT" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer2{ - dir = 1 - }, /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "jIc" = ( @@ -33767,12 +33752,12 @@ /turf/open/floor/iron, /area/commons/dorms) "kIO" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 1 }, -/turf/open/floor/plating/airless, -/area/engineering/supermatter/room) +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "kIT" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -34281,6 +34266,13 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/plating/asteroid/airless, /area/mine/explored) +"kTr" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/components/unary/passive_vent/layer2{ + dir = 1 + }, +/turf/open/openspace/airless/planetary, +/area/space) "kTw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -37195,6 +37187,12 @@ /obj/structure/plasticflaps, /turf/open/floor/plating, /area/cargo/sorting) +"mbv" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/airless, +/area/mine/explored) "mbB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43151,12 +43149,9 @@ /area/engineering/supermatter) "ouV" = ( /obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/components/binary/pump/on{ - name = "Incinerator Output Pump"; - target_pressure = 4500 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, /turf/open/floor/plating/airless, -/area/maintenance/disposal/incinerator) +/area/mine/explored) "ovf" = ( /obj/effect/turf_decal/trimline/purple/filled/corner{ dir = 4 @@ -46123,6 +46118,7 @@ dir = 10 }, /obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "pAe" = ( @@ -47981,6 +47977,7 @@ "qix" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/mine/explored) "qiB" = ( @@ -54557,6 +54554,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/security/checkpoint) +"sQS" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/asteroid/airless, +/area/mine/explored) "sRg" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 6 @@ -64779,6 +64780,14 @@ /obj/structure/cable, /turf/open/floor/plating/catwalk_floor, /area/maintenance/central/secondary) +"wHY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/plating/airless, +/area/mine/explored) "wIc" = ( /obj/machinery/computer/gateway_control, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -68673,12 +68682,12 @@ /turf/open/floor/engine, /area/engineering/supermatter/room) "ybC" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{ +/obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 }, -/turf/open/floor/plating/airless, -/area/maintenance/disposal/incinerator) +/obj/structure/lattice, +/turf/open/space/basic, +/area/space) "ybL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -101922,8 +101931,8 @@ dhe dhe dhe dhe -grQ -grQ +ouV +ouV kIO dhe dhe @@ -108863,7 +108872,7 @@ yak yak yak ybC -aBM +ajc ajc aBM aBM @@ -109116,10 +109125,10 @@ oWU xru nqo ouV -dMl -dMl -dMl -dMl +ouV +ouV +ouV +ouV aBM ajc aBM @@ -170789,7 +170798,7 @@ aMR qix qix qix -hFV +jHT dhe dhe dhe @@ -171046,7 +171055,7 @@ aBM aBM aBM aBM -mNq +wHY dhe dhe dhe @@ -171303,7 +171312,7 @@ dhe dhe dhe aBM -mNq +wHY aBM dhe dhe @@ -171560,7 +171569,7 @@ dhe dhe dhe aBM -mNq +wHY aBM dhe dhe @@ -171817,7 +171826,7 @@ dhe dhe dhe aBM -mNq +wHY aBM aBM aBM @@ -172075,7 +172084,7 @@ dhe dhe aBM pAc -dRX +mbv djA aBM aBM @@ -172334,8 +172343,8 @@ aBM aBM aBM jEq -dRX -dRX +mbv +mbv djA dhe dhe @@ -172595,7 +172604,7 @@ aBM aBM pAc cJO -dRX +mbv djA aBM aBM @@ -172854,11 +172863,11 @@ aBM lvw aBM pAc -dRX -dRX -dRX -dRX -dRX +mbv +mbv +mbv +mbv +mbv xbu aYr aYr @@ -173115,8 +173124,8 @@ aBM aBM aBM aBM -aBM -aBM +sQS +kTr aYr aYr aYr diff --git a/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm b/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm index a6546c15bdc..5f3c14e9220 100644 --- a/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm +++ b/code/__DEFINES/atmospherics/atmos_mapping_helpers.dm @@ -149,9 +149,6 @@ #define ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION "distro-loop_meter" #define ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE "atmos-waste_loop_meter" -#define ATMOS_GAS_MONITOR_WASTE_ENGINE "engine-waste_out" -#define ATMOS_GAS_MONITOR_WASTE_ATMOS "atmos-waste_out" - //AIRLOCK CONTROLLER TAGS //RnD ordnance burn chamber diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm index da1b5cc75f5..bb33d8ade6a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm @@ -221,12 +221,6 @@ on = TRUE volume_rate = MAX_TRANSFER_RATE -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste - name = "atmos waste outlet injector" - id = ATMOS_GAS_MONITOR_WASTE_ATMOS -/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste - name = "engine outlet injector" - id = ATMOS_GAS_MONITOR_WASTE_ENGINE /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/plasma_input name = "plasma tank input injector" id = ATMOS_GAS_MONITOR_INPUT_PLAS