From 832099b9f243a2f92e14e56d95dfbeca53607706 Mon Sep 17 00:00:00 2001
From: izac112 <izac10@live.com>
Date: Sat, 30 Mar 2024 23:00:13 +0100
Subject: [PATCH] Danger level and air alarm stuff

-80 air alarms
65 kpa air alarms
---
 code/game/machinery/air_alarm_yw.dm |  38 +++
 maps/yw/cryogaia-02-mining.dmm      | 158 +++++------
 maps/yw/cryogaia-04-maintenance.dmm | 248 ++++++++---------
 maps/yw/cryogaia-05-main.dmm        | 398 ++++++++++++++--------------
 maps/yw/cryogaia-06-upper.dmm       |  68 ++---
 vorestation.dme                     |   1 +
 6 files changed, 476 insertions(+), 435 deletions(-)
 create mode 100644 code/game/machinery/air_alarm_yw.dm

diff --git a/code/game/machinery/air_alarm_yw.dm b/code/game/machinery/air_alarm_yw.dm
new file mode 100644
index 00000000000..8a4cff21353
--- /dev/null
+++ b/code/game/machinery/air_alarm_yw.dm
@@ -0,0 +1,38 @@
+/obj/machinery/alarm/yw/Initialize(mapload)
+	. = ..()
+	if(!pixel_x && !pixel_y)
+		offset_airalarm()
+	first_run_yw()
+
+/obj/machinery/alarm/yw/proc/first_run_yw()
+	alarm_area = get_area(src)
+	area_uid = "\ref[alarm_area]"
+	if(name == "alarm")
+		name = "[alarm_area.name] Air Alarm"
+
+	if(!wires)
+		wires = new(src)
+
+	// breathable air according to human/Life()
+	TLV["oxygen"] =			list(16, 19, 135, 140) // Partial pressure, kpa
+	TLV["nitrogen"] =		list(0, 0, 135, 140) // Partial pressure, kpa
+	TLV["carbon_dioxide"] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
+	TLV["phoron"] =			list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
+	TLV["other"] =			list(-1.0, -1.0, 0.5, 1.0) // Partial pressure, kpa
+	TLV["pressure"] =		list(ONE_ATMOSPHERE * 0.65, ONE_ATMOSPHERE * 0.90, ONE_ATMOSPHERE * 1.10, ONE_ATMOSPHERE * 1.20) /* kpa */
+	TLV["temperature"] =	list(T0C - 80, T0C, T0C + 40, T0C + 66) // K
+
+	update_icon()
+
+/obj/machinery/alarm/yw/nobreach
+	breach_detection = 0
+
+/obj/machinery/alarm/yw/monitor
+	report_danger_level = 0
+	breach_detection = 0
+
+/obj/machinery/alarm/yw/isolation
+	req_one_access = list(access_research, access_atmospherics, access_engine_equip)
+
+/obj/machinery/alarm/yw/monitor/isolation
+	req_one_access = list(access_research, access_atmospherics, access_engine_equip)
diff --git a/maps/yw/cryogaia-02-mining.dmm b/maps/yw/cryogaia-02-mining.dmm
index a53003a368e..5f9ccc0cf7d 100644
--- a/maps/yw/cryogaia-02-mining.dmm
+++ b/maps/yw/cryogaia-02-mining.dmm
@@ -373,7 +373,7 @@
 	},
 /obj/item/weapon/clipboard,
 /obj/item/weapon/pen,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 23
 	},
 /obj/structure/table/glass,
@@ -510,7 +510,7 @@
 /obj/structure/closet,
 /obj/item/toy/figure/scientist,
 /obj/item/clothing/accessory/armband/science,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -655,7 +655,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology)
 "bz" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -668,7 +668,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/rnd/xenobiology/failsafe)
 "bA" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -738,7 +738,7 @@
 /area/outpost/research/isolation_a)
 "bJ" = (
 /obj/structure/table/standard,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -2184,7 +2184,7 @@
 /area/vacant/vacant_site/east)
 "fs" = (
 /obj/effect/floor_decal/corner/purple,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -2459,7 +2459,7 @@
 	pixel_y = 3
 	},
 /obj/item/roller,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -2557,7 +2557,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/surgery)
 "gh" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -2602,7 +2602,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 8
 	},
-/obj/machinery/alarm/monitor/isolation{
+/obj/machinery/alarm/yw/monitor/isolation{
 	alarm_id = "isolation_three";
 	dir = 8;
 	pixel_x = 22
@@ -3080,7 +3080,7 @@
 /area/rnd/xenobiology)
 "hq" = (
 /obj/machinery/atmospherics/portables_connector,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 22
 	},
@@ -3133,7 +3133,7 @@
 	dir = 1;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -3312,7 +3312,7 @@
 /turf/simulated/wall/r_wall,
 /area/outpost/mining_main/airlock)
 "hS" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -3440,7 +3440,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -3851,7 +3851,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -4275,7 +4275,7 @@
 /area/rnd/workshop)
 "ku" = (
 /obj/machinery/radiocarbon_spectrometer,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -4465,7 +4465,7 @@
 /turf/simulated/mineral/ignore_mapgen/cave,
 /area/mine/unexplored)
 "kU" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 23
 	},
 /turf/simulated/floor/plating,
