]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Reduced Warning Count By 130 For Full Rebuilds (#26518)
authorJake Huxell <JakeHuxell@pm.me>
Fri, 29 Mar 2024 05:28:16 +0000 (01:28 -0400)
committerGitHub <noreply@github.com>
Fri, 29 Mar 2024 05:28:16 +0000 (16:28 +1100)
* 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

69 files changed:
Content.Client/Alerts/ClientAlertsSystem.cs
Content.Client/Clothing/ClientClothingSystem.cs
Content.Client/Doors/DoorSystem.cs
Content.Client/IconSmoothing/IconSmoothSystem.cs
Content.Client/Items/Systems/ItemSystem.cs
Content.Client/NPC/PathfindingSystem.cs
Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs
Content.IntegrationTests/PoolManager.cs
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
Content.IntegrationTests/Tests/Power/PowerTest.cs
Content.IntegrationTests/Tests/PrototypeSaveTest.cs
Content.Server/Administration/Commands/PersistenceSaveCommand.cs
Content.Server/Administration/Commands/VariantizeCommand.cs
Content.Server/Anomaly/Effects/EntityAnomalySystem.cs
Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
Content.Server/Atmos/EntitySystems/GasTankSystem.cs
Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs
Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs
Content.Server/Body/Systems/BodySystem.cs
Content.Server/Body/Systems/InternalsSystem.cs
Content.Server/Cargo/Systems/CargoSystem.cs
Content.Server/Cargo/Systems/PricingSystem.cs
Content.Server/Chemistry/Containers/EntitySystems/SolutionContainerSystem.cs
Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
Content.Server/Decals/Commands/EditDecalCommand.cs
Content.Server/Decals/Commands/RemoveDecalCommand.cs
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs
Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs
Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
Content.Server/Instruments/InstrumentComponent.cs
Content.Server/Interaction/InteractionSystem.cs
Content.Server/Mech/Systems/MechSystem.cs
Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
Content.Server/Ninja/Systems/StunProviderSystem.cs
Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
Content.Server/Objectives/Systems/NinjaConditionsSystem.cs
Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs
Content.Server/Polymorph/Systems/PolymorphSystem.cs
Content.Server/Power/EntitySystems/ExtensionCableSystem.cs
Content.Server/Power/Generator/PortableGeneratorSystem.cs
Content.Server/RatKing/RatKingSystem.cs
Content.Server/Roles/RemoveRoleCommand.cs
Content.Server/Sandbox/Commands/ColorNetworkCommand.cs
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
Content.Server/Shuttles/Systems/ThrusterSystem.cs
Content.Server/Silicons/Laws/SiliconLawSystem.cs
Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs
Content.Server/Spreader/SpreaderSystem.cs
Content.Server/Station/Systems/StationJobsSystem.cs
Content.Server/Station/Systems/StationSystem.cs
Content.Server/StationEvents/Events/NinjaSpawnRule.cs
Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs
Content.Server/Temperature/Systems/TemperatureSystem.cs
Content.Server/Weapons/Ranged/Systems/GunSystem.cs
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactGasTriggerSystem.cs
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactHeatTriggerSystem.cs
Content.Server/Xenoarchaeology/XenoArtifacts/Triggers/Systems/ArtifactPressureTriggerSystem.cs
Content.Server/Zombies/ZombieSystem.cs
Content.Shared/Climbing/Systems/ClimbSystem.cs
Content.Shared/Construction/SharedFlatpackSystem.cs
Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
Content.Shared/Maps/TurfSystem.cs
Content.Shared/RCD/Systems/RCDSystem.cs
Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs
Content.Shared/Shuttles/Components/IFFComponent.cs
Content.Shared/Shuttles/Systems/SharedShuttleSystem.IFF.cs
Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs

index 9c4ebb9cd2ba62c1bde7f553334f61eb9e6e72c6..223bf7876ac07b07eff7243f3f63e91eeda1745b 100644 (file)
@@ -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!;
 
index fbe9d5ec5bb28474c732064cc18421e320919622..7e78ac7d707e34bccae6d8770b9e49f9ce46c9f9 100644 (file)
@@ -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;
index 473ae97059aaa8149ede60828f0210d2d7aa8cd8..bc52730b0e7b2a229178808882509c642a7cab12 100644 (file)
@@ -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()
index 20a80c42a3e4b3006f3c15db31f7f185e4941723..4b02560846505c2eb5e4550253443e63b8b458c8 100644 (file)
@@ -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();
 
index e406ba2b5574639d6d2d5a73d9c8ee0716397cf1..5e60d06d0ce1ded1c9beca86439aed7b91d2635c 100644 (file)
@@ -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)
index 7bf3df1f0b97217ddf35ef2c59b1da48221aa15a..709601a57b6ef8ac2ba524affa3e5455d9f677b9 100644 (file)
@@ -289,7 +289,6 @@ namespace Content.Client.NPC
 
                 var invGridMatrix = gridXform.InvWorldMatrix;
                 DebugPathPoly? nearest = null;
