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

Bugfixens for endgame

Browse Source
This commit is contained in:
Rob Nelson
2014-08-10 15:43:02 -07:00
parent c6c56d0fde
commit 61059b85ff
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/controllers/shuttle_controller.dm
View File

@@ -26,11 +26,12 @@ datum/shuttle_controller
var/always_fake_recall = 0
var/deny_shuttle = 0 //for admins not allowing it to be called.
var/departed = 0
// call the shuttle
// if not called before, set the endtime to T+600 seconds
// otherwise if outgoing, switch to incoming
proc/incall(coeff = 1)
if(deny_shuttle && alert == 1) //crew transfer shuttle does not gets recalled by gamemode
if((!universe.OnShuttleCall(null) || deny_shuttle) && alert == 1) //crew transfer shuttle does not gets recalled by gamemode
return
if(endtime)
if(direction == -1)
@@ -50,6 +51,17 @@ datum/shuttle_controller
alert = X
proc/force_shutdown()
online=0
// Heading to centcomm? Not anymore.
if(direction==2)
endtime=0 // Immediate (FIXME)
setdirection(1)
departed=0
proc/recall()
if(direction == 1)
var/timeleft = timeleft()