diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
index 21ffceac81d..a0e4e420b9c 100644
--- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
@@ -6035,9 +6035,8 @@
},
/area/ruin/unpowered/syndicate_lava_base/engineering)
"oB" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "syndie_lavaland_inc_in"
},
/obj/structure/sign/warning/vacuum/external{
diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
index 18a049114c1..d3d377dfa55 100644
--- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -2276,9 +2276,8 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"fC" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
dir = 8;
- frequency = 1441;
id_tag = "o2_out_bunker";
name = "oxygen out"
},
@@ -2323,7 +2322,6 @@
"fJ" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
- frequency = 1441;
input_tag = "o2_in_bunker";
name = "Oxygen Supply Control";
output_tag = "o2_out_bunker";
@@ -2338,7 +2336,6 @@
/area/ruin/space/has_grav/deepstorage/power)
"fL" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "o2_sensor_bunker"
},
/turf/open/floor/plating/airless,
@@ -2482,9 +2479,8 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/deepstorage/power)
"gd" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 8;
- frequency = 1441;
id = "n2_in_bunker"
},
/turf/open/floor/plating/airless,
@@ -2607,9 +2603,8 @@
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
dir = 8;
- frequency = 1441;
id_tag = "n2_out_bunker";
name = "nitrogen out"
},
@@ -2666,7 +2661,6 @@
"gC" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
- frequency = 1441;
input_tag = "n2_in_bunker";
name = "Nitrogen Supply Control";
output_tag = "n2_out_bunker";
@@ -2676,7 +2670,6 @@
/area/ruin/space/has_grav/deepstorage/power)
"gD" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "n2_sensor_bunker"
},
/turf/open/floor/plating/airless,
@@ -2755,9 +2748,8 @@
/turf/open/floor/plasteel/floorgrime,
/area/ruin/space/has_grav/deepstorage/power)
"gP" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 8;
- frequency = 1441;
id = "o2_in_bunker"
},
/turf/open/floor/plating/airless,
diff --git a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
index 9d88971dcff..e59f36a0330 100644
--- a/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+++ b/_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
@@ -733,9 +733,8 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man)
"cl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
dir = 8;
- frequency = 1441;
id_tag = "n2o_out_cat";
name = "n2o out"
},
@@ -768,9 +767,8 @@
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/powered/cat_man)
"cs" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
dir = 1;
- frequency = 1441;
id_tag = "o2_out_cat";
name = "freezer vent"
},
diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
index bfb9887a373..852e4efc1e0 100644
--- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm
@@ -4206,8 +4206,7 @@
},
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
dir = 8;
- frequency = 1441;
- id_tag = "air_out";
+ id_tag = "oldstation_air_out";
name = "air output"
},
/turf/open/floor/engine/air,
diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm
index 38ae9f91daf..e450855b622 100644
--- a/_maps/RandomZLevels/snowdin.dmm
+++ b/_maps/RandomZLevels/snowdin.dmm
@@ -7367,9 +7367,8 @@
/turf/open/floor/plating,
/area/awaymission/snowdin/post)
"rI" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "syndie_lavaland_inc_in";
pixel_x = 5;
pixel_y = 5
@@ -7717,9 +7716,8 @@
/turf/open/floor/engine/vacuum,
/area/awaymission/snowdin/post/engineering)
"sC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "snowdin_incin_in"
},
/turf/open/floor/engine/vacuum,
@@ -8714,9 +8712,8 @@
},
/area/awaymission/snowdin/cave/mountain)
"vG" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "snowdin_incin_in"
},
/turf/open/floor/plating/snowed/cavern,
diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm
index 94a95d0c01c..7260f60dae4 100644
--- a/_maps/RandomZLevels/undergroundoutpost45.dmm
+++ b/_maps/RandomZLevels/undergroundoutpost45.dmm
@@ -7455,7 +7455,6 @@
/area/awaymission/undergroundoutpost45/engineering)
"pa" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "UO45_air_sensor"
},
/turf/open/floor/engine/air,
@@ -7765,9 +7764,8 @@
},
/area/awaymission/undergroundoutpost45/engineering)
"pE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos{
dir = 2;
- frequency = 1441;
icon_state = "in";
id_tag = "UO45_air_out";
name = "air out"
@@ -7778,9 +7776,8 @@
},
/area/awaymission/undergroundoutpost45/engineering)
"pF" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 2;
- frequency = 1441;
id = "UO45_air_in"
},
/turf/open/floor/engine{
@@ -8340,7 +8337,6 @@
"qK" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/computer/atmos_control/tank{
- frequency = 1441;
input_tag = "UO45_air_in";
name = "Mixed Air Supply Control";
output_tag = "UO45_air_out";
@@ -8704,8 +8700,7 @@
/area/awaymission/undergroundoutpost45/engineering)
"rq" = (
/obj/machinery/atmospherics/pipe/manifold4w/supply/visible,
-/obj/machinery/meter{
- frequency = 1441;
+/obj/machinery/meter/atmos{
id_tag = "UO45_distro_meter";
name = "Distribution Loop"
},
@@ -9360,7 +9355,6 @@
"sr" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
dir = 8;
- frequency = 1441;
id_tag = "UO45_mix_in";
name = "distro out"
},
@@ -9737,7 +9731,6 @@
"tc" = (
/obj/machinery/computer/atmos_control/tank{
dir = 8;
- frequency = 1441;
input_tag = "UO45_mix_in";
name = "Gas Mix Tank Control";
output_tag = "UO45_mix_in";
@@ -9765,16 +9758,14 @@
},
/area/awaymission/undergroundoutpost45/engineering)
"te" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 8;
- frequency = 1441;
id = "UO45_mix_in"
},
/turf/open/floor/engine/vacuum,
/area/awaymission/undergroundoutpost45/engineering)
"tf" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "UO45_mix_sensor"
},
/turf/open/floor/engine/vacuum,
@@ -10043,8 +10034,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8
},
-/obj/machinery/meter{
- frequency = 1441;
+/obj/machinery/meter/atmos{
id_tag = "UO45_waste_meter";
name = "Waste Loop"
},
@@ -10405,7 +10395,6 @@
},
/obj/machinery/computer/atmos_control/tank{
dir = 1;
- frequency = 1441;
input_tag = "UO45_n2_in";
name = "Nitrogen Supply Control";
output_tag = "UO45_n2_out";
@@ -10447,7 +10436,6 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/machinery/computer/atmos_control/tank{
dir = 1;
- frequency = 1441;
input_tag = "UO45_o2_in";
name = "Oxygen Supply Control";
output_tag = "UO45_o2_out";
@@ -10533,7 +10521,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/computer/atmos_control{
dir = 4;
- frequency = 1441;
name = "Tank Monitor";
sensors = list("UO45_n2_sensor" = "Nitrogen", "UO45_o2_sensor" = "Oxygen", "UO45_mix_sensor" = "Gas Mix Tank")
},
@@ -10716,7 +10703,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/computer/atmos_control{
dir = 4;
- frequency = 1441;
level = 3;
name = "Distribution and Waste Monitor";
sensors = list("UO45_air_sensor" = "Mixed Air Supply Tank", "UO45_distro_meter" = "Distribution Loop", "UO45_waste_meter" = "Waste Loop")
@@ -10833,34 +10819,30 @@
},
/area/awaymission/undergroundoutpost45/engineering)
"vd" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "UO45_n2_in"
},
/turf/open/floor/engine/n2,
/area/awaymission/undergroundoutpost45/engineering)
"ve" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
dir = 1;
- frequency = 1441;
id_tag = "UO45_n2_out";
name = "nitrogen out"
},
/turf/open/floor/engine/n2,
/area/awaymission/undergroundoutpost45/engineering)
"vf" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "UO45_o2_in"
},
/turf/open/floor/engine/o2,
/area/awaymission/undergroundoutpost45/engineering)
"vg" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos{
dir = 1;
- frequency = 1441;
id_tag = "UO45_o2_out";
name = "oxygen out"
},
@@ -11094,7 +11076,6 @@
/area/awaymission/undergroundoutpost45/engineering)
"vD" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "UO45_n2_sensor"
},
/obj/machinery/light/small,
@@ -11106,7 +11087,6 @@
/area/awaymission/undergroundoutpost45/engineering)
"vF" = (
/obj/machinery/air_sensor{
- frequency = 1441;
id_tag = "UO45_o2_sensor"
},
/obj/machinery/light/small,
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 313a93b9cf8..4661391feba 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -608,8 +608,7 @@
},
/obj/machinery/camera/motion{
c_tag = "Armory Motion Sensor";
- dir = 2;
- name = "motion-sensitive security camera"
+ dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -6490,11 +6489,8 @@
/turf/open/floor/plating,
/area/shuttle/pod_1)
"apI" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "waste_out";
- volume_rate = 200
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+ dir = 1
},
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -9891,8 +9887,7 @@
"ayK" = (
/obj/structure/closet/crate/rcd,
/obj/machinery/camera/motion{
- c_tag = "EVA Motion Sensor";
- name = "motion-sensitive security camera"
+ c_tag = "EVA Motion Sensor"
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/storage/eva)
@@ -36385,7 +36380,7 @@
id = "mixingsparker";
pixel_x = 25
},
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
dir = 4
},
/turf/open/floor/engine/vacuum,
@@ -36561,11 +36556,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "waste_meter";
- name = "Waste Loop"
- },
+/obj/machinery/meter/atmos/atmos_waste_loop,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bMU" = (
@@ -36578,11 +36569,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
dir = 2
},
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "distro_meter";
- name = "Distribution Loop"
- },
+/obj/machinery/meter/atmos/distro_loop,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bMW" = (
@@ -37230,10 +37217,8 @@
id = "mixingsparker";
pixel_x = 25
},
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
+ dir = 4
},
/turf/open/floor/engine/vacuum,
/area/science/mixing)
@@ -37546,11 +37531,8 @@
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bPl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "mix_out";
- name = "distro out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
+ dir = 8
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -38095,13 +38077,8 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bQz" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "mix_in";
- name = "Gas Mix Tank Control";
- output_tag = "mix_out";
- sensors = list("mix_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/mix_tank{
+ dir = 8
},
/turf/open/floor/plasteel/green/side{
dir = 4
@@ -38112,10 +38089,7 @@
/turf/open/floor/plating/airless,
/area/engine/atmos)
"bQB" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "mix_sensor"
- },
+/obj/machinery/air_sensor/atmos/mix_tank,
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bQC" = (
@@ -38587,11 +38561,8 @@
/turf/open/space,
/area/space/nearstation)
"bRL" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "mix_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
+ dir = 8
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -39517,11 +39488,8 @@
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bTX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "n2o_out";
- name = "n2o out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{
+ dir = 8
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -39908,13 +39876,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bUT" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "n2o_in";
- name = "Nitrous Oxide Supply Control";
- output_tag = "n2o_out";
- sensors = list("n2o_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrous_tank{
+ dir = 8
},
/turf/open/floor/plasteel/escape{
dir = 4
@@ -39925,10 +39888,7 @@
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bUV" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2o_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bUW" = (
@@ -40342,11 +40302,8 @@
},
/area/engine/atmos)
"bWd" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "n2o_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{
+ dir = 8
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -41120,11 +41077,8 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bXX" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "tox_out";
- name = "toxin out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+ dir = 8
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -41456,13 +41410,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bYT" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "tox_in";
- name = "Plasma Supply Control";
- output_tag = "tox_out";
- sensors = list("tox_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+ dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -41474,10 +41423,7 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bYV" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "tox_sensor"
- },
+/obj/machinery/air_sensor/atmos/toxin_tank,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bYW" = (
@@ -41795,11 +41741,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bZL" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "tox_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+ dir = 8
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -42651,11 +42594,8 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"cbI" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "co2_out";
- name = "co2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
+ dir = 8
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -43021,13 +42961,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"ccA" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "co2_in";
- name = "Carbon Dioxide Supply Control";
- output_tag = "co2_out";
- sensors = list("co2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/carbon_tank{
+ dir = 8
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -43038,10 +42973,7 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"ccC" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "co2_sensor"
- },
+/obj/machinery/air_sensor/atmos/carbon_tank,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"ccD" = (
@@ -43434,11 +43366,8 @@
},
/area/engine/atmos)
"cdD" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "co2_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
+ dir = 8
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -44639,13 +44568,8 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"cgV" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "n2_in";
- name = "Nitrogen Supply Control";
- output_tag = "n2_out";
- sensors = list("n2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+ dir = 1
},
/turf/open/floor/plasteel/red/side,
/area/engine/atmos)
@@ -44672,13 +44596,8 @@
},
/area/engine/atmos)
"cgZ" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "o2_in";
- name = "Oxygen Supply Control";
- output_tag = "o2_out";
- sensors = list("o2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+ dir = 1
},
/turf/open/floor/plasteel/blue/side{
dir = 0
@@ -44701,13 +44620,8 @@
},
/area/engine/atmos)
"chc" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "air_in";
- name = "Mixed Air Supply Control";
- output_tag = "air_out";
- sensors = list("air_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/air_tank{
+ dir = 1
},
/turf/open/floor/plasteel/arrival,
/area/engine/atmos)
@@ -46235,74 +46149,50 @@
},
/area/engine/engineering)
"ckU" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/engine/atmos)
"ckV" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "n2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"ckW" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "n2_out";
- name = "n2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"ckX" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "o2_sensor"
- },
+/obj/machinery/air_sensor/atmos/oxygen_tank,
/turf/open/floor/engine/o2,
/area/engine/atmos)
"ckY" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "o2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"ckZ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "o2_out";
- name = "o2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"cla" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "air_sensor"
- },
+/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/engine/atmos)
"clb" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
"clc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "air_out";
- name = "air out"
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -47373,15 +47263,13 @@
/turf/open/floor/engine,
/area/engine/engineering)
"cop" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "inc_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
+ dir = 1
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"coq" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{
dir = 1
},
/obj/structure/sign/warning/vacuum/external{
@@ -47399,6 +47287,10 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/obj/machinery/air_sensor{
+ pixel_x = -32;
+ pixel_y = -32
+ },
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cos" = (
@@ -51667,6 +51559,7 @@
/area/maintenance/aft)
"cBE" = (
/obj/effect/landmark/event_spawn,
+/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"cBF" = (
@@ -53047,9 +52940,8 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"cGZ" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- volume_rate = 200
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
+ dir = 1
},
/turf/open/floor/plating/airless,
/area/engine/engineering)
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index dd5d4905f76..c64c40fde41 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -3881,8 +3881,7 @@
},
/obj/machinery/camera{
c_tag = "Security Post - Arrivals";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -4990,8 +4989,7 @@
/obj/item/clipboard,
/obj/machinery/camera{
c_tag = "Vacant Office";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/grimy,
/area/security/vacantoffice)
@@ -7657,11 +7655,8 @@
/area/engine/atmospherics_engine)
"avl" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "n2_in";
- volume_rate = 200
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
+ dir = 8
},
/turf/open/space,
/area/engine/atmospherics_engine)
@@ -15402,8 +15397,7 @@
},
/obj/machinery/camera{
c_tag = "Security Post - Cargo";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -15626,7 +15620,7 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"aMu" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{
dir = 4
},
/turf/open/floor/engine/vacuum,
@@ -16251,6 +16245,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/air_sensor/atmos/incinerator_tank{
+ pixel_x = -32;
+ pixel_y = 32
+ },
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"aNS" = (
@@ -16946,10 +16944,8 @@
/turf/open/floor/plasteel/vault,
/area/security/execution/education)
"aPx" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "mix_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine/vacuum,
@@ -18945,11 +18941,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"aTj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "air_out";
- name = "air out"
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+ dir = 8
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -19852,13 +19845,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"aUX" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "air_in";
- name = "Mixed Air Supply Control";
- output_tag = "air_out";
- sensors = list("air_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/air_tank{
+ dir = 8
},
/obj/structure/window/reinforced{
dir = 4
@@ -19875,10 +19863,7 @@
/turf/open/floor/plating,
/area/engine/atmos)
"aUZ" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "air_sensor"
- },
+/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/engine/atmos)
"aVa" = (
@@ -20632,11 +20617,8 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"aWv" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 4;
- frequency = 1441;
- id_tag = "co2_out";
- name = "co2 vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
+ dir = 4
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -20820,10 +20802,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"aWS" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
+ dir = 8
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -21344,10 +21324,7 @@
/turf/open/floor/engine/co2,
/area/engine/atmos)
"aXX" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "co2_sensor"
- },
+/obj/machinery/air_sensor/atmos/carbon_tank,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"aXY" = (
@@ -21358,13 +21335,8 @@
},
/area/engine/atmos)
"aXZ" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 4;
- frequency = 1441;
- input_tag = "co2_in";
- name = "Carbon Dioxide Supply Control";
- output_tag = "co2_out";
- sensors = list("co2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/carbon_tank{
+ dir = 4
},
/obj/structure/window/reinforced{
dir = 8
@@ -21990,8 +21962,7 @@
"aZm" = (
/obj/machinery/camera{
c_tag = "Security - Prison Port";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/corner,
/area/security/prison)
@@ -22090,8 +22061,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Security - Prison";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/corner,
/area/security/prison)
@@ -22315,8 +22285,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "Security - Escape Pod";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/side{
dir = 5
@@ -22347,10 +22316,8 @@
/turf/closed/wall/mineral/titanium,
/area/shuttle/pod_3)
"aZP" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "co2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
+ dir = 4
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -22522,11 +22489,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bak" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "o2_out";
- name = "oxygen vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+ dir = 8
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
@@ -23232,13 +23196,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bbL" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "o2_in";
- name = "Oxygen Supply Control";
- output_tag = "o2_out";
- sensors = list("o2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+ dir = 8
},
/obj/structure/window/reinforced{
dir = 4
@@ -23256,10 +23215,7 @@
},
/area/engine/atmos)
"bbN" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "o2_sensor"
- },
+/obj/machinery/air_sensor/atmos/oxygen_tank,
/turf/open/floor/engine/o2,
/area/engine/atmos)
"bbO" = (
@@ -23812,11 +23768,8 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bcZ" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 4;
- frequency = 1441;
- id_tag = "tox_out";
- name = "plasma vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+ dir = 4
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -23931,10 +23884,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bdn" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "o2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+ dir = 8
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
@@ -24457,20 +24408,12 @@
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bew" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "tox_sensor"
- },
+/obj/machinery/air_sensor/atmos/toxin_tank,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bex" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 4;
- frequency = 1441;
- input_tag = "tox_in";
- name = "Plasma Supply Control";
- output_tag = "tox_out";
- sensors = list("tox_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+ dir = 4
},
/obj/structure/window/reinforced{
dir = 8
@@ -25042,10 +24985,8 @@
},
/area/security/prison)
"bfT" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "tox_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+ dir = 4
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -25161,11 +25102,8 @@
},
/area/engine/atmos)
"bgf" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "n2_out";
- name = "n2 vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+ dir = 8
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
@@ -25718,13 +25656,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bht" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "n2_in";
- name = "Nitrogen Supply Control";
- output_tag = "n2_out";
- sensors = list("n2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+ dir = 8
},
/obj/structure/window/reinforced{
dir = 4
@@ -25741,10 +25674,7 @@
},
/area/engine/atmos)
"bhv" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/engine/atmos)
"bhw" = (
@@ -26222,8 +26152,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Medbay";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/whitered/side{
dir = 1
@@ -26311,8 +26240,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Office Fore";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/side{
dir = 1
@@ -26428,11 +26356,8 @@
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"biV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 4;
- frequency = 1441;
- id_tag = "n2o_out";
- name = "n2o vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{
+ dir = 4
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -26613,10 +26538,8 @@
},
/area/engine/atmos)
"bjn" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "n2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+ dir = 8
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
@@ -27157,8 +27080,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Head of Security's Office";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 4
@@ -27231,20 +27153,12 @@
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bkI" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2o_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bkJ" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 4;
- frequency = 1441;
- input_tag = "n2o_in";
- name = "Nitrous Oxide Supply Control";
- output_tag = "n2o_out";
- sensors = list("n2o_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrous_tank{
+ dir = 4
},
/obj/structure/window/reinforced{
dir = 8
@@ -28091,8 +28005,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Head of Security's Quarters";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/grimy,
/area/crew_quarters/heads/hos)
@@ -28152,10 +28065,8 @@
/turf/open/space,
/area/space/nearstation)
"bmI" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "n2o_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{
+ dir = 4
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -29359,8 +29270,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Transfer Centre";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/side{
dir = 9
@@ -29696,10 +29606,8 @@
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bpP" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "mix_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
+ dir = 4
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -30784,20 +30692,12 @@
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"brU" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "mix_sensor"
- },
+/obj/machinery/air_sensor/atmos/mix_tank,
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"brV" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 4;
- frequency = 1441;
- input_tag = "mix_in";
- name = "Gas Mix Tank Control";
- output_tag = "mix_in";
- sensors = list("mix_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/mix_tank{
+ dir = 4
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel/green/side{
@@ -31756,11 +31656,8 @@
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"btL" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 4;
- frequency = 1441;
- id_tag = "mix_in";
- name = "distro vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
+ dir = 4
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -32865,8 +32762,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Office Aft";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/red/side,
/area/security/main)
@@ -32996,11 +32892,7 @@
/area/engine/atmos)
"bwv" = (
/obj/effect/decal/cleanable/dirt,
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "distro_meter";
- name = "Distribution Loop"
- },
+/obj/machinery/meter/atmos/distro_loop,
/obj/machinery/atmospherics/pipe/manifold4w/supply/visible,
/turf/open/floor/plasteel/caution,
/area/engine/atmos)
@@ -33021,11 +32913,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
},
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "waste_meter";
- name = "Waste Loop"
- },
+/obj/machinery/meter/atmos/atmos_waste_loop,
/turf/open/floor/plasteel/caution{
dir = 6
},
@@ -33489,8 +33377,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Security - Brig Fore";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 4
@@ -35032,8 +34919,7 @@
/obj/item/pen,
/obj/machinery/camera{
c_tag = "Security - Interrogation Monitoring";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -35920,8 +35806,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Interrogation";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -37049,8 +36934,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Transfer Centre Aft";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/obj/structure/sign/poster/official/work_for_a_future{
pixel_y = -32
@@ -39995,8 +39879,7 @@
/obj/structure/closet/secure_closet/evidence,
/obj/machinery/camera{
c_tag = "Security - Evidence Storage";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -40780,8 +40663,7 @@
},
/obj/machinery/camera{
c_tag = "Detective's Interrogation";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -41682,8 +41564,7 @@
},
/obj/machinery/camera{
c_tag = "Detective's Office";
- dir = 4;
- name = "security camera"
+ dir = 4
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -41816,8 +41697,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/camera{
c_tag = "Security - Brig Center";
- dir = 4;
- name = "security camera"
+ dir = 4
},
/turf/open/floor/plasteel/red/side{
dir = 8
@@ -44658,8 +44538,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Warden's Office";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 5
@@ -45317,8 +45196,7 @@
},
/obj/machinery/camera{
c_tag = "Security Post - Engineering";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/side{
dir = 5
@@ -49275,8 +49153,7 @@
},
/obj/machinery/camera{
c_tag = "Armory - Interior";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/obj/effect/turf_decal/stripes/line{
dir = 4
@@ -49903,8 +49780,7 @@
},
/obj/machinery/camera{
c_tag = "Courtroom - Fore";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/obj/structure/sign/poster/official/report_crimes{
pixel_y = 32
@@ -50071,8 +49947,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/camera{
c_tag = "Security - Brig Aft";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/corner{
dir = 4
@@ -51129,8 +51004,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Gear Room";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/side{
dir = 1
@@ -52697,8 +52571,7 @@
},
/obj/machinery/camera{
c_tag = "Lawyer's Office";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/wood,
/area/lawoffice)
@@ -52731,8 +52604,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Brig Desk";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/red/side,
/area/security/brig)
@@ -53420,8 +53292,7 @@
},
/obj/machinery/camera{
c_tag = "Courtroom - Center";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/neutral/side{
dir = 4
@@ -55761,8 +55632,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Shooting Range";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plating,
/area/security/range)
@@ -56764,8 +56634,7 @@
},
/obj/machinery/camera{
c_tag = "Courtroom - Aft";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/vault{
dir = 5
@@ -72372,7 +72241,6 @@
/obj/machinery/camera{
c_tag = "Security Post - Science";
dir = 8;
- name = "security camera";
network = list("ss13","rd")
},
/turf/open/floor/plasteel/red/side{
@@ -73377,8 +73245,7 @@
},
/obj/machinery/camera{
c_tag = "Security Post - Medbay";
- dir = 4;
- name = "security camera"
+ dir = 4
},
/turf/open/floor/plasteel/red/side{
dir = 10
@@ -99857,8 +99724,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Departures Port";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/red/side{
dir = 9
@@ -100549,8 +100415,7 @@
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Security - Departures Starboard";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/red/side{
dir = 6
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index b3a12f5d554..1dcc421d971 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -26657,7 +26657,6 @@
/area/ai_monitored/turret_protected/ai)
"bew" = (
/obj/machinery/power/apc{
- aidisabled = 0;
dir = 1;
name = "AI Chamber APC";
areastring = "/area/ai_monitored/turret_protected/ai";
@@ -31044,7 +31043,6 @@
/area/ai_monitored/turret_protected/aisat_interior)
"bnE" = (
/obj/machinery/power/apc{
- aidisabled = 0;
dir = 4;
name = "MiniSat Antechamber APC";
areastring = "/area/ai_monitored/turret_protected/aisat_interior";
@@ -33234,7 +33232,6 @@
network = list("minisat")
},
/obj/machinery/power/apc{
- aidisabled = 0;
dir = 2;
name = "MiniSat Exterior APC";
areastring = "/area/aisat";
@@ -33336,7 +33333,6 @@
dir = 4
},
/obj/machinery/power/apc/highcap/five_k{
- aidisabled = 0;
dir = 2;
name = "MiniSat Foyer APC";
areastring = "/area/ai_monitored/turret_protected/aisat/foyer";
@@ -36731,11 +36727,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8
},
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "waste_meter";
- name = "Waste Loop"
- },
+/obj/machinery/meter/atmos/atmos_waste_loop,
/turf/open/floor/plasteel/caution{
dir = 1
},
@@ -36757,11 +36749,7 @@
},
/area/engine/atmos)
"bzd" = (
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "distro_meter";
- name = "Distribution Loop"
- },
+/obj/machinery/meter/atmos/distro_loop,
/obj/machinery/atmospherics/pipe/manifold4w/supply/visible,
/turf/open/floor/plasteel/caution{
dir = 1
@@ -38314,11 +38302,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bCB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "mix_in";
- name = "mix in"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
+ dir = 8
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -38950,13 +38935,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bEc" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "mix_in";
- name = "Gas Mix Tank Control";
- output_tag = "mix_in";
- sensors = list("mix_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/mix_tank{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/turf/open/floor/plasteel/green/side{
@@ -38964,10 +38944,7 @@
},
/area/engine/atmos)
"bEd" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "mix_sensor"
- },
+/obj/machinery/air_sensor/atmos/mix_tank,
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bEe" = (
@@ -40030,11 +40007,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bGa" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "mix_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
+ dir = 8
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -41322,11 +41296,8 @@
/turf/open/space,
/area/space/nearstation)
"bJc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "n2o_out";
- name = "n2o out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{
+ dir = 8
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -42027,13 +41998,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bKF" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "n2o_in";
- name = "Nitrous Oxide Supply Control";
- output_tag = "n2o_out";
- sensors = list("n2o_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrous_tank{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/structure/window/reinforced{
@@ -42048,10 +42014,7 @@
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"bKH" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2o_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bKI" = (
@@ -42774,11 +42737,8 @@
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
"bMm" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "n2o_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{
+ dir = 8
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -44290,11 +44250,8 @@
/turf/open/floor/plasteel/purple,
/area/engine/atmos)
"bPx" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "tox_out";
- name = "toxin out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+ dir = 8
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -44898,13 +44855,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bQW" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "tox_in";
- name = "Plasma Supply Control";
- output_tag = "tox_out";
- sensors = list("tox_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/structure/window/reinforced{
@@ -44913,10 +44865,7 @@
/turf/open/floor/plasteel/purple,
/area/engine/atmos)
"bQX" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "tox_sensor"
- },
+/obj/machinery/air_sensor/atmos/toxin_tank,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bQY" = (
@@ -45589,11 +45538,8 @@
/turf/open/floor/plasteel/purple,
/area/engine/atmos)
"bSk" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "tox_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+ dir = 8
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -46770,11 +46716,8 @@
/turf/open/floor/plasteel/vault,
/area/engine/atmos)
"bUI" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "co2_out";
- name = "co2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
+ dir = 8
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -47270,13 +47213,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bVM" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "co2_in";
- name = "Carbon Dioxide Supply Control";
- output_tag = "co2_out";
- sensors = list("co2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/carbon_tank{
+ dir = 8
},
/obj/machinery/atmospherics/pipe/simple/green/visible,
/obj/structure/window/reinforced{
@@ -47285,10 +47223,7 @@
/turf/open/floor/plasteel/vault,
/area/engine/atmos)
"bVN" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "co2_sensor"
- },
+/obj/machinery/air_sensor/atmos/carbon_tank,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"bVO" = (
@@ -48078,11 +48013,8 @@
/turf/open/floor/plasteel/vault,
/area/engine/atmos)
"bXr" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "co2_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
+ dir = 8
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -49841,13 +49773,8 @@
/area/engine/atmos)
"cbe" = (
/obj/structure/window/reinforced,
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "n2_in";
- name = "Nitrogen Supply Control";
- output_tag = "n2_out";
- sensors = list("n2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -49896,13 +49823,8 @@
/area/engine/atmos)
"cbi" = (
/obj/structure/window/reinforced,
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "o2_in";
- name = "Oxygen Supply Control";
- output_tag = "o2_out";
- sensors = list("o2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -53085,74 +53007,50 @@
/turf/open/floor/plasteel/dark,
/area/aisat)
"chN" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "n2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"chO" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/engine/atmos)
"chP" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "n2_out";
- name = "n2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"chQ" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "o2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"chR" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "o2_sensor"
- },
+/obj/machinery/air_sensor/atmos/oxygen_tank,
/turf/open/floor/engine/o2,
/area/engine/atmos)
"chS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "o2_out";
- name = "o2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"chT" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
"chU" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "air_sensor"
- },
+/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/engine/atmos)
"chV" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "air_out";
- name = "air out"
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -55523,9 +55421,8 @@
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
"cnd" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- name = "incinerator output intake"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{
+ dir = 1
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
@@ -55539,16 +55436,18 @@
/obj/structure/cable{
icon_state = "1-2"
},
+/obj/machinery/air_sensor/atmos/incinerator_tank{
+ pixel_x = -32;
+ pixel_y = -32
+ },
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"cnf" = (
/obj/structure/sign/warning/vacuum/external{
pixel_y = -32
},
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
+ dir = 1
},
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
@@ -64201,7 +64100,7 @@
id = "mixingsparker";
pixel_x = 25
},
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
dir = 4
},
/turf/open/floor/engine/vacuum,
@@ -65086,10 +64985,8 @@
id = "mixingsparker";
pixel_x = 25
},
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
+ dir = 4
},
/turf/open/floor/engine/vacuum,
/area/science/mixing)
@@ -71762,11 +71659,8 @@
/turf/open/floor/plating,
/area/engine/atmos)
"cVz" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "n2_in";
- volume_rate = 200
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{
+ dir = 1
},
/obj/structure/lattice/catwalk,
/turf/open/space,
@@ -71794,13 +71688,8 @@
/area/shuttle/auxillary_base)
"cVJ" = (
/obj/structure/window/reinforced,
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "air_in";
- name = "Mixed Air Supply Control";
- output_tag = "air_out";
- sensors = list("air_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/air_tank{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -73600,9 +73489,7 @@
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
"dea" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- volume_rate = 200
- },
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste,
/turf/open/floor/plating/airless,
/area/engine/engineering)
"deb" = (
@@ -77665,6 +77552,10 @@
/obj/item/gun/energy/laser/practice,
/turf/open/floor/plasteel/white,
/area/science/circuit)
+"tXK" = (
+/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/turf/open/floor/engine/vacuum,
+/area/science/mixing)
"upN" = (
/obj/effect/turf_decal/stripes/line{
dir = 5
@@ -110152,7 +110043,7 @@ cBu
cCv
cyK
cEt
-cFn
+tXK
cGj
cHe
cId
diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm
index 6d204cb7b80..3a9629bbd9e 100644
--- a/_maps/map_files/OmegaStation/OmegaStation.dmm
+++ b/_maps/map_files/OmegaStation/OmegaStation.dmm
@@ -1339,8 +1339,7 @@
},
/obj/machinery/camera{
c_tag = "Detective's Office - Quarters";
- dir = 2;
- name = "security camera"
+ dir = 2
},
/turf/open/floor/plasteel/vault{
dir = 8
@@ -2213,7 +2212,6 @@
/area/ai_monitored/nuke_storage)
"aeB" = (
/obj/machinery/power/apc{
- aidisabled = 0;
areastring = "/area/ai_monitored/nuke_storage";
dir = 1;
name = "AI Vault APC";
@@ -2892,8 +2890,7 @@
},
/obj/machinery/camera{
c_tag = "Detective's Office - Desk";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/grimy,
/area/security/detectives_office)
@@ -4287,7 +4284,8 @@
},
/obj/machinery/flasher{
id = "AI";
- pixel_x = -26
+ pixel_x = 26;
+ pixel_y = -10
},
/obj/item/device/radio/intercom{
broadcasting = 1;
@@ -4517,8 +4515,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Brig Fore";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/corner{
dir = 4
@@ -4752,6 +4749,15 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/fore";
+ dir = 1;
+ name = "Fore Primary Hallway APC";
+ pixel_y = 24
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"ajt" = (
@@ -5168,6 +5174,9 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1
},
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
/turf/open/floor/plasteel/neutral/corner{
dir = 8;
heat_capacity = 1e+006
@@ -5297,6 +5306,9 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/port/fore)
"akq" = (
@@ -5391,6 +5403,9 @@
/obj/effect/turf_decal/plaque{
icon_state = "L5"
},
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"akw" = (
@@ -5772,6 +5787,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"alf" = (
@@ -6220,6 +6238,9 @@
"alU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/delivery,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"alV" = (
@@ -6646,9 +6667,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"amQ" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"amR" = (
@@ -6657,6 +6684,9 @@
pixel_y = -22
},
/obj/machinery/light/small,
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"amS" = (
@@ -6664,6 +6694,15 @@
c_tag = "Locker Room Toilets";
dir = 8
},
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/toilet/restrooms";
+ dir = 4;
+ name = "Restrooms APC";
+ pixel_x = 26
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
/turf/open/floor/plasteel/freezer,
/area/crew_quarters/toilet/restrooms)
"amT" = (
@@ -7983,10 +8022,7 @@
/turf/open/space/basic,
/area/space)
"apv" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "mix_sensor"
- },
+/obj/machinery/air_sensor/atmos/mix_tank,
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"apx" = (
@@ -8708,8 +8744,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Brig Aft";
- dir = 8;
- name = "security camera"
+ dir = 8
},
/turf/open/floor/plasteel/red/corner{
dir = 4
@@ -8985,12 +9020,8 @@
},
/area/engine/atmos)
"arw" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 2;
- input_tag = "mix_in";
- name = "Mix Tank Supply Control";
- output_tag = "mix_out";
- sensors = list("mix_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/mix_tank{
+ dir = 2
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -9615,8 +9646,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Gear Room";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/vault/side{
dir = 1
@@ -9719,8 +9749,7 @@
},
/obj/machinery/camera{
c_tag = "Security - Front Desk";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/vault/side{
dir = 1
@@ -9974,10 +10003,7 @@
/turf/open/floor/plasteel,
/area/maintenance/starboard)
"atx" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/engine/atmos)
"aty" = (
@@ -10416,7 +10442,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/visible{
dir = 8
},
-/obj/machinery/meter,
+/obj/machinery/meter/atmos/distro_loop,
/turf/open/floor/plasteel,
/area/engine/atmos)
"auB" = (
@@ -10429,7 +10455,8 @@
},
/obj/structure/closet/secure_closet/atmospherics,
/obj/effect/turf_decal/bot,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -10861,12 +10888,8 @@
/area/maintenance/starboard)
"avx" = (
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- input_tag = "o2_in";
- name = "Oxygen Supply Control";
- output_tag = "o2_out";
- sensors = list("o2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+ dir = 1
},
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
@@ -11629,10 +11652,7 @@
/turf/open/floor/plasteel,
/area/maintenance/starboard)
"axi" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "o2_sensor"
- },
+/obj/machinery/air_sensor/atmos/oxygen_tank,
/turf/open/floor/engine/o2,
/area/engine/atmos)
"axm" = (
@@ -11983,6 +12003,7 @@
},
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -11992,6 +12013,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/meter/atmos/atmos_waste_loop,
/turf/open/floor/plasteel,
/area/engine/atmos)
"ayj" = (
@@ -12785,6 +12807,7 @@
/obj/machinery/atmospherics/pipe/manifold/cyan/visible{
dir = 1
},
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel,
/area/engine/atmos)
"aAr" = (
@@ -13187,8 +13210,7 @@
"aBg" = (
/obj/machinery/camera{
c_tag = "Security - Departures Starboard";
- dir = 1;
- name = "security camera"
+ dir = 1
},
/turf/open/floor/plasteel/red/side{
dir = 6
@@ -13208,29 +13230,20 @@
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
"aBp" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "o2_out";
- name = "oxygen vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"aBr" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "n2_out";
- name = "n2 vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"aBt" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "n2_in";
- name = "n2 injector"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
@@ -15480,6 +15493,12 @@
c_tag = "Engineering Foyer";
dir = 1
},
+/obj/machinery/power/apc{
+ areastring = "/area/engine/break_room";
+ dir = 2;
+ name = "Engineering Foyer APC";
+ pixel_y = -26
+ },
/turf/open/floor/plasteel/yellow/corner{
dir = 8
},
@@ -16503,6 +16522,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 10
},
+/obj/machinery/meter/atmos,
/turf/open/floor/engine,
/area/engine/engineering)
"aIr" = (
@@ -17183,10 +17203,6 @@
name = "Custodial RC";
pixel_y = 32
},
-/obj/item/device/radio/intercom{
- name = "Station Intercom";
- pixel_x = -26
- },
/obj/machinery/camera{
c_tag = "Custodial Closet"
},
@@ -17225,6 +17241,10 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/bot,
+/obj/item/device/radio/intercom{
+ name = "Station Intercom";
+ pixel_x = 26
+ },
/turf/open/floor/plasteel/vault/side{
dir = 8
},
@@ -19442,10 +19462,9 @@
dir = 4
},
/obj/machinery/power/apc{
- aidisabled = 0;
+ areastring = "/area/hallway/primary/port/aft";
dir = 1;
- name = "Primary Hall APC";
- areastring = "/area/hallway/primary/central";
+ name = "Port Quarter Hallway APC";
pixel_y = 24
},
/obj/structure/cable/white{
@@ -19687,6 +19706,15 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/central";
+ dir = 1;
+ name = "Central Primary Hallway APC";
+ pixel_y = 24
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
/turf/open/floor/plasteel/neutral/corner{
dir = 4
},
@@ -23625,12 +23653,18 @@
/turf/open/floor/plasteel/neutral/side,
/area/hallway/primary/aft)
"aYe" = (
-/obj/machinery/firealarm{
- pixel_y = 24
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/machinery/power/apc{
+ areastring = "/area/crew_quarters/lounge";
+ dir = 1;
+ name = "Lounge APC";
+ pixel_y = 24
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/neutral/side,
/area/hallway/primary/aft)
"aYf" = (
@@ -24076,6 +24110,9 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
+/obj/structure/cable/white{
+ icon_state = "1-4"
+ },
/turf/open/floor/plasteel/neutral,
/area/hallway/primary/aft)
"aYW" = (
@@ -29663,11 +29700,8 @@
/turf/open/floor/plasteel/redyellow,
/area/crew_quarters/bar/atrium)
"blk" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "o2_in";
- name = "o2 injector"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
@@ -29766,6 +29800,9 @@
c_tag = "Security Checkpoint";
dir = 1
},
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
/turf/open/floor/plasteel/neutral/side{
dir = 1;
heat_capacity = 1e+006
@@ -30005,6 +30042,7 @@
/obj/machinery/atmospherics/pipe/simple/yellow/visible{
dir = 10
},
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel,
/area/engine/atmos)
"bsv" = (
@@ -30585,11 +30623,8 @@
/area/engine/engineering)
"bxc" = (
/obj/structure/lattice/catwalk,
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "waste_out";
- volume_rate = 200
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/engine_waste{
+ dir = 4
},
/turf/open/space/basic,
/area/engine/engineering)
@@ -30944,11 +30979,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bGS" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
- frequency = 1441;
- id_tag = "co2_out";
- name = "co2 vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
+ dir = 2
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -31033,7 +31065,7 @@
dir = 10
},
/turf/open/floor/plating/airless,
-/area/space/nearstation)
+/area/maintenance/disposal/incinerator)
"csX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable/white{
@@ -31137,11 +31169,18 @@
dir = 8
},
/area/hallway/primary/port)
-"ddI" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "plasma_sensor"
+"dai" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -24
},
+/turf/open/floor/plasteel/blue/corner{
+ dir = 1
+ },
+/area/hallway/primary/aft)
+"ddI" = (
+/obj/machinery/air_sensor/atmos/toxin_tank,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"dfP" = (
@@ -31248,12 +31287,8 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- input_tag = "airmix_in";
- name = "Airmix Supply Control";
- output_tag = "airmix_out";
- sensors = list("airmix_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/air_tank{
+ dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -31298,7 +31333,7 @@
/area/maintenance/disposal/incinerator)
"ezP" = (
/obj/machinery/atmospherics/pipe/simple/general/visible,
-/obj/effect/spawner/structure/window/reinforced,
+/obj/effect/spawner/structure/window/plasma/reinforced,
/turf/open/floor/plating,
/area/engine/atmos)
"eCg" = (
@@ -31306,12 +31341,8 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/yellow/visible,
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- input_tag = "n2_in";
- name = "Nitrogen Supply Control";
- output_tag = "n2_out";
- sensors = list("n2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+ dir = 1
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -31388,6 +31419,18 @@
dir = 8
},
/area/engine/atmos)
+"fff" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 4
+ },
+/area/hallway/primary/starboard)
"fgG" = (
/obj/machinery/ai_status_display,
/turf/closed/wall,
@@ -31406,10 +31449,7 @@
},
/area/engine/atmos)
"fnp" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2o_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"fom" = (
@@ -31567,6 +31607,16 @@
dir = 4
},
/area/hallway/primary/starboard)
+"gMe" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "2-8"
+ },
+/turf/open/floor/plasteel/neutral/corner,
+/area/hallway/primary/starboard/fore)
"gNH" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -31578,6 +31628,9 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/orange/visible,
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
/turf/open/floor/plasteel/vault{
dir = 8
},
@@ -31632,11 +31685,31 @@
/area/crew_quarters/bar/atrium)
"hNO" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
- icon_state = "intact";
dir = 5
},
/turf/closed/wall/r_wall,
/area/engine/atmos)
+"hOc" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/aft";
+ dir = 2;
+ name = "Aft Primary Hallway APC";
+ pixel_y = -26
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/turf/open/floor/plasteel/neutral/side{
+ dir = 1;
+ heat_capacity = 1e+006
+ },
+/area/hallway/primary/aft)
"hOh" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/light/small{
@@ -31686,10 +31759,20 @@
dir = 5
},
/area/engine/atmos)
-"iqC" = (
-/obj/machinery/air_sensor{
- id_tag = "co2_sensor"
+"iey" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+ dir = 4
},
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/turf/open/floor/plasteel/neutral/side{
+ dir = 1;
+ heat_capacity = 1e+006
+ },
+/area/hallway/primary/aft)
+"iqC" = (
+/obj/machinery/air_sensor/atmos/carbon_tank,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"ixk" = (
@@ -31700,7 +31783,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"iye" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{
dir = 4
},
/turf/open/floor/engine/vacuum,
@@ -31729,6 +31812,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel,
/area/engine/atmos)
"iML" = (
@@ -31757,10 +31841,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"iZQ" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2;
- id = "co2_in";
- name = "co2 injector"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
+ dir = 2
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -31943,18 +32025,15 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel,
/area/engine/atmos)
"kHA" = (
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/machinery/computer/atmos_control/tank{
- dir = 2;
- input_tag = "co2_in";
- name = "Carbox Dioxide Supply Control";
- output_tag = "co2_out";
- sensors = list("co2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/carbon_tank{
+ dir = 2
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -31985,6 +32064,14 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"lqz" = (
+/obj/machinery/atmospherics/pipe/manifold/yellow/visible,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/meter/atmos,
+/turf/open/floor/plasteel/caution{
+ dir = 1
+ },
+/area/engine/atmos)
"lrg" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -31995,6 +32082,7 @@
"lvw" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel/caution{
dir = 8
},
@@ -32097,10 +32185,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"mgs" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- id = "airmix_in";
- name = "airmix injector"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -32140,6 +32226,23 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"mDx" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/port/fore";
+ dir = 1;
+ name = "Port Bow Primary Hallway APC";
+ pixel_y = 24
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 1
+ },
+/area/hallway/primary/port/fore)
"mJP" = (
/obj/machinery/igniter/off{
id = "Incinerator";
@@ -32148,6 +32251,10 @@
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/machinery/air_sensor/atmos/incinerator_tank{
+ pixel_x = -32;
+ pixel_y = 32
+ },
/turf/open/floor/engine/vacuum,
/area/maintenance/disposal/incinerator)
"mJQ" = (
@@ -32281,6 +32388,7 @@
dir = 6
},
/obj/effect/decal/cleanable/dirt,
+/obj/machinery/meter/atmos,
/turf/open/floor/plasteel/vault{
dir = 5
},
@@ -32349,11 +32457,8 @@
/turf/open/floor/plasteel/vault,
/area/engine/gravity_generator)
"pcl" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
- frequency = 1441;
- id_tag = "mix_out";
- name = "distro vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
+ dir = 2
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -32415,10 +32520,37 @@
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
},
+/obj/machinery/power/apc{
+ areastring = "/area/maintenance/disposal/incinerator";
+ dir = 8;
+ name = "Incinerator APC";
+ pixel_x = -26;
+ pixel_y = 3
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
/turf/open/floor/plasteel/caution{
dir = 10
},
/area/engine/atmos)
+"pEt" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/starboard/fore";
+ dir = 8;
+ name = "Starboard Bow Primary Hallway APC";
+ pixel_x = -26;
+ pixel_y = 3
+ },
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 8;
+ heat_capacity = 1e+006
+ },
+/area/hallway/primary/starboard/fore)
"pEH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plating,
@@ -32461,10 +32593,8 @@
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
"qgC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 4;
- frequency = 1441;
- id = "mix_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
+ dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/engine/vacuum,
@@ -32481,9 +32611,7 @@
/turf/closed/wall/r_wall/rust,
/area/engine/gravity_generator)
"qsc" = (
-/obj/machinery/air_sensor{
- id_tag = "airmix_sensor"
- },
+/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/engine/atmos)
"qui" = (
@@ -32556,7 +32684,7 @@
"rae" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
- name = "Airmix to Pure"
+ name = "Air to Pure"
},
/turf/open/floor/plasteel,
/area/engine/atmos)
@@ -32578,6 +32706,9 @@
master_tag = "incinerator_airlock_control";
pixel_y = 24
},
+/obj/machinery/camera/autoname{
+ dir = 2
+ },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"rlq" = (
@@ -32636,19 +32767,14 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"rVj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "airmix_out";
- name = "airmix vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
"rVs" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2;
- id = "mix_in";
- name = "gas mix injector"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
+ dir = 2
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -32695,10 +32821,8 @@
},
/area/engine/atmos)
"srR" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2;
- id = "n2o_in";
- name = "n2o injector"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{
+ dir = 2
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -34188,7 +34312,6 @@
/area/ai_monitored/turret_protected/ai)
"sMe" = (
/obj/machinery/power/apc{
- aidisabled = 0;
dir = 1;
name = "AI Chamber APC";
areastring = "/area/ai_monitored/turret_protected/ai";
@@ -35190,6 +35313,18 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"ttp" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
+/obj/structure/cable/white{
+ icon_state = "2-4"
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 8
+ },
+/area/hallway/primary/port)
"ttA" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/obj/effect/turf_decal/bot,
@@ -35224,6 +35359,22 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"udT" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/starboard";
+ dir = 8;
+ name = "Starboard Primary Hallway APC";
+ pixel_x = -26;
+ pixel_y = 3
+ },
+/obj/structure/cable/white{
+ icon_state = "0-4"
+ },
+/turf/open/floor/plasteel/neutral/corner{
+ dir = 1
+ },
+/area/hallway/primary/starboard)
"ueC" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/turf_decal/stripes/line{
@@ -35254,11 +35405,8 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"ujg" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
- frequency = 1441;
- id_tag = "n2o_out";
- name = "n2o vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{
+ dir = 2
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -35396,18 +35544,21 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/machinery/computer/atmos_control/tank{
- dir = 2;
- input_tag = "n2o_in";
- name = "Nitrogen Dioxide Supply Control";
- output_tag = "n2o_out";
- sensors = list("n2o_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrous_tank{
+ dir = 2
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/engine/atmos)
+"vjN" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
+ dir = 4
+ },
+/obj/machinery/meter/atmos,
+/turf/open/floor/plasteel,
+/area/engine/atmos)
"vkK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/door/firedoor,
@@ -35435,12 +35586,8 @@
/obj/machinery/atmospherics/pipe/simple/green/visible{
dir = 4
},
-/obj/machinery/computer/atmos_control/tank{
- dir = 2;
- input_tag = "plasma_in";
- name = "Plasma Supply Control";
- output_tag = "plasma_out";
- sensors = list("plasma_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+ dir = 2
},
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
@@ -35552,11 +35699,8 @@
},
/area/engine/atmos)
"vVS" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 2;
- id = "plasma_in";
- name = "plasma injector";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+ dir = 2
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -35629,18 +35773,14 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 4
},
-/obj/machinery/meter,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/vault{
dir = 5
},
/area/engine/atmos)
"xej" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 2;
- frequency = 1441;
- id_tag = "plasma_out";
- name = "plasma vent"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+ dir = 2
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -35714,6 +35854,11 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 9
},
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_x = -32;
+ pixel_y = -22
+ },
/turf/open/floor/plasteel/caution{
dir = 10
},
@@ -35736,6 +35881,19 @@
dir = 5
},
/area/engine/atmos)
+"xEl" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/power/apc{
+ areastring = "/area/hallway/primary/port";
+ dir = 4;
+ name = "Port Primary Hallway APC";
+ pixel_x = 26
+ },
+/obj/structure/cable/white{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel/neutral/corner,
+/area/hallway/primary/port)
"xEQ" = (
/obj/machinery/atmospherics/components/trinary/filter/flipped{
dir = 8;
@@ -63956,7 +64114,7 @@ kHA
oiL
mTT
tgm
-hqX
+vjN
hUL
diG
rEx
@@ -65238,7 +65396,7 @@ oOk
xej
oaV
uoy
-asw
+lqz
fFw
auq
hXn
@@ -71423,7 +71581,7 @@ aFK
aGw
aHC
cXu
-cXu
+ttp
cXu
cXu
aNh
@@ -71680,7 +71838,7 @@ aFL
aGx
aHD
aIA
-geZ
+xEl
bxP
geZ
aNi
@@ -75508,7 +75666,7 @@ agc
agT
ahM
abw
-ajh
+mDx
akp
alh
amc
@@ -76577,7 +76735,7 @@ aTw
aTw
aTw
aTw
-aTw
+dai
aYa
aYU
aZQ
@@ -77093,7 +77251,7 @@ aUx
aWP
uuU
aYc
-aYW
+iey
byo
byo
bbx
@@ -77350,7 +77508,7 @@ aUy
aWQ
tWh
aYc
-aYW
+iey
sKB
baI
bby
@@ -77864,7 +78022,7 @@ aUy
aWS
lIM
aYe
-aYW
+hOc
byo
baK
bbA
@@ -81176,7 +81334,7 @@ aqh
auo
avt
awy
-aqh
+pEt
axV
ayU
azT
@@ -81189,7 +81347,7 @@ aFX
aGX
aly
aIX
-aly
+udT
aLm
uqY
aNF
@@ -81433,7 +81591,7 @@ sOI
aup
avu
atp
-arj
+gMe
arj
arj
sEJ
@@ -81446,7 +81604,7 @@ aFY
bsz
aDZ
aIY
-aDZ
+fff
sJa
tLt
tLt
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index 6d0b65a354f..04b50271b4c 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -139,7 +139,6 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
- aidisabled = 0;
dir = 1;
name = "AI Chamber APC";
areastring = "/area/ai_monitored/turret_protected/ai";
@@ -2605,8 +2604,7 @@
/obj/structure/closet/secure_closet/lethalshots,
/obj/machinery/camera/motion{
c_tag = "Armory Motion Sensor";
- dir = 2;
- name = "motion-sensitive security camera"
+ dir = 2
},
/turf/open/floor/plasteel/dark,
/area/security/armory)
@@ -17522,7 +17520,6 @@
/obj/machinery/camera{
c_tag = "Departures - Port";
dir = 4;
- name = "security camera";
pixel_y = -7
},
/turf/open/floor/plasteel/escape{
@@ -25722,10 +25719,9 @@
/turf/open/floor/engine,
/area/science/xenobiology)
"bnf" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
- id = "air_in"
+ id = "xenobio_out"
},
/turf/open/floor/engine,
/area/science/xenobiology)
@@ -36710,11 +36706,8 @@
/turf/closed/wall/r_wall,
/area/engine/atmos)
"bLc" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "mix_out";
- name = "distro out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output{
+ dir = 8
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -37091,11 +37084,7 @@
},
/area/engine/atmos)
"bLZ" = (
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "waste_meter";
- name = "Waste Loop"
- },
+/obj/machinery/meter/atmos/atmos_waste_loop,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{
dir = 8
},
@@ -37117,11 +37106,7 @@
},
/area/engine/atmos)
"bMb" = (
-/obj/machinery/meter{
- frequency = 1441;
- id_tag = "distro_meter";
- name = "Distribution Loop"
- },
+/obj/machinery/meter/atmos/distro_loop,
/obj/machinery/atmospherics/pipe/manifold/supply/visible,
/turf/open/floor/plasteel/yellow/side{
dir = 1
@@ -37161,13 +37146,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bMh" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "mix_in";
- name = "Gas Mix Tank Control";
- output_tag = "mix_out";
- sensors = list("mix_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/mix_tank{
+ dir = 8
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -37178,10 +37158,7 @@
/turf/open/floor/plating/airless,
/area/engine/atmos)
"bMj" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "mix_sensor"
- },
+/obj/machinery/air_sensor/atmos/mix_tank,
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bMk" = (
@@ -37191,10 +37168,8 @@
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
"bMl" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "inc_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input{
+ dir = 1
},
/obj/structure/sign/warning/vacuum/external{
pixel_x = -32
@@ -37211,7 +37186,7 @@
/turf/open/floor/engine/vacuum,
/area/science/mixing)
"bMn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output{
dir = 1
},
/turf/open/floor/engine/vacuum,
@@ -37597,11 +37572,8 @@
/turf/open/space,
/area/space/nearstation)
"bNo" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "mix_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{
+ dir = 8
},
/turf/open/floor/engine/vacuum,
/area/engine/atmos)
@@ -38304,11 +38276,8 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bPg" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "n2o_out";
- name = "n2o out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output{
+ dir = 8
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -38569,13 +38538,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bPX" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "n2o_in";
- name = "Nitrous Oxide Supply Control";
- output_tag = "n2o_out";
- sensors = list("n2o_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrous_tank{
+ dir = 8
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -38587,10 +38551,7 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bPZ" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2o_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrous_tank,
/turf/open/floor/engine/n2o,
/area/engine/atmos)
"bQa" = (
@@ -38946,11 +38907,8 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bQP" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "n2o_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input{
+ dir = 8
},
/turf/open/floor/engine/n2o,
/area/engine/atmos)
@@ -39577,11 +39535,8 @@
/turf/open/floor/plating,
/area/engine/atmos)
"bSj" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "tox_out";
- name = "toxin out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output{
+ dir = 8
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -39856,23 +39811,15 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bSV" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "tox_in";
- name = "Plasma Supply Control";
- output_tag = "tox_out";
- sensors = list("tox_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/toxin_tank{
+ dir = 8
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
/area/engine/atmos)
"bSW" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "tox_sensor"
- },
+/obj/machinery/air_sensor/atmos/toxin_tank,
/turf/open/floor/engine/plasma,
/area/engine/atmos)
"bSX" = (
@@ -40304,11 +40251,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bTV" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "tox_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxin_input{
+ dir = 8
},
/turf/open/floor/engine/plasma,
/area/engine/atmos)
@@ -40888,11 +40832,8 @@
/turf/open/space,
/area/space/nearstation)
"bVn" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 8;
- frequency = 1441;
- id_tag = "co2_out";
- name = "co2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output{
+ dir = 8
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -41259,13 +41200,8 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"bWb" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 8;
- frequency = 1441;
- input_tag = "co2_in";
- name = "Carbon Dioxide Supply Control";
- output_tag = "co2_out";
- sensors = list("co2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/carbon_tank{
+ dir = 8
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
@@ -41282,10 +41218,7 @@
/turf/open/space,
/area/space/nearstation)
"bWe" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "co2_sensor"
- },
+/obj/machinery/air_sensor/atmos/carbon_tank,
/turf/open/floor/engine/co2,
/area/engine/atmos)
"bWf" = (
@@ -41652,11 +41585,8 @@
/turf/open/space,
/area/space/nearstation)
"bWT" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "co2_in";
- pixel_y = 1
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input{
+ dir = 8
},
/turf/open/floor/engine/co2,
/area/engine/atmos)
@@ -41826,13 +41756,8 @@
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
"bXu" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "n2_in";
- name = "Nitrogen Supply Control";
- output_tag = "n2_out";
- sensors = list("n2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank{
+ dir = 1
},
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
@@ -41845,13 +41770,8 @@
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
"bXx" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "o2_in";
- name = "Oxygen Supply Control";
- output_tag = "o2_out";
- sensors = list("o2_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/oxygen_tank{
+ dir = 1
},
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
@@ -41877,13 +41797,8 @@
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
"bXB" = (
-/obj/machinery/computer/atmos_control/tank{
- dir = 1;
- frequency = 1441;
- input_tag = "air_in";
- name = "Mixed Air Supply Control";
- output_tag = "air_out";
- sensors = list("air_sensor" = "Tank")
+/obj/machinery/computer/atmos_control/tank/air_tank{
+ dir = 1
},
/turf/open/floor/plasteel/yellow/side,
/area/engine/atmos)
@@ -42885,10 +42800,8 @@
/turf/closed/wall/r_wall,
/area/maintenance/disposal/incinerator)
"bZU" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 8;
- frequency = 1441;
- id = "inc_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input{
+ dir = 8
},
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
@@ -43072,74 +42985,50 @@
/turf/open/floor/plasteel,
/area/engine/engineering)
"caz" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "n2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"caA" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "n2_sensor"
- },
+/obj/machinery/air_sensor/atmos/nitrogen_tank,
/turf/open/floor/engine/n2,
/area/engine/atmos)
"caB" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "n2_out";
- name = "n2 out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output{
+ dir = 1
},
/turf/open/floor/engine/n2,
/area/engine/atmos)
"caC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "o2_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"caD" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "o2_sensor"
- },
+/obj/machinery/air_sensor/atmos/oxygen_tank,
/turf/open/floor/engine/o2,
/area/engine/atmos)
"caE" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "o2_out";
- name = "oxygen out"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output{
+ dir = 1
},
/turf/open/floor/engine/o2,
/area/engine/atmos)
"caF" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
- dir = 1;
- frequency = 1441;
- id = "air_in"
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
"caG" = (
-/obj/machinery/air_sensor{
- frequency = 1441;
- id_tag = "air_sensor"
- },
+/obj/machinery/air_sensor/atmos/air_tank,
/turf/open/floor/engine/air,
/area/engine/atmos)
"caH" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/on{
- dir = 1;
- frequency = 1441;
- id_tag = "air_out";
- name = "air out"
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output{
+ dir = 1
},
/turf/open/floor/engine/air,
/area/engine/atmos)
@@ -43237,6 +43126,10 @@
luminosity = 2;
on = 0
},
+/obj/machinery/air_sensor/atmos/incinerator_tank{
+ pixel_x = 32;
+ pixel_y = -32
+ },
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"caP" = (
@@ -43557,7 +43450,7 @@
/turf/open/floor/engine,
/area/maintenance/disposal/incinerator)
"cbF" = (
-/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output{
dir = 8
},
/turf/open/floor/engine,
@@ -50859,6 +50752,10 @@
},
/turf/open/floor/plasteel,
/area/science/circuit)
+"stl" = (
+/obj/machinery/air_sensor/atmos/toxins_mixing_tank,
+/turf/open/floor/engine/vacuum,
+/area/science/mixing)
"sBA" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -93669,7 +93566,7 @@ bIL
bJR
bLf
bMm
-bNp
+stl
bOt
bPj
aaa
diff --git a/_maps/templates/pirate_ship.dmm b/_maps/templates/pirate_ship.dmm
index b9de6d85408..65c51e60c87 100644
--- a/_maps/templates/pirate_ship.dmm
+++ b/_maps/templates/pirate_ship.dmm
@@ -1734,9 +1734,8 @@
/turf/open/floor/engine/vacuum,
/area/shuttle/pirate)
"dP" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/on{
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos{
dir = 1;
- frequency = 1441;
id = "inc_in"
},
/obj/structure/sign/warning/vacuum/external{
diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
index d3fb3fc5617..3592c657853 100644
--- a/code/__DEFINES/atmospherics.dm
+++ b/code/__DEFINES/atmospherics.dm
@@ -149,6 +149,49 @@
#define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50 //what pressure you have to be under to increase the effect of equipment meant for lavaland
#define LAVALAND_DEFAULT_ATMOS "o2=14;n2=23;TEMP=300"
+//ATMOSIA GAS MONITOR TAGS
+#define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_O2 "o2_out"
+#define ATMOS_GAS_MONITOR_SENSOR_O2 "o2_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_TOX "tox_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_TOX "tox_out"
+#define ATMOS_GAS_MONITOR_SENSOR_TOX "tox_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_AIR "air_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_AIR "air_out"
+#define ATMOS_GAS_MONITOR_SENSOR_AIR "air_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_MIX "mix_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_MIX "mix_out"
+#define ATMOS_GAS_MONITOR_SENSOR_MIX "mix_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_N2O "n2o_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_N2O "n2o_out"
+#define ATMOS_GAS_MONITOR_SENSOR_N2O "n2o_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_N2 "n2_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_N2 "n2_out"
+#define ATMOS_GAS_MONITOR_SENSOR_N2 "n2_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_CO2 "co2_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_CO2 "co2_out"
+#define ATMOS_GAS_MONITOR_SENSOR_CO2 "co2_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_INCINERATOR "incinerator_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR "incinerator_out"
+#define ATMOS_GAS_MONITOR_SENSOR_INCINERATOR "incinerator_sensor"
+
+#define ATMOS_GAS_MONITOR_INPUT_TOXINS_LAB "toxinslab_in"
+#define ATMOS_GAS_MONITOR_OUTPUT_TOXINS_LAB "toxinslab_out"
+#define ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB "toxinslab_sensor"
+
+#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"
+
//MULTIPIPES
//IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH.
#define PIPING_LAYER_MIN 1
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index 3c53c395f46..6e4507c465c 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -14,6 +14,34 @@
var/frequency = FREQ_ATMOS_STORAGE
var/datum/radio_frequency/radio_connection
+/obj/machinery/air_sensor/atmos/toxin_tank
+ name = "plasma tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_TOX
+/obj/machinery/air_sensor/atmos/toxins_mixing_tank
+ name = "toxins mixing gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB
+/obj/machinery/air_sensor/atmos/oxygen_tank
+ name = "oxygen tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_O2
+/obj/machinery/air_sensor/atmos/nitrogen_tank
+ name = "nitrogen tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_N2
+/obj/machinery/air_sensor/atmos/mix_tank
+ name = "mix tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_MIX
+/obj/machinery/air_sensor/atmos/nitrous_tank
+ name = "nitrous oxide tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_N2O
+/obj/machinery/air_sensor/atmos/air_tank
+ name = "air mix tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_AIR
+/obj/machinery/air_sensor/atmos/carbon_tank
+ name = "carbon dioxide tank gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_CO2
+/obj/machinery/air_sensor/atmos/incinerator_tank
+ name = "incinerator chamber gas sensor"
+ id_tag = ATMOS_GAS_MONITOR_SENSOR_INCINERATOR
+
/obj/machinery/air_sensor/update_icon()
icon_state = "gsensor[on]"
@@ -56,6 +84,7 @@
/////////////////////////////////////////////////////////////
// GENERAL AIR CONTROL (a.k.a atmos computer)
/////////////////////////////////////////////////////////////
+GLOBAL_LIST_EMPTY(atmos_air_controllers)
/obj/machinery/computer/atmos_control
name = "atmospherics monitoring"
@@ -66,15 +95,17 @@
var/frequency = FREQ_ATMOS_STORAGE
var/list/sensors = list(
- "n2_sensor" = "Nitrogen Tank",
- "o2_sensor" = "Oxygen Tank",
- "co2_sensor" = "Carbon Dioxide Tank",
- "tox_sensor" = "Plasma Tank",
- "n2o_sensor" = "Nitrous Oxide Tank",
- "air_sensor" = "Mixed Air Tank",
- "mix_sensor" = "Mix Tank",
- "distro_meter" = "Distribution Loop",
- "waste_meter" = "Waste Loop",
+ ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank",
+ ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank",
+ ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank",
+ ATMOS_GAS_MONITOR_SENSOR_TOX = "Plasma Tank",
+ ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank",
+ ATMOS_GAS_MONITOR_SENSOR_AIR = "Mixed Air Tank",
+ ATMOS_GAS_MONITOR_SENSOR_MIX = "Mix Tank",
+ ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION = "Distribution Loop",
+ ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE = "Atmos Waste Loop",
+ ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber",
+ ATMOS_GAS_MONITOR_SENSOR_TOXINS_LAB = "Toxins Mixing Chamber"
)
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
@@ -83,9 +114,11 @@
/obj/machinery/computer/atmos_control/Initialize()
. = ..()
+ GLOB.atmos_air_controllers += src
set_frequency(frequency)
/obj/machinery/computer/atmos_control/Destroy()
+ GLOB.atmos_air_controllers -= src
SSradio.remove_object(src, frequency)
return ..()
@@ -142,6 +175,54 @@
var/list/input_info
var/list/output_info
+/obj/machinery/computer/atmos_control/tank/oxygen_tank
+ name = "Oxygen Supply Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_O2
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_O2
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_O2 = "Oxygen Tank")
+
+/obj/machinery/computer/atmos_control/tank/toxin_tank
+ name = "Plasma Supply Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_TOX
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_TOX
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_TOX = "Plasma Tank")
+
+/obj/machinery/computer/atmos_control/tank/air_tank
+ name = "Mixed Air Supply Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_AIR
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_AIR
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_AIR = "Air Mix Tank")
+
+/obj/machinery/computer/atmos_control/tank/mix_tank
+ name = "Gas Mix Tank Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_MIX
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_MIX
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_MIX = "Gas Mix Tank")
+
+/obj/machinery/computer/atmos_control/tank/nitrous_tank
+ name = "Nitrous Oxide Supply Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_N2O
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_N2O
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_N2O = "Nitrous Oxide Tank")
+
+/obj/machinery/computer/atmos_control/tank/nitrogen_tank
+ name = "Nitrogen Supply Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_N2
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_N2
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_N2 = "Nitrogen Tank")
+
+/obj/machinery/computer/atmos_control/tank/carbon_tank
+ name = "Carbon Dioxide Supply Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_CO2
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_CO2
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_CO2 = "Carbon Dioxide Tank")
+
+/obj/machinery/computer/atmos_control/tank/incinerator
+ name = "Incinerator Air Control"
+ input_tag = ATMOS_GAS_MONITOR_INPUT_INCINERATOR
+ output_tag = ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR
+ sensors = list(ATMOS_GAS_MONITOR_SENSOR_INCINERATOR = "Incinerator Chamber")
+
// This hacky madness is the evidence of the fact that a lot of machines were never meant to be constructable, im so sorry you had to see this
/obj/machinery/computer/atmos_control/tank/proc/reconnect(mob/user)
var/list/IO = list()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 695d6775a5f..f62e55c854f 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -299,6 +299,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
/client/proc/cmd_admin_grantfullaccess,
/client/proc/cmd_admin_areatest_all,
/client/proc/cmd_admin_areatest_station,
+ /client/proc/cmd_admin_test_atmos_controllers,
/client/proc/readmin
)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 871d43722c6..d365c56e17b 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -500,6 +500,42 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
qdel(adminmob)
SSblackbox.record_feedback("tally", "admin_verb", 1, "Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/cmd_admin_test_atmos_controllers()
+ set category = "Mapping"
+ set name = "Test Atmos Monitoring Consoles"
+
+ var/list/dat = list()
+
+ if(SSticker.current_state == GAME_STATE_STARTUP)
+ to_chat(usr, "Game still loading, please hold!")
+ return
+
+ message_admins("[key_name_admin(usr)] used the Test Atmos Monitor debug command.")
+ log_admin("[key_name(usr)] used the Test Atmos Monitor debug command.")
+
+ var/bad_shit = 0
+ for(var/obj/machinery/computer/atmos_control/tank/console in GLOB.atmos_air_controllers)
+ dat += "[console] at [get_area_name(console, TRUE)] [COORD(console)]:
"
+ if(console.input_tag == console.output_tag)
+ dat += "Error: input_tag is the same as the output_tag, \"[console.input_tag]\"!
"
+ bad_shit++
+ if(!LAZYLEN(console.input_info))
+ dat += "Failed to find a valid outlet injector as an input with the tag [console.input_tag].
"
+ bad_shit++
+ if(!LAZYLEN(console.output_info))
+ dat += "Failed to find a valid siphon pump as an outlet with the tag [console.output_tag].
"
+ bad_shit++
+ if(!bad_shit)
+ dat += "STATUS: NORMAL"
+ else
+ bad_shit = 0
+ dat += "
"
+ CHECK_TICK
+
+ var/datum/browser/popup = new(usr, "testatmoscontroller", "Test Atmos Monitoring Consoles", 500, 750)
+ popup.set_content(dat.Join())
+ popup.open()
+
/client/proc/cmd_admin_areatest(on_station)
set category = "Mapping"
set name = "Test Areas"
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 539d3987f80..745dd05749f 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -36,6 +36,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
/client/proc/cmd_admin_grantfullaccess,
/client/proc/cmd_admin_areatest_all,
/client/proc/cmd_admin_areatest_station,
+ /client/proc/cmd_admin_test_atmos_controllers,
/client/proc/cmd_admin_rejuvenate,
/datum/admins/proc/show_traitor_panel,
/client/proc/disable_communication,
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 6eec4558ee4..60c219e38df 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -24,6 +24,45 @@
SSradio.remove_object(src,frequency)
return ..()
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos
+ frequency = FREQ_ATMOS_STORAGE
+ on = TRUE
+ volume_rate = 200
+
+/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/toxin_input
+ name = "plasma tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_TOX
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/toxins_mixing_input
+ name = "toxins mixing input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_INCINERATOR
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/oxygen_input
+ name = "oxygen tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_O2
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input
+ name = "nitrogen tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_N2
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input
+ name = "mix tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_MIX
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrous_input
+ name = "nitrous oxide tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_N2O
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input
+ name = "air mix tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_AIR
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/carbon_input
+ name = "carbon dioxide tank input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_CO2
+/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/incinerator_input
+ name = "incinerator chamber input injector"
+ id = ATMOS_GAS_MONITOR_INPUT_INCINERATOR
+
/obj/machinery/atmospherics/components/unary/outlet_injector/on
on = TRUE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index eca0a6797ab..8edae8ae574 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -47,6 +47,36 @@
on = TRUE
icon_state = "vent_map_siphon_on"
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos
+ frequency = FREQ_ATMOS_STORAGE
+ on = TRUE
+ icon_state = "vent_map_siphon_on"
+
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxin_output
+ name = "plasma tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_TOX
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/toxins_mixing_output
+ name = "toxins mixing output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/oxygen_output
+ name = "oxygen tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_O2
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrogen_output
+ name = "nitrogen tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_N2
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/mix_output
+ name = "mix tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_MIX
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/nitrous_output
+ name = "nitrous oxide tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_N2O
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/carbon_output
+ name = "carbon dioxide tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_CO2
+/obj/machinery/atmospherics/components/unary/vent_pump/siphon/atmos/incinerator_output
+ name = "incinerator chamber output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_INCINERATOR
+
/obj/machinery/atmospherics/components/unary/vent_pump/New()
..()
if(!id_tag)
@@ -79,6 +109,15 @@
on = TRUE
icon_state = "vent_map_siphon_on"
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos
+ frequency = FREQ_ATMOS_STORAGE
+ on = TRUE
+ icon_state = "vent_map_siphon_on"
+
+/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/atmos/air_output
+ name = "air mix tank output inlet"
+ id_tag = ATMOS_GAS_MONITOR_OUTPUT_AIR
+
/obj/machinery/atmospherics/components/unary/vent_pump/high_volume/New()
..()
var/datum/gas_mixture/air_contents = airs[1]
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index a0a3db2fa20..9a310fb5452 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -16,6 +16,17 @@
var/id_tag
var/target_layer = PIPING_LAYER_DEFAULT
+/obj/machinery/meter/atmos
+ frequency = FREQ_ATMOS_STORAGE
+
+/obj/machinery/meter/atmos/atmos_waste_loop
+ name = "waste loop gas flow meter"
+ id_tag = ATMOS_GAS_MONITOR_LOOP_ATMOS_WASTE
+
+/obj/machinery/meter/atmos/distro_loop
+ name = "distribution loop gas flow meter"
+ id_tag = ATMOS_GAS_MONITOR_LOOP_DISTRIBUTION
+
/obj/machinery/meter/Destroy()
SSair.atmos_machinery -= src
target = null