From 02df67e8dfbe0cd879b3b02156b18e069357b44a Mon Sep 17 00:00:00 2001 From: ikarrus Date: Sun, 28 Sep 2014 17:52:46 -0600 Subject: [PATCH] Calling the shuttle during Red Alert will now announce the correct time Instead of 10 minutes every time. --- code/controllers/shuttle_controller.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/controllers/shuttle_controller.dm b/code/controllers/shuttle_controller.dm index c8ca0d4730d..9329ccdd396 100644 --- a/code/controllers/shuttle_controller.dm +++ b/code/controllers/shuttle_controller.dm @@ -48,10 +48,11 @@ var/global/datum/shuttle_controller/emergency_shuttle/emergency_shuttle else last_call_loc = null - priority_announce("The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.[emergency_reason][emergency_shuttle.last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communcations console." : "" ]", null, 'sound/AI/shuttlecalled.ogg', "Priority") - settimeleft(SHUTTLEARRIVETIME*coeff) online = 1 + + priority_announce("The emergency shuttle has been called. [red_alert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.[emergency_reason][emergency_shuttle.last_call_loc ? "\n\nCall signal traced. Results can be viewed on any communcations console." : "" ]", null, 'sound/AI/shuttlecalled.ogg', "Priority") + if(always_fake_recall) if ((seclevel2num(get_security_level()) == SEC_LEVEL_RED))