diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs index 013625feff..888a4f736a 100644 --- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs +++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs @@ -19,7 +19,6 @@ namespace Content.Client.GameTicking.Managers public class ClientGameTicker : SharedGameTicker { [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IClientNetManager _netManager = default!; [ViewVariables] private bool _initialized; private readonly List _jobsAvailable = new(); diff --git a/Content.Client/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/Inventory/HumanInventoryInterfaceController.cs index 8df5647861..413f09978b 100644 --- a/Content.Client/Inventory/HumanInventoryInterfaceController.cs +++ b/Content.Client/Inventory/HumanInventoryInterfaceController.cs @@ -25,11 +25,9 @@ namespace Content.Client.Inventory [UsedImplicitly] public class HumanInventoryInterfaceController : InventoryInterfaceController { - [Dependency] private readonly IResourceCache _resourceCache = default!; [Dependency] private readonly IGameHud _gameHud = default!; [Dependency] private readonly IItemSlotManager _itemSlotManager = default!; [Dependency] private readonly INetConfigurationManager _configManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private readonly Dictionary> _inventoryButtons = new(); @@ -283,7 +281,6 @@ namespace Content.Client.Inventory private const int RightSeparation = 2; public IReadOnlyDictionary Buttons { get; } - [Dependency] private readonly IGameHud _gameHud = default!; public HumanInventoryWindow(IGameHud gameHud) { diff --git a/Content.Client/Items/Managers/ItemSlotManager.cs b/Content.Client/Items/Managers/ItemSlotManager.cs index 515eb521ec..3e058a58dd 100644 --- a/Content.Client/Items/Managers/ItemSlotManager.cs +++ b/Content.Client/Items/Managers/ItemSlotManager.cs @@ -24,14 +24,10 @@ namespace Content.Client.Items.Managers { public class ItemSlotManager : IItemSlotManager { - [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IInputManager _inputManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; [Dependency] private readonly IUserInterfaceManager _uiMgr = default!; [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IComponentManager _componentManager = default!; private readonly HashSet _highlightEntities = new(); diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs index db3c84e924..6ca6e40e19 100644 --- a/Content.Client/Parallax/ParallaxOverlay.cs +++ b/Content.Client/Parallax/ParallaxOverlay.cs @@ -11,8 +11,6 @@ namespace Content.Client.Parallax public class ParallaxOverlay : Overlay { [Dependency] private readonly IParallaxManager _parallaxManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IClyde _displayManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; private const float Slowness = 0.5f; diff --git a/Content.Client/Viewport/GameScreen.cs b/Content.Client/Viewport/GameScreen.cs index 522f7e5f0b..e8a93e17c0 100644 --- a/Content.Client/Viewport/GameScreen.cs +++ b/Content.Client/Viewport/GameScreen.cs @@ -28,9 +28,6 @@ namespace Content.Client.Viewport [Dependency] private readonly IInputManager _inputManager = default!; [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IClyde _clyde = default!; [Dependency] private readonly IEyeManager _eyeManager = default!; [ViewVariables] private ChatBox? _gameChat; diff --git a/Content.Server/Actions/ServerActionsComponent.cs b/Content.Server/Actions/ServerActionsComponent.cs index 584de89606..5aad2a8095 100644 --- a/Content.Server/Actions/ServerActionsComponent.cs +++ b/Content.Server/Actions/ServerActionsComponent.cs @@ -20,7 +20,6 @@ namespace Content.Server.Actions [ComponentReference(typeof(SharedActionsComponent))] public sealed class ServerActionsComponent : SharedActionsComponent { - [Dependency] private readonly IServerEntityManager _entityManager = default!; [Dependency] private readonly IServerGameStateManager _stateManager = default!; public override void HandleNetworkMessage(ComponentMessage message, INetChannel netChannel, ICommonSession? session = null) diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index f9cf48b984..f952b6e76d 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -17,7 +17,6 @@ namespace Content.Server.Atmos.EntitySystems [UsedImplicitly] public sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IConfigurationManager _configManager = default!; diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index 9ed3eda9da..3460ea6eb6 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -84,7 +84,6 @@ namespace Content.Server.GameTicking [Dependency] private readonly IServerPreferencesManager _prefsManager = default!; [Dependency] private readonly IBaseServer _baseServer = default!; [Dependency] private readonly IWatchdogApi _watchdogApi = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; [Dependency] private readonly IReflectionManager _reflectionManager = default!; } } diff --git a/Content.Server/MachineLinking/System/SignalLinkerSystem.cs b/Content.Server/MachineLinking/System/SignalLinkerSystem.cs index 98127a7efd..45194bdba2 100644 --- a/Content.Server/MachineLinking/System/SignalLinkerSystem.cs +++ b/Content.Server/MachineLinking/System/SignalLinkerSystem.cs @@ -23,7 +23,6 @@ namespace Content.Server.MachineLinking.System { public class SignalLinkerSystem : EntitySystem { - [Dependency] private IComponentManager _componentManager = default!; private InteractionSystem _interaction = default!; private SignalLinkCollection _linkCollection = new(); diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index e01b80327f..6a13a20bdc 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -33,12 +33,8 @@ namespace Content.Server.Physics.Controllers { public class MoverController : SharedMoverController { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - - private AudioSystem _audioSystem = default!; private const float StepSoundMoveDistanceRunning = 2; private const float StepSoundMoveDistanceWalking = 1.5f; @@ -50,7 +46,6 @@ namespace Content.Server.Physics.Controllers public override void Initialize() { base.Initialize(); - _audioSystem = EntitySystem.Get(); var configManager = IoCManager.Resolve(); configManager.OnValueChanged(CCVars.ShuttleDockSpeedCap, value => _shuttleDockSpeedCap = value, true); diff --git a/Content.Server/Research/Components/ResearchConsoleComponent.cs b/Content.Server/Research/Components/ResearchConsoleComponent.cs index 7615259fcd..3ec7adf925 100644 --- a/Content.Server/Research/Components/ResearchConsoleComponent.cs +++ b/Content.Server/Research/Components/ResearchConsoleComponent.cs @@ -23,7 +23,6 @@ namespace Content.Server.Research.Components public class ResearchConsoleComponent : SharedResearchConsoleComponent, IActivate { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; [DataField("sound")] private SoundSpecifier _soundCollectionName = new SoundCollectionSpecifier("keyboard"); diff --git a/RobustToolbox b/RobustToolbox index 3142dcbfda..ac21e24f33 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 3142dcbfda01163e384fb7d244a6235ece947a1f +Subproject commit ac21e24f332a332487583cdd1ea326b62a448bea