@@ -4509,7 +4509,7 @@
 /obj/effect/floor_decal/industrial/warning/cee{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -4771,7 +4771,7 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -5030,7 +5030,7 @@
 /area/outpost/mining_main/north_hall)
 "mi" = (
 /obj/machinery/washing_machine,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -5142,7 +5142,7 @@
 /obj/structure/table/standard,
 /obj/item/weapon/melee/baton/slime/loaded,
 /obj/item/weapon/gun/energy/taser/xeno,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -5363,7 +5363,7 @@
 /turf/simulated/floor/tiled,
 /area/maintenance/shelter3)
 "mW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -5519,7 +5519,7 @@
 /turf/simulated/floor/tiled,
 /area/gateway)
 "nq" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -6213,7 +6213,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/outpost/research/longtermstorage)
 "pd" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -6319,7 +6319,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora)
 "pr" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -6417,7 +6417,7 @@
 	dir = 1
 	},
 /obj/item/weapon/storage/box/solution_trays,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -6497,7 +6497,7 @@
 /area/rnd/xenobiology/xenoflora/lab_atmos)
 "pO" = (
 /obj/effect/floor_decal/industrial/warning/dust,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -7462,7 +7462,7 @@
 /turf/simulated/floor/tiled,
 /area/rnd/xenobiology/hallway)
 "rU" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -7650,7 +7650,7 @@
 /area/outpost/research/hallway/mid)
 "sv" = (
 /obj/structure/closet,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -7880,7 +7880,7 @@
 /turf/simulated/floor/tiled,
 /area/gateway)
 "tj" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -8067,7 +8067,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -8142,7 +8142,7 @@
 /turf/simulated/floor/reinforced,
 /area/rnd/xenobiology/secure)
 "tW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -8584,7 +8584,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 6
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -8916,7 +8916,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -9783,7 +9783,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -9975,7 +9975,7 @@
 	name = "south bump";
 	pixel_y = -32
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -10272,7 +10272,7 @@
 /turf/simulated/floor/tiled,
 /area/outpost/research/isolation_a)
 "za" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -10637,7 +10637,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -10761,7 +10761,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -11037,7 +11037,7 @@
 /turf/simulated/wall/r_wall,
 /area/vacant/vacant_site/east)
 "AQ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -11153,7 +11153,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/hallway)
 "Bf" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -11314,7 +11314,7 @@
 /turf/simulated/floor/tiled/white,
 /area/outpost/research/hallway/mid)
 "Bx" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -11568,7 +11568,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/xenoflora)
 "BU" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -11944,7 +11944,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -12031,7 +12031,7 @@
 /area/rnd/xenobiology/control)
 "Dc" = (
 /obj/structure/dispenser/oxygen,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/tiled,
@@ -12232,7 +12232,7 @@
 	dir = 4;
 	pixel_x = 11
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -12481,7 +12481,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/outpost/research/eva)
 "Ej" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -12612,7 +12612,7 @@
 /turf/simulated/floor/tiled,
 /area/outpost/research/anomaly)
 "Ex" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -12961,7 +12961,7 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -13461,7 +13461,7 @@
 /turf/simulated/floor/plating,
 /area/rnd/xenobiology)
 "Gs" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -13496,7 +13496,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -13532,7 +13532,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 8
 	},
-/obj/machinery/alarm/monitor/isolation{
+/obj/machinery/alarm/yw/monitor/isolation{
 	alarm_id = "isolation_two";
 	dir = 8;
 	pixel_x = 22
@@ -13609,7 +13609,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/rnd/xenobiology/failsafe)
 "GN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/chem_master,
@@ -13798,7 +13798,7 @@
 /turf/simulated/floor/tiled,
 /area/outpost/mining_main/south_hall)
 "Hl" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -13973,7 +13973,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/hallway)
 "HA" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -14403,7 +14403,7 @@
 /area/outpost/mining_main/refinery)
 "ID" = (
 /obj/structure/table/standard,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -14423,7 +14423,7 @@
 "IE" = (
 /obj/structure/table/standard,
 /obj/item/weapon/storage/box/donkpockets,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -14704,7 +14704,7 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -14949,7 +14949,7 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -15056,7 +15056,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/outpost/storage)
 "Kc" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -15368,7 +15368,7 @@
 /obj/effect/floor_decal/corner/green{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -15416,7 +15416,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber{
 	dir = 8
 	},
-/obj/machinery/alarm/monitor/isolation{
+/obj/machinery/alarm/yw/monitor/isolation{
 	alarm_id = "isolation_one";
 	dir = 8;
 	pixel_x = 22
@@ -15616,7 +15616,7 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -15639,7 +15639,7 @@
 /turf/simulated/floor/plating,
 /area/rnd/outpost/hallway)
 "Lv" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -15854,7 +15854,7 @@
 /area/maintenance/shelter)
 "LT" = (
 /obj/structure/table/standard,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -16282,7 +16282,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -16980,7 +16980,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/gateway)
 "OA" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -17309,7 +17309,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -17413,7 +17413,7 @@
 	d2 = 4;
 	icon_state = "2-4"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -18098,7 +18098,7 @@
 	pixel_y = 15
 	},
 /obj/item/weapon/melee/baton/loaded,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -18684,7 +18684,7 @@
 	name = "east bump";
 	pixel_x = 24
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -18750,7 +18750,7 @@
 /turf/simulated/floor/tiled/white,
 /area/outpost/research/anomaly_analysis)
 "SN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -19374,7 +19374,7 @@
 /area/outpost/research/hallway/mid)
 "Uk" = (
 /obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -19547,7 +19547,7 @@
 	pixel_x = 24;
 	pixel_y = 32
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -19717,7 +19717,7 @@
 /turf/simulated/floor/tiled/white,
 /area/outpost/research/tempstorage)
 "UY" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -20633,7 +20633,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -20723,7 +20723,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/outpost/mixing)
 "Xu" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 24
 	},
 /obj/item/device/radio/intercom{
@@ -21279,7 +21279,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/xenobiology/hallway)
 "YN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -21728,7 +21728,7 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -21790,7 +21790,7 @@
 /obj/item/weapon/folder/red{
 	pixel_y = 3
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
diff --git a/maps/yw/cryogaia-04-maintenance.dmm b/maps/yw/cryogaia-04-maintenance.dmm
index 59abe3b4656..61184e9beb7 100644
--- a/maps/yw/cryogaia-04-maintenance.dmm
+++ b/maps/yw/cryogaia-04-maintenance.dmm
@@ -347,7 +347,7 @@
 /turf/simulated/floor,
 /area/maintenance/aft)
 "alj" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -573,7 +573,7 @@
 /turf/simulated/floor/bluegrid,
 /area/ai)
 "avd" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/structure/closet/crate/hydroponics{
@@ -1595,7 +1595,7 @@
 /turf/simulated/floor,
 /area/crew_quarters/recreation_area)
 "aXI" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -1767,7 +1767,7 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -1824,7 +1824,7 @@
 /turf/simulated/floor,
 /area/engineering/atmos)
 "bfY" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -2174,7 +2174,7 @@
 	d2 = 8;
 	icon_state = "2-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -2314,7 +2314,7 @@
 /area/hydroponics)
 "buU" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/red,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -2564,7 +2564,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/lab)
 "bGv" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -3027,7 +3027,7 @@
 	dir = 8
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -3050,7 +3050,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -3502,7 +3502,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/fish)
 "cgb" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -3893,7 +3893,7 @@
 /turf/simulated/floor,
 /area/maintenance/chapel)
 "crA" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -4062,7 +4062,7 @@
 /turf/simulated/floor,
 /area/chapel/main)
 "cvu" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -4329,7 +4329,7 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/pool)
 "cFi" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -4558,7 +4558,7 @@
 /turf/simulated/wall,
 /area/crew_quarters/sleep/cryo)
 "cLV" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -5040,7 +5040,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -5141,7 +5141,7 @@
 /turf/simulated/floor,
 /area/maintenance/medical_lower)
 "dcW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -5406,7 +5406,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -5756,7 +5756,7 @@
 	},
 /area/tcommsat/chamber)
 "duL" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -6626,7 +6626,7 @@
 /turf/simulated/floor,
 /area/maintenance/substation/civilian_lower)
 "dXJ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -7392,7 +7392,7 @@
 /obj/effect/floor_decal/corner_techfloor_grid{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -7594,7 +7594,7 @@
 /turf/simulated/floor/tiled/steel_dirty,
 /area/hallway/lower/aft)
 "euw" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -8773,7 +8773,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_8)
 "fiX" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -9042,7 +9042,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -10576,7 +10576,7 @@
 /turf/simulated/wall/durasteel,
 /area/maintenance/blueserg/misc)
 "glz" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -10813,7 +10813,7 @@
 /area/medical/virology)
 "gtv" = (
 /obj/structure/table/glass,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -11396,7 +11396,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -12032,7 +12032,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
 "gZl" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -12274,7 +12274,7 @@
 	name_tag = "Atmospherics Subgrid"
 	},
 /obj/structure/cable/cyan,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -12480,7 +12480,7 @@
 /turf/simulated/wall,
 /area/security/perma/bathroom)
 "hkq" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -13682,7 +13682,7 @@
 	d2 = 4;
 	icon_state = "1-4"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -14293,7 +14293,7 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/recreation_area_restroom)
 "ifH" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -14418,7 +14418,7 @@
 	dir = 1
 	},
 /obj/effect/floor_decal/techfloor,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/tiled/techfloor,
