From 28d9a994f93cad0c7186c6a93405e0874df9cd36 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Thu, 17 Nov 2022 15:14:44 -0800
Subject: [PATCH] Do not interrupt mapping with auto-shuttle (#12656)

---
 Content.Server/Mapping/MappingCommand.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs
index c68d01c4ba..e4a4cd8942 100644
--- a/Content.Server/Mapping/MappingCommand.cs
+++ b/Content.Server/Mapping/MappingCommand.cs
@@ -118,7 +118,10 @@ namespace Content.Server.Mapping
 
             var cfg = IoCManager.Resolve<IConfigurationManager>();
 
+            // don't interrupt mapping with events or auto-shuttle
             shell.ExecuteCommand("sudo cvar events.enabled false");
+            shell.ExecuteCommand("sudo cvar shuttle.auto_call_time 0");
+
             if (cfg.GetCVar(CCVars.AutosaveEnabled))
                 shell.ExecuteCommand($"toggleautosave {mapId} {toLoad ?? "NEWMAP"}");
             shell.ExecuteCommand($"tp 0 0 {mapId}");