Merge pull request #5674 from Heroman3003/alarm-fix

Fixes non-working air alarms
This commit is contained in:
Novacat
2019-08-20 18:32:24 -04:00
committed by GitHub
5 changed files with 16 additions and 39 deletions
-9
View File
@@ -26241,7 +26241,6 @@
dir = 1
},
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/obj/item/weapon/towel/random,
@@ -26539,7 +26538,6 @@
/area/vacant/vacant_bar)
"dQB" = (
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -26573,7 +26571,6 @@
/area/tether/surfacebase/public_garden_one)
"dUk" = (
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/obj/machinery/power/apc{
@@ -28223,7 +28220,6 @@
dir = 4
},
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/obj/structure/cable/green{
@@ -28236,7 +28232,6 @@
/area/maintenance/lower/atmos)
"jXa" = (
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/obj/structure/table/bench/steel,
@@ -28697,7 +28692,6 @@
dir = 1
},
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/turf/simulated/floor/tiled/freezer,
@@ -30905,7 +30899,6 @@
dir = 4
},
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -32114,7 +32107,6 @@
/area/engineering/atmos)
"xiL" = (
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/turf/simulated/floor/plating,
@@ -32309,7 +32301,6 @@
/area/engineering/atmos)
"ycb" = (
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/turf/simulated/floor/tiled,
+16 -25
View File
@@ -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
-2
View File
@@ -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,
-1
View File
@@ -33,7 +33,6 @@
"aah" = (
/obj/structure/closet/coffin,
/obj/machinery/alarm{
frequency = 1441;
pixel_y = 22
},
/turf/simulated/floor/tiled/dark,
-2
View File
@@ -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,