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

*FIXES* comms consoles not working after autocall - yes this is a bug
2018-08-26 21:23:23 -04:00
parent 186ee000a0 c1b3f7afee
commit 1e4bcc7af3
2 changed files with 6 additions and 3 deletions
@@ -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