Merge pull request #1174 from Citadel-Station-13/upstream-merge-27414

[MIRROR] 4th Attempt at 60% shuttle recall gang murderbone thing
2017-05-30 16:04:41 -05:00
parent df34173509 a38973ece8
commit c81dc599e3
2 changed files with 3 additions and 12 deletions
@@ -167,6 +167,9 @@
 	if(!can_use(user))
 		return 0

+	if(SSshuttle.emergencyNoRecall)
+		return 0
+
 	if(recalling)
 		to_chat(usr, "<span class='warning'>Error: Recall already in progress.</span>")
 		return 0