Injector and sensor implementation

Wallemations · May 18, 2022 · f16e620 · f16e620
1 parent fdb508a
commit f16e620
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 69 deletions.
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -16863,8 +16863,7 @@
 /turf/open/floor/iron,
 /area/station/engineering/supermatter/room)
 "eLa" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas1";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
 	dir = 4
 	},
 /turf/open/floor/engine/vacuum,
@@ -46218,9 +46217,7 @@
 /turf/open/floor/iron,
 /area/station/commons/lounge)
 "mDv" = (
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/air_sensor/ordnance_burn_chamber,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "mDw" = (
@@ -46379,10 +46376,8 @@
 /turf/open/floor/iron,
 /area/station/engineering/atmos)
 "mGn" = (
-/obj/machinery/computer/atmos_control/noreconnect{
-	atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber")
-	},
 /obj/machinery/light/directional/north,
+/obj/machinery/computer/atmos_control/ordnancemix,
 /turf/open/floor/iron/dark,
 /area/station/science/mixing)
 "mGo" = (
@@ -48198,9 +48193,7 @@
 /area/station/science/lobby)
 "nhi" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas2"
-	},
+/obj/machinery/air_sensor/ordnance_freezer_chamber,
 /turf/open/floor/iron/dark/airless,
 /area/station/science/mixing/chamber)
 "nhj" = (
@@ -70442,8 +70435,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 6
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas2";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{
 	dir = 8
 	},
 /turf/open/floor/iron/dark/airless,

diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -11769,9 +11769,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 8
 	},
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas2"
-	},
+/obj/machinery/air_sensor/ordnance_freezer_chamber,
 /turf/open/floor/iron/dark/airless,
 /area/station/science/mixing/chamber)
 "dLH" = (
@@ -38609,9 +38607,7 @@
 /turf/open/floor/iron/cafeteria,
 /area/station/hallway/secondary/exit/departure_lounge)
 "mtQ" = (
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/air_sensor/ordnance_burn_chamber,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "muh" = (
@@ -46292,8 +46288,7 @@
 /area/station/medical/surgery/fore)
 "oRu" = (
 /obj/structure/window/reinforced,
-/obj/machinery/computer/atmos_control/noreconnect{
-	atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber");
+/obj/machinery/computer/atmos_control/ordnancemix{
 	dir = 1
 	},
 /turf/open/floor/iron,
@@ -52831,9 +52826,7 @@
 /turf/open/floor/iron/chapel,
 /area/station/service/chapel)
 "qYu" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "qYw" = (
@@ -67157,8 +67150,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
 	dir = 1
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas2";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{
 	dir = 1
 	},
 /turf/open/floor/iron/dark/airless,

diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -16291,12 +16291,11 @@
 /turf/open/floor/iron/dark,
 /area/station/commons/fitness/recreation)
 "eLb" = (
-/obj/machinery/computer/atmos_control/noreconnect{
-	atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber");
-	dir = 4
-	},
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/light/directional/west,
+/obj/machinery/computer/atmos_control/ordnancemix{
+	dir = 4
+	},
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/mixing)
 "eLm" = (
@@ -18795,9 +18794,7 @@
 /area/station/service/chapel/monastery)
 "frq" = (
 /obj/effect/decal/cleanable/blood/old,
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/air_sensor/ordnance_burn_chamber,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "frK" = (
@@ -21482,9 +21479,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 8
 	},
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas2"
-	},
+/obj/machinery/air_sensor/ordnance_freezer_chamber,
 /turf/open/floor/iron/dark/airless,
 /area/station/science/mixing/chamber)
 "gdk" = (
@@ -60862,8 +60857,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 6
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas2";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{
 	dir = 1
 	},
 /turf/open/floor/iron/dark/airless,
@@ -69968,9 +69962,7 @@
 	},
 /area/station/maintenance/starboard/aft)
 "tKn" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "tKt" = (
@@ -85245,6 +85237,9 @@
 /obj/item/pipe_dispenser,
 /obj/effect/turf_decal/tile/purple/half/contrasted,
 /obj/structure/cable,
+/obj/machinery/air_sensor{
+	chamber_id = "ordnancegas2"
+	},
 /turf/open/floor/iron/showroomfloor,
 /area/station/science/storage)
 "xVa" = (

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -5737,8 +5737,7 @@
 	},
 /area/station/security/prison)
 "cgC" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas1";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
 	dir = 1
 	},
 /turf/open/floor/engine/vacuum,
@@ -34967,9 +34966,7 @@
 /turf/open/floor/iron/white/corner,
 /area/station/hallway/secondary/entry)
 "mAh" = (
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/air_sensor/ordnance_burn_chamber,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "mAm" = (
@@ -43373,8 +43370,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 10
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas2";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input{
 	dir = 4
 	},
 /turf/open/floor/iron/dark/airless,
@@ -60012,9 +60008,7 @@
 /area/station/medical/chemistry)
 "vga" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2,
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas2"
-	},
+/obj/machinery/air_sensor/ordnance_freezer_chamber,
 /turf/open/floor/iron/dark/airless,
 /area/station/science/mixing/chamber)
 "vgb" = (
@@ -66331,14 +66325,13 @@
 /area/station/maintenance/disposal/incinerator)
 "xpC" = (
 /obj/effect/turf_decal/siding/purple,
-/obj/machinery/computer/atmos_control/noreconnect{
-	atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber");
-	dir = 1
-	},
 /obj/machinery/camera/directional/south{
 	c_tag = "Science Ordnance Mix Lab";
 	network = list("ss13","rd")
 	},
+/obj/machinery/computer/atmos_control/ordnancemix{
+	dir = 1
+	},
 /turf/open/floor/iron/dark,
 /area/station/science/mixing)
 "xpI" = (

diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
@@ -11803,11 +11803,10 @@
 /area/station/hallway/secondary/exit/departure_lounge)
 "dSM" = (
 /obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
-/obj/machinery/computer/atmos_control/noreconnect{
-	atmos_chambers = list("ordnancegas1" = "Burn Chamber", "ordnancegas2" = "Freezer Chamber");
+/obj/machinery/light/directional/east,
+/obj/machinery/computer/atmos_control/ordnancemix{
 	dir = 8
 	},
-/obj/machinery/light/directional/east,
 /turf/open/floor/iron/white,
 /area/station/science/mixing)
 "dSN" = (
@@ -13522,9 +13521,7 @@
 /turf/open/floor/iron,
 /area/station/hallway/secondary/exit/departure_lounge)
 "eAp" = (
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas1"
-	},
+/obj/machinery/air_sensor/ordnance_burn_chamber,
 /turf/open/floor/engine/vacuum,
 /area/station/science/mixing/chamber)
 "eAr" = (
@@ -18067,8 +18064,7 @@
 /turf/open/floor/iron,
 /area/station/commons/dorms)
 "gge" = (
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas1";
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{
 	dir = 8
 	},
 /turf/open/floor/engine/vacuum,
@@ -51008,9 +51004,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 5
 	},
-/obj/machinery/atmospherics/components/unary/outlet_injector/monitored{
-	chamber_id = "ordnancegas2"
-	},
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_freezer_chamber_input,
 /turf/open/floor/iron/dark/airless,
 /area/station/science/mixing/chamber)
 "rlU" = (
@@ -70559,9 +70553,7 @@
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{
 	dir = 8
 	},
-/obj/machinery/air_sensor{
-	chamber_id = "ordnancegas2"
-	},
+/obj/machinery/air_sensor/ordnance_freezer_chamber,
 /turf/open/floor/iron/dark/airless,
 /area/station/science/mixing/chamber)
 "xWW" = (