cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes missing announcements, bad returned() check

Browse Source 
Also fixes some bad grammar in the shuttle authorization announcements, and reduces the number of authorizations required to 2. 3 seemed a bit high.
This commit is contained in:
mwerezak
2014-06-24 21:29:50 -04:00
parent e7aef647c2
commit 05ced4b89d
2 changed files with 45 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/controllers/emergency_shuttle_controller.dm
View File

@@ -77,8 +77,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
//launch the pods!
for (var/datum/shuttle/ferry/escape_pod/pod in escape_pods)
pod.launch(src)
if(autopilot)
shuttle.launch(src)
//called when the shuttle has arrived.
@@ -119,7 +118,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
set_launch_countdown(get_shuttle_prep_time())
auto_recall_time = rand(world.time + 300, launch_time - 300)
captain_announce("A crew transfer has been initiated. The shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
captain_announce("A crew transfer has been scheduled. The shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.")
//recalls the shuttle
/datum/emergency_shuttle_controller/proc/recall()
@@ -198,7 +197,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
//returns 1 if the shuttle has gone to the station and come back at least once,
//used for game completion checking purposes
/datum/emergency_shuttle_controller/proc/returned()
return (departed && shuttle.moving_status != SHUTTLE_IDLE && shuttle.location) //we've gone to the station at least once, no longer in transit and are idle back at centcom
return (departed && shuttle.moving_status == SHUTTLE_IDLE && shuttle.location) //we've gone to the station at least once, no longer in transit and are idle back at centcom
//returns 1 if the shuttle is not idle at centcom
/datum/emergency_shuttle_controller/proc/online()