From 77519c926f14db1f8adfd30574576c87eea95839 Mon Sep 17 00:00:00 2001 From: tigercat2000 Date: Wed, 4 Apr 2018 09:26:14 -0700 Subject: [PATCH] Make sec levels avoid overwriting an admin-forced nightshift --- code/controllers/subsystem/nightshift.dm | 4 +++- code/modules/security_levels/security levels.dm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index b24a1d45e59..813cfd5012a 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -27,7 +27,9 @@ SUBSYSTEM_DEF(nightshift) /datum/controller/subsystem/nightshift/proc/announce(message) priority_announcement.Announce(message, new_sound = 'sound/misc/notice2.ogg', new_title = "Automated Lighting System Announcement") -/datum/controller/subsystem/nightshift/proc/check_nightshift() +/datum/controller/subsystem/nightshift/proc/check_nightshift(check_canfire=FALSE) + if(check_canfire && !can_fire) + return var/emergency = security_level >= SEC_LEVEL_RED var/announcing = TRUE var/time = station_time() diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm index 48941295157..aa96b79dd01 100644 --- a/code/modules/security_levels/security levels.dm +++ b/code/modules/security_levels/security levels.dm @@ -127,7 +127,7 @@ atc.reroute_traffic(yes = TRUE) // Tell them fuck off we're busy. else atc.reroute_traffic(yes = FALSE) - SSnightshift.check_nightshift() + SSnightshift.check_nightshift(TRUE) else return