diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index fe17b4c8b3..24b392ec8f 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -198,7 +198,10 @@ state = STATE_CANCELSHUTTLE if("cancelshuttle2") if(authenticated) - SSshuttle.cancelEvac(usr) + if(world.time > SSshuttle.auto_call) + say("Warning: Emergency shuttle recalls have been blocked by Central Command due to ongoing crew transfer procedures.") + else + SSshuttle.cancelEvac(usr) state = STATE_DEFAULT if("messagelist") currmsg = 0 diff --git a/modular_citadel/code/controllers/subsystem/shuttle.dm b/modular_citadel/code/controllers/subsystem/shuttle.dm index 0ec7a375e5..4b9dd33d08 100644 --- a/modular_citadel/code/controllers/subsystem/shuttle.dm +++ b/modular_citadel/code/controllers/subsystem/shuttle.dm @@ -1,6 +1,6 @@ /datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 3 hours has passed. if(world.time > auto_call && EMERGENCY_IDLE_OR_RECALLED) //3 hours - SSshuttle.emergency.request(null, 1.5) + SSshuttle.emergency.request() priority_announce("The shift has come to an end and the shuttle called.") log_game("Round time limit reached. Shuttle has been auto-called.") - message_admins("Round time limit reached. Shuttle called.") \ No newline at end of file + message_admins("Round time limit reached. Shuttle called.")