Merge pull request #7493 from Citadel-Station-13/kevinz000-patch-2

*FIXES* comms consoles not working after autocall - yes this is a bug

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

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.")
+		message_admins("Round time limit reached. Shuttle called.")