cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-05 23:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution.

Browse Source
This commit is contained in:
Zuhayr
2014-12-08 13:01:04 +10:30
parent d6640771b1 b4becaa587
commit 3c66bd3920
48 changed files with 350 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/WorkInProgress/Chinsky/overmap/ships/computers/shuttle.dm
View File

@@ -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."