Merge pull request #1196 from Citadel-Station-13/upstream-merge-27675

[MIRROR] Fixes Gang War's infinity shuttle
2017-05-30 15:48:23 -05:00
parent 377d3ffbf9 b2afc61f54
commit f259908266
6 changed files with 47 additions and 2 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