Merge pull request #7256 from mwerezak/shuttle

Makes forced launch handled by shuttle/process()
This commit is contained in:
PsiOmegaDelta
2014-12-07 22:02:36 +01:00
6 changed files with 25 additions and 19 deletions
@@ -83,7 +83,7 @@
shuttle_status = "Standing-by at station."
else
shuttle_status = "Standing-by at offsite location."
if(WAIT_LAUNCH)
if(WAIT_LAUNCH, FORCE_LAUNCH)
shuttle_status = "Shuttle has recieved command and will depart shortly."
if(WAIT_ARRIVE)
shuttle_status = "Proceeding to destination."