Reduced Warning Count By 130 For Full Rebuilds (#26518)

* remove deprecated entity coordinate extension functions. Reduces warning count by approximately 50 * final toCoords Removed * Remove all unused variables and dead code paths * remove always true variable, should be a cvar or something instead * remove superfluous variables from tests
2024-03-29 01:28:16 -04:00
parent cdfa7c3c70
commit 59e46aab93
69 changed files with 101 additions and 256 deletions
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -4,7 +4,6 @@ using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;

 namespace Content.Client.Alerts;

@@ -13,7 +12,6 @@ public sealed class ClientAlertsSystem : AlertsSystem
 {
    public AlertOrderPrototype? AlertOrder { get; set; }

-    [Dependency] private readonly IGameTiming _timing = default!;
    [Dependency] private readonly IPlayerManager _playerManager = default!;
    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;

--- a/Content.Client/Clothing/ClientClothingSystem.cs
+++ b/Content.Client/Clothing/ClientClothingSystem.cs
@@ -133,7 +133,7 @@ public sealed class ClientClothingSystem : ClothingSystem
        else if (TryComp(uid, out SpriteComponent? sprite))
            rsi = sprite.BaseRSI;

-        if (rsi == null || rsi.Path == null)
+        if (rsi == null)
            return false;

        var correctedSlot = slot;
--- a/Content.Client/Doors/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -4,14 +4,12 @@ using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Serialization.TypeSerializers.Implementations;
-using Robust.Shared.Timing;

 namespace Content.Client.Doors;

 public sealed class DoorSystem : SharedDoorSystem
 {
    [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!;
-    [Dependency] private readonly IGameTiming _gameTiming = default!;
    [Dependency] private readonly IResourceCache _resourceCache = default!;

    public override void Initialize()
--- a/Content.Client/IconSmoothing/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -16,8 +16,6 @@ namespace Content.Client.IconSmoothing
    [UsedImplicitly]
    public sealed partial class IconSmoothSystem : EntitySystem
    {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
        private readonly Queue<EntityUid> _dirtyEntities = new();
        private readonly Queue<EntityUid> _anchorChangedEntities = new();

--- a/Content.Client/Items/Systems/ItemSystem.cs
+++ b/Content.Client/Items/Systems/ItemSystem.cs
@@ -93,7 +93,7 @@ public sealed class ItemSystem : SharedItemSystem
        else if (TryComp(uid, out SpriteComponent? sprite))
            rsi = sprite.BaseRSI;

-        if (rsi == null || rsi.Path == null)
+        if (rsi == null)
            return false;

        var state = (item.HeldPrefix == null)
--- a/Content.Client/NPC/PathfindingSystem.cs
+++ b/Content.Client/NPC/PathfindingSystem.cs
@@ -289,7 +289,6 @@ namespace Content.Client.NPC

                var invGridMatrix = gridXform.InvWorldMatrix;
                DebugPathPoly? nearest = null;
-                var nearestDistance = float.MaxValue;

                foreach (var poly in tile)
                {
--- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
+++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
@@ -88,7 +88,6 @@ public partial class BaseShuttleControl : MapGridControl
        var cornerDistance = MathF.Sqrt(WorldRange * WorldRange + WorldRange * WorldRange);

        var origin = ScalePosition(-new Vector2(Offset.X, -Offset.Y));
-        var distOffset = -24f;

        for (var radius = minDistance; radius <= maxDistance; radius *= EquatorialMultiplier)
        {
--- a/Content.IntegrationTests/PoolManager.cs
+++ b/Content.IntegrationTests/PoolManager.cs
@@ -306,11 +306,6 @@ public static partial class PoolManager
                Pairs[fallback!] = true;
            }

-            if (fallback == null && _pairId > 8)
-            {
-                var x = 2;
-            }
-
            return fallback;
        }
    }
--- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
@@ -67,7 +67,7 @@ namespace Content.IntegrationTests.Tests.Fluids

            await server.WaitAssertion(() =>
            {
-                var coordinates = grid.ToCoordinates();
+                var coordinates = grid.Owner.ToCoordinates();
                var solution = new Solution("Water", FixedPoint2.New(20));

                Assert.That(spillSystem.TrySpillAt(coordinates, solution, out _), Is.False);
--- a/Content.IntegrationTests/Tests/Power/PowerTest.cs
+++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs
@@ -176,16 +176,18 @@ namespace Content.IntegrationTests.Tests.Power
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);

+                var gridOwner = grid.Owner;
+
                // Power only works when anchored
                for (var i = 0; i < 3; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 1));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));

                supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
@@ -237,16 +239,18 @@ namespace Content.IntegrationTests.Tests.Power
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);

+                var gridOwner = grid.Owner;
+
                // Power only works when anchored
                for (var i = 0; i < 3; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 1));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));

                supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
@@ -292,16 +296,17 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 3; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));

                supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
@@ -383,16 +388,17 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 3; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("DischargingBatteryDummy", gridOwner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 2));

                netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(generatorEnt);
                battery = entityManager.GetComponent<BatteryComponent>(generatorEnt);
@@ -486,17 +492,18 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 3; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 1));
-                var batteryEnt = entityManager.SpawnEntity("DischargingBatteryDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 1));
+                var batteryEnt = entityManager.SpawnEntity("DischargingBatteryDummy", gridOwner.ToCoordinates(0, 2));
                netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
                battery = entityManager.GetComponent<BatteryComponent>(batteryEnt);
                supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
@@ -577,16 +584,17 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 3; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates());
-                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates());
+                var batteryEnt = entityManager.SpawnEntity("ChargingBatteryDummy", gridOwner.ToCoordinates(0, 2));

                supplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                var netBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(batteryEnt);
@@ -635,20 +643,21 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 4; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);

-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
+                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 3));

                consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -712,20 +721,21 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 4; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);

-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
+                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 3));

                consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -787,6 +797,7 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Map layout here is
                // C - consumer
@@ -800,18 +811,18 @@ namespace Content.IntegrationTests.Tests.Power
                for (var i = 0; i < 5; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
                entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);

