From 17f8a390a9c8f4d815dc93f2c686093d4e562b58 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 25 Jun 2016 01:25:18 +0300 Subject: [PATCH] Fixes #458 (#459) --- code/game/machinery/computer/atmos_alert.dm | 4 ++-- code/game/machinery/computer/station_alert.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 640eb9c4d26..1c95dad48f8 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -47,11 +47,11 @@ var/global/list/minor_air_alarms = list() ..() if(stat & (NOPOWER|BROKEN)) return - var/list/alarms = atmosphere_alarm.major_alarms() + var/list/alarms = atmosphere_alarm ? atmosphere_alarm.major_alarms() : list() if(alarms.len) icon_state = "alert:2" else - alarms = atmosphere_alarm.minor_alarms() + alarms = atmosphere_alarm ? atmosphere_alarm.minor_alarms() : list() if(alarms.len) icon_state = "alert:1" else diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 7beae328427..acc8d4040c0 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -62,7 +62,7 @@ if(stat & (BROKEN|NOPOWER)) return - var/list/alarms = alarm_monitor.major_alarms() + var/list/alarms = alarm_monitor ? alarm_monitor.major_alarms() : list() if(alarms.len) icon_state = "alert:2" else