SSalarms

code/controllers/Processes/alarm.dm

@@ -1,37 +0,0 @@
-// We manually initialize the alarm handlers instead of looping over all existing types
-// to make it possible to write: camera.triggerAlarm() rather than alarm_manager.managers[datum/alarm_handler/camera].triggerAlarm() or a variant thereof.
-/var/global/datum/alarm_handler/atmosphere/atmosphere_alarm	= new()
-/var/global/datum/alarm_handler/burglar/burglar_alarm		= new()
-/var/global/datum/alarm_handler/camera/camera_alarm			= new()
-/var/global/datum/alarm_handler/fire/fire_alarm				= new()
-/var/global/datum/alarm_handler/motion/motion_alarm			= new()
-/var/global/datum/alarm_handler/power/power_alarm			= new()
-
-// Alarm Manager, the manager for alarms.
-var/datum/controller/process/alarm/alarm_manager
-
-/datum/controller/process/alarm
-	var/list/datum/alarm/all_handlers
-
-/datum/controller/process/alarm/setup()
-	name = "alarm"
-	schedule_interval = 20 // every 2 seconds
-	all_handlers = list(atmosphere_alarm, burglar_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm)
-
-/datum/controller/process/alarm/doWork()
-	for(var/datum/alarm_handler/AH in all_handlers)
-		AH.process()
-
-DECLARE_GLOBAL_CONTROLLER(alarm, alarm_manager)
-
-/datum/controller/process/alarm/proc/active_alarms()
-	var/list/all_alarms = new
-	for(var/datum/alarm_handler/AH in all_handlers)
-		var/list/alarms = AH.alarms
-		all_alarms += alarms
-
-	return all_alarms
-
-/datum/controller/process/alarm/proc/number_of_active_alarms()
-	var/list/alarms = active_alarms()
-	return alarms.len

code/controllers/subsystem/alarm.dm

@@ -0,0 +1,30 @@
+SUBSYSTEM_DEF(alarms)
+   	name = "Alarms"
+   	init_order = INIT_ORDER_ALARMS // 2
+    var/datum/alarm_handler/atmosphere/atmosphere_alarm = new()
+    var/datum/alarm_handler/burglar/burglar_alarm = new()
+    var/datum/alarm_handler/camera/camera_alarm = new()
+    var/datum/alarm_handler/fire/fire_alarm = new()
+    var/datum/alarm_handler/motion/motion_alarm = new()
+    var/datum/alarm_handler/power/power_alarm = new()
+    var/list/datum/alarm/all_handlers
+
+/datum/controller/subsystem/alarms/Initialize(start_timeofday)
+    all_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm)
+    ..()
+	
+/datum/controller/subsystem/alarms/fire()
+	for(var/datum/alarm_handler/AH in all_handlers)
+		AH.process()
+
+/datum/controller/subsystem/alarms/proc/active_alarms()
+	var/list/all_alarms = new
+	for(var/datum/alarm_handler/AH in all_handlers)
+		var/list/alarms = AH.alarms
+		all_alarms += alarms
+
+	return all_alarms
+
+/datum/controller/subsystem/alarms/proc/number_of_active_alarms()
+	var/list/alarms = active_alarms()
+	return alarms.len

code/controllers/verbs.dm

@@ -63,7 +63,7 @@
 			debug_variables(event_manager)
 			feedback_add_details("admin_verb","DEvent")
 		if("Alarm")
-			debug_variables(alarm_manager)
+			debug_variables(SSalarms)
 			feedback_add_details("admin_verb", "DAlarm")
 		if("Garbage")
 			debug_variables(SSgarbage)