From cfbba5c153fd975e3d24afdfc4a084ade05fa7d4 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 8 Mar 2015 17:58:48 +0100 Subject: [PATCH] Station alert monitor should now only react to major alarms. --- code/game/machinery/computer/station_alert.dm | 2 +- code/modules/nano/modules/alarm_monitor.dm | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 84ce5cc0d1..197d65065a 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -38,7 +38,7 @@ if(stat & (BROKEN|NOPOWER)) return - var/list/alarms = alarm_monitor.active_alarms() + var/list/alarms = alarm_monitor.major_alarms() if(alarms.len) icon_state = "alert:2" else diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm index e4de543498..9047023bf1 100644 --- a/code/modules/nano/modules/alarm_monitor.dm +++ b/code/modules/nano/modules/alarm_monitor.dm @@ -30,11 +30,24 @@ for(var/datum/alarm_handler/AH in alarm_handlers) AH.unregister(object) -/obj/nano_module/alarm_monitor/proc/active_alarms() +/obj/nano_module/alarm_monitor/proc/all_alarms() var/list/all_alarms = new() for(var/datum/alarm_handler/AH in alarm_handlers) - var/list/alarms = AH.alarms - all_alarms += alarms + all_alarms += AH.alarms + + return all_alarms + +/obj/nano_module/alarm_monitor/proc/major_alarms() + var/list/all_alarms = new() + for(var/datum/alarm_handler/AH in alarm_handlers) + all_alarms += AH.major_alarms() + + return all_alarms + +/obj/nano_module/alarm_monitor/proc/minor_alarms() + var/list/all_alarms = new() + for(var/datum/alarm_handler/AH in alarm_handlers) + all_alarms += AH.minor_alarms() return all_alarms