]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Resolve all non-obsoleting warnings in content (#27934)
authorKara <lunarautomaton6@gmail.com>
Sun, 12 May 2024 03:13:58 +0000 (20:13 -0700)
committerGitHub <noreply@github.com>
Sun, 12 May 2024 03:13:58 +0000 (20:13 -0700)
* Resolve all non-obsoleting warnings in content

* Update ClientGameTicker.cs

* Update SkeletonAccentSystem.cs

* Update BwoinkSystem.cs

35 files changed:
Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs
Content.Client/RCD/AlignRCDConstruction.cs
Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs
Content.Client/Shuttles/UI/DockObject.xaml.cs
Content.IntegrationTests/Tests/RoundEndTest.cs
Content.Server/Access/Systems/AccessOverriderSystem.cs
Content.Server/Administration/Systems/BwoinkSystem.cs
Content.Server/Anomaly/AnomalySystem.cs
Content.Server/Atmos/EntitySystems/AirFilterSystem.cs
Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
Content.Server/Geras/GerasSystem.cs
Content.Server/Ghost/GhostSystem.cs
Content.Server/Ghost/Roles/GhostRoleSystem.cs
Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
Content.Server/Hands/Systems/HandsSystem.cs
Content.Server/IdentityManagement/IdentitySystem.cs
Content.Server/Kitchen/EntitySystems/SharpSystem.cs
Content.Server/Ninja/Systems/NinjaGlovesSystem.cs
Content.Server/Power/Components/ChargerComponent.cs
Content.Server/Preferences/Managers/ServerPreferencesManager.cs
Content.Server/Salvage/SpawnSalvageMissionJob.cs
Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs
Content.Server/Station/Systems/StationSystem.cs
Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs
Content.Server/Wires/WiresSystem.cs
Content.Server/Xenoarchaeology/Equipment/Systems/TraversalDistorterSystem.cs
Content.Server/Zombies/InitialInfectedExemptComponent.cs
Content.Shared/Access/Components/IdCardConsoleComponent.cs
Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs
Content.Shared/Mind/SharedMindSystem.cs
Content.Shared/Pinpointer/SharedNavMapSystem.cs
Content.Shared/Plunger/Systems/PlungerSystem.cs

index 5b7011c195ab914d197725845c3225de98d7825b..a321b4121e58eae37f7ba953726942fdf7a81d81 100644 (file)
@@ -1,6 +1,5 @@
 using Content.Shared.Access;
 using Content.Shared.Access.Components;
-using Content.Shared.Access;
 using Content.Shared.Access.Systems;
 using Content.Shared.Containers.ItemSlots;
 using Content.Shared.CrewManifest;
index 072730d65d40a87f8ed13cd1595d5487202a4873..60fe339069af6dedf3b918053945dcc47730ad9b 100644 (file)
@@ -9,7 +9,6 @@ namespace Content.Client.Audio.Jukebox;
 
 public sealed class JukeboxBoundUserInterface : BoundUserInterface
 {
-    [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IPrototypeManager _protoManager = default!;
 
     [ViewVariables]
index da7b22c91a8881092d1b141d9a20ff0e7c1b8d65..d5425425a768d19310e18a4cdae8db73fc9598dd 100644 (file)
@@ -16,9 +16,9 @@ public sealed class AlignRCDConstruction : PlacementMode
 {
     [Dependency] private readonly IEntityManager _entityManager = default!;
     [Dependency] private readonly IMapManager _mapManager = default!;
-    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
-    [Dependency] private readonly RCDSystem _rcdSystem = default!;
-    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    private readonly SharedMapSystem _mapSystem;
+    private readonly RCDSystem _rcdSystem;
+    private readonly SharedTransformSystem _transformSystem;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IStateManager _stateManager = default!;
 
@@ -32,12 +32,7 @@ public sealed class AlignRCDConstruction : PlacementMode
     /// </summary>
     public AlignRCDConstruction(PlacementManager pMan) : base(pMan)
     {
-        var dependencies = IoCManager.Instance!;
-        _entityManager = dependencies.Resolve<IEntityManager>();
-        _mapManager = dependencies.Resolve<IMapManager>();
-        _playerManager = dependencies.Resolve<IPlayerManager>();
-        _stateManager = dependencies.Resolve<IStateManager>();
-
+        IoCManager.InjectDependencies(this);
         _mapSystem = _entityManager.System<SharedMapSystem>();
         _rcdSystem = _entityManager.System<RCDSystem>();
         _transformSystem = _entityManager.System<SharedTransformSystem>();
index 3555099370e6f0c2dee5f7f14890565309c2a9cf..367114f2aa6c5e2dab0ce34d325fa26491c35e26 100644 (file)
@@ -17,7 +17,6 @@ public sealed partial class RoboticsConsoleWindow : FancyWindow
 {
     [Dependency] private readonly IEntityManager _entMan = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly IPrototypeManager _proto = default!;
     private readonly LockSystem _lock;
     private readonly SpriteSystem _sprite;
 
index 9dae6b7a4d3586adc6b9e352d8d7d029c086c581..d7d565a23e94b130212bb5831171af83ae7dbc22 100644 (file)
@@ -1,6 +1,7 @@
 using System.Text;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Systems;
+using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
@@ -12,7 +13,10 @@ namespace Content.Client.Shuttles.UI;
 [GenerateTypedNameReferences]
 public sealed partial class DockObject : PanelContainer
 {
+    [PublicAPI]
     public event Action? UndockPressed;
+
+    [PublicAPI]
     public event Action? ViewPressed;
 
     public BoxContainer ContentsContainer => Contents;
index 1ddddf66bce9cdc8441e7c9b8b272b1d83b1fbb7..6978085640676e93156f2e27519623e90199624c 100644 (file)
@@ -12,7 +12,7 @@ namespace Content.IntegrationTests.Tests
     {
         private sealed class RoundEndTestSystem : EntitySystem
         {
-            public int Count;
+            public int RoundCount;
 
             public override void Initialize()
             {
@@ -22,7 +22,7 @@ namespace Content.IntegrationTests.Tests
 
             private void OnRoundEnd(RoundEndSystemChangedEvent ev)
             {
-                Interlocked.Increment(ref Count);
+                Interlocked.Increment(ref RoundCount);
             }
         }
 
@@ -43,7 +43,7 @@ namespace Content.IntegrationTests.Tests
             var ticker = sysManager.GetEntitySystem<GameTicker>();
             var roundEndSystem = sysManager.GetEntitySystem<RoundEndSystem>();
             var sys = server.System<RoundEndTestSystem>();
-            sys.Count = 0;
+            sys.RoundCount = 0;
 
             await server.WaitAssertion(() =>
             {
@@ -128,8 +128,8 @@ namespace Content.IntegrationTests.Tests
             async Task WaitForEvent()
             {
                 var timeout = Task.Delay(TimeSpan.FromSeconds(10));
-                var currentCount = Thread.VolatileRead(ref sys.Count);
-                while (currentCount == Thread.VolatileRead(ref sys.Count) && !timeout.IsCompleted)
+                var currentCount = Thread.VolatileRead(ref sys.RoundCount);
+                while (currentCount == Thread.VolatileRead(ref sys.RoundCount) && !timeout.IsCompleted)
                 {
                     await pair.RunTicksSync(5);
                 }
index bc038fe4ff02a7d67158e2dfa6a8bbf8afc44c97..c7b20513f428b3a8691fff9a93a9cdf3ab7d9c80 100644 (file)
@@ -28,7 +28,6 @@ public sealed class AccessOverriderSystem : SharedAccessOverriderSystem
     [Dependency] private readonly PopupSystem _popupSystem = default!;
     [Dependency] private readonly SharedAudioSystem _audioSystem = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
-    [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
 
     public override void Initialize()
     {
index 2e236688ac3e2f5546e5b35b5cd7e241ced9ff00..a07115544bfd28c4a1ab15eb247be8d553fa9fcb 100644 (file)
@@ -25,7 +25,7 @@ using Robust.Shared.Utility;
 namespace Content.Server.Administration.Systems
 {
     [UsedImplicitly]
-    public sealed class BwoinkSystem : SharedBwoinkSystem
+    public sealed partial class BwoinkSystem : SharedBwoinkSystem
     {
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IAdminManager _adminManager = default!;
@@ -36,6 +36,9 @@ namespace Content.Server.Administration.Systems
         [Dependency] private readonly SharedMindSystem _minds = default!;
         [Dependency] private readonly IAfkManager _afkManager = default!;
 
+        [GeneratedRegex(@"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$")]
+        private static partial Regex DiscordRegex();
+
         private ISawmill _sawmill = default!;
         private readonly HttpClient _httpClient = new();
         private string _webhookUrl = string.Empty;
@@ -157,7 +160,7 @@ namespace Content.Server.Administration.Systems
                 return;
 
             // Basic sanity check and capturing webhook ID and token
-            var match = Regex.Match(url, @"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$");
+            var match = DiscordRegex().Match(url);
 
             if (!match.Success)
             {
index bae101de87819ae9cd0c56429c5c5afba097ea35..73658a0320eec8f3509bbe9c1a999a44f598e911 100644 (file)
@@ -42,9 +42,6 @@ public sealed partial class AnomalySystem : SharedAnomalySystem
     [Dependency] private readonly RadiationSystem _radiation = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly UserInterfaceSystem _ui = default!;
-    [Dependency] private readonly IComponentFactory _componentFactory = default!;
-    [Dependency] private readonly ISerializationManager _serialization = default!;
-    [Dependency] private readonly IEntityManager _entity = default!;
 
     public const float MinParticleVariation = 0.8f;
     public const float MaxParticleVariation = 1.2f;
index 2ab15cfb174322dad8f0fc71f19d2d075e0dd5c2..c3344c830c08345064235ad970073f1b736726b7 100644 (file)
@@ -12,7 +12,6 @@ namespace Content.Server.Atmos.EntitySystems;
 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 dfbe45c035b7e43bdb9a399973473149b4c305c7..56cc0f9670935e16bf3f49d8de8534df2feab2de 100644 (file)
@@ -25,7 +25,6 @@ public sealed class HypospraySystem : SharedHypospraySystem
 {
     [Dependency] private readonly AudioSystem _audio = default!;
     [Dependency] private readonly InteractionSystem _interaction = default!;
-    [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
 
     public override void Initialize()
     {
index b970ae4b0df5f1a168429e5728ce03da28b59a57..7f4ee87ee110afa3ec62fa4ec8bcb1ed976b733f 100644 (file)
@@ -42,7 +42,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems;
 public sealed class DisposalUnitSystem : SharedDisposalUnitSystem
 {
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
-    [Dependency] private readonly IRobustRandom _robustRandom = default!;
     [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
     [Dependency] private readonly AppearanceSystem _appearance = default!;
     [Dependency] private readonly AtmosphereSystem _atmosSystem = default!;
index e7999d64d8720a9a344954a187e0ee0b9728e7c7..f83f7c19990005b411c4058ac2e327c36e8a2c1b 100644 (file)
@@ -11,7 +11,6 @@ namespace Content.Server.Geras;
 public sealed class GerasSystem : SharedGerasSystem
 {
     [Dependency] private readonly PolymorphSystem _polymorphSystem = default!;
-    [Dependency] private readonly MetaDataSystem _metaDataSystem = default!;
     [Dependency] private readonly ActionsSystem _actionsSystem = default!;
     [Dependency] private readonly PopupSystem _popupSystem = default!;
 
index b1fb67cce7b2fa6539b9a757a4cc2a12a4159341..f4e6a4d607da1602dba40b22cd432b173bbc24b2 100644 (file)
@@ -44,7 +44,6 @@ namespace Content.Server.Ghost
         [Dependency] private readonly TransformSystem _transformSystem = default!;
         [Dependency] private readonly VisibilitySystem _visibilitySystem = default!;
         [Dependency] private readonly MetaDataSystem _metaData = default!;
-        [Dependency] private readonly IMapManager _mapManager = default!;
 
         private EntityQuery<GhostComponent> _ghostQuery;
         private EntityQuery<PhysicsComponent> _physicsQuery;
index 5b9d6ae1adfe66073607a4210b0f86afb0bc4dec..c198b54b1b953688f1fa3c8de57a9fed8481647d 100644 (file)
@@ -30,7 +30,6 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Server.Popups;
 using Content.Shared.Verbs;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Collections;
 
 namespace Content.Server.Ghost.Roles
index fc73fc3454d2ca18b9d9ba07448855479de0cef1..c1e39919a2f7d340b083efea68acbd39ddd9780f 100644 (file)
@@ -6,7 +6,7 @@ namespace Content.Server.Ghost.Roles.UI
 {
     public sealed class GhostRolesEui : BaseEui
     {
-        [Dependency] private readonly GhostRoleSystem _ghostRoleSystem;
+        private readonly GhostRoleSystem _ghostRoleSystem;
 
         public GhostRolesEui()
         {
index 4c6b80bd987939eb15ad82d5e38c09e65b01e51c..feae130ce8e363ea73f2e510fd008387da825b2d 100644 (file)
@@ -33,7 +33,6 @@ namespace Content.Server.Hands.Systems
         [Dependency] private readonly StackSystem _stackSystem = default!;
         [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
-        [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
         [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
         [Dependency] private readonly PullingSystem _pullingSystem = default!;
         [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
index a959b96ef974882e6cb968f305accb5b4d4091f6..4766b89172fa581e44e3bfccf253b2c17aa2b618 100644 (file)
@@ -19,7 +19,7 @@ namespace Content.Server.IdentityManagement;
 /// <summary>
 ///     Responsible for updating the identity of an entity on init or clothing equip/unequip.
 /// </summary>
-public class IdentitySystem : SharedIdentitySystem
+public sealed class IdentitySystem : SharedIdentitySystem
 {
     [Dependency] private readonly IdCardSystem _idCard = default!;
     [Dependency] private readonly IAdminLogManager _adminLog = default!;
index 3c1e89b1f2d9ccd012991bb10e4ce7bbdb741655..431e438fd8d768e660976f7dd8a292a03b127b10 100644 (file)
@@ -3,24 +3,17 @@ using Content.Server.Kitchen.Components;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Body.Components;
 using Content.Shared.Administration.Logs;
-using Content.Shared.Body.Components;
 using Content.Shared.Database;
 using Content.Shared.Interaction;
 using Content.Shared.Nutrition.Components;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
 using Content.Shared.Verbs;
 using Content.Shared.Destructible;
 using Content.Shared.DoAfter;
-using Content.Shared.Interaction;
 using Content.Shared.Kitchen;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Nutrition.Components;
-using Content.Shared.Popups;
-using Content.Shared.Storage;
-using Content.Shared.Verbs;
 using Robust.Server.Containers;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
index 2c0f6c63e3e589150dbb0c816a8f6b7730554fac..ac76ae6b77119a71892bd8e60f688479d9f14e8a 100644 (file)
@@ -19,7 +19,6 @@ public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem
     [Dependency] private readonly EmagProviderSystem _emagProvider = default!;
     [Dependency] private readonly CodeConditionSystem _codeCondition = default!;
     [Dependency] private readonly CommsHackerSystem _commsHacker = default!;
-    [Dependency] private readonly MindSystem _mind = default!;
     [Dependency] private readonly SharedStunProviderSystem _stunProvider = default!;
     [Dependency] private readonly SpaceNinjaSystem _ninja = default!;
 
index e45ded071cfd9444221b13bd7b9441ea327eb1be..4a3c83ae03b31d8baa32cfc9b6a79f82059c0fee 100644 (file)
@@ -1,10 +1,5 @@
 using Content.Shared.Power;
 using Content.Shared.Whitelist;
-using Content.Shared.Power;
-using Content.Shared.Whitelist;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Power.Components
 {
index 7a80757435e7303cc243e68bb8c511a31ea87d9a..1aad61715bb76b8150d2414101e1e4ff9522e578 100644 (file)
@@ -29,7 +29,6 @@ namespace Content.Server.Preferences.Managers
         [Dependency] private readonly IServerDbManager _db = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
         [Dependency] private readonly IDependencyCollection _dependencies = default!;
-        [Dependency] private readonly IPrototypeManager _protos = default!;
 
         // Cache player prefs on the server so we don't need as much async hell related to them.
         private readonly Dictionary<NetUserId, PlayerPrefData> _cachedPlayerPrefs =
index 47123e978454baa8fdd39db8424871e683a0de38..ce844e57a13e9750e016294107ebf0b5ac3da1d0 100644 (file)
@@ -34,8 +34,6 @@ using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Content.Server.Shuttles.Components;
-using Content.Shared.Coordinates;
-using Content.Shared.Shuttles.Components;
 
 namespace Content.Server.Salvage;
 
index ead9b4382e38da6f26385d8a34fce4b8e8266b25..d143c25fdbab2350e6e67962ca069d7a69ce7784 100644 (file)
@@ -4,10 +4,13 @@ using Robust.Shared.Random;
 
 namespace Content.Server.Speech.EntitySystems;
 
-public sealed class SkeletonAccentSystem : EntitySystem
+public sealed partial class SkeletonAccentSystem : EntitySystem
 {
     [Dependency] private readonly IRobustRandom _random = default!;
 
+    [GeneratedRegex(@"(?<!\w)[^aeiou]one", RegexOptions.IgnoreCase, "en-US")]
+    private static partial Regex BoneRegex();
+
     private static readonly Dictionary<string, string> DirectReplacements = new()
     {
         { "fuck you", "I've got a BONE to pick with you" },
@@ -45,7 +48,7 @@ public sealed class SkeletonAccentSystem : EntitySystem
 
         // Character manipulations:
         // At the start of words, any non-vowel + "one" becomes "bone", e.g. tone -> bone ; lonely -> bonely; clone -> clone (remains unchanged).
-        msg = Regex.Replace(msg, @"(?<!\w)[^aeiou]one", "bone", RegexOptions.IgnoreCase);
+        msg = BoneRegex().Replace(msg, "bone");
 
         // Direct word/phrase replacements:
         foreach (var (first, replace) in DirectReplacements)
index 2fa2671b196493865269313ccd2fa13942c52301..88e419ae39af0cd260c7b1948dc67749a637ee44 100644 (file)
@@ -28,22 +28,16 @@ namespace Content.Server.Station.Systems;
 [PublicAPI]
 public sealed class StationSystem : EntitySystem
 {
-    [Dependency] private readonly IConfigurationManager _configurationManager = default!;
     [Dependency] private readonly ILogManager _logManager = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly ChatSystem _chatSystem = default!;
-    [Dependency] private readonly GameTicker _gameTicker = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly MetaDataSystem _metaData = default!;
     [Dependency] private readonly MapSystem _map = default!;
 
     private ISawmill _sawmill = default!;
 
-    private bool _randomStationOffset;
-    private bool _randomStationRotation;
-    private float _maxRandomStationOffset;
-
     /// <inheritdoc/>
     public override void Initialize()
     {
index 79192f6b496f9d8e9be1376aa41f9f883801126f..63be36b360adb0c5e2fc7f73397dac70bd843daf 100644 (file)
@@ -12,7 +12,6 @@ namespace Content.Server.Traitor.Uplink.Commands
     [AdminCommand(AdminFlags.Admin)]
     public sealed class AddUplinkCommand : IConsoleCommand
     {
-        [Dependency] private readonly IConfigurationManager _cfgManager = default!;
         [Dependency] private readonly IEntityManager _entManager = default!;
         [Dependency] private readonly IPlayerManager _playerManager = default!;
 
index 5d31a4d1440249fc0398f3a80a63f113c348cccb..c643759f504b358f7809ec72da5f43f199f0454a 100644 (file)
@@ -348,7 +348,7 @@ public sealed class WiresSystem : SharedWiresSystem
         }
     }
 
-    private class ActiveWireAction
+    private sealed class ActiveWireAction
     {
         /// <summary>
         ///     The wire action's ID. This is so that once the action is finished,
index 2092f79f05ba1a9b992dcf8bfb7afc185ea93021..d277792243d8ddd26eb636b0a3bd6f44bdc2cea2 100644 (file)
@@ -11,7 +11,6 @@ namespace Content.Server.Xenoarchaeology.Equipment.Systems;
 public sealed class TraversalDistorterSystem : EntitySystem
 {
     [Dependency] private readonly IGameTiming _timing = default!;
-    [Dependency] private readonly PopupSystem _popup = default!;
 
     /// <inheritdoc/>
     public override void Initialize()
index 46077935c68e49f533bbd79bfc353bcc1792c52a..f2dfda3f872d2785fc4502c2abc4921fe13439d9 100644 (file)
@@ -1,7 +1,7 @@
 namespace Content.Server.Zombies;
 
 [RegisterComponent]
-public partial class InitialInfectedExemptComponent : Component
+public sealed partial class InitialInfectedExemptComponent : Component
 {
 
 }
index deeafe27936c08df5a1a7b1ada9f4ca193c038da..4f1c27fb4d368509e373ea0c4152529ff50ee3e9 100644 (file)
@@ -3,8 +3,6 @@ using Content.Shared.Containers.ItemSlots;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
-using Robust.Shared.Prototypes;
 
 namespace Content.Shared.Access.Components;
 
index fdb2f550f9694e0d16e03f0fae57e189c7d80cc2..5e58a0944a496e1cbf00961768deaf0231f76541 100644 (file)
@@ -60,7 +60,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
     [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!;
     [Dependency] protected readonly SharedHandsSystem Hands = default!;
     [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!;
-    [Dependency] protected readonly MetaDataSystem MetaData = default!;
+    [Dependency] protected readonly MetaDataSystem MetaDataSys = default!;
     [Dependency] protected readonly INetManager NetManager = default!;
 
     public override void Initialize()
@@ -1123,7 +1123,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         Dirty(uid, container);
         return solution;
     }
-    
+
     private Entity<SolutionComponent, ContainedSolutionComponent> SpawnSolutionUninitialized(ContainerSlot container, string name, FixedPoint2 maxVol, Solution prototype)
     {
         var coords = new EntityCoordinates(container.Owner, Vector2.Zero);
@@ -1135,7 +1135,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
         var relation = new ContainedSolutionComponent() { Container = container.Owner, ContainerName = name };
         AddComp(uid, relation);
 
-        MetaData.SetEntityName(uid, $"solution - {name}");
+        MetaDataSys.SetEntityName(uid, $"solution - {name}");
         ContainerSystem.Insert(uid, container, force: true);
 
         return (uid, solution, relation);
index 3bea79d345171e3437272b32d8dba664d58a5124..b12778262c8a445447de5157a1bf2425009aea1f 100644 (file)
@@ -17,7 +17,6 @@ namespace Content.Shared.Chemistry.EntitySystems;
 /// </summary>
 public sealed class SolutionTransferSystem : EntitySystem
 {
-    [Dependency] private readonly INetManager _net = default!;
     [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
index 7887b8f9b221a6123084498d58b65b702ea9aaf8..bf1065c1b1d6f17c43426a76c445a416ba9e13b3 100644 (file)
@@ -26,7 +26,6 @@ public abstract class SharedMindSystem : EntitySystem
     [Dependency] private readonly SharedObjectivesSystem _objectives = default!;
     [Dependency] private readonly SharedPlayerSystem _player = default!;
     [Dependency] private readonly MetaDataSystem _metadata = default!;
-    [Dependency] private readonly ISharedPlayerManager _playerMan = default!;
 
     [ViewVariables]
     protected readonly Dictionary<NetUserId, EntityUid> UserMinds = new();
index 0edcd5a4378c419165d995f38fe9b9b6ee51b782..ffe81c2d0ea49e9c04fdb61686102e8ba237d299 100644 (file)
@@ -23,7 +23,6 @@ public abstract class SharedNavMapSystem : EntitySystem
     public const int FloorMask = AllDirMask << (int) NavMapChunkType.Floor;
 
     [Robust.Shared.IoC.Dependency] private readonly TagSystem _tagSystem = default!;
-    [Robust.Shared.IoC.Dependency] private readonly IGameTiming _gameTiming = default!;
 
     private readonly string[] _wallTags = ["Wall", "Window"];
     private EntityQuery<NavMapDoorComponent> _doorQuery;
index 57bd77a7d95abccb4c3fa2223154f4b7aed1b531..fbefad9f6e7ba8c568b9a0169ede842a1fe5f994 100644 (file)
@@ -17,8 +17,8 @@ namespace Content.Shared.Plunger.Systems;
 /// </summary>
 public sealed class PlungerSystem : EntitySystem
 {
-    [Dependency] protected readonly IPrototypeManager _proto = default!;
-    [Dependency] protected readonly IRobustRandom _random = default!;
+    [Dependency] private readonly IPrototypeManager _proto = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;
     [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
     [Dependency] private readonly SharedPopupSystem _popup = default!;