Merge branch 'master220' into trans

ss220-space · Sep 11, 2024 · 2f62498 · 2f62498
2 parents 399570a + c9ee220
commit 2f62498
Show file tree

Hide file tree

Showing 66 changed files with 1,616 additions and 1,125 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
@@ -5807,12 +5807,8 @@
 /area/engine/controlroom)
 "aSH" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "air_sensor"
-	},
-/obj/machinery/atmospherics/air_sensor{
-	frequency = 1443;
 	id_tag = "air_sensor";
-	output = 7
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/atmos)
@@ -51506,7 +51502,8 @@
 /area/crew_quarters/kitchen)
 "gCu" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "mix_sensor"
+	id_tag = "mix_sensor";
+	output = 127
 	},
 /turf/simulated/floor/engine/vacuum,
 /area/atmos)

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/map_files/RandomRuins/SpaceRuins/gasthelizards.dmm
@@ -477,7 +477,8 @@
 "rk" = (
 /obj/machinery/atmospherics/air_sensor{
 	frequency = 1441;
-	id_tag = "mix_sensor_gtl"
+	id_tag = "mix_sensor_gtl";
+	output = 127
 	},
 /turf/simulated/floor/engine,
 /area/ruin/space/gasthelizards/viewzone)

diff --git a/_maps/map_files/RandomZLevels/terrorspiders.dmm b/_maps/map_files/RandomZLevels/terrorspiders.dmm
@@ -6618,7 +6618,7 @@
 /obj/machinery/atmospherics/air_sensor{
 	frequency = 1443;
 	id_tag = "UO71_air_sensor";
-	output = 7
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/awaymission/UO71/eng)
@@ -8652,7 +8652,7 @@
 "ty" = (
 /obj/machinery/atmospherics/air_sensor{
 	id_tag = "UO71_waste_sensor";
-	output = 63
+	output = 127
 	},
 /turf/simulated/floor/engine{
 	name = "vacuum floor";

diff --git a/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm b/_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
@@ -7065,7 +7065,7 @@
 /obj/machinery/atmospherics/air_sensor{
 	frequency = 1443;
 	id_tag = "UO45_air_sensor";
-	output = 7
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/awaymission/UO45/engineering)
@@ -9235,7 +9235,7 @@
 "tg" = (
 /obj/machinery/atmospherics/air_sensor{
 	id_tag = "UO45_waste_sensor";
-	output = 63
+	output = 127
 	},
 /turf/simulated/floor/engine{
 	name = "vacuum floor";

diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
@@ -57761,7 +57761,8 @@
 /area/security/lobby)
 "jFZ" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "mix_sensor"
+	id_tag = "mix_sensor";
+	output = 127
 	},
 /turf/simulated/floor/engine/insulated/vacuum,
 /area/atmos)
@@ -119365,7 +119366,8 @@
 /area/chapel/main)
 "vEd" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "air_sensor"
+	id_tag = "air_sensor";
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/atmos)

diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
@@ -48450,7 +48450,8 @@
 /area/maintenance/asmaint5)
 "kdK" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "mix_sensor"
+	id_tag = "mix_sensor";
+	output = 127
 	},
 /turf/simulated/floor/engine/insulated/vacuum,
 /area/atmos)
@@ -66834,7 +66835,8 @@
 /area/security/prison/cell_block/A)
 "pkf" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "air_sensor"
+	id_tag = "air_sensor";
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/atmos)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -47970,7 +47970,7 @@
 "cSr" = (
 /obj/machinery/atmospherics/air_sensor{
 	id_tag = "waste_sensor";
-	output = 63
+	output = 127
 	},
 /turf/simulated/floor/engine/insulated/vacuum,
 /area/atmos)
@@ -66312,7 +66312,7 @@
 /obj/machinery/atmospherics/air_sensor{
 	frequency = 1443;
 	id_tag = "air_sensor";
-	output = 7
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/atmos)

diff --git a/_maps/map_files/event/Station/delta_old.dmm b/_maps/map_files/event/Station/delta_old.dmm
@@ -151,7 +151,8 @@
 /area/space/nearstation)
 "acX" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "mix_sensor"
+	id_tag = "mix_sensor";
+	output = 127
 	},
 /turf/simulated/floor/engine/insulated/vacuum,
 /area/atmos)
@@ -41872,12 +41873,8 @@
 /area/medical/virology)
 "ehg" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "air_sensor"
-	},
-/obj/machinery/atmospherics/air_sensor{
-	frequency = 1443;
 	id_tag = "air_sensor";
-	output = 7
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/atmos)

diff --git a/_maps/map_files/event/Station/towerstation.dmm b/_maps/map_files/event/Station/towerstation.dmm
@@ -13238,7 +13238,8 @@
 /area/crew_quarters/bar/atrium)
 "izH" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "mix_sensor"
+	id_tag = "mix_sensor";
+	output = 127
 	},
 /turf/simulated/floor/engine/vacuum,
 /area/atmos)
@@ -14350,7 +14351,8 @@
 /area/medical/medbay)
 "jlk" = (
 /obj/machinery/atmospherics/air_sensor{
-	id_tag = "air_sensor"
+	id_tag = "air_sensor";
+	output = 23
 	},
 /turf/simulated/floor/engine/air,
 /area/atmos)

diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm
@@ -34033,7 +34033,10 @@
 	req_access = list(114);
 	pixel_x = -24
 	},
-/turf/simulated/wall/indestructible/reinforced,
+/turf/simulated/floor/plasteel{
+	dir = 8;
+	icon_state = "darkyellowalt"
+	},
 /area/centcom/supply)
 "pLm" = (
 /obj/machinery/light{