From 7336e784c50651e2a7ce292a964c7d232c7dc91d Mon Sep 17 00:00:00 2001 From: Heroman Date: Wed, 21 Aug 2019 08:19:22 +1000 Subject: [PATCH] Fixes non-working air alarms --- maps/tether/tether-01-surface1.dmm | 9 ------- maps/tether/tether-02-surface2.dmm | 41 ++++++++++++------------------ maps/tether/tether-03-surface3.dmm | 2 -- maps/tether/tether-05-station1.dmm | 1 - maps/tether/tether-07-station3.dmm | 2 -- 5 files changed, 16 insertions(+), 39 deletions(-) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 42bf97f651d..00a61836143 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -26237,7 +26237,6 @@ dir = 1 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/item/weapon/towel/random, @@ -26535,7 +26534,6 @@ /area/vacant/vacant_bar) "dQB" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -26569,7 +26567,6 @@ /area/tether/surfacebase/public_garden_one) "dUk" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/power/apc{ @@ -28219,7 +28216,6 @@ dir = 4 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/structure/cable/green{ @@ -28232,7 +28228,6 @@ /area/maintenance/lower/atmos) "jXa" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/structure/table/bench/steel, @@ -28693,7 +28688,6 @@ dir = 1 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled/freezer, @@ -30897,7 +30891,6 @@ dir = 4 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -32106,7 +32099,6 @@ /area/engineering/atmos) "xiL" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/plating, @@ -32301,7 +32293,6 @@ /area/engineering/atmos) "ycb" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled, diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 550a3554f00..39bcd67c70d 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1022,6 +1022,21 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/public_garden_maintenence/upper) +"cn" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1; + icon_state = "borderfloor"; + pixel_y = 0 + }, +/obj/effect/floor_decal/corner/yellow/border{ + icon_state = "bordercolor"; + dir = 1 + }, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, +/area/engineering/lower/atmos_eva) "co" = ( /obj/structure/catwalk, /obj/structure/grille/broken, @@ -7566,7 +7581,6 @@ dir = 4 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/effect/floor_decal/steeldecal/steel_decals4, @@ -8553,7 +8567,6 @@ /obj/machinery/washing_machine, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled/white, @@ -9044,18 +9057,6 @@ /obj/item/clothing/head/helmet/space/void/atmos, /turf/simulated/floor/tiled, /area/engineering/lower/atmos_eva) -"sj" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1; - icon_state = "borderfloor"; - pixel_y = 0 - }, -/obj/effect/floor_decal/corner/yellow/border{ - icon_state = "bordercolor"; - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/engineering/lower/atmos_eva) "sk" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/steel_dirty, @@ -9380,7 +9381,6 @@ /area/rnd/breakroom/bathroom) "sU" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled/white, @@ -11865,7 +11865,6 @@ dir = 8 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled, @@ -12661,7 +12660,6 @@ /area/maintenance/asmaint2) "zd" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/structure/railing, @@ -16436,7 +16434,6 @@ }, /obj/structure/closet/secure_closet/atmos_personal, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled, @@ -16794,7 +16791,6 @@ /area/maintenance/lower/bar) "Mz" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/wood, @@ -17135,7 +17131,6 @@ dir = 1 }, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled, @@ -18350,7 +18345,6 @@ /area/maintenance/asmaint2) "UG" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/structure/catwalk, @@ -18606,7 +18600,6 @@ /area/maintenance/lower/atmos) "VD" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/effect/decal/cleanable/dirt, @@ -18663,7 +18656,6 @@ /area/tether/surfacebase/public_garden_two) "VO" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/item/weapon/bananapeel, @@ -19418,7 +19410,6 @@ /area/engineering/drone_fabrication) "Zi" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/carpet, @@ -29327,7 +29318,7 @@ pm qa qO rC -sj +cn tf Ke uD diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 9608b0e9bdf..2127ee7d9d3 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -21335,7 +21335,6 @@ /area/vacant/vacant_library) "Pm" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -21701,7 +21700,6 @@ /area/tether/surfacebase/public_garden_three) "Rf" = ( /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled, diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 3769e9c90f9..745de78959a 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -33,7 +33,6 @@ "aah" = ( /obj/structure/closet/coffin, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled/dark, diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index e328716772c..a4c0f9cd6ea 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -1972,7 +1972,6 @@ "di" = ( /obj/machinery/meter, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -28715,7 +28714,6 @@ /obj/structure/bed/chair/shuttle, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm{ - frequency = 1441; pixel_y = 22 }, /turf/simulated/floor/tiled,