Merge branch 'master' into upstream-merge-27454

2017-05-30 23:48:25 -05:00
parent 872b0e61fd 52881797d0
commit b19115e10f
280 changed files with 401755 additions and 224891 deletions
@@ -235,7 +235,9 @@
 /obj/docking_port/mobile/emergency/cancel(area/signalOrigin)
 	if(mode != SHUTTLE_CALL)
 		return
-
+	if(SSshuttle.emergencyNoRecall)
+		return
+	
 	invertTimer()
 	mode = SHUTTLE_RECALL