From 9adb77c5e3067b5ea839902a93d4832c79eaf1f5 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Fri, 15 Dec 2017 15:53:12 -0500
Subject: [PATCH 1/2] Merge pull request #33530 from
 AutomaticFrenzy/patch/autocall

Fix shuttle autocalls when the round is already over
---
 code/controllers/subsystem/shuttle.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index c80bc17047..35208d4137 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -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)