@@ -14879,7 +14879,7 @@
 /obj/structure/flora/pottedplant{
 	icon_state = "plant-22"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -15249,7 +15249,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -15515,7 +15515,7 @@
 	dir = 4
 	},
 /obj/structure/catwalk,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -15778,7 +15778,7 @@
 	dir = 1;
 	pixel_y = -24
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -15990,7 +15990,7 @@
 /obj/effect/floor_decal/corner/white{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -16274,7 +16274,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/maintroom5)
 "jgM" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -16567,7 +16567,7 @@
 	tag_east = 2;
 	tag_west = 1;
 	tag_south = 5;
-	power_rating = 120000;
+	power_rating = 240000;
 	desc = "An advanced High power version of the gas filter, able to be configured for filtering of multiple gasses."
 	},
 /turf/simulated/floor/tiled,
@@ -16857,7 +16857,7 @@
 /turf/simulated/floor/tiled,
 /area/ai_monitored/storage/emergency/eva)
 "jxD" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -17195,7 +17195,7 @@
 /turf/simulated/floor,
 /area/maintenance/starboard)
 "jDJ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -17208,7 +17208,7 @@
 	},
 /area/civilian/atrium/lower)
 "jEs" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/structure/table/standard,
@@ -17230,7 +17230,7 @@
 "jFi" = (
 /obj/structure/window/reinforced,
 /obj/structure/closet/firecloset,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -17412,7 +17412,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/lower/fore)
 "jKq" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -17699,7 +17699,7 @@
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/medical/morgue)
 "jPF" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -17899,7 +17899,7 @@
 /obj/item/weapon/stock_parts/subspace/ansible,
 /obj/item/weapon/stock_parts/subspace/ansible,
 /obj/item/weapon/stock_parts/subspace/ansible,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -18318,7 +18318,7 @@
 /area/crew_quarters/coffee_shop)
 "kfp" = (
 /obj/structure/closet/secure_closet/hydroponics,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -18430,7 +18430,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -18817,7 +18817,7 @@
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/crew_quarters/sleep/cryo)
 "kra" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -19058,7 +19058,7 @@
 /obj/effect/floor_decal/steeldecal/steel_decals9{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -19129,7 +19129,7 @@
 	tag_east = 2;
 	tag_south = 1;
 	tag_north = 4;
-	power_rating = 120000;
+	power_rating = 240000;
 	desc = "An advanced High power version of the gas filter, able to be configured for filtering of multiple gasses."
 	},
 /turf/simulated/floor/tiled,
@@ -19454,7 +19454,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -19849,7 +19849,7 @@
 /turf/simulated/floor/tiled/hydro,
 /area/hydroponics)
 "kPL" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -20266,7 +20266,7 @@
 	dir = 1;
 	icon_state = "comfychair_preview"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -20315,7 +20315,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -20433,7 +20433,7 @@
 /area/chapel/main)
 "lgw" = (
 /obj/structure/closet/wardrobe/pjs,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -21306,7 +21306,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -22139,7 +22139,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/lower/central)
 "mar" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -22148,7 +22148,7 @@
 /area/maintenance/atmos_control)
 "maL" = (
 /obj/effect/decal/cleanable/dirt,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -22368,7 +22368,7 @@
 	tag_north = 3;
 	tag_south = 2;
 	tag_west = 1;
-	power_rating = 120000;
+	power_rating = 240000;
 	desc = "An advanced High power version of the gas filter, able to be configured for filtering of multiple gasses."
 	},
 /turf/simulated/floor/tiled,