-                var nearestDistance = float.MaxValue;
 
                 foreach (var poly in tile)
                 {
index fed2a9f17165229b367763a080c7399978bead2d..284c6681905fd26283131f2d8fbaffb76bcd71b7 100644 (file)
@@ -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)
         {
index 6046ed65e44b1bed9afc4a30c2c75d0c492bcc1c..b544fe28547e91a78924074353a9283c291d16a6 100644 (file)
@@ -306,11 +306,6 @@ public static partial class PoolManager
                 Pairs[fallback!] = true;
             }
 
-            if (fallback == null && _pairId > 8)
-            {
-                var x = 2;
-            }
-
             return fallback;
         }
     }
index 3213bba51f93419823a2df35317808cec643cde7..611af6738095b9d9c21c106bc8c7e4cd54503df4 100644 (file)
@@ -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);
index d4e2cde9b0d541712986c60fbc651336f53b29be..a6af3e6a65bd6780b1edb7f82ae4660baa766b60 100644 (file)
@@ -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);
index 6096c497efac1eb604400cf5e8a6fc373e35c23a..e4a9c1a840dfc1f1648c28a69274f21dc5268a32 100644 (file)
@@ -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(() =>
             {
index 2684e85d5f13ce01646d5f62219f2396dd4cf025..7ef1932c56809db8e4d83debebae0f3a98550172 100644 (file)
@@ -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!;
 
index 7aabd76335e8f52ecc1bbc979be646437dd66ced..3f9b7efd07ed49b999c03b06c2f413f3556a6928 100644 (file)
@@ -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";
index 7c397d68887297f50fce1c6ed12f76f08b613840..90a655fbba764adef8d69d72825f275a5b2164d9 100644 (file)
@@ -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!;
 
index 416045fc5ed9fc395bf00168ad491b2f1c78236b..d947e60b6dad38fd565a1eaeacc5e42b8623fb79 100644 (file)
@@ -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()
     {
index dfe84473402fc2c4fbb038b11e65055846edf1a1..aed00432e1f5d1e1ec6692d12f4a1a73e651d2d5 100644 (file)
@@ -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!;
 
index 10b9cccc0991defc349331bb70d1df5a6ebd866c..8e478bd2b5456444216b905b30da04aa98b510ee 100644 (file)
@@ -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!;
index ad647fad1b8fd20e8fe9ffd7313f48742c6ea84b..170586339db6e52bd9dd8d9d4e5d57d558f5beb8 100644 (file)
@@ -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!;
index 92074d06ffb4eab64b1210386da87ee030117cb3..e10158cf357cecbafefeb0423b2d2385fc637189 100644 (file)
@@ -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()
     {
index 999aa40077b455b1e0eec79d8457ca18080fdcb6..972967fb15a4a0bcc076675aec1367c7c52265c9 100644 (file)
@@ -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;
index d4be68efc85631a491ed04884e25c8b4ce2f563d..badad9e57b4b55bdfdce06599b8e1f1c8b382b2a 100644 (file)
@@ -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!;
index 6fb36c960834c31b3ef9125fc560ed1f98c9a2e3..9e1970d63c9e3601da07c18541e2596cdd5509f2 100644 (file)
@@ -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!;
index 7926121c2b3345bd8a5c8b9dbfcf5f197cfaa0bb..468212f5eafb5d1287177fb3a145d93de4206d00 100644 (file)
@@ -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();
index b93498fe31bcdded5256240bdf9f85c1eaf38d8e..a8583e6bcb3fcbfea32504c2e96965efdec4a7b8 100644 (file)
@@ -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()
index 2344b0a367ed43c3ae8c49b47963e13d1b2053fd..812e131832ea0c87f0e88723a87cc93bc125a522 100644 (file)
@@ -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.";
index 3fc5c75e10ed0351090ed47a3cc910bfad31bb05..fc6af4d009df7ae9b47c6276d39df2562d8c3a0c 100644 (file)
@@ -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";
index eb3cda4db9b48deecc5b566a2b3199d24224fc35..38e3923803941aa35082a5c323106f525ce150a4 100644 (file)
@@ -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!;
index 85d705846e1976b65832f7b6178ae162a99cf503..60db6bdf5bbafd688505df05865ba7c611b2522b 100644 (file)
@@ -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)
                 {
index 24ee2b71541cd9a0d58f1da05677468938a9a2d8..2d54c03b51bc6e0748ba28cf629e31e0fcb2d25d 100644 (file)
@@ -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()
         {
index 7558f7afc0bcce3feb1340f5142fd836a5dc2638..c934fb66bfb061b27be79b28ee07323afceffccb 100644 (file)
@@ -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!;
 
index 4302ab6791b1ba8b25ba730e58d409079f0eb665..1b7913386d2cc0c4243ee870231f5ec3f9c50a0d 100644 (file)
@@ -1,6 +1,5 @@
 using Content.Server.UserInterface;
 using Content.Shared.Instruments;
-using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 
 namespace Content.Server.Instruments;
index 6692886daeeccd4dc0889af6ca7ab39a88f8fc1b..203781bcdaa4135e283119ba21d1ffdc45c6c024 100644 (file)
@@ -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!;
 
index 2f5f8bf4339b27ba77d9e8c3a380b709b8e3de10..78034e0fc3df5d5b6db8c316d2f891f68ae4f23a 100644 (file)
@@ -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!;
index b807b63e21f6687cf2a4ab0f006e1bb3bde9f8ff..29e4ceebbecda3f117128daef452fa65ef61f6ee 100644 (file)
@@ -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!;
index 636037060a94785d2a51a54dbbd4cddb176af8f1..970ca78e2cc01eed08a1513044ffc1fe6bcb079a 100644 (file)
@@ -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!;
index e966daf5e58ed69b0ef3d05cf1b5a1287bfb3a91..ea422afdf019fd6a94efe812e8eef249590d08aa 100644 (file)
@@ -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()
index 2bd8538af161f8e06d8fa04a19f08f1a93cab74f..888a365a5ddb8ece2825f9ca2bd4c949d8d46285 100644 (file)
@@ -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()
index ddc7e2a08303444da3bd285a8a6038fcd4471714..e9b62bc4a80a445459613d441dd1561f9ba0d414 100644 (file)
@@ -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!;
index 66dc9dab99d5d32eda80ad87714d3b29c3e32312..5fe29dcd30e28c441afb7d3fb71cd558fd68238e 100644 (file)
@@ -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!;
index acfb8ff87b3674247694e89ae66303d993bde995..85e553031fc1e5210e7c0c00570058e003416bba 100644 (file)
@@ -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();
index 3cd18d7d56942a4a864dfb999821bb12bc349013..a95a3fd4234dd1be61dbb6d424585850d173ceb9 100644 (file)
@@ -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()
     {
index f676e89ac3f4875e5284ca6af02b72300121825d..4b82dba33590f4883eceb177a8ed47081f8ac487 100644 (file)
@@ -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()
         {
index edb29da624f604292d6f2de7e4c31f4a31ae18e6..feba63a253f8028066ed645e2522f367e5174a5f 100644 (file)
@@ -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";
index 2ab29d1b2f01533ec430dfc74bd30b034de5732c..6ce8edd1d840a9faf5c98d82d45dbdf149c053bc 100644 (file)
@@ -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";
index f4dd502b37523470d885c5420dbe95465b091a42..ae742cf1f9e75cc746dc19436843bc3ebedeadf9 100644 (file)
@@ -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!;
index 97fe19ea74eaec1b3437efee15da6fa4a8e67246..74c42ccbc53503300766f68ee8ea2d355cd2aa2c 100644 (file)
@@ -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!;
index 4584a9e88b5f740e5a7a29d7d71be658cd58fcdd..010682bc0d3f06d1cbde4c09881cd7bafabf9580 100644 (file)
@@ -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()
index 92b963e2017d186aa1b571ef78cba9745564fd63..b26ab301c64e7bb2eb32f3f237dbdc9c7f6c3b3a 100644 (file)
@@ -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";
 
index 5b2f3298a2b4022f47d1a41812f320df4ee08da1..671c281d1f4059caf4c765ecb37e7cd69df3bbe2 100644 (file)
@@ -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!;
index a3b7a573545fd31eee56b7f6cf158fdc07b7a818..debac8902e2c0783d0bc6f128fe3c4cf014df7e9 100644 (file)
@@ -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/>
index b9ff8a4339d2b5f78ce6c0679bdecef6eca983ef..492f15c8e2b1b31cca2f226544bd195891f14da4 100644 (file)
@@ -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!;
index c60f3298e74172e68e912e8c22d42cc192e3672e..8ad5c8602e3d825c456487dd3841f0f21908db04 100644 (file)
@@ -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)
index 7544fc376ba94cb04f66fb5f7d0f8152f77205a6..0e694a801eb0deb64fc7668e09a571f53785e995 100644 (file)
@@ -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()
index aef4b89d50932ca929d1ff436dd3cb8401f10b03..6c9e99e5f3b960dcb6281d8cbe839ff924727754 100644 (file)
@@ -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.
index b8f8f122111b64a233368d3aab04110d40860f27..e64657743dea501998f8e322ce2dbe446a7d28d2 100644 (file)
@@ -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!;
index 96f1dc37835e89d82415976276f6e04eae18ef52..00f409f5533f345f1597a901b7e624497f3435de 100644 (file)
@@ -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()
     {
index 33d1a43c1257dd503fa3b9fd33b9de6a650bcd1f..5525cdf3591581f7d86701bcaf45110581b3f173 100644 (file)
@@ -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()
     {
index 4388756cce003d7058ee8b7c2edadc2da19e7360..8777ab0a8c73bb5b6e5267d20bb6e54d6fc95d10 100644 (file)
@@ -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)
     {
index bef57eceb391fd45efd59f9eb64fab058c8cb14b..080bef44e7a9bc4c842b6676cd9488b60a5c9e4d 100644 (file)
@@ -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!;
index ec4ec17acde84c9ada1c1f10cac0fe72ef0fed40..5471f072501abebac4c4a9a50c6ce44e207d1c4a 100644 (file)
@@ -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!;
index a62488d6f38d6a8121fa4bfdb9f64a2b6ce13223..8b21bca52aea56255cf0b6b861881f7f56b22bea 100644 (file)
@@ -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)
index b9083eabe1918d46b34220136be6884b37690c11..47d359d3875068021f0800c48486304d81f4507a 100644 (file)
@@ -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);
-        }
     }
 }
index c0757c5573036ee9ccb57d8899e5727de9def74b..ad8b3ddea8d17d686470a7e8f0ec06549584b77e 100644 (file)
@@ -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.
index 50a7c0fef972f07e9a4b815de2b77c3652c96643..6282a117bb36273720d2923580300afb5cd3bb08 100644 (file)
@@ -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);
 
index 72d807e6a0c37cc9e5304b062d7cfdb5a66de5f5..e9bbd27ada407829e598b5ee2683b97dd5446754 100644 (file)
@@ -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()
     {
index a7e6ac1152b1e56c0bc45105c984a83c6e93c769..6bacbd2b5b1e9ccdc6900a98c22874045399e6a9 100644 (file)
@@ -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>
index ed687d48f4b463ae92ffdf091e1413c5b1939943..8231e48e2dbee2a9097614aebc27900ed62526f7 100644 (file)
@@ -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)
index 324fd65c86044ae5854b48e196ee2bac309fec9e..ca25a49b23fe2b93dc3ad8942618604dc400eac8 100644 (file)
@@ -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));
index d47d024de5e1b93d4b49f394e08bfa6004f55ea8..274828a20864bc2c267672ca8d99bde58c59f0d3 100644 (file)
@@ -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)