Don't preload content maps in tests (#14577)

diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
index 10dd8dca5fbcad43bc943189a0c30d81c0d4abab..695aae7cba901fef026d42093a479df934f318c3 100644 (file)
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -51,6 +51,9 @@ public static class PoolManager
         (CCVars.SysWinTickPeriod.Name, "0", true),
         (CCVars.ThreadParallelCount.Name, "1", true),
         (CCVars.GameRoleTimers.Name, "false", false),
+        (CCVars.CargoShuttles.Name, "false", false),
+        (CCVars.EmergencyShuttleEnabled.Name, "false", false),
+        (CCVars.ProcgenPreload.Name, "false", false),
     };
 
     private static int PairId;

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 24c52d3fac7ab9cf5723dbe9b4d59a691dc29c71..fbf7bda83bb1b301a3f5f7701627feeedb361cf3 100644 (file)
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -265,6 +265,9 @@ public sealed partial class CargoSystem
 
     private void OnCargoOrderStartup(EntityUid uid, StationCargoOrderDatabaseComponent component, ComponentStartup args)
     {
+        if (!_enabled)
+            return;
+
         // Stations get created first but if any are added at runtime then do this.
         AddShuttle(component);
     }