Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530

[MIRROR] Fix shuttle autocalls when the round is already over
2017-12-17 21:24:12 -06:00
parent cc3fddb0d7 f5b84e21a1
commit 781f40926c
1 changed files with 3 additions and 0 deletions
@@ -307,6 +307,9 @@ SUBSYSTEM_DEF(shuttle)
 	return 1

 /datum/controller/subsystem/shuttle/proc/autoEvac()
+	if (!SSticker.IsRoundInProgress())
+		return
+
 	var/callShuttle = 1

 	for(var/thing in GLOB.shuttle_caller_list)