cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Station alert monitor should now only react to major alarms.

Browse Source
This commit is contained in:
PsiOmega
2015-03-08 17:58:48 +01:00
parent db450303c4
commit cfbba5c153
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/computer/station_alert.dm
View File

@@ -38,7 +38,7 @@
if(stat & (BROKEN|NOPOWER)) if(stat & (BROKEN|NOPOWER))
return return
var/list/alarms = alarm_monitor.active_alarms() var/list/alarms = alarm_monitor.major_alarms()
if(alarms.len) if(alarms.len)
icon_state = "alert:2" icon_state = "alert:2"
else else

19
code/modules/nano/modules/alarm_monitor.dm
View File

@@ -30,11 +30,24 @@
for(var/datum/alarm_handler/AH in alarm_handlers) for(var/datum/alarm_handler/AH in alarm_handlers)
AH.unregister(object) AH.unregister(object)
/obj/nano_module/alarm_monitor/proc/active_alarms() /obj/nano_module/alarm_monitor/proc/all_alarms()
var/list/all_alarms = new() var/list/all_alarms = new()
for(var/datum/alarm_handler/AH in alarm_handlers) for(var/datum/alarm_handler/AH in alarm_handlers)
var/list/alarms = AH.alarms all_alarms += AH.alarms
all_alarms += 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 return all_alarms