cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed emergency shuttle announcements to use command alert datums (#27882)

Browse Source 
* convert to command alert datum

* remove extra announcement

* fix
This commit is contained in:
gurfan
2020-09-21 20:08:01 -05:00
committed by GitHub
parent de1e2dcefd
commit bce02fc5e2
6 changed files with 60 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/shuttle_controller.dm
View File

@@ -84,7 +84,7 @@ datum/emergency_shuttle/proc/recall()
if(alert == 0)
if(timeleft >= 600)
return
captain_announce("The emergency shuttle has been recalled.")
command_alert(/datum/command_alert/emergency_shuttle_recalled)
world << sound('sound/AI/shuttlerecalled.ogg')
setdirection(-1)
online = 1
@@ -231,7 +231,7 @@ datum/emergency_shuttle/proc/shuttle_phase(var/phase, var/casual = 1)
settimeleft(SHUTTLELEAVETIME)
send2mainirc("The Emergency Shuttle has docked with the station.")
send2maindiscord("The **Emergency Shuttle** has docked with the station.")
captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.")
command_alert(/datum/command_alert/emergency_shuttle_docked)
world << sound('sound/AI/shuttledock.ogg')
if(ticker)
ticker.shuttledocked_time = world.time / 10
@@ -258,8 +258,7 @@ datum/emergency_shuttle/proc/shuttle_phase(var/phase, var/casual = 1)
// Shuttle Radio
CallHook("EmergencyShuttleDeparture", list())
captain_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.")
command_alert(/datum/command_alert/emergency_shuttle_left)
vote_preload()
if(shuttle && istype(shuttle,/datum/shuttle/escape))