@@ -22394,7 +22394,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "mmy" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -22909,7 +22909,7 @@
 /turf/simulated/floor,
 /area/maintenance/atmos_control)
 "mAZ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -23276,7 +23276,7 @@
 /turf/simulated/floor,
 /area/vacant/vacant_site)
 "mIq" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -23335,7 +23335,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lowfloor3)
 "mJP" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -23431,7 +23431,7 @@
 /turf/simulated/floor,
 /area/engineering/atmos)
 "mMp" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -23483,7 +23483,7 @@
 /turf/simulated/floor/lino,
 /area/chapel/office)
 "mOL" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -23976,7 +23976,7 @@
 /obj/effect/floor_decal/corner/green{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -24236,7 +24236,7 @@
 /obj/item/stack/cable_coil/pink,
 /obj/item/stack/cable_coil/pink,
 /obj/item/stack/cable_coil/pink,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -24405,7 +24405,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -25397,7 +25397,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/lower/central)
 "nXk" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -26308,7 +26308,7 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/recreation_area)
 "ovY" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -26456,7 +26456,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -26757,14 +26757,14 @@
 /obj/structure/morgue{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
 /turf/simulated/floor/holofloor/tiled/dark,
 /area/medical/morgue)
 "oIW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -27066,7 +27066,7 @@
 /turf/simulated/floor,
 /area/engineering/atmos)
 "oRg" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 23
 	},
 /obj/item/weapon/camera_assembly,
@@ -27190,7 +27190,7 @@
 "oTx" = (
 /obj/machinery/portable_atmospherics/hydroponics,
 /obj/effect/floor_decal/corner/green/full,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -27914,7 +27914,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -28634,7 +28634,7 @@
 /obj/structure/bed/chair/comfy/black{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -28797,7 +28797,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -29378,7 +29378,7 @@
 /turf/simulated/floor/tiled/steel_grid,
 /area/maintenance/starboard)
 "pYg" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -29740,7 +29740,7 @@
 /obj/effect/floor_decal/corner/lime{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/tiled/white,
@@ -29752,7 +29752,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/lower/central)
 "qiA" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -30095,7 +30095,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/coffee_shop)
 "qtY" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -30447,7 +30447,7 @@
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "qFq" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -30630,7 +30630,7 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/kitchen/fish_farm)
 "qMq" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -30737,7 +30737,7 @@
 /turf/simulated/wall/r_wall,
 /area/ai)
 "qPh" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -30981,7 +30981,7 @@
 /turf/simulated/wall/titanium,
 /area/cryogaia/outpost/tower/southeast)
 "qZJ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -31044,7 +31044,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -31332,7 +31332,7 @@
 	pixel_x = -4;
 	pixel_y = 12
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -32088,7 +32088,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/lower)
 "rIk" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -32745,7 +32745,7 @@
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medbay Chemistry"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -33235,7 +33235,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/medical/biostorage2)
 "ssL" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/item/roller,
@@ -35063,7 +35063,7 @@
 /obj/effect/floor_decal/corner/lime{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -35323,7 +35323,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -35636,7 +35636,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbaylower)
 "tHb" = (
-/obj/machinery/stationboiler_radiator,
+/obj/machinery/stationboiler_radiator{
+	target_heat_temperature = 260
+	},
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/kitchen/lower)
 "tHc" = (
@@ -35733,7 +35735,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/lower/central)
 "tIC" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -36618,7 +36620,7 @@
 /area/crew_quarters/recreation_area)
 "uea" = (
 /obj/structure/kitchenspike,
-/obj/machinery/alarm{
+/obj/machinery/alarm/freezer{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -36666,7 +36668,7 @@
 /area/hallway/primary/starboard)
 "ueH" = (
 /obj/effect/floor_decal/techfloor/hole/right,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -36761,7 +36763,7 @@
 /area/tcommsat/entrance)
 "ugt" = (
 /obj/effect/floor_decal/corner/blue,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -36776,7 +36778,7 @@
 	},
 /area/tcommsat/chamber)
 "uhy" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -37389,7 +37391,7 @@
 "uya" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -38027,7 +38029,7 @@
 /turf/simulated/floor/tiled/freezer,
 /area/security/perma/bathroom)
 "uNG" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -38102,7 +38104,7 @@
 	},
 /area/library)
 "uPY" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -38467,7 +38469,7 @@
 /turf/simulated/floor,
 /area/maintenance/starboard)
 "vaW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -38902,7 +38904,7 @@
 /obj/item/device/radio/off,
 /obj/item/device/radio/off,
 /obj/item/device/radio/off,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -39404,7 +39406,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -39714,7 +39716,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 23
 	},
 /turf/simulated/floor/tiled,
@@ -39853,7 +39855,7 @@
 	pixel_x = 30
 	},
 /obj/item/weapon/soap/nanotrasen,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -40054,7 +40056,7 @@
 /obj/effect/floor_decal/corner/lime{
 	dir = 9
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -40163,7 +40165,7 @@
 /area/maintenance/maintroom8)
 "vVm" = (
 /obj/structure/table/standard,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/effect/floor_decal/corner/lime{
@@ -40301,7 +40303,7 @@
 /turf/simulated/floor/grass,
 /area/civilian/atrium/lower)
 "wae" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -40431,7 +40433,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/fish)
 "weZ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/lino,
@@ -40566,7 +40568,7 @@
 	tag_east = 1;
 	tag_west_con = 0.79;
 	tag_west = 1;
-	power_rating = 120000;
+	power_rating = 240000;
 	desc = "An advanced High power version of the gas mixer, able to be configured for mixing of multiple gasses."
 	},
 /turf/simulated/floor/tiled,
@@ -41410,7 +41412,7 @@
 /turf/simulated/floor/plating,
 /area/maintenance/aft)
 "wLE" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -42519,7 +42521,7 @@
 /turf/simulated/floor/lino,
 /area/chapel/office)
 "xpG" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -42530,7 +42532,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/sleep/engi_wash)
 "xpN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -42733,7 +42735,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/sleep/Dorm_7)
 "xtQ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -42993,7 +42995,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/wood,
