shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8765 from Ghommie/Ghommie-cit91

Browse Source 
Merging the end-of-shift and its shuttle autocall announcements into one.
This commit is contained in:
deathride58
2019-07-08 18:04:27 -04:00
committed by GitHub
parent e19c622b08 db0d1ae565
commit 82d527b760
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/controllers/subsystem/shuttle.dm
+5 -4
View File
@@ -1,6 +1,7 @@
/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 3 hours has passed.
if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //3 hours
SSshuttle.emergency.request()
priority_announce("The shift has come to an end and the shuttle called.")
/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed.
if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours
SSshuttle.emergency.request(silent = TRUE)
priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, 'sound/ai/shuttlecalled.ogg', "Priority")
log_game("Round time limit reached. Shuttle has been auto-called.")
message_admins("Round time limit reached. Shuttle called.")
emergencyNoRecall = TRUE