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
@@ -25,6 +25,7 @@ SUBSYSTEM_DEF(shuttle)
 	var/area/emergencyLastCallLoc
 	var/emergencyCallAmount = 0		//how many times the escape shuttle was called
 	var/emergencyNoEscape
+	var/emergencyNoRecall = FALSE
 	var/list/hostileEnvironments = list()

 		//supply shuttle stuff