Merge pull request #8847 from tigercat2000/nightshift_tweak

Make sec levels avoid overwriting an admin-forced nightshift
This commit is contained in:
Fox McCloud
2018-04-13 21:32:14 -04:00
committed by GitHub
2 changed files with 4 additions and 2 deletions
+3 -1
View File
@@ -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()