From d9a87d2c04761a6b3fe3bb2aebf6d7f5e39c1399 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 23 Aug 2018 22:44:38 -0700
Subject: [PATCH 1/2] Update shuttle.dm

---
 modular_citadel/code/controllers/subsystem/shuttle.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From c1b3f7afee125b6798575dbd93145639ad8a40f2 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Thu, 23 Aug 2018 22:46:59 -0700
Subject: [PATCH 2/2] Update communications.dm

---
 code/game/machinery/computer/communications.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 5e5c08ee99..ce36fcf4a8 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