@@ -43020,7 +43022,7 @@
 "xAM" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -43779,7 +43781,7 @@
 /turf/simulated/floor/tiled,
 /area/engineering/atmos)
 "xWh" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -43807,7 +43809,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/lower)
 "xWH" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -43879,7 +43881,7 @@
 "xYb" = (
 /obj/structure/closet,
 /obj/random/maintenance/research,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
diff --git a/maps/yw/cryogaia-05-main.dmm b/maps/yw/cryogaia-05-main.dmm
index 94a6963df0e..d8af26f953c 100644
--- a/maps/yw/cryogaia-05-main.dmm
+++ b/maps/yw/cryogaia-05-main.dmm
@@ -84,7 +84,7 @@
 "acc" = (
 /obj/machinery/cell_charger,
 /obj/structure/table/steel,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -150,7 +150,7 @@
 /area/quartermaster/miningwing)
 "adJ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -842,7 +842,7 @@
 /obj/effect/floor_decal/corner_oldtile/purple{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -1020,7 +1020,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -1030,7 +1030,7 @@
 /turf/simulated/floor,
 /area/maintenance/substation/security)
 "aue" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -1353,7 +1353,7 @@
 /obj/machinery/computer/aifixer{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -1454,7 +1454,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/storage)
 "aCP" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/structure/table/glass,
@@ -1494,7 +1494,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -1981,7 +1981,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "aNJ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -2046,7 +2046,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -2207,7 +2207,7 @@
 /area/engineering/foyer)
 "aRI" = (
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -2240,7 +2240,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/delivery)
 "aRO" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -2418,7 +2418,7 @@
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -2555,7 +2555,7 @@
 	frequency = 1379;
 	id_tag = "engine_airlock_pump"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -2769,7 +2769,7 @@
 	pixel_x = 5;
 	pixel_y = -8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -2894,7 +2894,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/kitchen)
 "bes" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -3510,7 +3510,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -3727,7 +3727,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/southeast)
 "bxJ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -4083,7 +4083,7 @@
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "bGE" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -4210,7 +4210,7 @@
 /obj/structure/bed/chair{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -4465,7 +4465,7 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -4992,8 +4992,8 @@
 	input_level_max = 0;
 	max_coils = 1;
 	name = "bluespace power storage unit";
-	output_level = 1000000;
-	output_level_max = 1000000;
+	output_level = 1500000;
+	output_level_max = 1500000;
 	recharge_rate = 1000000
 	},
 /obj/structure/cable{
@@ -5236,7 +5236,7 @@
 /turf/simulated/floor/wood,
 /area/chapel/monastery)
 "bYW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -5518,7 +5518,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 6
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -5584,7 +5584,7 @@
 	icon_state = "1-2"
 	},
 /obj/effect/floor_decal/industrial/warning,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -5665,7 +5665,7 @@
 /turf/simulated/floor/tiled/white,
 /area/assembly/robotics)
 "chs" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -5998,7 +5998,7 @@
 /area/borealis2/outdoors/exterior)
 "cnD" = (
 /obj/structure/closet/secure_closet/quartermaster,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -6071,7 +6071,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -6495,7 +6495,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -6635,7 +6635,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/central)
 "cyM" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -6883,7 +6883,7 @@
 /obj/effect/floor_decal/corner/pink{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -7687,7 +7687,7 @@
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -7709,7 +7709,7 @@
 /obj/machinery/camera/network/research{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -7838,7 +7838,7 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -8652,7 +8652,7 @@
 /obj/item/clothing/suit/storage/hooded/wintercoat/snowsuit/security,
 /obj/item/clothing/shoes/boots/winter/security,
 /obj/item/device/gps/security,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -8915,7 +8915,7 @@
 /turf/simulated/floor/plating,
 /area/rnd/rdoffice)
 "drM" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -9399,7 +9399,7 @@
 /area/security/checkpoint)
 "dEr" = (
 /obj/machinery/computer/rdconsole/robotics,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 25
 	},
 /obj/item/device/geiger/wall{
@@ -9417,7 +9417,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -9669,7 +9669,7 @@
 /obj/machinery/photocopier/faxmachine{
 	department = "Internal Affairs"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/tiled/dark,
@@ -10101,7 +10101,7 @@
 /obj/effect/floor_decal/corner/pink/full{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -10650,7 +10650,7 @@
 /obj/structure/table/reinforced,
 /obj/item/weapon/packageWrap,
 /obj/item/weapon/hand_labeler,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -10857,7 +10857,7 @@
 /obj/structure/closet/secure_closet{
 	name = "secure evidence locker"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -11229,7 +11229,7 @@
 	dir = 10
 	},
 /obj/structure/closet/secure_closet/personal/patient,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -11877,7 +11877,7 @@
 "eAK" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -12176,7 +12176,7 @@
 "eHZ" = (
 /obj/machinery/space_heater,
 /obj/effect/floor_decal/industrial/outline/yellow,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -12328,7 +12328,7 @@
 	pixel_y = 4
 	},
 /obj/item/weapon/storage/box/syringes,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/stationboiler_radiator{
@@ -12396,7 +12396,7 @@
 /obj/effect/floor_decal/corner/pink{
 	dir = 9
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -12826,7 +12826,7 @@
 /area/cryogaia/outpost/tower/west)
 "eUS" = (
 /obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -12977,7 +12977,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "eYw" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -13152,7 +13152,7 @@
 	dir = 8
 	},
 /obj/structure/closet/wardrobe/tactical,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -13751,7 +13751,7 @@
 /obj/structure/table/steel,
 /obj/item/weapon/storage/box,
 /obj/item/weapon/storage/box,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -14030,7 +14030,7 @@
 	name = "Bar Shutters";
 	pixel_x = -26
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -14242,7 +14242,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -14391,7 +14391,7 @@
 	icon_state = "freezer"
 	},
 /obj/effect/floor_decal/industrial/danger,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -15007,7 +15007,7 @@
 /obj/effect/floor_decal/corner/paleblue/full{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -15126,7 +15126,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -15191,7 +15191,7 @@
 /area/security/hallway)
 "fQg" = (
 /obj/structure/filingcabinet/chestdrawer,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -15379,7 +15379,7 @@
 /obj/structure/cable/green{
 	icon_state = "0-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -15481,7 +15481,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/security/airlock)
 "fVg" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -15520,7 +15520,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -15634,7 +15634,7 @@
 /obj/effect/floor_decal/industrial/warning{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -16178,7 +16178,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -16604,7 +16604,7 @@
 	},
 /obj/item/weapon/storage/box/trackimp,
 /obj/effect/floor_decal/industrial/outline/grey,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -16772,7 +16772,7 @@
 /turf/simulated/floor/carpet,
 /area/bridge/meeting_room)
 "gsc" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -16995,7 +16995,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -17135,7 +17135,7 @@
 /turf/simulated/floor,
 /area/maintenance/substation/command)
 "gzl" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -17370,7 +17370,7 @@
 /turf/simulated/floor/tiled,
 /area/security/hallway)
 "gEv" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -17402,7 +17402,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/foyer)
 "gES" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -17859,7 +17859,7 @@
 /obj/machinery/camera/network/civilian{
 	c_tag = "Bar Backroom"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/stationboiler_radiator{
@@ -17880,7 +17880,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "gPf" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -19579,7 +19579,7 @@
 	d2 = 4;
 	icon_state = "0-4"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -19889,7 +19889,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -19948,7 +19948,7 @@
 /obj/machinery/atmospherics/pipe/simple/visible/cyan{
 	dir = 10
 	},
-/obj/machinery/alarm/nobreach{
+/obj/machinery/alarm/yw/nobreach{
 	pixel_y = 22
 	},
 /obj/effect/floor_decal/industrial/warning{
@@ -20215,7 +20215,7 @@
 /area/cryogaia/outpost/checkpoint)
 "hJp" = (
 /obj/structure/reagent_dispensers/watertank,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -20302,7 +20302,7 @@
 	req_access = null;
 	req_one_access = list(11,24)
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -21286,7 +21286,7 @@
 /obj/machinery/camera/network/engine{
 	c_tag = "ENG - Engine Access"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -21499,7 +21499,7 @@
 	pixel_x = -24
 	},
 /obj/structure/cable/green,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -22163,7 +22163,7 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -22297,7 +22297,7 @@
 /turf/simulated/floor,
 /area/maintenance/medbay)
 "iCa" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -22470,7 +22470,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 6
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -22636,7 +22636,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -23149,7 +23149,7 @@
 /turf/simulated/floor/plating,
 /area/quartermaster)
 "iSZ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -23460,7 +23460,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -23689,7 +23689,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/rnd/research/testingrange)
 "jhz" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -23724,7 +23724,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -23831,7 +23831,7 @@
 /obj/vehicle/train/security/engine{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -23929,7 +23929,7 @@
 	name = "Powernet Sensor - Cargo Subgrid";
 	name_tag = "Cargo Subgrid"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -24056,7 +24056,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/chapel/monastery)
 "jnX" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -24579,7 +24579,7 @@
 /turf/simulated/floor/tiled/freezer,
 /area/crew_quarters/showers)
 "jxh" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -25229,7 +25229,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/entry/docking_lounge)
 "jJm" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/machinery/camera/network/civilian{
@@ -26219,7 +26219,7 @@
 	dir = 10
 	},
 /obj/structure/closet/secure_closet/personal/patient,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -26440,7 +26440,7 @@
 /turf/simulated/floor/wood,
 /area/medical/psych)
 "kjR" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /turf/simulated/floor/bluegrid,
