From 684ec60be6dc4c9b97f580891d0b04b30100020c Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 4 Feb 2021 00:20:48 +1100
Subject: [PATCH] Pausing content (#3061)

* Change EntityQuery to not retrieve paused by default

* GetAllComponents

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
---
 Content.Benchmarks/ComponentManagerGetAllComponents.cs        | 2 +-
 Content.Client/Commands/DebugCommands.cs                      | 2 +-
 Content.Client/Commands/HideMechanismsCommand.cs              | 2 +-
 Content.Client/Commands/ShowMechanismsCommand.cs              | 2 +-
 .../GameObjects/Components/Observer/GhostComponent.cs         | 2 +-
 .../GameObjects/EntitySystems/CameraRecoilSystem.cs           | 2 +-
 .../GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs        | 2 +-
 Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs  | 2 +-
 Content.Client/GameObjects/EntitySystems/MarkerSystem.cs      | 2 +-
 Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs  | 2 +-
 Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs | 2 +-
 .../GameObjects/EntitySystems/SubFloorHideSystem.cs           | 2 +-
 Content.Client/StationEvents/RadiationPulseOverlay.cs         | 2 +-
 Content.Server/Administration/Commands/DeleteComponent.cs     | 2 +-
 Content.Server/Administration/Commands/WarpCommand.cs         | 4 ++--
 .../GameObjects/Components/Observer/GhostComponent.cs         | 2 +-
 .../GameObjects/EntitySystems/AI/AiFactionTagSystem.cs        | 2 +-
 .../GameObjects/EntitySystems/AntimatterEngineSystem.cs       | 2 +-
 .../GameObjects/EntitySystems/AtmosExposedSystem.cs           | 2 +-
 Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs  | 2 +-
 Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs   | 2 +-
 .../GameObjects/EntitySystems/CargoConsoleSystem.cs           | 2 +-
 Content.Server/GameObjects/EntitySystems/ClimbSystem.cs       | 2 +-
 Content.Server/GameObjects/EntitySystems/CloningSystem.cs     | 4 ++--
 Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs    | 2 +-
 Content.Server/GameObjects/EntitySystems/DisposableSystem.cs  | 2 +-
 .../GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs        | 4 +---
 .../GameObjects/EntitySystems/ExpendableLightSystem.cs        | 2 +-
 Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs | 2 +-
 Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs | 2 +-
 Content.Server/GameObjects/EntitySystems/GasTankSystem.cs     | 2 +-
 Content.Server/GameObjects/EntitySystems/GravitySystem.cs     | 2 +-
 Content.Server/GameObjects/EntitySystems/HungerSystem.cs      | 2 +-
 Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs  | 2 +-
 Content.Server/GameObjects/EntitySystems/LatheSystem.cs       | 2 +-
 Content.Server/GameObjects/EntitySystems/ListeningSystem.cs   | 2 +-
 .../GameObjects/EntitySystems/MedicalScannerSystem.cs         | 2 +-
 Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs  | 2 +-
 Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs   | 2 +-
 Content.Server/GameObjects/EntitySystems/MorgueSystem.cs      | 2 +-
 Content.Server/GameObjects/EntitySystems/PlantSystem.cs       | 2 +-
 Content.Server/GameObjects/EntitySystems/PointingSystem.cs    | 4 ++--
 .../GameObjects/EntitySystems/Power/BaseChargerSystem.cs      | 2 +-
 .../GameObjects/EntitySystems/Power/BatterySystem.cs          | 2 +-
 .../GameObjects/EntitySystems/Power/PowerSmesSystem.cs        | 2 +-
 .../EntitySystems/Power/PowerSolarControlConsoleSystem.cs     | 2 +-
 .../GameObjects/EntitySystems/Power/PowerSolarSystem.cs       | 2 +-
 Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs  | 2 +-
 Content.Server/GameObjects/EntitySystems/PuddleSystem.cs      | 2 +-
 Content.Server/GameObjects/EntitySystems/RadioSystem.cs       | 2 +-
 .../GameObjects/EntitySystems/ReagentGrinderSystem.cs         | 2 +-
 Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs    | 2 +-
 .../GameObjects/EntitySystems/RoguePointingSystem.cs          | 2 +-
 Content.Server/GameObjects/EntitySystems/SingularitySystem.cs | 2 +-
 .../EntitySystems/StationEvents/RadiationPulseSystem.cs       | 2 +-
 Content.Server/GameObjects/EntitySystems/StorageSystem.cs     | 2 +-
 .../GameObjects/EntitySystems/StressTestMovementSystem.cs     | 2 +-
 Content.Server/GameObjects/EntitySystems/StunSystem.cs        | 2 +-
 Content.Server/GameObjects/EntitySystems/ThirstSystem.cs      | 2 +-
 Content.Server/GameObjects/EntitySystems/VaporSystem.cs       | 2 +-
 .../Objectives/Conditions/KillRandomPersonCondition.cs        | 2 +-
 Content.Server/StationEvents/PowerGridCheck.cs                | 2 +-
 Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs   | 2 +-
 .../GameObjects/EntitySystems/SharedDisposalUnitSystem.cs     | 4 ++--
 Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs    | 2 +-
 65 files changed, 69 insertions(+), 71 deletions(-)

diff --git a/Content.Benchmarks/ComponentManagerGetAllComponents.cs b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
index 46e6150f1e..ec8ae2f3d9 100644
--- a/Content.Benchmarks/ComponentManagerGetAllComponents.cs
+++ b/Content.Benchmarks/ComponentManagerGetAllComponents.cs
@@ -79,7 +79,7 @@ namespace Content.Benchmarks
         {
             var count = 0;
 
-            foreach (var _ in _componentManager.EntityQuery<DummyComponent>())
+            foreach (var _ in _componentManager.EntityQuery<DummyComponent>(true))
             {
                 count += 1;
             }
diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs
index 0ea5efc6c7..15879deece 100644
--- a/Content.Client/Commands/DebugCommands.cs
+++ b/Content.Client/Commands/DebugCommands.cs
@@ -52,7 +52,7 @@ namespace Content.Client.Commands
                 .EnableAll = true;
 
             var components = IoCManager.Resolve<IEntityManager>().ComponentManager
-                .EntityQuery<SubFloorHideComponent>();
+                .EntityQuery<SubFloorHideComponent>(true);
 
             foreach (var component in components)
             {
diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index 9e7bde255c..bbe5d9f769 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -17,7 +17,7 @@ namespace Content.Client.Commands
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var componentManager = IoCManager.Resolve<IComponentManager>();
-            var mechanisms = componentManager.EntityQuery<IMechanism>();
+            var mechanisms = componentManager.EntityQuery<IMechanism>(true);
 
             foreach (var mechanism in mechanisms)
             {
diff --git a/Content.Client/Commands/ShowMechanismsCommand.cs b/Content.Client/Commands/ShowMechanismsCommand.cs
index fe0381a3c6..85ab4583a4 100644
--- a/Content.Client/Commands/ShowMechanismsCommand.cs
+++ b/Content.Client/Commands/ShowMechanismsCommand.cs
@@ -19,7 +19,7 @@ namespace Content.Client.Commands
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
             var componentManager = IoCManager.Resolve<IComponentManager>();
-            var mechanisms = componentManager.EntityQuery<IMechanism>();
+            var mechanisms = componentManager.EntityQuery<IMechanism>(true);
 
             foreach (var mechanism in mechanisms)
             {
diff --git a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
index 8af023096f..b42f8439e0 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
+++ b/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
@@ -46,7 +46,7 @@ namespace Content.Client.GameObjects.Components.Observer
 
         private void SetGhostVisibility(bool visibility)
         {
-            foreach (var ghost in _componentManager.GetAllComponents(typeof(GhostComponent)))
+            foreach (var ghost in _componentManager.GetAllComponents(typeof(GhostComponent), true))
             {
                 if (ghost.Owner.TryGetComponent(out SpriteComponent? component))
                 {
diff --git a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs b/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs
index f37f9c8539..6f6f598b4c 100644
--- a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Client.GameObjects.EntitySystems
         {
             base.FrameUpdate(frameTime);
 
-            foreach (var recoil in EntityManager.ComponentManager.EntityQuery<CameraRecoilComponent>())
+            foreach (var recoil in EntityManager.ComponentManager.EntityQuery<CameraRecoilComponent>(true))
             {
                 recoil.FrameUpdate(frameTime);
             }
diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
index 7f911cfcb4..c93905ded1 100644
--- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
@@ -61,7 +61,7 @@ namespace Content.Client.GameObjects.EntitySystems.DoAfter
             if (_attachedEntity == null || _attachedEntity.Deleted)
                 return;
 
-            foreach (var comp in ComponentManager.EntityQuery<DoAfterComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<DoAfterComponent>(true))
             {
                 if (!_knownComponents.Contains(comp))
                 {
diff --git a/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs b/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs
index 59c22113c1..4d4e7c907a 100644
--- a/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs
@@ -44,7 +44,7 @@ namespace Content.Client.GameObjects.EntitySystems
                 return;
             }
 
-            foreach (var instrumentComponent in EntityManager.ComponentManager.EntityQuery<InstrumentComponent>())
+            foreach (var instrumentComponent in EntityManager.ComponentManager.EntityQuery<InstrumentComponent>(true))
             {
                 instrumentComponent.Update(frameTime);
             }
diff --git a/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs b/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs
index bec86abbb4..f6acf68b4f 100644
--- a/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs
@@ -19,7 +19,7 @@ namespace Content.Client.GameObjects.EntitySystems
 
         private void UpdateMarkers()
         {
-            foreach (var markerComponent in EntityManager.ComponentManager.EntityQuery<MarkerComponent>())
+            foreach (var markerComponent in EntityManager.ComponentManager.EntityQuery<MarkerComponent>(true))
             {
                 markerComponent.UpdateVisibility();
             }
diff --git a/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs
index 3f180d4399..f61ae4506f 100644
--- a/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Client.GameObjects.EntitySystems
         {
             base.FrameUpdate(frameTime);
 
-            foreach (var meleeLungeComponent in EntityManager.ComponentManager.EntityQuery<MeleeLungeComponent>())
+            foreach (var meleeLungeComponent in EntityManager.ComponentManager.EntityQuery<MeleeLungeComponent>(true))
             {
                 meleeLungeComponent.Update(frameTime);
             }
diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
index 1133c1a8d2..f3d7883d8d 100644
--- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
@@ -34,7 +34,7 @@ namespace Content.Client.GameObjects.EntitySystems
         {
             base.FrameUpdate(frameTime);
 
-            foreach (var arcAnimationComponent in EntityManager.ComponentManager.EntityQuery<MeleeWeaponArcAnimationComponent>())
+            foreach (var arcAnimationComponent in EntityManager.ComponentManager.EntityQuery<MeleeWeaponArcAnimationComponent>(true))
             {
                 arcAnimationComponent.Update(frameTime);
             }
diff --git a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
index d4f4352bd9..249df06da8 100644
--- a/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
+++ b/Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
@@ -35,7 +35,7 @@ namespace Content.Client.GameObjects.EntitySystems
 
         private void UpdateAll()
         {
-            foreach (var comp in EntityManager.ComponentManager.EntityQuery<SubFloorHideComponent>())
+            foreach (var comp in EntityManager.ComponentManager.EntityQuery<SubFloorHideComponent>(true))
             {
                 if (!_mapManager.TryGetGrid(comp.Owner.Transform.GridID, out var grid)) return;
 
diff --git a/Content.Client/StationEvents/RadiationPulseOverlay.cs b/Content.Client/StationEvents/RadiationPulseOverlay.cs
index b08d38358a..91917ea9dc 100644
--- a/Content.Client/StationEvents/RadiationPulseOverlay.cs
+++ b/Content.Client/StationEvents/RadiationPulseOverlay.cs
@@ -124,7 +124,7 @@ namespace Content.Client.StationEvents
             _lastTick = _gameTiming.CurTime;
 
             var radiationPulses = _componentManager
-                .EntityQuery<RadiationPulseComponent>()
+                .EntityQuery<RadiationPulseComponent>(true)
                 .ToList();
 
             var screenHandle = (DrawingHandleScreen) handle;
diff --git a/Content.Server/Administration/Commands/DeleteComponent.cs b/Content.Server/Administration/Commands/DeleteComponent.cs
index 8a6777d7fc..5e6941b52f 100644
--- a/Content.Server/Administration/Commands/DeleteComponent.cs
+++ b/Content.Server/Administration/Commands/DeleteComponent.cs
@@ -33,7 +33,7 @@ namespace Content.Server.Administration.Commands
                     }
 
                     var componentType = registration.Type;
-                    var components = entityManager.ComponentManager.GetAllComponents(componentType);
+                    var components = entityManager.ComponentManager.GetAllComponents(componentType, true);
 
                     var i = 0;
 
diff --git a/Content.Server/Administration/Commands/WarpCommand.cs b/Content.Server/Administration/Commands/WarpCommand.cs
index a8972487b7..9170dc2da0 100644
--- a/Content.Server/Administration/Commands/WarpCommand.cs
+++ b/Content.Server/Administration/Commands/WarpCommand.cs
@@ -43,7 +43,7 @@ namespace Content.Server.Administration.Commands
             if (location == "?")
             {
                 var locations = string.Join(", ",
-                    comp.EntityQuery<WarpPointComponent>()
+                    comp.EntityQuery<WarpPointComponent>(true)
                         .Select(p => p.Location)
                         .Where(p => p != null)
                         .OrderBy(p => p)
@@ -64,7 +64,7 @@ namespace Content.Server.Administration.Commands
                 var currentGrid = player.AttachedEntity.Transform.GridID;
                 var entityManager = IoCManager.Resolve<IEntityManager>();
 
-                var found = comp.EntityQuery<WarpPointComponent>()
+                var found = comp.EntityQuery<WarpPointComponent>(true)
                     .Where(p => p.Location == location)
                     .Select(p => p.Owner.Transform.Coordinates)
                     .OrderBy(p => p, Comparer<EntityCoordinates>.Create((a, b) =>
diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
index 8fd45b1bdc..15b909435b 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
+++ b/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
@@ -144,7 +144,7 @@ namespace Content.Server.GameObjects.Components.Observer
         private List<WarpPointComponent> FindWaypoints()
         {
             var comp = IoCManager.Resolve<IComponentManager>();
-            return comp.EntityQuery<WarpPointComponent>().ToList();
+            return comp.EntityQuery<WarpPointComponent>(true).ToList();
         }
 
         public void Examine(FormattedMessage message, bool inDetailsRange)
diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs
index dc83c30d67..acfb7c0277 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs
@@ -48,7 +48,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI
                 yield break;
             }
 
-            foreach (var component in ComponentManager.EntityQuery<AiFactionTagComponent>())
+            foreach (var component in ComponentManager.EntityQuery<AiFactionTagComponent>(true))
             {
                 if ((component.Factions & hostile) == 0)
                     continue;
diff --git a/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs b/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs
index 3f4576fb84..0c73f45322 100644
--- a/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs
@@ -15,7 +15,7 @@ namespace Content.Server.GameObjects.EntitySystems
             _accumulatedFrameTime += frameTime;
             if (_accumulatedFrameTime >= 10)
             {
-                foreach (var comp in ComponentManager.EntityQuery<AMEControllerComponent>())
+                foreach (var comp in ComponentManager.EntityQuery<AMEControllerComponent>(true))
                 {
                     comp.OnUpdate(frameTime);
                 }
diff --git a/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs
index 94b0c3adb6..8dad965d5e 100644
--- a/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AtmosExposedSystem.cs
@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.EntitySystems
             if (_lastUpdate < UpdateDelay) return;
 
             // creadth: everything exposable by atmos should be updated as well
-            foreach (var atmosExposedComponent in EntityManager.ComponentManager.EntityQuery<AtmosExposedComponent>())
+            foreach (var atmosExposedComponent in EntityManager.ComponentManager.EntityQuery<AtmosExposedComponent>(true))
             {
                 var tile = atmosExposedComponent.Owner.Transform.Coordinates.GetTileAtmosphere(EntityManager);
                 if (tile == null) continue;
diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
index 2864d813b0..71b0856e99 100644
--- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
@@ -143,7 +143,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var (mapGridComponent, gridAtmosphereComponent) in EntityManager.ComponentManager.EntityQuery<IMapGridComponent, IGridAtmosphereComponent>())
+            foreach (var (mapGridComponent, gridAtmosphereComponent) in EntityManager.ComponentManager.EntityQuery<IMapGridComponent, IGridAtmosphereComponent>(true))
             {
                 if (_pauseManager.IsGridPaused(mapGridComponent.GridIndex)) continue;
 
diff --git a/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs b/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs
index 37a881d1bf..5ebfe7dc5c 100644
--- a/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs
@@ -63,7 +63,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<BlockGameArcadeComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<BlockGameArcadeComponent>(true))
             {
                 comp.DoGameTick(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs b/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs
index ad6ffad73c..c30bd6052f 100644
--- a/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs
@@ -180,7 +180,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
         private void SyncComponentsWithId(int id)
         {
-            foreach (var comp in ComponentManager.EntityQuery<CargoOrderDatabaseComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<CargoOrderDatabaseComponent>(true))
             {
                 if (!comp.ConnectedToDatabase || comp.Database.Id != id)
                     continue;
diff --git a/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs b/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs
index f4d5b0f6cf..7f0a0a3857 100644
--- a/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<ClimbingComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<ClimbingComponent>(true))
             {
                 comp.Update();
             }
diff --git a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs b/Content.Server/GameObjects/EntitySystems/CloningSystem.cs
index f759a5d139..438d26269d 100644
--- a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/CloningSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<CloningPodComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<CloningPodComponent>(true))
             {
                 comp.Update(frameTime);
             }
@@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             if (!Minds.ContainsValue(mind))
             {
-                Minds.Add(Minds.Count(), mind);
+                Minds.Add(Minds.Count, mind);
             }
         }
 
diff --git a/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs b/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs
index b692bdd1bd..30a61761bf 100644
--- a/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ConveyorSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<ConveyorComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<ConveyorComponent>(true))
             {
                 comp.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs b/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs
index 536f0dfda4..eef8d319e8 100644
--- a/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<DisposalHolderComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<DisposalHolderComponent>(true))
             {
                 comp.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
index 93dc9478bd..226d942b00 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
@@ -17,10 +17,8 @@ namespace Content.Server.GameObjects.EntitySystems.DoAfter
         {
             base.Update(frameTime);
 
-            foreach (var comp in ComponentManager.EntityQuery<DoAfterComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<DoAfterComponent>(true))
             {
-                if (comp.Owner.Paused) continue;
-
                 var cancelled = new List<DoAfter>(0);
                 var finished = new List<DoAfter>(0);
 
diff --git a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs b/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs
index 4feba72bb0..36c9c3ab87 100644
--- a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var light in ComponentManager.EntityQuery<ExpendableLightComponent>())
+            foreach (var light in ComponentManager.EntityQuery<ExpendableLightComponent>(true))
             {
                 light.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs
index cf452f4111..d0a65cfa6e 100644
--- a/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/GasAnalyzerSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var analyzer in ComponentManager.EntityQuery<GasAnalyzerComponent>())
+            foreach (var analyzer in ComponentManager.EntityQuery<GasAnalyzerComponent>(true))
             {
                 analyzer.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs b/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs
index a9c74af4f7..b94b2fed60 100644
--- a/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/GasCanisterSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var component in ComponentManager.EntityQuery<GasCanisterComponent>())
+            foreach (var component in ComponentManager.EntityQuery<GasCanisterComponent>(true))
             {
                 component.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs b/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs
index fe88bc52f3..657e618c1f 100644
--- a/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/GasTankSystem.cs
@@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.EntitySystems
             if (_timer < Interval) return;
             _timer = 0f;
 
-            foreach (var gasTank in EntityManager.ComponentManager.EntityQuery<GasTankComponent>())
+            foreach (var gasTank in EntityManager.ComponentManager.EntityQuery<GasTankComponent>(true))
             {
                 gasTank.Update();
             }
diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs
index 24f6057ba9..ca0b8572a5 100644
--- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/GravitySystem.cs
@@ -36,7 +36,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             _internalTimer += frameTime;
             var gridsWithGravity = new List<GridId>();
-            foreach (var generator in ComponentManager.EntityQuery<GravityGeneratorComponent>())
+            foreach (var generator in ComponentManager.EntityQuery<GravityGeneratorComponent>(true))
             {
                 if (generator.NeedsUpdate)
                 {
diff --git a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
index bd8cd6a866..18a34dbae3 100644
--- a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
@@ -15,7 +15,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
             if (_accumulatedFrameTime > 1)
             {
-                foreach (var comp in ComponentManager.EntityQuery<HungerComponent>())
+                foreach (var comp in ComponentManager.EntityQuery<HungerComponent>(true))
                 {
                     comp.OnUpdate(_accumulatedFrameTime);
                 }
diff --git a/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs b/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs
index 80a50a93b8..a62c9b2962 100644
--- a/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs
@@ -51,7 +51,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var component in ComponentManager.EntityQuery<InstrumentComponent>())
+            foreach (var component in ComponentManager.EntityQuery<InstrumentComponent>(true))
             {
                 component.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs b/Content.Server/GameObjects/EntitySystems/LatheSystem.cs
index 777c22c82c..7fc92095be 100644
--- a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/LatheSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<LatheComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<LatheComponent>(true))
             {
                 if (comp.Producing == false && comp.Queue.Count > 0)
                 {
diff --git a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs b/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs
index eb92727745..6b6a42a357 100644
--- a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public void PingListeners(IEntity source, string message)
         {
-            foreach (var listener in ComponentManager.EntityQuery<IListen>())
+            foreach (var listener in ComponentManager.EntityQuery<IListen>(true))
             {
                 // TODO: Map Position distance
                 if (listener.CanListen(message, source))
diff --git a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs b/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs
index 01d1cd20ac..d7f00b8437 100644
--- a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<MedicalScannerComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<MedicalScannerComponent>(true))
             {
                 comp.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs b/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs
index 7c33138ee6..80c6d099cf 100644
--- a/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var metabolism in ComponentManager.EntityQuery<MetabolismComponent>())
+            foreach (var metabolism in ComponentManager.EntityQuery<MetabolismComponent>(true))
             {
                 metabolism.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs b/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs
index a1ccba35ed..5e789493e2 100644
--- a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
-            foreach (var comp in ComponentManager.EntityQuery<MicrowaveComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<MicrowaveComponent>(true))
             {
                 comp.OnUpdate();
             }
diff --git a/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs b/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs
index bbb18adca2..0692438de1 100644
--- a/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs
@@ -16,7 +16,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
             if (_accumulatedFrameTime >= 10)
             {
-                foreach (var morgue in ComponentManager.EntityQuery<MorgueEntityStorageComponent>())
+                foreach (var morgue in ComponentManager.EntityQuery<MorgueEntityStorageComponent>(true))
                 {
                     morgue.Update();
                 }
diff --git a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs b/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
index d2e776d6f4..5b43f9d1a0 100644
--- a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
@@ -70,7 +70,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
             _timer = 0f;
 
-            foreach (var plantHolder in _componentManager.EntityQuery<PlantHolderComponent>())
+            foreach (var plantHolder in _componentManager.EntityQuery<PlantHolderComponent>(true))
             {
                 plantHolder.Update();
             }
diff --git a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs b/Content.Server/GameObjects/EntitySystems/PointingSystem.cs
index 0569600e7b..797171d780 100644
--- a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/PointingSystem.cs
@@ -86,7 +86,7 @@ namespace Content.Server.GameObjects.EntitySystems
             else
             {
                 return pointer.InRangeUnOccluded(coordinates, 15, e => e == pointer);
-            }         
+            }
         }
 
         public bool TryPoint(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
@@ -199,7 +199,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
         public override void Update(float frameTime)
         {
-            foreach (var component in ComponentManager.EntityQuery<PointingArrowComponent>())
+            foreach (var component in ComponentManager.EntityQuery<PointingArrowComponent>(true))
             {
                 component.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs
index d7a6a44afc..9b5ec578a4 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<BaseCharger>())
+            foreach (var comp in ComponentManager.EntityQuery<BaseCharger>(true))
             {
                 comp.OnUpdate(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs b/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs
index c94defd61d..92eb658962 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<BatteryComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<BatteryComponent>(true))
             {
                 comp.OnUpdate(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs
index 989c82dd47..a1922d2288 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<SmesComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<SmesComponent>(true))
             {
                 comp.OnUpdate();
             }
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs
index 555aab54bf..226b40c788 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs
@@ -22,7 +22,7 @@ namespace Content.Server.GameObjects.EntitySystems
             if (_updateTimer >= 1)
             {
                 _updateTimer -= 1;
-                foreach (var component in ComponentManager.EntityQuery<SolarControlConsoleComponent>())
+                foreach (var component in ComponentManager.EntityQuery<SolarControlConsoleComponent>(true))
                 {
                     component.UpdateUIState();
                 }
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs
index 3e763f5516..b2a8dfa5c3 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs
@@ -87,7 +87,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
             TotalPanelPower = 0;
 
-            foreach (var panel in ComponentManager.EntityQuery<SolarPanelComponent>())
+            foreach (var panel in ComponentManager.EntityQuery<SolarPanelComponent>(true))
             {
                 // There's supposed to be rotational logic here, but that implies putting it somewhere.
                 panel.Owner.Transform.WorldRotation = TargetPanelRotation;
diff --git a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs b/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs
index 7838ef62e0..5c8483866c 100644
--- a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var component in ComponentManager.EntityQuery<ProjectileComponent>())
+            foreach (var component in ComponentManager.EntityQuery<ProjectileComponent>(true))
             {
                 component.TimeLeft -= frameTime;
 
diff --git a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs
index f36783a983..6b8f6ab87e 100644
--- a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs
@@ -28,7 +28,7 @@ namespace Content.Server.GameObjects.EntitySystems
         private void HandleTileChanged(object sender, TileChangedEventArgs eventArgs)
         {
             // If this gets hammered you could probably queue up all the tile changes every tick but I doubt that would ever happen.
-            foreach (var (puddle, snapGrid) in ComponentManager.EntityQuery<PuddleComponent, SnapGridComponent>())
+            foreach (var (puddle, snapGrid) in ComponentManager.EntityQuery<PuddleComponent, SnapGridComponent>(true))
             {
                 // If the tile becomes space then delete it (potentially change by design)
                 if (eventArgs.NewTile.GridIndex == puddle.Owner.Transform.GridID &&
diff --git a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs b/Content.Server/GameObjects/EntitySystems/RadioSystem.cs
index f5696c14f8..7915ea6056 100644
--- a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/RadioSystem.cs
@@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
             _messages.Add(message);
 
-            foreach (var radio in ComponentManager.EntityQuery<IRadio>())
+            foreach (var radio in ComponentManager.EntityQuery<IRadio>(true))
             {
                 if (radio.Channels.Contains(channel))
                 {
diff --git a/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs
index 85a4682d4b..0122a7e18f 100644
--- a/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs
@@ -10,7 +10,7 @@ namespace Content.Server.GameObjects.EntitySystems
         public override void Update(float frameTime)
         {
             base.Update(frameTime);
-            foreach (var comp in ComponentManager.EntityQuery<ReagentGrinderComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<ReagentGrinderComponent>(true))
             {
                 comp.OnUpdate();
             }
diff --git a/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs b/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs
index c0904a1271..bea76c6e49 100644
--- a/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/RecyclerSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var component in ComponentManager.EntityQuery<RecyclerComponent>())
+            foreach (var component in ComponentManager.EntityQuery<RecyclerComponent>(true))
             {
                 component.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs b/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs
index 7686fb1e3a..e4fa11b019 100644
--- a/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var component in ComponentManager.EntityQuery<RoguePointingArrowComponent>())
+            foreach (var component in ComponentManager.EntityQuery<RoguePointingArrowComponent>(true))
             {
                 component.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs b/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs
index 18a4c524ca..55cad3de26 100644
--- a/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs
@@ -20,7 +20,7 @@ namespace Content.Server.GameObjects.EntitySystems
             var shouldUpdate = curTimeSingulo >= 1f;
             var shouldPull = curTimePull >= 0.2f;
             if (!shouldUpdate && !shouldPull) return;
-            var singulos = ComponentManager.EntityQuery<SingularityComponent>();
+            var singulos = ComponentManager.EntityQuery<SingularityComponent>(true);
 
             if (curTimeSingulo >= 1f)
             {
diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
index 9dd45401be..db4e2db866 100644
--- a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
@@ -35,7 +35,7 @@ namespace Content.Server.GameObjects.EntitySystems.StationEvents
         {
             base.Update(frameTime);
 
-            foreach (var comp in ComponentManager.EntityQuery<RadiationPulseComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<RadiationPulseComponent>(true))
             {
                 comp.Update(frameTime);
                 var ent = comp.Owner;
diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
index 4753b332e6..d3dc608ce3 100644
--- a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
@@ -23,7 +23,7 @@ namespace Content.Server.GameObjects.EntitySystems
         /// <inheritdoc />
         public override void Update(float frameTime)
         {
-            foreach (var component in ComponentManager.EntityQuery<ServerStorageComponent>())
+            foreach (var component in ComponentManager.EntityQuery<ServerStorageComponent>(true))
             {
                 CheckSubscribedEntities(component);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs b/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs
index abdda79a09..ed941c83c5 100644
--- a/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs
@@ -13,7 +13,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var stressTest in ComponentManager.EntityQuery<StressTestMovementComponent>())
+            foreach (var stressTest in ComponentManager.EntityQuery<StressTestMovementComponent>(true))
             {
                 var transform = stressTest.Owner.Transform;
 
diff --git a/Content.Server/GameObjects/EntitySystems/StunSystem.cs b/Content.Server/GameObjects/EntitySystems/StunSystem.cs
index 6e3a4459ba..05ce68c119 100644
--- a/Content.Server/GameObjects/EntitySystems/StunSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/StunSystem.cs
@@ -11,7 +11,7 @@ namespace Content.Server.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var component in ComponentManager.EntityQuery<StunnableComponent>())
+            foreach (var component in ComponentManager.EntityQuery<StunnableComponent>(true))
             {
                 component.Update(frameTime);
             }
diff --git a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
index dbb8816a49..64a057d791 100644
--- a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
@@ -15,7 +15,7 @@ namespace Content.Server.GameObjects.EntitySystems
 
             if (_accumulatedFrameTime > 1)
             {
-                foreach (var component in ComponentManager.EntityQuery<ThirstComponent>())
+                foreach (var component in ComponentManager.EntityQuery<ThirstComponent>(true))
                 {
                     component.OnUpdate(_accumulatedFrameTime);
                 }
diff --git a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs b/Content.Server/GameObjects/EntitySystems/VaporSystem.cs
index e842db680f..7dc8155f5f 100644
--- a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/VaporSystem.cs
@@ -9,7 +9,7 @@ namespace Content.Server.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var vaporComp in ComponentManager.EntityQuery<VaporComponent>())
+            foreach (var vaporComp in ComponentManager.EntityQuery<VaporComponent>(true))
             {
                 vaporComp.Update(frameTime);
             }
diff --git a/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs b/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
index fd3a583d38..62cff5cc11 100644
--- a/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
+++ b/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
@@ -17,7 +17,7 @@ namespace Content.Server.Objectives.Conditions
         public override IObjectiveCondition GetAssigned(Mind mind)
         {
             var entityMgr = IoCManager.Resolve<IEntityManager>();
-            var allHumans = entityMgr.ComponentManager.EntityQuery<MindComponent>().Where(mc =>
+            var allHumans = entityMgr.ComponentManager.EntityQuery<MindComponent>(true).Where(mc =>
             {
                 var entity = mc.Mind?.OwnedEntity;
                 return (entity?.GetComponentOrNull<IMobStateComponent>()?.IsAlive() ?? false) && mc.Mind != mind;
diff --git a/Content.Server/StationEvents/PowerGridCheck.cs b/Content.Server/StationEvents/PowerGridCheck.cs
index 31b000b2e7..90226c356e 100644
--- a/Content.Server/StationEvents/PowerGridCheck.cs
+++ b/Content.Server/StationEvents/PowerGridCheck.cs
@@ -43,7 +43,7 @@ namespace Content.Server.StationEvents
         {
             var componentManager = IoCManager.Resolve<IComponentManager>();
 
-            foreach (var component in componentManager.EntityQuery<PowerReceiverComponent>())
+            foreach (var component in componentManager.EntityQuery<PowerReceiverComponent>(true))
             {
                 component.PowerDisabled = true;
                 _powered.Add(component.Owner);
diff --git a/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs b/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs
index d3e9dd0daa..75861219e6 100644
--- a/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs
@@ -12,7 +12,7 @@ namespace Content.Shared.GameObjects.EntitySystems
         {
             base.Update(frameTime);
 
-            foreach (var mechanism in ComponentManager.EntityQuery<IMechanism>())
+            foreach (var mechanism in ComponentManager.EntityQuery<IMechanism>(true))
             {
                 mechanism.Update(frameTime);
             }
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs b/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs
index d957a9f203..b8fd1ead39 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs
@@ -9,12 +9,12 @@ namespace Content.Shared.GameObjects.EntitySystems
     {
         public override void Update(float frameTime)
         {
-            foreach (var comp in ComponentManager.EntityQuery<SharedDisposalUnitComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<SharedDisposalUnitComponent>(true))
             {
                 comp.Update(frameTime);
             }
 
-            foreach (var comp in ComponentManager.EntityQuery<SharedDisposalMailingUnitComponent>())
+            foreach (var comp in ComponentManager.EntityQuery<SharedDisposalMailingUnitComponent>(true))
             {
                 comp.Update(frameTime);
             }
diff --git a/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs b/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs
index e5ad22f7ec..6a44dd5634 100644
--- a/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs
+++ b/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs
@@ -10,7 +10,7 @@ namespace Content.Shared.GameObjects.EntitySystems
         /// <inheritdoc />
         public override void Update(float frameTime)
         {
-            foreach (var slipperyComp in ComponentManager.EntityQuery<SharedSlipperyComponent>())
+            foreach (var slipperyComp in ComponentManager.EntityQuery<SharedSlipperyComponent>(true))
             {
                 slipperyComp.Update();
             }