From 34c3585d6deaf21fd8600c1e8b334e6e8bfc07d7 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sat, 28 Jun 2014 18:47:42 -0400 Subject: [PATCH] Fixes shuttle announcing arrival in 7 minutes. Conflicts: code/controllers/emergency_shuttle_controller.dm --- code/controllers/emergency_shuttle_controller.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 6f9998af594..681f0f66948 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -70,6 +70,9 @@ 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) + //reset the shuttle transit time if we need to + shuttle.move_time = SHUTTLE_TRANSIT_DURATION + evac = 1 captain_announce("An emergency evacuation shuttle has been called. It will arrive in approximately [round(estimate_arrival_time()/60)] minutes.") world << sound('sound/AI/shuttlecalled.ogg') @@ -86,6 +89,9 @@ 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) + //reset the shuttle transit time if we need to + shuttle.move_time = SHUTTLE_TRANSIT_DURATION + 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