@@ -26523,7 +26523,7 @@
 /obj/item/weapon/stock_parts/console_screen,
 /obj/item/weapon/circuitboard/autolathe,
 /obj/item/weapon/circuitboard/partslathe,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -26534,7 +26534,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/hangar)
 "knv" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -26814,7 +26814,7 @@
 /obj/structure/mirror{
 	pixel_x = -28
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -26842,7 +26842,7 @@
 	pixel_x = 24
 	},
 /obj/structure/cable/green,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -27564,7 +27564,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -27944,7 +27944,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/evidence_storage)
 "kNN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -29101,7 +29101,7 @@
 	name = "west bump";
 	pixel_x = -24
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/structure/cable/green{
@@ -29217,7 +29217,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -29261,7 +29261,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/research)
 "lpN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -29364,7 +29364,7 @@
 /obj/effect/floor_decal/corner_oldtile/gray/diagonal{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -29533,7 +29533,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -29617,7 +29617,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/secondary/exit)
 "lvZ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -30538,7 +30538,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 9
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -31066,7 +31066,7 @@
 /turf/simulated/floor/tiled/techfloor,
 /area/shuttle/security)
 "lZo" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -31427,7 +31427,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_one)
 "mgo" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -31535,7 +31535,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/phoronics)
 "miu" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -31714,7 +31714,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -32316,7 +32316,7 @@
 /turf/simulated/floor/plating,
 /area/shuttle/security)
 "mxh" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -32345,7 +32345,7 @@
 "mxx" = (
 /obj/structure/closet/secure_closet/scientist,
 /obj/effect/floor_decal/industrial/outline,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -32431,7 +32431,7 @@
 "myF" = (
 /obj/machinery/space_heater,
 /obj/effect/floor_decal/industrial/outline/grey,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -32769,7 +32769,7 @@
 	dir = 8
 	},
 /obj/effect/floor_decal/corner/red,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -32812,7 +32812,7 @@
 	pixel_x = 6;
 	pixel_y = -5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -33636,7 +33636,7 @@
 /area/crew_quarters/captain)
 "mPH" = (
 /obj/structure/bookcase/manuals/engineering,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -33982,7 +33982,7 @@
 /turf/simulated/floor,
 /area/medical/psych)
 "mVR" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -34111,7 +34111,7 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -35000,7 +35000,7 @@
 /area/civilian/atrium/central)
 "now" = (
 /obj/effect/floor_decal/corner_oldtile/purple,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -35180,7 +35180,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -35686,7 +35686,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm,
+/obj/machinery/alarm/yw,
 /turf/simulated/floor/plating,
 /area/maintenance/bridge)
 "nBk" = (
@@ -35712,7 +35712,7 @@
 	pixel_x = 3;
 	pixel_y = 3
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -35892,7 +35892,7 @@
 	external_pressure_bound = 105;
 	external_pressure_bound_default = 105;
 	desc = "High power vent, Has a valve and pump attached to it";
-	power_rating = 240000
+	power_rating = 480000
 	},
 /turf/simulated/floor/plating/snow/plating/cryogaia,
 /area/engineering/engine_room)
@@ -35915,7 +35915,7 @@
 "nEZ" = (
 /obj/structure/bed/padded,
 /obj/item/weapon/bedsheet/medical,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -35942,7 +35942,7 @@
 /turf/simulated/floor/plating,
 /area/engineering/engine_room)
 "nFL" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -36010,7 +36010,7 @@
 /area/maintenance/bridge)
 "nHZ" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -37055,7 +37055,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -37190,7 +37190,7 @@
 /obj/structure/cable{
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -37310,7 +37310,7 @@
 	dir = 1
 	},
 /obj/structure/curtain/open/shower,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -37439,7 +37439,7 @@
 /obj/item/weapon/reagent_containers/spray/luminol,
 /obj/item/device/uv_light,
 /obj/item/clothing/gloves/sterile/latex,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -38375,7 +38375,7 @@
 	pixel_x = 5
 	},
 /obj/structure/curtain/open/shower,