-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 2));
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 1));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 3));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 2));
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 4));

                consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
                consumer2 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt2);
@@ -888,6 +899,7 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Layout is two generators, two batteries, and one load. As to why two: because previously this test
                // would fail ONLY if there were more than two batteries present, because each of them tries to supply
@@ -900,16 +912,16 @@ namespace Content.IntegrationTests.Tests.Power
                for (var i = -2; i <= 2; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, -2));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, -2));

-                var supplyEnt1 = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 1));
-                var supplyEnt2 = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, -1));
+                var supplyEnt1 = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 1));
+                var supplyEnt2 = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, -1));

-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));

                consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                supplier1 = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt1);
@@ -981,6 +993,7 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Map layout here is
                // C - consumer
@@ -994,18 +1007,18 @@ namespace Content.IntegrationTests.Tests.Power
                for (var i = 0; i < 5; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 2));
                entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);

-                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 1));
-                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 3));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 2));
-                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 4));
+                var batteryEnt1 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 1));
+                var batteryEnt2 = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 3));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 2));
+                var consumerEnt1 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 0));
+                var consumerEnt2 = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 4));

                consumer1 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt1);
                consumer2 = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt2);
@@ -1068,20 +1081,21 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 4; i++)
                {
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
-                    entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, i));
+                    entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, i));
                }

-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);

-                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
-                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", grid.ToCoordinates(0, 3));
+                var batteryEnt = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
+                var supplyEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
+                var consumerEnt = entityManager.SpawnEntity("ConsumerDummy", gridOwner.ToCoordinates(0, 3));

                consumer = entityManager.GetComponent<PowerConsumerComponent>(consumerEnt);
                supplier = entityManager.GetComponent<PowerSupplierComponent>(supplyEnt);
@@ -1153,6 +1167,7 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 4; i++)
@@ -1160,15 +1175,15 @@ namespace Content.IntegrationTests.Tests.Power
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
                }

-                var leftEnt = entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 0));
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 2));
-                var rightEnt = entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 3));
+                var leftEnt = entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 0));
+                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 1));
+                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 2));
+                var rightEnt = entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 3));

-                var terminal = entityManager.SpawnEntity("CableTerminal", grid.ToCoordinates(0, 1));
+                var terminal = entityManager.SpawnEntity("CableTerminal", gridOwner.ToCoordinates(0, 1));
                entityManager.GetComponent<TransformComponent>(terminal).LocalRotation = Angle.FromDegrees(180);

-                var battery = entityManager.SpawnEntity("FullBatteryDummy", grid.ToCoordinates(0, 2));
+                var battery = entityManager.SpawnEntity("FullBatteryDummy", gridOwner.ToCoordinates(0, 2));
                var batteryNodeContainer = entityManager.GetComponent<NodeContainerComponent>(battery);

                if (nodeContainer.TryGetNode<CableNode>(entityManager.GetComponent<NodeContainerComponent>(leftEnt),
@@ -1216,6 +1231,7 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                // Power only works when anchored
                for (var i = 0; i < 3; i++)
@@ -1223,14 +1239,14 @@ namespace Content.IntegrationTests.Tests.Power
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
                }

-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 0));
-                entityManager.SpawnEntity("CableHV", grid.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableMV", grid.ToCoordinates(0, 1));
-                entityManager.SpawnEntity("CableMV", grid.ToCoordinates(0, 2));
+                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 0));
+                entityManager.SpawnEntity("CableHV", gridOwner.ToCoordinates(0, 1));
+                entityManager.SpawnEntity("CableMV", gridOwner.ToCoordinates(0, 1));
+                entityManager.SpawnEntity("CableMV", gridOwner.ToCoordinates(0, 2));

-                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", grid.ToCoordinates(0, 0));
-                var substationEnt = entityManager.SpawnEntity("SubstationDummy", grid.ToCoordinates(0, 1));
-                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 2));
+                var generatorEnt = entityManager.SpawnEntity("GeneratorDummy", gridOwner.ToCoordinates(0, 0));
+                var substationEnt = entityManager.SpawnEntity("SubstationDummy", gridOwner.ToCoordinates(0, 1));
+                var apcEnt = entityManager.SpawnEntity("ApcDummy", gridOwner.ToCoordinates(0, 2));

                var generatorSupplier = entityManager.GetComponent<PowerSupplierComponent>(generatorEnt);
                substationNetBattery = entityManager.GetComponent<PowerNetworkBatteryComponent>(substationEnt);
@@ -1273,6 +1289,7 @@ namespace Content.IntegrationTests.Tests.Power
            {
                var map = mapManager.CreateMap();
                var grid = mapManager.CreateGrid(map);
+                var gridOwner = grid.Owner;

                const int range = 5;

@@ -1282,15 +1299,15 @@ namespace Content.IntegrationTests.Tests.Power
                    grid.SetTile(new Vector2i(0, i), new Tile(1));
                }

-                var apcEnt = entityManager.SpawnEntity("ApcDummy", grid.ToCoordinates(0, 0));
-                var apcExtensionEnt = entityManager.SpawnEntity("CableApcExtension", grid.ToCoordinates(0, 0));
+                var apcEnt = entityManager.SpawnEntity("ApcDummy", gridOwner.ToCoordinates(0, 0));
+                var apcExtensionEnt = entityManager.SpawnEntity("CableApcExtension", gridOwner.ToCoordinates(0, 0));

                // Create a powered receiver in range (range is 0 indexed)
-                var powerReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, range - 1));
+                var powerReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", gridOwner.ToCoordinates(0, range - 1));
                receiver = entityManager.GetComponent<ApcPowerReceiverComponent>(powerReceiverEnt);

                // Create an unpowered receiver outside range
-                var unpoweredReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", grid.ToCoordinates(0, range));
+                var unpoweredReceiverEnt = entityManager.SpawnEntity("ApcPowerReceiverDummy", gridOwner.ToCoordinates(0, range));
                unpoweredReceiver = entityManager.GetComponent<ApcPowerReceiverComponent>(unpoweredReceiverEnt);

                var battery = entityManager.GetComponent<BatteryComponent>(apcEnt);
--- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
+++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs
@@ -59,7 +59,7 @@ public sealed class PrototypeSaveTest

            var tileDefinition = tileDefinitionManager["FloorSteel"]; // Wires n such disable ambiance while under the floor
            var tile = new Tile(tileDefinition.TileId);
-            var coordinates = grid.ToCoordinates();
+            var coordinates = grid.Owner.ToCoordinates();

            grid.SetTile(coordinates, tile);
        });
@@ -94,7 +94,7 @@ public sealed class PrototypeSaveTest
        await server.WaitAssertion(() =>
        {
            Assert.That(!mapManager.IsMapInitialized(mapId));
-            var testLocation = grid.ToCoordinates();
+            var testLocation = grid.Owner.ToCoordinates();

            Assert.Multiple(() =>
            {
--- a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs
+++ b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs
@@ -1,11 +1,6 @@
-using Content.Server.GameTicking;
-using Content.Server.Ghost.Components;
-using Content.Server.Players;
 using Content.Shared.Administration;
 using Content.Shared.CCVar;
-using Content.Shared.Ghost;
 using Robust.Server.GameObjects;
-using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
@@ -17,7 +12,6 @@ namespace Content.Server.Administration.Commands;
 public sealed class PersistenceSave : IConsoleCommand
 {
    [Dependency] private readonly IConfigurationManager _config = default!;
-    [Dependency] private readonly IEntityManager _entities = default!;
    [Dependency] private readonly IEntitySystemManager _system = default!;
    [Dependency] private readonly IMapManager _map = default!;

--- a/Content.Server/Administration/Commands/VariantizeCommand.cs
+++ b/Content.Server/Administration/Commands/VariantizeCommand.cs
@@ -3,7 +3,6 @@ using Content.Shared.Maps;
 using Robust.Shared.Console;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Random;

 namespace Content.Server.Administration.Commands;

@@ -11,7 +10,6 @@ namespace Content.Server.Administration.Commands;
 public sealed class VariantizeCommand : IConsoleCommand
 {
    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;
    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;

    public string Command => "variantize";
--- a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
+++ b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
@@ -2,7 +2,6 @@ using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Content.Shared.Anomaly.Effects;
 using Content.Shared.Anomaly.Effects.Components;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Random;
@@ -12,7 +11,6 @@ namespace Content.Server.Anomaly.Effects;
 public sealed class EntityAnomalySystem : SharedEntityAnomalySystem
 {
    [Dependency] private readonly SharedAnomalySystem _anomaly = default!;
-    [Dependency] private readonly IMapManager _map = default!;
    [Dependency] private readonly IRobustRandom _random = default!;
    [Dependency] private readonly SharedMapSystem _mapSystem = default!;

--- a/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
@@ -1,8 +1,6 @@
-using Content.Server.Atmos;
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.Piping.Components;
 using Content.Shared.Atmos;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using System.Diagnostics.CodeAnalysis;

@@ -15,7 +13,6 @@ public sealed class AirFilterSystem : EntitySystem
 {
    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
    [Dependency] private readonly IMapManager _map = default!;
-    [Dependency] private readonly SharedTransformSystem _transform = default!;

    public override void Initialize()
    {
--- a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs
@@ -1,4 +1,3 @@
-using System.Numerics;
 using Content.Server.Atmos.Components;
 using Content.Server.Body.Components;
 using Content.Server.Body.Systems;
@@ -17,8 +16,6 @@ using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Containers;
-using Robust.Shared.Physics.Systems;
-using Robust.Shared.Player;
 using Robust.Shared.Random;

 namespace Content.Server.Atmos.EntitySystems
@@ -33,7 +30,6 @@ namespace Content.Server.Atmos.EntitySystems
        [Dependency] private readonly SharedContainerSystem _containers = default!;
        [Dependency] private readonly SharedActionsSystem _actions = default!;
        [Dependency] private readonly UserInterfaceSystem _ui = default!;
-        [Dependency] private readonly SharedPhysicsSystem _physics = default!;
        [Dependency] private readonly IRobustRandom _random = default!;
        [Dependency] private readonly ThrowingSystem _throwing = default!;

--- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
+++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
@@ -27,7 +27,6 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems
    public sealed class GasVolumePumpSystem : EntitySystem
    {
        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-        [Dependency] private readonly TransformSystem _transformSystem = default!;
        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
        [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
        [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!;
--- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
+++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
@@ -13,7 +13,6 @@ using Content.Shared.Atmos;
 using Content.Shared.Atmos.Piping.Binary.Components;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.Database;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Content.Shared.Lock;
 using Robust.Server.GameObjects;
@@ -29,8 +28,6 @@ public sealed class GasCanisterSystem : EntitySystem
    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedContainerSystem _container = default!;
-    [Dependency] private readonly SharedHandsSystem _hands = default!;
    [Dependency] private readonly PopupSystem _popup = default!;
    [Dependency] private readonly UserInterfaceSystem _ui = default!;
    [Dependency] private readonly NodeContainerSystem _nodeContainer = default!;
--- a/Content.Server/Body/Systems/BodySystem.cs
+++ b/Content.Server/Body/Systems/BodySystem.cs
@@ -10,8 +10,6 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.Movement.Events;
 using Content.Shared.Movement.Systems;
 using Robust.Shared.Audio;
-using Robust.Shared.Audio.Systems;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using System.Numerics;

@@ -23,9 +21,7 @@ public sealed class BodySystem : SharedBodySystem
    [Dependency] private readonly IGameTiming _gameTiming = default!;
    [Dependency] private readonly HumanoidAppearanceSystem _humanoidSystem = default!;
    [Dependency] private readonly MobStateSystem _mobState = default!;
-    [Dependency] private readonly SharedAudioSystem _audio = default!;
    [Dependency] private readonly SharedMindSystem _mindSystem = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;

    public override void Initialize()
    {
--- a/Content.Server/Body/Systems/InternalsSystem.cs
+++ b/Content.Server/Body/Systems/InternalsSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Body.Components;
-using Content.Server.Hands.Systems;
 using Content.Server.Popups;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
@@ -11,7 +10,6 @@ using Content.Shared.Internals;
 using Content.Shared.Inventory;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;

 namespace Content.Server.Body.Systems;
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -37,7 +37,6 @@ public sealed partial class CargoSystem : SharedCargoSystem
    [Dependency] private readonly PricingSystem _pricing = default!;
    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedTransformSystem _xformSystem = default!;
    [Dependency] private readonly ShuttleConsoleSystem _console = default!;
    [Dependency] private readonly StackSystem _stack = default!;
    [Dependency] private readonly StationSystem _station = default!;
--- a/Content.Server/Cargo/Systems/PricingSystem.cs
+++ b/Content.Server/Cargo/Systems/PricingSystem.cs
@@ -12,7 +12,6 @@ using Content.Shared.Mobs.Systems;
 using Content.Shared.Stacks;
 using Robust.Shared.Console;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
@@ -27,7 +26,6 @@ public sealed class PricingSystem : EntitySystem
 {
    [Dependency] private readonly IComponentFactory _factory = default!;
    [Dependency] private readonly IConsoleHost _consoleHost = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
    [Dependency] private readonly BodySystem _bodySystem = default!;
    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
--- a/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
+++ b/Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
@@ -4,7 +4,6 @@ using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Containers;
 using Robust.Shared.Map;
-using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using System.Numerics;

@@ -12,8 +11,6 @@ namespace Content.Server.Chemistry.Containers.EntitySystems;

 public sealed partial class SolutionContainerSystem : SharedSolutionContainerSystem
 {
-    [Dependency] private readonly INetManager _netManager = default!;
-
    public override void Initialize()
    {
        base.Initialize();
--- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
@@ -1,4 +1,3 @@
-using Content.Server.Administration.Logs;
 using Content.Server.Chemistry.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Nutrition.EntitySystems;
@@ -30,7 +29,6 @@ namespace Content.Server.Chemistry.EntitySystems
        [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
        [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-        [Dependency] private readonly IAdminLogManager _adminLogger = default!;
        [Dependency] private readonly OpenableSystem _openable = default!;

        public override void Initialize()
--- a/Content.Server/Decals/Commands/EditDecalCommand.cs
+++ b/Content.Server/Decals/Commands/EditDecalCommand.cs
@@ -2,7 +2,6 @@ using System.Numerics;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;

 namespace Content.Server.Decals;
@@ -11,7 +10,6 @@ namespace Content.Server.Decals;
 public sealed class EditDecalCommand : IConsoleCommand
 {
    [Dependency] private readonly IEntityManager _entManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;

    public string Command => "editdecal";
    public string Description => "Edits a decal.";
--- a/Content.Server/Decals/Commands/RemoveDecalCommand.cs
+++ b/Content.Server/Decals/Commands/RemoveDecalCommand.cs
@@ -1,9 +1,7 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using SQLitePCL;

 namespace Content.Server.Decals.Commands
 {
@@ -11,7 +9,6 @@ namespace Content.Server.Decals.Commands
    public sealed class RemoveDecalCommand : IConsoleCommand
    {
        [Dependency] private readonly IEntityManager _entManager = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;

        public string Command => "rmdecal";
        public string Description => "removes a decal";
--- a/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Disposal.Tube;
 using Content.Server.Disposal.Tube.Components;
@@ -12,14 +11,12 @@ using Robust.Shared.Containers;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Random;

 namespace Content.Server.Disposal.Unit.EntitySystems
 {
    public sealed class DisposableSystem : EntitySystem
    {
        [Dependency] private readonly ThrowingSystem _throwing = default!;
-        [Dependency] private readonly IRobustRandom _random = default!;
        [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
        [Dependency] private readonly DamageableSystem _damageable = default!;
        [Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!;
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
@@ -1,4 +1,3 @@
-using System.Linq;
 using System.Numerics;
 using Content.Shared.CCVar;
 using Content.Shared.Damage;
@@ -17,7 +16,6 @@ using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent;
-using Content.Server.Atmos.Components;
 using Content.Server.Atmos.EntitySystems;

 namespace Content.Server.Explosion.EntitySystems;
@@ -48,13 +46,6 @@ public sealed partial class ExplosionSystem
    /// </summary>
    private Explosion? _activeExplosion;

-    /// <summary>
-    ///     While processing an explosion, the "progress" is sent to clients, so that the explosion fireball effect
-    ///     syncs up with the damage. When the tile iteration increments, an update needs to be sent to clients.
-    ///     This integer keeps track of the last value sent to clients.
-    /// </summary>
-    private int _previousTileIteration;
-
    /// <summary>
    /// This list is used when raising <see cref="BeforeExplodeEvent"/> to avoid allocating a new list per event.
    /// </summary>
@@ -112,8 +103,6 @@ public sealed partial class ExplosionSystem
                if (_activeExplosion == null)
                    continue;

-                _previousTileIteration = 0;
-
                // just a lil nap
                if (SleepNodeSys)
                {
--- a/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
+++ b/Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
@@ -1,10 +1,8 @@
 using Content.Shared.StatusEffect;
 using Content.Shared.Inventory;
-using Content.Shared.Item;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Tools.Components;
-using Content.Shared.Item.ItemToggle;
 using Content.Shared.Item.ItemToggle.Components;

 namespace Content.Server.Eye.Blinding.EyeProtection
@@ -13,7 +11,6 @@ namespace Content.Server.Eye.Blinding.EyeProtection
    {
        [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
        [Dependency] private readonly BlindableSystem _blindingSystem = default!;
-        [Dependency] private readonly SharedItemToggleSystem _itemToggle = default!;
        
        public override void Initialize()
        {
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -1,23 +1,16 @@
 using System.Linq;
-using System.Numerics;
 using Content.Server.Gateway.Components;
 using Content.Server.Parallax;
 using Content.Server.Procedural;
-using Content.Server.Salvage;
 using Content.Shared.CCVar;
 using Content.Shared.Dataset;
 using Content.Shared.Maps;
-using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
-using Content.Shared.Physics;
 using Content.Shared.Procedural;
 using Content.Shared.Salvage;
 using Robust.Shared.Configuration;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Physics.Collision.Shapes;
-using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Systems;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
@@ -40,7 +33,6 @@ public sealed class GatewayGeneratorSystem : EntitySystem
    [Dependency] private readonly DungeonSystem _dungeon = default!;
    [Dependency] private readonly GatewaySystem _gateway = default!;
    [Dependency] private readonly MetaDataSystem _metadata = default!;
-    [Dependency] private readonly RestrictedRangeSystem _restricted = default!;
    [Dependency] private readonly SharedMapSystem _maps = default!;
    [Dependency] private readonly TileSystem _tile = default!;

--- a/Content.Server/Instruments/InstrumentComponent.cs
+++ b/Content.Server/Instruments/InstrumentComponent.cs
@@ -1,6 +1,5 @@
 using Content.Server.UserInterface;
 using Content.Shared.Instruments;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;

 namespace Content.Server.Instruments;
--- a/Content.Server/Interaction/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.ActionBlocker;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
@@ -14,7 +13,6 @@ namespace Content.Server.Interaction
    [UsedImplicitly]
    public sealed partial class InteractionSystem : SharedInteractionSystem
    {
-        [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
        [Dependency] private readonly SharedContainerSystem _container = default!;
        [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;

--- a/Content.Server/Mech/Systems/MechSystem.cs
+++ b/Content.Server/Mech/Systems/MechSystem.cs
@@ -20,7 +20,6 @@ using Content.Server.Body.Systems;
 using Robust.Server.Containers;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
-using Robust.Shared.Map;
 using Robust.Shared.Player;

 namespace Content.Server.Mech.Systems;
@@ -33,8 +32,6 @@ public sealed partial class MechSystem : SharedMechSystem
    [Dependency] private readonly BatterySystem _battery = default!;
    [Dependency] private readonly ContainerSystem _container = default!;
    [Dependency] private readonly DamageableSystem _damageable = default!;
-    [Dependency] private readonly IMapManager _map = default!;
-    [Dependency] private readonly MapSystem _mapSystem = default!;
    [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
    [Dependency] private readonly SharedPopupSystem _popup = default!;
    [Dependency] private readonly UserInterfaceSystem _ui = default!;
--- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
+++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
@@ -9,7 +9,6 @@ using Content.Server.Popups;
 using Content.Server.Station.Systems;
 using Content.Shared.Damage;
 using Content.Shared.DeviceNetwork;
-using Content.Shared.Emp;
 using Content.Shared.Examine;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Medical.SuitSensor;
@@ -27,7 +26,6 @@ public sealed class SuitSensorSystem : EntitySystem
 {
    [Dependency] private readonly IGameTiming _gameTiming = default!;
    [Dependency] private readonly IRobustRandom _random = default!;
-    [Dependency] private readonly CrewMonitoringServerSystem _monitoringServerSystem = default!;
    [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
    [Dependency] private readonly IdCardSystem _idCardSystem = default!;
    [Dependency] private readonly MobStateSystem _mobStateSystem = default!;
--- a/Content.Server/Ninja/Systems/StunProviderSystem.cs
+++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs
@@ -1,14 +1,11 @@
 using Content.Server.Ninja.Events;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Damage;
-using Content.Shared.Damage.Prototypes;
 using Content.Shared.Interaction;
 using Content.Shared.Ninja.Components;
 using Content.Shared.Ninja.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Stunnable;
-using Content.Shared.Whitelist;
-using Robust.Shared.Audio;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Timing;
@@ -23,7 +20,6 @@ public sealed class StunProviderSystem : SharedStunProviderSystem
    [Dependency] private readonly BatterySystem _battery = default!;
    [Dependency] private readonly DamageableSystem _damageable = default!;
    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
    [Dependency] private readonly SharedAudioSystem _audio = default!;
    [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!;
    [Dependency] private readonly SharedPopupSystem _popup = default!;
--- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
@@ -5,7 +5,6 @@ using Content.Shared.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;
-using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -19,7 +18,6 @@ namespace Content.Server.Nutrition.EntitySystems
        [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
        [Dependency] private readonly SharedAudioSystem _audio = default!;
        [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
        [Dependency] private readonly TransformSystem _xformSystem = default!;

        public override void Initialize()
--- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
+++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Objectives.Components;
 using Content.Server.Warps;
 using Content.Shared.Objectives.Components;
-using Content.Shared.Mind;
 using Content.Shared.Ninja.Components;
 using Robust.Shared.Random;
 using Content.Server.Roles;
@@ -16,7 +15,6 @@ public sealed class NinjaConditionsSystem : EntitySystem
 {
    [Dependency] private readonly MetaDataSystem _metaData = default!;
    [Dependency] private readonly NumberObjectiveSystem _number = default!;
-    [Dependency] private readonly SharedMindSystem _mind = default!;
    [Dependency] private readonly IRobustRandom _random = default!;

    public override void Initialize()
--- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs
+++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs
@@ -2,7 +2,6 @@ using Content.Server.Administration.Logs;
 using Content.Server.Chat.Managers;
 using Content.Server.Projectiles;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Map;
 using Robust.Shared.Timing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
@@ -13,7 +12,6 @@ public sealed partial class ParticleAcceleratorSystem : EntitySystem
 {
    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
    [Dependency] private readonly IConfigurationManager _cfg = default!;
    [Dependency] private readonly IChatManager _chat = default!;
    [Dependency] private readonly ProjectileSystem _projectileSystem = default!;
--- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs
+++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs
@@ -32,7 +32,6 @@ public sealed partial class PolymorphSystem : EntitySystem
    [Dependency] private readonly IPrototypeManager _proto = default!;
    [Dependency] private readonly IGameTiming _gameTiming = default!;
    [Dependency] private readonly ActionsSystem _actions = default!;
-    [Dependency] private readonly ActionContainerSystem _actionContainer = default!;
    [Dependency] private readonly AudioSystem _audio = default!;
    [Dependency] private readonly SharedBuckleSystem _buckle = default!;
    [Dependency] private readonly ContainerSystem _container = default!;
--- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
+++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.Power.Components;
-using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
@@ -9,8 +8,6 @@ namespace Content.Server.Power.EntitySystems
 {
    public sealed class ExtensionCableSystem : EntitySystem
    {
-        [Dependency] private readonly IMapManager _mapManager = default!;
-
        public override void Initialize()
        {
            base.Initialize();
--- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs
+++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs
@@ -1,5 +1,4 @@
 using Content.Server.DoAfter;
-using Content.Server.NodeContainer.NodeGroups;
 using Content.Server.Popups;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
@@ -28,7 +27,6 @@ public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem
    [Dependency] private readonly GeneratorSystem _generator = default!;
    [Dependency] private readonly PowerSwitchableSystem _switchable = default!;
    [Dependency] private readonly ActiveGeneratorRevvingSystem _revving = default!;
-    [Dependency] private readonly PowerNetSystem _powerNet = default!;

    public override void Initialize()
    {
--- a/Content.Server/RatKing/RatKingSystem.cs
+++ b/Content.Server/RatKing/RatKingSystem.cs
@@ -11,7 +11,6 @@ using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
 using Content.Shared.Pointing;
 using Content.Shared.RatKing;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Random;

@@ -26,7 +25,6 @@ namespace Content.Server.RatKing
        [Dependency] private readonly HungerSystem _hunger = default!;
        [Dependency] private readonly NPCSystem _npc = default!;
        [Dependency] private readonly PopupSystem _popup = default!;
-        [Dependency] private readonly TransformSystem _xform = default!;

        public override void Initialize()
        {
--- a/Content.Server/Roles/RemoveRoleCommand.cs
+++ b/Content.Server/Roles/RemoveRoleCommand.cs
@@ -5,14 +5,12 @@ using Content.Shared.Roles;
 using Content.Shared.Roles.Jobs;
 using Robust.Server.Player;
 using Robust.Shared.Console;
-using Robust.Shared.Prototypes;

 namespace Content.Server.Roles
 {
    [AdminCommand(AdminFlags.Admin)]
    public sealed class RemoveRoleCommand : IConsoleCommand
    {
-        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
        [Dependency] private readonly IEntityManager _entityManager = default!;

        public string Command => "rmrole";
--- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
+++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
@@ -11,7 +11,6 @@ namespace Content.Server.Sandbox.Commands
    [AnyCommand]
    public sealed class ColorNetworkCommand : IConsoleCommand
    {
-        [Dependency] private readonly IAdminManager _adminManager = default!;
        [Dependency] private readonly IEntityManager _entManager = default!;

        public string Command => "colornetwork";
--- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
+++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -1,13 +1,10 @@
 using System.Linq;
-using System.Numerics;
 using Content.Server.Administration;
 using Content.Server.GameTicking;
 using Content.Server.GameTicking.Events;
 using Content.Server.Parallax;
-using Content.Server.DeviceNetwork;
 using Content.Server.DeviceNetwork.Components;
 using Content.Server.DeviceNetwork.Systems;
-using Content.Server.Salvage;
 using Content.Server.Screens.Components;
 using Content.Server.Shuttles.Components;
 using Content.Server.Shuttles.Events;
@@ -22,7 +19,6 @@ using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
 using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
-using Robust.Shared.Spawners;
 using Content.Shared.Tiles;
 using Robust.Server.GameObjects;
 using Robust.Shared.Collections;
@@ -51,7 +47,6 @@ public sealed class ArrivalsSystem : EntitySystem
    [Dependency] private readonly GameTicker _ticker = default!;
    [Dependency] private readonly MapLoaderSystem _loader = default!;
    [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!;
-    [Dependency] private readonly RestrictedRangeSystem _restricted = default!;
    [Dependency] private readonly SharedTransformSystem _transform = default!;
    [Dependency] private readonly ShuttleSystem _shuttles = default!;
    [Dependency] private readonly StationSpawningSystem _stationSpawning = default!;
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Content.Server.Audio;
-using Content.Server.Construction;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Shuttles.Components;
@@ -25,7 +24,6 @@ namespace Content.Server.Shuttles.Systems;
 public sealed class ThrusterSystem : EntitySystem
 {
    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
    [Dependency] private readonly AmbientSoundSystem _ambient = default!;
    [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
--- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs
+++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs
@@ -19,7 +19,6 @@ using Content.Shared.Silicons.Laws.Components;
 using Content.Shared.Stunnable;
 using Content.Shared.Wires;
 using Robust.Server.GameObjects;
-using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Toolshed;
@@ -38,7 +37,6 @@ public sealed class SiliconLawSystem : SharedSiliconLawSystem
    [Dependency] private readonly SharedStunSystem _stunSystem = default!;
    [Dependency] private readonly IEntityManager _entityManager = default!;
    [Dependency] private readonly SharedRoleSystem _roles = default!;
-    [Dependency] private readonly SharedAudioSystem _audioSystem = default!;

    /// <inheritdoc/>
    public override void Initialize()
--- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
@@ -24,7 +24,6 @@ public sealed class RadiationCollectorSystem : EntitySystem
    [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
    [Dependency] private readonly UseDelaySystem _useDelay = default!;
-    [Dependency] private readonly BatterySystem _batterySystem = default!;

    private const string GasTankContainer = "gas_tank";

--- a/Content.Server/Spreader/SpreaderSystem.cs
+++ b/Content.Server/Spreader/SpreaderSystem.cs
@@ -18,7 +18,6 @@ namespace Content.Server.Spreader;
 /// </summary>
 public sealed class SpreaderSystem : EntitySystem
 {
-    [Dependency] private readonly IMapManager _mapManager = default!;
    [Dependency] private readonly IPrototypeManager _prototype = default!;
    [Dependency] private readonly IRobustRandom _robustRandom = default!;
    [Dependency] private readonly SharedMapSystem _map = default!;
--- a/Content.Server/Station/Systems/StationJobsSystem.cs
+++ b/Content.Server/Station/Systems/StationJobsSystem.cs
@@ -25,7 +25,6 @@ public sealed partial class StationJobsSystem : EntitySystem
    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
    [Dependency] private readonly IRobustRandom _random = default!;
    [Dependency] private readonly GameTicker _gameTicker = default!;
-    [Dependency] private readonly StationSystem _stationSystem = default!;
    [Dependency] private readonly IPlayerManager _playerManager = default!;

    /// <inheritdoc/>
--- a/Content.Server/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -29,7 +29,6 @@ public sealed class StationSystem : EntitySystem
 {
    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
    [Dependency] private readonly ILogManager _logManager = default!;
-    [Dependency] private readonly IMapManager _mapManager = default!;
    [Dependency] private readonly IPlayerManager _player = default!;
    [Dependency] private readonly IRobustRandom _random = default!;
    [Dependency] private readonly ChatSystem _chatSystem = default!;
--- a/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
+++ b/Content.Server/StationEvents/Events/NinjaSpawnRule.cs
@@ -2,10 +2,8 @@ using Content.Server.GameTicking.Rules.Components;
 using Content.Server.Ninja.Systems;
 using Content.Server.Station.Components;
 using Content.Server.StationEvents.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
-using Robust.Shared.Random;

 namespace Content.Server.StationEvents.Events;

@@ -14,7 +12,6 @@ namespace Content.Server.StationEvents.Events;
 /// </summary>
 public sealed class NinjaSpawnRule : StationEventSystem<NinjaSpawnRuleComponent>
 {
-    [Dependency] private readonly SpaceNinjaSystem _ninja = default!;
    [Dependency] private readonly SharedTransformSystem _transform = default!;

    protected override void Started(EntityUid uid, NinjaSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args)
--- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
+++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
@@ -1,10 +1,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Speech;
 using Content.Shared.Speech;
-using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Random;
 using Robust.Shared.Timing;

 namespace Content.Server.SurveillanceCamera;
@@ -18,8 +15,6 @@ public sealed class SurveillanceCameraSpeakerSystem : EntitySystem
    [Dependency] private readonly SpeechSoundSystem _speechSound = default!;
    [Dependency] private readonly ChatSystem _chatSystem = default!;
    [Dependency] private readonly IGameTiming _gameTiming = default!;
-    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
-    [Dependency] private readonly IRobustRandom _random = default!;

    /// <inheritdoc/>
    public override void Initialize()
--- a/Content.Server/Temperature/Systems/TemperatureSystem.cs
+++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs
@@ -11,7 +11,6 @@ using Content.Shared.Database;
 using Content.Shared.Inventory;
 using Content.Shared.Rejuvenate;
 using Content.Shared.Temperature;
-using Robust.Server.GameObjects;
 using Robust.Shared.Physics.Components;

 namespace Content.Server.Temperature.Systems;
@@ -22,7 +21,6 @@ public sealed class TemperatureSystem : EntitySystem
    [Dependency] private readonly AtmosphereSystem _atmosphere = default!;
    [Dependency] private readonly DamageableSystem _damageable = default!;
    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;

    /// <summary>
    ///     All the components that will have their damage updated at the end of the tick.
--- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
+++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Numerics;
-using Content.Server.Administration.Logs;
 using Content.Server.Cargo.Systems;
 using Content.Server.Interaction;
 using Content.Server.Power.EntitySystems;
@@ -29,7 +28,6 @@ namespace Content.Server.Weapons.Ranged.Systems;

 public sealed partial class GunSystem : SharedGunSystem
 {
-    [Dependency] private readonly IAdminLogManager _adminLogger = default!;
    [Dependency] private readonly IComponentFactory _factory = default!;
    [Dependency] private readonly BatterySystem _battery = default!;
    [Dependency] private readonly DamageExamineSystem _damageExamine = default!;
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs
@@ -1,7 +1,6 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Events;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
-using Robust.Server.GameObjects;

 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;

@@ -9,7 +8,6 @@ public sealed class ArtifactGasTriggerSystem : EntitySystem
 {
    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
    [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
-    [Dependency] private readonly TransformSystem _transformSystem = default!;

    public override void Initialize()
    {
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs
@@ -3,7 +3,6 @@ using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Temperature;
 using Content.Shared.Weapons.Melee.Events;
-using Robust.Server.GameObjects;

 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;

@@ -11,7 +10,6 @@ public sealed class ArtifactHeatTriggerSystem : EntitySystem
 {
    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
    [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
-    [Dependency] private readonly TransformSystem _transformSystem = default!;

    public override void Initialize()
    {
--- a/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs
+++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs
@@ -1,6 +1,5 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Components;
-using Robust.Server.GameObjects;

 namespace Content.Server.Xenoarchaeology.XenoArtifacts.Triggers.Systems;

@@ -11,7 +10,6 @@ public sealed class ArtifactPressureTriggerSystem : EntitySystem
 {
    [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
    [Dependency] private readonly ArtifactSystem _artifactSystem = default!;
-    [Dependency] private readonly TransformSystem _transformSystem = default!;

    public override void Update(float frameTime)
    {
--- a/Content.Server/Zombies/ZombieSystem.cs
+++ b/Content.Server/Zombies/ZombieSystem.cs
@@ -2,9 +2,7 @@ using System.Linq;
 using Content.Server.Body.Systems;
 using Content.Server.Chat;
 using Content.Server.Chat.Systems;
-using Content.Server.Cloning;
 using Content.Server.Emoting.Systems;
-using Content.Server.Inventory;
 using Content.Server.Speech.EntitySystems;
 using Content.Shared.Bed.Sleep;
 using Content.Shared.Cloning;
@@ -31,7 +29,6 @@ namespace Content.Server.Zombies
        [Dependency] private readonly IRobustRandom _random = default!;
        [Dependency] private readonly BloodstreamSystem _bloodstream = default!;
        [Dependency] private readonly DamageableSystem _damageable = default!;
-        [Dependency] private readonly ServerInventorySystem _inv = default!;
        [Dependency] private readonly ChatSystem _chat = default!;
        [Dependency] private readonly AutoEmoteSystem _autoEmote = default!;
        [Dependency] private readonly EmoteOnDamageSystem _emoteOnDamage = default!;
--- a/Content.Shared/Climbing/Systems/ClimbSystem.cs
+++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs
@@ -34,7 +34,6 @@ public sealed partial class ClimbSystem : VirtualController
    [Dependency] private readonly DamageableSystem _damageableSystem = default!;
    [Dependency] private readonly FixtureSystem _fixtureSystem = default!;
    [Dependency] private readonly SharedAudioSystem _audio = default!;
-    [Dependency] private readonly SharedBodySystem _bodySystem = default!;
    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
    [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
--- a/Content.Shared/Construction/SharedFlatpackSystem.cs
+++ b/Content.Shared/Construction/SharedFlatpackSystem.cs
@@ -114,8 +114,7 @@ public abstract class SharedFlatpackSystem : EntitySystem
        if (!Resolve(ent, ref ent.Comp))
            return;

-        EntProtoId machinePrototypeId;
-        string? entityPrototype;
+        var machinePrototypeId = new EntProtoId();
        if (TryComp<MachineBoardComponent>(board, out var machineBoard) && machineBoard.Prototype is not null)
            machinePrototypeId = machineBoard.Prototype;
        else if (TryComp<ComputerBoardComponent>(board, out var computerBoard) && computerBoard.Prototype is not null)
--- a/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
+++ b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
@@ -1,6 +1,5 @@
 using System.Numerics;
 using Robust.Shared.Map;
-using Robust.Shared.Map.Components;

 namespace Content.Shared.Coordinates
 {
@@ -20,17 +19,5 @@ namespace Content.Shared.Coordinates
        {
            return new EntityCoordinates(id, x, y);
        }
-
-        [Obsolete]
-        public static EntityCoordinates ToCoordinates(this MapGridComponent grid, float x, float y)
-        {
-            return ToCoordinates(grid.Owner, x, y);
-        }
-
-        [Obsolete]
-        public static EntityCoordinates ToCoordinates(this MapGridComponent grid)
-        {
-            return ToCoordinates(grid.Owner, Vector2.Zero);
-        }
    }
 }
--- a/Content.Shared/Maps/TurfSystem.cs
+++ b/Content.Shared/Maps/TurfSystem.cs
@@ -13,7 +13,6 @@ public sealed class TurfSystem : EntitySystem
 {
    [Dependency] private readonly EntityLookupSystem _entityLookup = default!;
    [Dependency] private readonly SharedTransformSystem _transform = default!;
-    [Dependency] private readonly IMapManager _mapMan = default!;

    /// <summary>
    ///     Returns true if a given tile is blocked by physics-enabled entities.
--- a/Content.Shared/RCD/Systems/RCDSystem.cs
+++ b/Content.Shared/RCD/Systems/RCDSystem.cs
@@ -25,7 +25,6 @@ namespace Content.Shared.RCD.Systems;
 public sealed class RCDSystem : EntitySystem
 {
    [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IMapManager _mapMan = default!;
    [Dependency] private readonly INetManager _net = default!;
    [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
    [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!;
@@ -39,7 +38,7 @@ public sealed class RCDSystem : EntitySystem
    [Dependency] private readonly TurfSystem _turf = default!;
    [Dependency] private readonly IGameTiming _gameTiming = default!;

-    private readonly int RcdModeCount = Enum.GetValues(typeof(RcdMode)).Length;
+    private readonly int _rcdModeCount = Enum.GetValues(typeof(RcdMode)).Length;

    public override void Initialize()
    {
@@ -310,7 +309,7 @@ public sealed class RCDSystem : EntitySystem
        _audio.PlayPredicted(comp.SwapModeSound, uid, user);

        var mode = (int) comp.Mode;
-        mode = ++mode % RcdModeCount;
+        mode = ++mode % _rcdModeCount;
        comp.Mode = (RcdMode) mode;
        Dirty(uid, comp);

--- a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
+++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
@@ -1,4 +1,3 @@
-using Content.Shared.Interaction;
 using Content.Shared.Popups;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Remotes.Components;
@@ -8,8 +7,6 @@ namespace Content.Shared.Remotes.EntitySystems;
 public abstract class SharedDoorRemoteSystem : EntitySystem
 {
    [Dependency] protected readonly SharedPopupSystem Popup = default!;
-    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
-    // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!;

    public override void Initialize()
    {
--- a/Content.Shared/Shuttles/Components/IFFComponent.cs
+++ b/Content.Shared/Shuttles/Components/IFFComponent.cs
@@ -10,11 +10,6 @@ namespace Content.Shared.Shuttles.Components;
 [Access(typeof(SharedShuttleSystem))]
 public sealed partial class IFFComponent : Component
 {
-    /// <summary>
-    /// Should we show IFF by default?
-    /// </summary>
-    public const bool ShowIFFDefault = true;
-
    public static readonly Color SelfColor = Color.MediumSpringGreen;

    /// <summary>
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
@@ -28,11 +28,6 @@ public abstract partial class SharedShuttleSystem

    public string? GetIFFLabel(EntityUid gridUid, bool self = false, IFFComponent? component = null)
    {
-        if (!IFFComponent.ShowIFFDefault)
-        {
-            return null;
-        }
-
        var entName = MetaData(gridUid).EntityName;

        if (self)
--- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
+++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
@@ -146,7 +146,6 @@ public abstract partial class SharedShuttleSystem : EntitySystem

        // Just checks if any grids inside of a buffer range at the target position.
        _grids.Clear();
-        var ftlRange = FTLRange;
        var mapCoordinates = coordinates.ToMap(EntityManager, XformSystem);

        var ourPos = Maps.GetGridPosition((shuttleUid, shuttlePhysics, shuttleXform));
--- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
+++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
@@ -102,7 +102,7 @@ public abstract partial class SharedGunSystem
    // TODO: Actions need doing for guns anyway.
    private sealed partial class CycleModeEvent : InstantActionEvent
    {
-        public SelectiveFire Mode;
+        public SelectiveFire Mode = default;
    }

    private void OnCycleMode(EntityUid uid, GunComponent component, CycleModeEvent args)