diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm index 081aeea54af..e9b2e77f3b3 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm @@ -2513,15 +2513,14 @@ /turf/simulated/floor/plating/airless, /area/ruin/ancientstation/betanorth) "ht" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - inlet_injector_autolink_id = "theta_air_in"; - name = "Mixed Air Supply Control"; - outlet_vent_autolink_id = "theta_air_out"; - outlet_setting = 2000; - autolink_sensors = list("air_sensor"="Tank") - }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/computer/general_air_control/large_tank_control{ + name = "Mixed Air Supply Control"; + autolink_sensors = list("air_sensor"="Tank"); + outlet_autolink_ids = list("theta_air_out"); + inlet_injector_autolink_ids = list("theta_air_in"); + dir = 8 + }, /turf/simulated/floor/plasteel/airless, /area/ruin/ancientstation/atmo) "hu" = ( @@ -2570,7 +2569,7 @@ }, /obj/machinery/atmospherics/unary/outlet_injector/on{ dir = 8; - autolink_id = "theta_n2_in" + autolink_id = "theta_air_in" }, /turf/simulated/floor/engine/air, /area/ruin/ancientstation/atmo) @@ -6254,7 +6253,7 @@ /obj/machinery/atmospherics/unary/vent_pump/siphon/on{ dir = 8; external_pressure_bound = 0; - autolink_id = "co2_out"; + autolink_id = "theta_air_out"; internal_pressure_bound = 4000; pressure_checks = 2 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm index 1a5a0b879ae..a9ee3c2e1cc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm @@ -3188,9 +3188,9 @@ }, /area/ruin/unpowered/syndicate_space_base/service) "sA" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "syndiebase_mix_out"; - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber{ + dir = 8; + autolink_id = "syndiebase_mix_out" }, /turf/simulated/floor/engine/vacuum, /area/ruin/unpowered/syndicate_space_base/atmos) @@ -4453,10 +4453,10 @@ pixel_y = 6 }, /obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "syndiebase_mix_in"; - outlet_vent_autolink_id = "syndiebase_mix_out"; autolink_sensors = list("syndiebase_mix_sensor" = "Burn Mix"); - dir = 8 + dir = 8; + outlet_autolink_ids = list("syndiebase_mix_out"); + inlet_injector_autolink_ids = list("syndiebase_mix_in") }, /turf/simulated/floor/plating, /area/ruin/unpowered/syndicate_space_base/atmos) diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index ccf3ac978a5..a3d2b62c902 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -48628,10 +48628,10 @@ "edf" = ( /obj/machinery/computer/general_air_control/large_tank_control{ dir = 1; - inlet_injector_autolink_id = "o2_in"; - name = "Oxygen Supply Control"; - outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor"="Tank") + autolink_sensors = list("o2_sensor"); + inlet_injector_autolink_ids = list("o2_in"); + outlet_autolink_ids = list("o2_outlet_scrubber"); + name = "Oxygen Supply Control" }, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -50359,14 +50359,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/port) "eTp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/computer/general_air_control/large_tank_control{ dir = 1; - inlet_injector_autolink_id = "n2_in"; - name = "Nitrogen Supply Control"; - outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor"="Tank") + autolink_sensors = list("n2_sensor"); + inlet_injector_autolink_ids = list("n2_in"); + outlet_autolink_ids = list("n2_outlet_scrubber"); + name = "Nitrogen Supply Control" }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -54055,12 +54055,9 @@ /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) "gMP" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "n2o_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "n2o_outlet_scrubber" }, /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) @@ -54793,12 +54790,9 @@ }, /area/station/maintenance/asmaint) "hea" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "tox_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "tox_outlet_scrubber" }, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) @@ -56344,12 +56338,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "hWr" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "co2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "co2_outlet_scrubber" }, /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) @@ -60484,12 +60475,9 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "khK" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "air_out"; - internal_pressure_bound = 2000; - pressure_checks = 2 + autolink_id = "air_outlet_scrubber" }, /turf/simulated/floor/engine/air, /area/station/engineering/atmos) @@ -61587,10 +61575,10 @@ "kIR" = ( /obj/machinery/computer/general_air_control/large_tank_control{ dir = 8; - inlet_injector_autolink_id = "co2_in"; - name = "Carbon Dioxide Supply Control"; - outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor"="Tank") + autolink_sensors = list("co2_sensor"); + inlet_injector_autolink_ids = list("co2_in"); + outlet_autolink_ids = list("co2_outlet_scrubber"); + name = "Carbon Dioxide Supply Control" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -67678,9 +67666,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "nTk" = ( -/obj/machinery/atmospherics/unary/outlet_injector/on{ - autolink_id = "air_in" - }, +/obj/machinery/atmospherics/unary/outlet_injector/on, /obj/machinery/sparker{ id = "toxinsigniter"; pixel_x = -20 @@ -68466,12 +68452,9 @@ }, /area/station/medical/surgery/primary) "olG" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "waste_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "waste_outlet_scrubber" }, /turf/simulated/floor/engine/vacuum, /area/station/engineering/atmos) @@ -69147,12 +69130,9 @@ /turf/simulated/floor/carpet, /area/station/legal/magistrate) "oCa" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "o2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "o2_outlet_scrubber" }, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) @@ -69238,7 +69218,6 @@ "oEK" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; - autolink_id = "air_in"; on = 1 }, /turf/simulated/floor/engine, @@ -69630,16 +69609,16 @@ }, /area/station/hallway/secondary/exit) "oMN" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - inlet_injector_autolink_id = "tox_in"; - name = "Toxin Supply Control"; - outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor"="Tank") - }, /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("tox_sensor"); + inlet_injector_autolink_ids = list("tox_in"); + outlet_autolink_ids = list("tox_outlet_scrubber"); + name = "Plasma Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "oNo" = ( @@ -73340,8 +73319,7 @@ pixel_y = 32 }, /obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 4; - autolink_id = "air_in" + dir = 4 }, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) @@ -73859,12 +73837,9 @@ /turf/simulated/floor/plating, /area/station/science/toxins/mixing) "qRU" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "n2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "n2_outlet_scrubber" }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) @@ -75208,11 +75183,10 @@ "rDW" = ( /obj/machinery/computer/general_air_control/large_tank_control{ dir = 1; - inlet_injector_autolink_id = "air_in"; - name = "Mixed Air Supply Control"; - outlet_vent_autolink_id = "air_out"; - outlet_setting = 2000; - autolink_sensors = list("air_sensor"="Tank") + autolink_sensors = list("air_sensor"); + inlet_injector_autolink_ids = list("air_in"); + outlet_autolink_ids = list("air_outlet_scrubber"); + name = "Air Supply Control" }, /turf/simulated/floor/plasteel{ icon_state = "arrival" @@ -80766,10 +80740,10 @@ "uFr" = ( /obj/machinery/computer/general_air_control/large_tank_control{ dir = 8; - inlet_injector_autolink_id = "waste_in"; - name = "Gas Mix Tank Control"; - outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor"="Tank") + autolink_sensors = list("waste_sensor"); + inlet_injector_autolink_ids = list("waste_in"); + outlet_autolink_ids = list("waste_outlet_scrubber"); + name = "Gas Mix Tank Control" }, /turf/simulated/floor/plasteel{ dir = 4; @@ -86047,10 +86021,10 @@ "xyK" = ( /obj/machinery/computer/general_air_control/large_tank_control{ dir = 8; - inlet_injector_autolink_id = "n2o_in"; - name = "Nitrous Oxide Supply Control"; - outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor"="Tank") + autolink_sensors = list("n2o_sensor"); + inlet_injector_autolink_ids = list("n2o_in"); + outlet_autolink_ids = list("n2o_outlet_scrubber"); + name = "Nitrous Oxide Supply Control" }, /turf/simulated/floor/plasteel{ dir = 4; diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 72d5a33d2a3..134265f8fc5 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -13027,12 +13027,9 @@ /turf/simulated/floor/wood, /area/station/service/library) "bPo" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - autolink_id = "n2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "n2_outlet_scrubber" }, /turf/simulated/floor/engine{ name = "n2 floor"; @@ -13802,12 +13799,9 @@ }, /area/station/maintenance/port2) "bSW" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - autolink_id = "o2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "o2_outlet_scrubber" }, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) @@ -14451,12 +14445,9 @@ }, /area/station/security/armory/secure) "bVr" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - autolink_id = "air_out"; - internal_pressure_bound = 2000; - pressure_checks = 2 + autolink_id = "air_outlet_scrubber" }, /turf/simulated/floor/engine{ name = "air floor"; @@ -14539,17 +14530,17 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "bVy" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "co2_in"; - name = "Carbon Dioxide Supply Control"; - outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor"="Tank"); - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, /obj/structure/window/reinforced, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 1; + autolink_sensors = list("co2_sensor"); + inlet_injector_autolink_ids = list("co2_in"); + outlet_autolink_ids = list("co2_outlet_scrubber"); + name = "Carbon Dioxide Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "bVz" = ( @@ -14714,16 +14705,16 @@ }, /area/station/engineering/atmos/distribution) "bWc" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 1; - inlet_injector_autolink_id = "waste_in"; - name = "Gas Mix Tank Control"; - outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 1; + autolink_sensors = list("waste_sensor"); + inlet_injector_autolink_ids = list("waste_in"); + outlet_autolink_ids = list("waste_outlet_scrubber"); + name = "Gas Mix Tank Control" + }, /turf/simulated/floor/plasteel{ icon_state = "darkyellow" }, @@ -14827,12 +14818,9 @@ /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) "bWP" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "co2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "co2_outlet_scrubber" }, /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) @@ -14850,12 +14838,9 @@ /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) "bWS" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "tox_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "tox_outlet_scrubber" }, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) @@ -14873,12 +14858,9 @@ /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) "bWV" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "n2o_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "n2o_outlet_scrubber" }, /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) @@ -14905,12 +14887,9 @@ }, /area/station/engineering/atmos) "bWY" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "waste_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "waste_outlet_scrubber" }, /turf/simulated/floor/engine{ name = "vacuum floor"; @@ -22907,17 +22886,17 @@ /turf/simulated/wall, /area/station/engineering/atmos/control) "ddM" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 4; - inlet_injector_autolink_id = "n2_in"; - name = "Nitrogen Supply Control"; - outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("n2_sensor"); + inlet_injector_autolink_ids = list("n2_in"); + outlet_autolink_ids = list("n2_outlet_scrubber"); + name = "Nitrogen Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "ddN" = ( @@ -22979,17 +22958,17 @@ }, /area/station/hallway/secondary/exit) "ddV" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 4; - inlet_injector_autolink_id = "o2_in"; - name = "Oxygen Supply Control"; - outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("o2_sensor"); + inlet_injector_autolink_ids = list("o2_in"); + outlet_autolink_ids = list("o2_outlet_scrubber"); + name = "Oxygen Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "ddW" = ( @@ -23141,18 +23120,17 @@ }, /area/station/engineering/atmos/distribution) "dev" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 4; - inlet_injector_autolink_id = "air_in"; - name = "Mixed Air Supply Control"; - outlet_vent_autolink_id = "air_out"; - outlet_setting = 2000; - autolink_sensors = list("air_sensor"="Tank") - }, /obj/structure/window/reinforced{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("air_sensor"); + inlet_injector_autolink_ids = list("air_in"); + outlet_autolink_ids = list("air_outlet_scrubber"); + name = "Air Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dew" = ( @@ -23190,14 +23168,14 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/structure/window/reinforced, /obj/machinery/computer/general_air_control/large_tank_control{ dir = 1; - inlet_injector_autolink_id = "tox_in"; - name = "Toxin Supply Control"; - outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor"="Tank") + autolink_sensors = list("tox_sensor"); + inlet_injector_autolink_ids = list("tox_in"); + outlet_autolink_ids = list("tox_outlet_scrubber"); + name = "Plasma Supply Control" }, -/obj/structure/window/reinforced, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "dez" = ( @@ -23225,14 +23203,14 @@ /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, +/obj/structure/window/reinforced, /obj/machinery/computer/general_air_control/large_tank_control{ dir = 1; - inlet_injector_autolink_id = "n2o_in"; - name = "Nitrous Oxide Supply Control"; - outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor"="Tank") + autolink_sensors = list("n2o_sensor"); + inlet_injector_autolink_ids = list("n2o_in"); + outlet_autolink_ids = list("n2o_outlet_scrubber"); + name = "Nitrous Oxide Supply Control" }, -/obj/structure/window/reinforced, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "deC" = ( @@ -36162,7 +36140,6 @@ dir = 1 }, /obj/machinery/atmospherics/unary/outlet_injector/on{ - autolink_id = "air_in"; name = "Justice Injector" }, /turf/simulated/floor/plasteel{ diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 0b4a98deea6..1b2510d937c 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -54237,16 +54237,9 @@ }, /area/station/security/armory/secure) "eXU" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "o2_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - icon_state = "in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "o2_outlet_scrubber" }, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) @@ -54497,16 +54490,9 @@ }, /area/station/medical/surgery/secondary) "ffd" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "n2_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - icon_state = "in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "n2_outlet_scrubber" }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) @@ -56051,14 +56037,14 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("n2o_sensor"="Tank"); - dir = 4; - inlet_injector_autolink_id = "n2o_in"; - name = "Nitrous Oxide Supply Control"; - outlet_vent_autolink_id = "n2o_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("n2o_sensor"); + inlet_injector_autolink_ids = list("n2o_in"); + outlet_autolink_ids = list("n2o_outlet_scrubber"); + name = "Nitrous Oxide Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "escape" @@ -59606,17 +59592,16 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("air_sensor"="Tank"); - dir = 8; - inlet_injector_autolink_id = "air_in"; - name = "Mixed Air Supply Control"; - outlet_setting = 2000; - outlet_vent_autolink_id = "air_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 10 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("air_sensor"); + inlet_injector_autolink_ids = list("air_in"); + outlet_autolink_ids = list("air_outlet_scrubber"); + name = "Air Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "arrival" @@ -60938,15 +60923,9 @@ }, /area/station/science/toxins/mixing) "ihK" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - autolink_id = "air_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - icon_state = "in"; - internal_pressure_bound = 2000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "air_outlet_scrubber" }, /turf/simulated/floor/engine/air, /area/station/engineering/atmos) @@ -64111,17 +64090,17 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("n2_sensor"="Tank"); - dir = 8; - inlet_injector_autolink_id = "n2_in"; - name = "Nitrogen Supply Control"; - outlet_vent_autolink_id = "n2_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("n2_sensor"); + inlet_injector_autolink_ids = list("n2_in"); + outlet_autolink_ids = list("n2_outlet_scrubber"); + name = "Nitrogen Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -71302,14 +71281,14 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("tox_sensor"="Tank"); - dir = 4; - inlet_injector_autolink_id = "tox_in"; - name = "Toxin Supply Control"; - outlet_vent_autolink_id = "tox_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("tox_sensor"); + inlet_injector_autolink_ids = list("tox_in"); + outlet_autolink_ids = list("tox_outlet_scrubber"); + name = "Plasma Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "purple" @@ -73922,14 +73901,14 @@ /turf/simulated/floor/plasteel, /area/station/supply/smith_office) "olZ" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("waste_sensor"="Tank"); - dir = 4; - inlet_injector_autolink_id = "waste_in"; - name = "Gas Mix Tank Control"; - outlet_vent_autolink_id = "waste_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/cyan, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("waste_sensor"); + inlet_injector_autolink_ids = list("waste_in"); + outlet_autolink_ids = list("waste_outlet_scrubber"); + name = "Gas Mix Tank Control" + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "green" @@ -78065,14 +78044,14 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("o2_sensor"="Tank"); - dir = 8; - inlet_injector_autolink_id = "o2_in"; - name = "Oxygen Supply Control"; - outlet_vent_autolink_id = "o2_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("o2_sensor"); + inlet_injector_autolink_ids = list("o2_in"); + outlet_autolink_ids = list("o2_outlet_scrubber"); + name = "Oxygen Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "blue" @@ -78669,16 +78648,9 @@ }, /area/station/science/robotics/chargebay) "qtC" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "co2_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - icon_state = "in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "co2_outlet_scrubber" }, /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) @@ -82559,14 +82531,14 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/machinery/computer/general_air_control/large_tank_control{ - autolink_sensors = list("co2_sensor"="Tank"); - dir = 4; - inlet_injector_autolink_id = "co2_in"; - name = "Carbon Dioxide Supply Control"; - outlet_vent_autolink_id = "co2_out" - }, /obj/machinery/atmospherics/pipe/simple/visible/green, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + autolink_sensors = list("co2_sensor"); + inlet_injector_autolink_ids = list("co2_in"); + outlet_autolink_ids = list("co2_outlet_scrubber"); + name = "Carbon Dioxide Supply Control" + }, /turf/simulated/floor/plasteel/dark, /area/station/engineering/atmos) "rZy" = ( @@ -88146,16 +88118,9 @@ /turf/simulated/floor/plasteel/white, /area/station/science/break_room) "uit" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "tox_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - icon_state = "in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "tox_outlet_scrubber" }, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) @@ -89288,16 +89253,9 @@ }, /area/station/supply/sorting) "uJH" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "n2o_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - icon_state = "in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "n2o_outlet_scrubber" }, /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) @@ -95957,16 +95915,9 @@ /turf/simulated/floor/grass, /area/station/science/lobby) "xBO" = ( -/obj/machinery/atmospherics/unary/vent_pump{ - autolink_id = "waste_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 4; - external_pressure_bound = 0; - icon_state = "in"; - initialize_directions = 1; - internal_pressure_bound = 4000; - on = 1; - pressure_checks = 2; - releasing = 0 + autolink_id = "waste_outlet_scrubber" }, /turf/simulated/floor/engine/vacuum, /area/station/engineering/atmos) diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 88abbc70d04..0cc11551037 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -9991,15 +9991,15 @@ /area/station/medical/surgery/observation) "bWF" = ( /obj/machinery/atmospherics/pipe/simple/visible/green, -/obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "n2o_in"; - name = "Nitrous Oxide Supply Control"; - outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor"="Tank") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + autolink_sensors = list("n2o_sensor"); + inlet_injector_autolink_ids = list("n2o_in"); + outlet_autolink_ids = list("n2o_outlet_scrubber"); + name = "Nitrous Oxide Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "bWG" = ( @@ -12220,11 +12220,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) "cvE" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "air_out"; - internal_pressure_bound = 2000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "air_outlet_scrubber" }, /turf/simulated/floor/engine/air, /area/station/engineering/atmos) @@ -21858,16 +21855,15 @@ }, /area/station/supply/storage) "euK" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "air_in"; - name = "Mixed Air Supply Control"; - outlet_vent_autolink_id = "air_out"; - outlet_setting = 2000; - autolink_sensors = list("air_sensor"="Tank") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + autolink_sensors = list("air_sensor"); + inlet_injector_autolink_ids = list("air_in"); + outlet_autolink_ids = list("air_outlet_scrubber"); + name = "Air Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "euO" = ( @@ -29045,10 +29041,10 @@ /area/station/legal/courtroom) "fMS" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "cstm_in"; - name = "Custom Mixture Control"; - outlet_vent_autolink_id = "cstm_out"; - autolink_sensors = list("cstm_sensor"="Tank") + autolink_sensors = list("cstm_sensor"); + inlet_injector_autolink_ids = list("cstm_in"); + outlet_autolink_ids = list("cstm_outlet_scrubber"); + name = "Custom Gas Mix Tank Control" }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) @@ -43083,11 +43079,8 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) "iDJ" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "o2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "o2_outlet_scrubber" }, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) @@ -43657,11 +43650,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "iJj" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "co2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "co2_outlet_scrubber" }, /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) @@ -50828,11 +50818,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "kep" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "n2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "n2_outlet_scrubber" }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) @@ -53557,15 +53544,15 @@ /turf/simulated/floor/beach/away/water/deep, /area/station/public/dorms) "kJu" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "waste_in"; - name = "Gas Mix Tank Control"; - outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor"="Tank") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + autolink_sensors = list("waste_sensor"); + inlet_injector_autolink_ids = list("waste_in"); + outlet_autolink_ids = list("waste_outlet_scrubber"); + name = "Gas Mix Tank Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "kJw" = ( @@ -64178,11 +64165,8 @@ }, /area/station/science/robotics) "mTK" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "n2o_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "n2o_outlet_scrubber" }, /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) @@ -67813,10 +67797,10 @@ dir = 10 }, /obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "o2_in"; - name = "Oxygen Supply Control"; - outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor"="Tank") + autolink_sensors = list("o2_sensor"); + inlet_injector_autolink_ids = list("o2_in"); + outlet_autolink_ids = list("o2_outlet_scrubber"); + name = "Oxygen Supply Control" }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) @@ -73024,11 +73008,8 @@ }, /area/station/supply/qm) "oDI" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "waste_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "waste_outlet_scrubber" }, /turf/simulated/floor/engine/airless, /area/station/engineering/atmos) @@ -75767,7 +75748,6 @@ /area/station/hallway/primary/aft) "pdg" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ - autolink_id = "air_in"; dir = 8 }, /turf/simulated/floor/engine/airless/nodecay, @@ -79972,10 +79952,10 @@ /area/station/command/office/blueshield) "pVZ" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "co2_in"; - name = "Carbon Dioxide Supply Control"; - outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor"="Tank") + autolink_sensors = list("co2_sensor"); + inlet_injector_autolink_ids = list("co2_in"); + outlet_autolink_ids = list("co2_outlet_scrubber"); + name = "Carbon Dioxide Supply Control" }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) @@ -81177,15 +81157,15 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "qiW" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "n2_in"; - name = "Nitrogen Supply Control"; - outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor"="Tank") - }, /obj/machinery/light{ dir = 1 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + autolink_sensors = list("n2_sensor"); + inlet_injector_autolink_ids = list("n2_in"); + outlet_autolink_ids = list("n2_outlet_scrubber"); + name = "Nitrogen Supply Control" + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) "qjc" = ( @@ -87231,11 +87211,8 @@ }, /area/station/security/prison/cell_block) "ruV" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "cstm_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "cstm_outlet_scrubber" }, /turf/simulated/floor/engine/airless/nodecay, /area/station/engineering/atmos/asteroid_filtering) @@ -96252,7 +96229,6 @@ /area/station/security/armory/secure) "thS" = ( /obj/machinery/atmospherics/unary/outlet_injector{ - autolink_id = "air_in"; on = 1 }, /turf/simulated/floor/engine, @@ -104938,8 +104914,7 @@ /area/station/maintenance/security/aft_port) "uTB" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ - dir = 1; - autolink_id = "air_in" + dir = 1 }, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) @@ -108226,10 +108201,10 @@ /area/station/engineering/equipmentstorage) "vCU" = ( /obj/machinery/computer/general_air_control/large_tank_control{ - inlet_injector_autolink_id = "tox_in"; - name = "Toxin Supply Control"; - outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor"="Tank") + autolink_sensors = list("tox_sensor"); + inlet_injector_autolink_ids = list("tox_in"); + outlet_autolink_ids = list("tox_outlet_scrubber"); + name = "Plasma Supply Control" }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/asteroid_filtering) @@ -113836,11 +113811,8 @@ /turf/simulated/floor/engine, /area/station/medical/chemistry) "wKP" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - external_pressure_bound = 0; - autolink_id = "tox_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 +/obj/machinery/atmospherics/unary/vent_scrubber{ + autolink_id = "tox_outlet_scrubber" }, /turf/simulated/floor/engine/airless/nodecay, /area/station/engineering/atmos/asteroid_filtering) diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 6c0a4b4faa8..6e75e972c84 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -32347,7 +32347,6 @@ "cAS" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; - autolink_id = "air_in"; on = 1 }, /turf/simulated/floor/engine, @@ -43945,17 +43944,17 @@ }, /area/station/hallway/primary/port/east) "ftI" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - inlet_injector_autolink_id = "n2o_in"; - name = "Nitrous Oxide Supply Control"; - outlet_vent_autolink_id = "n2o_out"; - autolink_sensors = list("n2o_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("n2o_sensor"); + inlet_injector_autolink_ids = list("n2o_in"); + outlet_autolink_ids = list("n2o_outlet_scrubber"); + name = "Nitrous Oxide Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "escape" @@ -48866,12 +48865,9 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "hBH" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "co2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "co2_outlet_scrubber" }, /turf/simulated/floor/engine/co2, /area/station/engineering/atmos) @@ -49619,17 +49615,17 @@ }, /area/station/security/permabrig) "hRm" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 1; - inlet_injector_autolink_id = "o2_in"; - name = "Oxygen Supply Control"; - outlet_vent_autolink_id = "o2_out"; - autolink_sensors = list("o2_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, /obj/structure/window/reinforced, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 1; + autolink_sensors = list("o2_sensor"); + inlet_injector_autolink_ids = list("o2_in"); + outlet_autolink_ids = list("o2_outlet_scrubber"); + name = "Oxygen Supply Control" + }, /turf/simulated/floor/plasteel{ icon_state = "blue" }, @@ -51700,12 +51696,9 @@ }, /area/station/science/research) "iKE" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "o2_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "o2_outlet_scrubber" }, /turf/simulated/floor/engine/o2, /area/station/engineering/atmos) @@ -56483,7 +56476,6 @@ /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/unary/outlet_injector{ dir = 8; - autolink_id = "air_in"; on = 1 }, /turf/space, @@ -59925,12 +59917,9 @@ }, /area/station/security/warden) "mkK" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "n2o_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "n2o_outlet_scrubber" }, /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) @@ -60914,18 +60903,18 @@ }, /area/station/science/lobby) "mHs" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 1; - inlet_injector_autolink_id = "n2_in"; - name = "Nitrogen Supply Control"; - outlet_vent_autolink_id = "n2_out"; - autolink_sensors = list("n2_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/window/reinforced, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 1; + autolink_sensors = list("n2_sensor"); + inlet_injector_autolink_ids = list("n2_in"); + outlet_autolink_ids = list("n2_outlet_scrubber"); + name = "Nitrogen Supply Control" + }, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -64838,12 +64827,9 @@ }, /area/station/security/warden) "ooX" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ - autolink_id = "n2_out"; +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "n2_outlet_scrubber" }, /turf/simulated/floor/engine/n2, /area/station/engineering/atmos) @@ -66834,17 +66820,17 @@ }, /area/station/command/bridge) "phI" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - inlet_injector_autolink_id = "tox_in"; - name = "Toxin Supply Control"; - outlet_vent_autolink_id = "tox_out"; - autolink_sensors = list("tox_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("tox_sensor"); + inlet_injector_autolink_ids = list("tox_in"); + outlet_autolink_ids = list("tox_outlet_scrubber"); + name = "Plasma Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "purple" @@ -73354,18 +73340,17 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/south) "rTX" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 1; - inlet_injector_autolink_id = "air_in"; - name = "Mixed Air Supply Control"; - outlet_vent_autolink_id = "air_out"; - outlet_setting = 2000; - autolink_sensors = list("air_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 }, /obj/structure/window/reinforced, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 1; + autolink_sensors = list("air_sensor"); + inlet_injector_autolink_ids = list("air_in"); + outlet_autolink_ids = list("air_outlet_scrubber"); + name = "Air Supply Control" + }, /turf/simulated/floor/plasteel{ icon_state = "whiteblue" }, @@ -75081,12 +75066,9 @@ /turf/simulated/floor/carpet, /area/station/public/vacant_office) "sHu" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "waste_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "waste_outlet_scrubber" }, /turf/simulated/floor/engine/vacuum, /area/station/engineering/atmos) @@ -78097,14 +78079,14 @@ }, /area/station/hallway/primary/central/south) "tZG" = ( +/obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/machinery/computer/general_air_control/large_tank_control{ dir = 8; - inlet_injector_autolink_id = "waste_in"; - name = "Gas Mix Tank Control"; - outlet_vent_autolink_id = "waste_out"; - autolink_sensors = list("waste_sensor"="Tank") + autolink_sensors = list("waste_sensor"); + inlet_injector_autolink_ids = list("waste_in"); + outlet_autolink_ids = list("waste_outlet_scrubber"); + name = "Gas Mix Tank Control" }, -/obj/machinery/atmospherics/pipe/simple/visible/cyan, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "green" @@ -81196,17 +81178,17 @@ /turf/simulated/floor/carpet/arcade, /area/station/maintenance/fore) "vnl" = ( -/obj/machinery/computer/general_air_control/large_tank_control{ - dir = 8; - inlet_injector_autolink_id = "co2_in"; - name = "Carbon Dioxide Supply Control"; - outlet_vent_autolink_id = "co2_out"; - autolink_sensors = list("co2_sensor"="Tank") - }, /obj/machinery/atmospherics/pipe/simple/visible/green, /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/computer/general_air_control/large_tank_control{ + dir = 8; + autolink_sensors = list("co2_sensor"); + inlet_injector_autolink_ids = list("co2_in"); + outlet_autolink_ids = list("co2_outlet_scrubber"); + name = "Carbon Dioxide Supply Control" + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "black" @@ -83048,12 +83030,9 @@ }, /area/station/medical/virology) "wjI" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 1; - external_pressure_bound = 0; - autolink_id = "air_out"; - internal_pressure_bound = 2000; - pressure_checks = 2 + autolink_id = "air_outlet_scrubber" }, /turf/simulated/floor/engine/air, /area/station/engineering/atmos) @@ -84872,12 +84851,9 @@ }, /area/station/science/toxins/mixing) "wZw" = ( -/obj/machinery/atmospherics/unary/vent_pump/siphon/on{ +/obj/machinery/atmospherics/unary/vent_scrubber{ dir = 8; - external_pressure_bound = 0; - autolink_id = "tox_out"; - internal_pressure_bound = 4000; - pressure_checks = 2 + autolink_id = "tox_outlet_scrubber" }, /turf/simulated/floor/engine/plasma, /area/station/engineering/atmos) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index d8bfbf0eac3..37bbc9e8862 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -26,6 +26,7 @@ GLOBAL_LIST_EMPTY(apcs) GLOBAL_LIST_EMPTY(air_alarms) GLOBAL_LIST_EMPTY(power_monitors) GLOBAL_LIST_EMPTY(all_vent_pumps) +GLOBAL_LIST_EMPTY(all_scrubbers) GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used for patrolling. GLOBAL_LIST_EMPTY(deliverybeacons) //list of all MULEbot delivery beacons. diff --git a/code/game/machinery/computer/atmos_controllers.dm b/code/game/machinery/computer/atmos_controllers.dm index fb4b7088867..22ae8b746b2 100644 --- a/code/game/machinery/computer/atmos_controllers.dm +++ b/code/game/machinery/computer/atmos_controllers.dm @@ -285,9 +285,9 @@ GLOBAL_LIST_EMPTY(gas_sensors) // Map set vars /// Autolink ID of the chamber inlet injector - var/inlet_injector_autolink_id + var/list/inlet_injector_autolink_ids = list() /// Autolink ID of the chamber outlet vent - var/outlet_vent_autolink_id + var/list/outlet_autolink_ids = list() // Instanced vars. These are /tmp/ to avoid mappers trying to set them /// The runtime UID of the inlet injector @@ -311,9 +311,9 @@ GLOBAL_LIST_EMPTY(gas_sensors) ..() // Setup inlet - if(inlet_injector_autolink_id) + if(length(inlet_injector_autolink_ids)) for(var/obj/machinery/atmospherics/unary/outlet_injector/inlet_injector as anything in GLOB.air_injectors) - if(inlet_injector.autolink_id == inlet_injector_autolink_id) + if(inlet_injector.autolink_id in inlet_injector_autolink_ids) inlet_uids += inlet_injector.UID() // inlet_injector! // Setup some defaults inlet_injector.on = TRUE @@ -324,9 +324,9 @@ GLOBAL_LIST_EMPTY(gas_sensors) break // Setup outlet - if(outlet_vent_autolink_id) + if(length(outlet_autolink_ids)) for(var/obj/machinery/atmospherics/unary/vent_pump/outlet_vent as anything in GLOB.all_vent_pumps) - if(outlet_vent.autolink_id == outlet_vent_autolink_id) + if(outlet_vent.autolink_id in outlet_autolink_ids) outlet_uids += outlet_vent.UID() var/area/our_area = get_area(src) our_area.vents -= outlet_vent @@ -337,22 +337,25 @@ GLOBAL_LIST_EMPTY(gas_sensors) outlet_vent_data += list("[outlet_vent.UID()]" = list("name" =outlet_vent.name, "on" = outlet_vent.on, "checks" = outlet_vent.pressure_checks, "rate" = outlet_vent.pressure_checks == 1 ? outlet_vent.external_pressure_bound : outlet_vent.internal_pressure_bound, "uid" = outlet_vent.UID())) refresh_outlets() return - var/obj/machinery/atmospherics/unary/vent_scrubber/scrubber = locateUID(outlet_vent_autolink_id) - if(!QDELETED(scrubber)) - scrubber.on = TRUE - scrubber.scrubbing = FALSE + for(var/obj/machinery/atmospherics/unary/vent_scrubber/scrubber in GLOB.all_scrubbers) + if(scrubber.autolink_id in outlet_autolink_ids) + outlet_uids += scrubber.UID() + var/area/our_area = get_area(src) + our_area.scrubbers -= scrubber + scrubber.on = TRUE + scrubber.scrubbing = FALSE + outlet_scrubber_data += list("[scrubber.UID()]" = list( + "id_tag" = scrubber.UID(), + "name" = scrubber.name, + "power" = scrubber.on, + "scrubbing" = scrubber.scrubbing, + "widenet" = scrubber.widenet, + "filter_o2" = scrubber.scrub_O2, + "filter_n2" = scrubber.scrub_N2, + "filter_co2" = scrubber.scrub_CO2, + "filter_toxins" = scrubber.scrub_Toxins, + "filter_n2o" = scrubber.scrub_N2O)) - outlet_scrubber_data += list("[scrubber.UID()]" = list( - "id_tag" = scrubber.UID(), - "name" = scrubber.name, - "power" = scrubber.on, - "scrubbing" = scrubber.scrubbing, - "widenet" = scrubber.widenet, - "filter_o2" = scrubber.scrub_O2, - "filter_n2" = scrubber.scrub_N2, - "filter_co2" = scrubber.scrub_CO2, - "filter_toxins" = scrubber.scrub_Toxins, - "filter_n2o" = scrubber.scrub_N2O)) /obj/machinery/computer/general_air_control/large_tank_control/multitool_act(mob/living/user, obj/item/I) if(!ismultitool(I)) // Should never happen @@ -391,7 +394,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) inlet_uids += linked_datum.UID() // Make sure the multitool ref didnt change while they had the menu open var/obj/machinery/atmospherics/unary/outlet_injector/inlet_injector = linked_datum // Setup some defaults - inlet_injector.on = TRUE + inlet_injector.on = FALSE inlet_injector.volume_rate = inlet_setting inlet_injector.update_icon() inlet_data += list("[linked_datum.UID()]" = list("name" = inlet_injector.name, "on" = inlet_injector.on, "rate" = inlet_injector.volume_rate, "uid" = inlet_injector.UID())) @@ -451,7 +454,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) // Setup some defaults var/area/our_area = get_area(src) our_area.vents -= outlet_vent - outlet_vent.on = TRUE + outlet_vent.on = FALSE outlet_vent.releasing = FALSE outlet_vent.internal_pressure_bound = outlet_setting outlet_vent.update_icon() @@ -465,7 +468,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) // Setup some defaults var/area/our_area = get_area(src) our_area.scrubbers -= scrubber - scrubber.on = TRUE + scrubber.on = FALSE scrubber.scrubbing = FALSE scrubber.update_icon() outlet_scrubber_data += list("[scrubber.UID()]" = list( @@ -529,7 +532,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) if(QDELETED(inlet_injector)) inlet_data -= uid inlet_uids -= uid - return + continue inlet_data[uid]["name"] = inlet_injector.name inlet_data[uid]["on"] = inlet_injector.on inlet_data[uid]["rate"] = inlet_injector.volume_rate @@ -544,7 +547,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) outlet_scrubber_data -= uid outlet_vent_data -= uid outlet_uids -= uid - return + continue outlet_vent_data[uid]["name"] = vent.name outlet_vent_data[uid]["on"] = vent.on outlet_vent_data[uid]["checks"] = vent.pressure_checks @@ -555,7 +558,7 @@ GLOBAL_LIST_EMPTY(gas_sensors) outlet_scrubber_data -= uid outlet_vent_data -= uid outlet_uids -= uid - return + continue outlet_scrubber_data[uid]["id_tag"] = scrubber.UID() outlet_scrubber_data[uid]["name"] = scrubber.name outlet_scrubber_data[uid]["power"] = scrubber.on diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 6f36f69ba09..27d8e3c6765 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -49,8 +49,13 @@ icon = null initial_loc = get_area(loc) initial_loc.scrubbers += src + GLOB.all_scrubbers += src name = "[initial_loc.name] Air Scrubber #[length(initial_loc.scrubbers)]" +/obj/machinery/atmospherics/unary/vent_scrubber/Destroy() + . = ..() + GLOB.all_scrubbers -= src + /obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user) . = ..() . += "This filters the atmosphere of harmful gas. Filtered gas goes straight into the connected pipenet. Controlled by an Air Alarm."