-/obj/machinery/alarm/nobreach{
+/obj/machinery/alarm/yw/nobreach{
 	pixel_y = 22
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on{
@@ -38814,7 +38814,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -38837,7 +38837,7 @@
 /turf/simulated/floor/tiled,
 /area/assembly/robotics)
 "oNp" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -39084,7 +39084,7 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -39620,7 +39620,7 @@
 /obj/structure/bed/chair{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -40074,7 +40074,7 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -40098,7 +40098,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -40218,7 +40218,7 @@
 	pixel_y = -5
 	},
 /obj/effect/floor_decal/corner/brown/full,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -40280,7 +40280,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -40657,7 +40657,7 @@
 /area/security/pilotroom)
 "pty" = (
 /obj/structure/closet,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -40668,7 +40668,7 @@
 /area/security/checkpoint)
 "ptT" = (
 /obj/machinery/photocopier,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -40827,7 +40827,7 @@
 /obj/item/device/flash,
 /obj/item/device/flash,
 /obj/structure/table/steel,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -41552,7 +41552,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/armoury)
 "pLu" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -42328,7 +42328,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -42601,7 +42601,7 @@
 /obj/effect/floor_decal/industrial/warning/corner{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -42641,7 +42641,7 @@
 /obj/item/weapon/paper_bin,
 /obj/item/weapon/clipboard,
 /obj/item/weapon/pen,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -42659,7 +42659,7 @@
 /area/medical/surgeryprep)
 "qkl" = (
 /obj/structure/closet/l3closet/medical,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -42840,7 +42840,7 @@
 /obj/structure/closet/secure_closet/cargotech,
 /obj/item/weapon/storage/backpack/dufflebag,
 /obj/item/weapon/stamp/cargo,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -43308,7 +43308,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/sleeper)
 "qxW" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -43528,7 +43528,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/central)
 "qCK" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -43905,7 +43905,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/southeast)
 "qIb" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -44594,7 +44594,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
 /obj/structure/disposalpipe/segment,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -44863,7 +44863,7 @@
 	pixel_x = 1;
 	pixel_y = -1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -45057,7 +45057,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/security/lobby)
 "rgd" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -46058,7 +46058,7 @@
 /obj/machinery/computer/atmoscontrol{
 	name = "\improper Auxiliary Atmospherics Computer"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -47318,7 +47318,7 @@
 /area/bridge)
 "rXN" = (
 /obj/structure/bed/chair,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -47725,7 +47725,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/hallway/secondary/entry/docking_lounge)
 "shE" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -48193,7 +48193,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -48679,7 +48679,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/scanning)
 "szi" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -48951,7 +48951,7 @@
 /turf/simulated/floor/tiled,
 /area/engineering/engineering_monitoring)
 "sEn" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -49281,9 +49281,6 @@
 	},
 /turf/simulated/wall/r_wall,
 /area/security/armoury)
-"sLL" = (
-/turf/simulated/floor/outdoors/snow/snow/cryogaia,
-/area/medical/medbay3)
 "sLU" = (
 /obj/effect/landmark{
 	name = "carpspawn"
@@ -49829,7 +49826,7 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/starboard)
 "sYG" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -50711,7 +50708,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/interrogation)
 "tqQ" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -51740,7 +51737,7 @@
 	},
 /obj/machinery/atmospherics/pipe/manifold/hidden/supply,
 /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -52299,7 +52296,7 @@
 /area/quartermaster/warehouse)
 "tVc" = (
 /obj/effect/floor_decal/corner/paleblue/full,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -52346,7 +52343,7 @@
 /obj/effect/floor_decal/techfloor{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -52648,7 +52645,7 @@
 /obj/item/device/assembly/timer,
 /obj/item/device/assembly/timer,
 /obj/item/device/assembly/timer,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -52877,7 +52874,7 @@
 /obj/effect/floor_decal/corner/red{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -52939,7 +52936,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -53035,7 +53032,7 @@
 /turf/simulated/floor/tiled,
 /area/bridge_hallway)
 "uqw" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -53122,7 +53119,7 @@
 /turf/simulated/wall,
 /area/maintenance/substation/cargo)
 "usw" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -54201,7 +54198,7 @@
 	pixel_y = 3
 	},
 /obj/item/clothing/head/soft,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -54805,7 +54802,7 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -54889,7 +54886,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/storage)
 "vgi" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -55916,7 +55913,7 @@
 /obj/machinery/computer/operating{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -56060,7 +56057,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/hallway/secondary/exit)
 "vEa" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -56090,14 +56087,14 @@
 "vEG" = (
 /obj/structure/table/standard,
 /obj/machinery/reagentgrinder,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
 /turf/simulated/floor/tiled/yellow,
 /area/chapel/monastery/kitchen)
 "vEH" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -56479,7 +56476,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/central)
 "vNh" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -57173,7 +57170,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/security/security_cell_hallway)
 "vZT" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -57662,6 +57659,9 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 6
 	},
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+	dir = 4
+	},
 /turf/simulated/floor/tiled/white,
 /area/medical/medbaymain)
 "wkJ" = (
@@ -57890,7 +57890,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -57970,7 +57970,7 @@
 /area/borealis2/outdoors/grounds)
 "wpo" = (
 /obj/machinery/suit_storage_unit/standard_unit,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -58427,7 +58427,7 @@
 /obj/item/stack/medical/ointment{
 	pixel_y = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	pixel_y = 22
 	},
 /obj/random/medical/lite,
@@ -58588,7 +58588,7 @@
 	dir = 4
 	},
 /obj/machinery/portable_atmospherics/powered/pump/filled,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -58772,7 +58772,7 @@
 "wDh" = (
 /obj/structure/bed/double,
 /obj/item/weapon/bedsheet/captaindouble,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -59050,7 +59050,7 @@
 /obj/machinery/computer/operating{
 	name = "Robotics Operating Computer"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -59136,7 +59136,7 @@
 /obj/item/device/megaphone,
 /obj/item/weapon/folder/yellow_ce,
 /obj/item/weapon/pen/multi,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -59812,7 +59812,7 @@
 /obj/machinery/computer/operating{
 	dir = 1
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -60365,7 +60365,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/central)
 "xkP" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -60533,7 +60533,7 @@
 /obj/machinery/camera/network/medbay{
 	c_tag = "Medical Hallway"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -60588,7 +60588,7 @@
 "xou" = (
 /obj/structure/closet/secure_closet/security,
 /obj/effect/floor_decal/industrial/outline,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -60701,7 +60701,7 @@
 /turf/simulated/floor/tiled/white,
 /area/rnd/phoronics)
 "xsg" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -62498,7 +62498,7 @@
 /turf/simulated/floor/tiled,
 /area/quartermaster/office)
 "ybf" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -62574,7 +62574,7 @@
 /turf/simulated/floor/tiled/white,
 /area/hallway/secondary/entry/docking_lounge)
 "ycN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -62741,7 +62741,7 @@
 /turf/simulated/floor/tiled/steel,
 /area/hallway/primary/aft)
 "yfP" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -62956,7 +62956,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 10
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -71068,7 +71068,7 @@ cpw
 aHP
 kwz
 kwz
