Merge pull request #579 from Citadel-Station-13/upstream-merge-26129

[MIRROR] Unorphans the blackbox
This commit is contained in:
LetterJay
2017-05-02 05:13:49 -05:00
committed by GitHub
131 changed files with 2226 additions and 589 deletions
+1 -1
View File
@@ -299,7 +299,7 @@
setTimer(SSshuttle.emergencyDockTime)
send2irc("Server", "The Emergency Shuttle has docked with the station.")
priority_announce("The Emergency Shuttle has docked with the station. You have [timeLeft(600)] minutes to board the Emergency Shuttle.", null, 'sound/AI/shuttledock.ogg', "Priority")
feedback_add_details("emergency_shuttle", src.name)
SSblackbox.add_details("emergency_shuttle", src.name)
// Gangs only have one attempt left if the shuttle has
// docked with the station to prevent suffering from