Merge pull request #5463 from mwerezak/emergency-shuttle

Fixes shuttle ETA blanking out on launch, allows escape pods to be armed by breaking into the pod.
This commit is contained in:
Chinsky
2014-07-03 05:10:35 +04:00
13 changed files with 178 additions and 189 deletions
+1 -1
View File
@@ -413,7 +413,7 @@
var/supplyData[0]
var/datum/shuttle/ferry/supply/shuttle = supply_controller.shuttle
if (shuttle)
supplyData["shuttle_moving"] = shuttle.has_eta()
supplyData["shuttle_moving"] = shuttle.has_arrive_time()
supplyData["shuttle_eta"] = shuttle.eta_minutes()
supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock"
var/supplyOrderCount = 0