Merge remote-tracking branch 'citrp/master' into to_chat

code/modules/modular_computers/file_system/programs/command/comm.dm

@@ -79,9 +79,9 @@
 	if(current_viewing_message)
 		data["message_current"] = current_viewing_message
 
-	if(emergency_shuttle.location())
+	if(SSemergencyshuttle.location())
 		data["have_shuttle"] = 1
-		if(emergency_shuttle.online())
+		if(SSemergencyshuttle.online())
 			data["have_shuttle_called"] = 1
 		else
 			data["have_shuttle_called"] = 0

code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm

@@ -42,15 +42,15 @@
 
 /datum/nano_module/alarm_monitor/all/New()
 	..()
-	alarm_handlers = alarm_manager.all_handlers
+	alarm_handlers = SSalarms.all_handlers
 
 /datum/nano_module/alarm_monitor/engineering/New()
 	..()
-	alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm)
+	alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.fire_alarm, SSalarms.power_alarm)
 
 /datum/nano_module/alarm_monitor/security/New()
 	..()
-	alarm_handlers = list(camera_alarm, motion_alarm)
+	alarm_handlers = list(SSalarms.camera_alarm, SSalarms.motion_alarm)
 
 /datum/nano_module/alarm_monitor/proc/register_alarm(var/object, var/procName)
 	for(var/datum/alarm_handler/AH in alarm_handlers)