-sLL
+kwz
 ePy
 kWT
 syp
diff --git a/maps/yw/cryogaia-06-upper.dmm b/maps/yw/cryogaia-06-upper.dmm
index 8316c4fb648..a5fb92045ec 100644
--- a/maps/yw/cryogaia-06-upper.dmm
+++ b/maps/yw/cryogaia-06-upper.dmm
@@ -1948,13 +1948,13 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/cryogaia/station/excursion_dock)
 "ep" = (
-/obj/machinery/alarm{
-	pixel_y = 22
-	},
 /obj/machinery/light/small{
 	dir = 1
 	},
 /obj/machinery/floodlight,
+/obj/machinery/alarm{
+	pixel_y = 22
+	},
 /turf/simulated/floor/tiled/techfloor/grid,
 /area/shuttle/excursion)
 "eq" = (
@@ -2461,7 +2461,7 @@
 /turf/simulated/open/cryogaia,
 /area/cryogaia/outpost/tower/northeast)
 "fx" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -3241,7 +3241,7 @@
 /turf/simulated/floor/tiled,
 /area/security/watchtower)
 "hs" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -25
 	},
@@ -3749,7 +3749,7 @@
 /obj/item/clothing/under/explorer/utility/engineering,
 /obj/item/clothing/shoes/boots/winter/explorer,
 /obj/item/clothing/shoes/boots/winter/explorer,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -4039,7 +4039,7 @@
 /turf/simulated/floor/tiled,
 /area/cryogaia/station/pathfinder_office)
 "iN" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -4520,7 +4520,7 @@
 /area/chapel/monastery/upper)
 "jJ" = (
 /obj/structure/closet/secure_closet/explorer,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -4674,7 +4674,7 @@
 /area/chapel/monastery/upper)
 "jZ" = (
 /obj/structure/table/standard,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -4909,7 +4909,7 @@
 	dir = 9
 	},
 /obj/random/medical/lite,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -5081,7 +5081,7 @@
 /turf/simulated/wall,
 /area/cryogaia/station/explorer_meeting)
 "kT" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -22
 	},
@@ -5641,7 +5641,7 @@
 /obj/effect/floor_decal/corner_oldtile/gray{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -6331,7 +6331,7 @@
 /turf/simulated/floor/plating,
 /area/cryogaia/station/hallway/primary/upper/south)
 "nu" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -6997,7 +6997,7 @@
 /turf/simulated/open/cryogaia,
 /area/cryogaia/outpost/tower/northeast)
 "pu" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -7220,7 +7220,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -7836,7 +7836,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 9
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -8895,7 +8895,7 @@
 /turf/simulated/floor/plating/snow/plating/cryogaia,
 /area/borealis2/outdoors/grounds/walkway)
 "zv" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -8903,7 +8903,7 @@
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "zw" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -9459,7 +9459,7 @@
 /turf/simulated/floor/tiled/techmaint,
 /area/cryogaia/outpost/tower/east)
 "Cb" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -9531,7 +9531,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbayupper)
 "Cw" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -23
 	},
@@ -10807,7 +10807,7 @@
 	dir = 4
 	},
 /obj/item/weapon/deck/cards,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -11149,7 +11149,7 @@
 	pressure_checks_default = 2;
 	frequency = 1441;
 	id_tag = "roof_air_out";
-	power_rating = 240000;
+	power_rating = 480000;
 	desc = "High power vent, Has a valve and pump attached to it"
 	},
 /turf/simulated/floor/plating/snow/plating/cryogaia,
@@ -11278,7 +11278,7 @@
 /area/quartermaster/miningdock)
 "KQ" = (
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -11288,7 +11288,7 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -11696,7 +11696,7 @@
 /obj/effect/floor_decal/corner/brown{
 	dir = 6
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 24
 	},
@@ -12408,7 +12408,7 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/medbreak)
 "Rl" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 4;
 	pixel_x = -25
 	},
@@ -12972,7 +12972,7 @@
 /turf/simulated/floor/wood,
 /area/chapel/monastery/music)
 "Ug" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -12990,7 +12990,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -13000,7 +13000,7 @@
 /turf/simulated/floor/tiled,
 /area/security/watchtower)
 "Ui" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -13426,7 +13426,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 8;
 	pixel_x = 25
 	},
@@ -13436,7 +13436,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 5
 	},
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -13639,7 +13639,7 @@
 /turf/simulated/floor/tiled,
 /area/civilian/atrium/upper)
 "Xe" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
@@ -13764,7 +13764,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/medbayupper)
 "XK" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	dir = 1;
 	pixel_y = -22
 	},
@@ -14175,7 +14175,7 @@
 /turf/simulated/floor/tiled,
 /area/cryogaia/station/hallway/primary/upper/south)
 "ZP" = (
-/obj/machinery/alarm{
+/obj/machinery/alarm/yw{
 	frequency = 1441;
 	pixel_y = 22
 	},
diff --git a/vorestation.dme b/vorestation.dme
index dc56c143b1e..9a0fac4f12d 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -848,6 +848,7 @@
 #include "code\game\machinery\adv_med_vr.dm"
 #include "code\game\machinery\ai_slipper.dm"
 #include "code\game\machinery\air_alarm.dm"
+#include "code\game\machinery\air_alarm_yw.dm"
 #include "code\game\machinery\airconditioner_vr.dm"
 #include "code\game\machinery\airconditioner_yw.dm"
 #include "code\game\machinery\atm_ret_field.dm"