Replace pragma warning 649 disable/restore with default!

Content.Client/Chat/ChatManager.cs

@@ -70,14 +70,12 @@ namespace Content.Client.Chat
         // Flag Enums for holding filtered channels
         private ChatChannel _filteredChannels;
 
-#pragma warning disable 649
-        [Dependency] private readonly IClientNetManager _netManager;
-        [Dependency] private readonly IClientConsole _console;
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+        [Dependency] private readonly IClientConsole _console = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
         [Dependency] private readonly IClientConGroupController _groupController = default!;
-#pragma warning restore 649
 
         private ChatBox _currentChatBox;
         private Control _speechBubbleRoot;
@@ -231,7 +229,7 @@ namespace Content.Client.Chat
             {
                 string locWarning = Loc.GetString("Your message exceeds {0} character limit", _maxMessageLength);
                 _currentChatBox?.AddLine(locWarning, ChatChannel.Server, Color.Orange);
-                _currentChatBox.ClearOnEnter = false;   // The text shouldn't be cleared if it hasn't been sent 
+                _currentChatBox.ClearOnEnter = false;   // The text shouldn't be cleared if it hasn't been sent
                 return;
             }
 

Content.Client/ClientNotifyManager.cs

@@ -21,14 +21,12 @@ namespace Content.Client
 {
     public class ClientNotifyManager : SharedNotifyManager, IClientNotifyManager
     {
-#pragma warning disable 649
-        [Dependency] private IPlayerManager _playerManager;
-        [Dependency] private IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private IInputManager _inputManager;
-        [Dependency] private IEyeManager _eyeManager;
-        [Dependency] private IClientNetManager _netManager;
-        [Dependency] private IEntityManager _entityManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private readonly List<PopupLabel> _aliveLabels = new List<PopupLabel>();
         private bool _initialized;

Content.Client/ClientPreferencesManager.cs

@@ -14,9 +14,7 @@ namespace Content.Client
     /// </summary>
     public class ClientPreferencesManager : SharedPreferencesManager, IClientPreferencesManager
     {
-#pragma warning disable 649
-        [Dependency] private readonly IClientNetManager _netManager;
-#pragma warning restore 649
+        [Dependency] private readonly IClientNetManager _netManager = default!;
 
         public event Action OnServerDataLoaded;
         public GameSettings Settings { get; private set; }

Content.Client/Command/CommunicationsConsoleMenu.cs

@@ -12,9 +12,7 @@ namespace Content.Client.Command
 {
     public class CommunicationsConsoleMenu : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _localizationManager;
-#pragma warning restore 649
+        [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
         protected override Vector2? CustomSize => new Vector2(600, 400);
 

Content.Client/Construction/ConstructionMenu.cs

@@ -22,11 +22,9 @@ namespace Content.Client.Construction
 {
     public class ConstructionMenu : SS14Window
     {
-#pragma warning disable CS0649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IEntitySystemManager _systemManager;
-#pragma warning restore
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IEntitySystemManager _systemManager = default!;
 
         private readonly Button BuildButton;
         private readonly Button EraseButton;

Content.Client/EntryPoint.cs

@@ -39,14 +39,12 @@ namespace Content.Client
 {
     public class EntryPoint : GameClient
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IBaseClient _baseClient;
-        [Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner;
-        [Dependency] private readonly IGameController _gameController;
-        [Dependency] private readonly IStateManager _stateManager;
-        [Dependency] private readonly IConfigurationManager _configurationManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IBaseClient _baseClient = default!;
+        [Dependency] private readonly IEscapeMenuOwner _escapeMenuOwner = default!;
+        [Dependency] private readonly IGameController _gameController = default!;
+        [Dependency] private readonly IStateManager _stateManager = default!;
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         public override void Init()
         {

Content.Client/EscapeMenuOwner.cs

@@ -17,18 +17,16 @@ namespace Content.Client
 {
     internal sealed class EscapeMenuOwner : IEscapeMenuOwner
     {
-#pragma warning disable 649
-        [Dependency] private readonly IClientConsole _clientConsole;
-        [Dependency] private readonly IConfigurationManager _configurationManager;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IPlacementManager _placementManager;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IStateManager _stateManager;
-        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly ILocalizationManager _localizationManager;
-#pragma warning restore 649
+        [Dependency] private readonly IClientConsole _clientConsole = default!;
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IPlacementManager _placementManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IStateManager _stateManager = default!;
+        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
         private EscapeMenu _escapeMenu;
 

Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs

@@ -10,10 +10,9 @@ namespace Content.Client.GameObjects.Components.Access
 {
     public class IdCardConsoleBoundUserInterface : BoundUserInterface
     {
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _localizationManager;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
+        [Dependency] private readonly ILocalizationManager _localizationManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
         public IdCardConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
         {
         }

Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs

@@ -14,12 +14,10 @@ namespace Content.Client.GameObjects.Components.Actor
     [RegisterComponent]
     public sealed class CharacterInfoComponent : Component, ICharacterUI
     {
-        private CharacterInfoControl _control;
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
 
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _loc;
-        [Dependency] private readonly IResourceCache _resourceCache;
-#pragma warning restore 649
+        private CharacterInfoControl _control;
 
         public override string Name => "CharacterInfo";
 

Content.Client/GameObjects/Components/Actor/CharacterInterface.cs

@@ -20,12 +20,9 @@ namespace Content.Client.GameObjects.Components.Actor
     [RegisterComponent]
     public class CharacterInterface : Component
     {
-        public override string Name => "Character Interface Component";
+        [Dependency] private readonly IGameHud _gameHud = default!;
 
-        [Dependency]
-#pragma warning disable 649
-        private readonly IGameHud _gameHud;
-#pragma warning restore 649
+        public override string Name => "Character Interface Component";
 
         /// <summary>
         ///     Window to hold each of the character interfaces

Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs

@@ -10,9 +10,7 @@ namespace Content.Client.GameObjects.Components.Cargo
     [RegisterComponent]
     public class GalacticMarketComponent : SharedGalacticMarketComponent
     {
-#pragma warning disable CS0649
-        [Dependency] private IPrototypeManager _prototypeManager;
-#pragma warning restore
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         /// <summary>
         ///     Event called when the database is updated.

Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs

@@ -21,9 +21,7 @@ namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
     /// </summary>
     public class ChemMasterWindow : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         /// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary>
         private readonly VBoxContainer ContainerInfo;

Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs

@@ -20,9 +20,7 @@ namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
     /// </summary>
     public class ReagentDispenserWindow : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         /// <summary>Contains info about the reagent container such as it's contents, if one is loaded into the dispenser.</summary>
         private readonly VBoxContainer ContainerInfo;

Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs

@@ -11,12 +11,9 @@ namespace Content.Client.GameObjects.Components.Command
 {
     public class CommunicationsConsoleBoundUserInterface : BoundUserInterface
     {
-        [ViewVariables]
-        private CommunicationsConsoleMenu _menu;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
-#pragma warning disable 649
-        [Dependency] private IGameTiming _gameTiming;
-#pragma warning restore 649
+        [ViewVariables] private CommunicationsConsoleMenu _menu;
 
         public bool CountdownStarted { get; private set; }
 

Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs

@@ -18,11 +18,9 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
     [UsedImplicitly]
     public class HumanInventoryInterfaceController : InventoryInterfaceController
     {
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _loc;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IItemSlotManager _itemSlotManager;
-#pragma warning restore 649
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
 
         private readonly Dictionary<Slots, List<ItemSlotButton>> _inventoryButtons
             = new Dictionary<Slots, List<ItemSlotButton>>();
@@ -43,7 +41,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
             base.Initialize();
 
             _window = new HumanInventoryWindow(_loc, _resourceCache);
-            _window.OnClose += () => _gameHud.InventoryButtonDown = false;
+            _window.OnClose += () => GameHud.InventoryButtonDown = false;
             foreach (var (slot, button) in _window.Buttons)
             {
                 button.OnPressed = (e) => AddToInventory(e, slot);
@@ -153,7 +151,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
         {
             base.PlayerAttached();
 
-            _gameHud.InventoryQuickButtonContainer.AddChild(_quickButtonsContainer);
+            GameHud.InventoryQuickButtonContainer.AddChild(_quickButtonsContainer);
 
             // Update all the buttons to make sure they check out.
 
@@ -175,7 +173,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
         {
             base.PlayerDetached();
 
-            _gameHud.InventoryQuickButtonContainer.RemoveChild(_quickButtonsContainer);
+            GameHud.InventoryQuickButtonContainer.RemoveChild(_quickButtonsContainer);
 
             foreach (var (slot, list) in _inventoryButtons)
             {

Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs

@@ -12,9 +12,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
 {
     public abstract class InventoryInterfaceController : IDisposable
     {
-#pragma warning disable 649
-        [Dependency] protected readonly IGameHud _gameHud;
-#pragma warning restore 649
+        [Dependency] protected readonly IGameHud GameHud = default!;
 
         protected InventoryInterfaceController(ClientInventoryComponent owner)
         {
@@ -31,8 +29,8 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
 
         public virtual void PlayerAttached()
         {
-            _gameHud.InventoryButtonVisible = true;
-            _gameHud.InventoryButtonToggled = b =>
+            GameHud.InventoryButtonVisible = true;
+            GameHud.InventoryButtonToggled = b =>
             {
                 if (b)
                 {
@@ -47,7 +45,7 @@ namespace Content.Client.GameObjects.Components.HUD.Inventory
 
         public virtual void PlayerDetached()
         {
-            _gameHud.InventoryButtonVisible = false;
+            GameHud.InventoryButtonVisible = false;
             Window.Close();
         }
 

Content.Client/GameObjects/Components/InteractionOutlineComponent.cs

@@ -9,15 +9,13 @@ namespace Content.Client.GameObjects.Components
     [RegisterComponent]
     public class InteractionOutlineComponent : Component
     {
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
         private const string ShaderInRange = "SelectionOutlineInrange";
         private const string ShaderOutOfRange = "SelectionOutline";
 
         public override string Name => "InteractionOutline";
 
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
-
         private ShaderInstance _selectionShaderInstance;
         private ShaderInstance _selectionShaderInRangeInstance;
 

Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs

@@ -20,10 +20,9 @@ namespace Content.Client.GameObjects.Components.Kitchen
 {
     public  class MicrowaveBoundUserInterface : BoundUserInterface
     {
-#pragma warning disable 649
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
         private MicrowaveMenu _menu;
 
         private Dictionary<int, EntityUid> _solids = new Dictionary<int, EntityUid>();

Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs

@@ -24,6 +24,10 @@ namespace Content.Client.GameObjects.Components.Mobs
     [ComponentReference(typeof(SharedOverlayEffectsComponent))]
     public sealed class ClientOverlayEffectsComponent : SharedOverlayEffectsComponent//, ICharacterUI
     {
+        [Dependency] private readonly IOverlayManager _overlayManager = default!;
+        [Dependency] private readonly IReflectionManager _reflectionManager = default!;
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+
         /// <summary>
         /// A list of overlay containers representing the current overlays applied
         /// </summary>
@@ -36,13 +40,6 @@ namespace Content.Client.GameObjects.Components.Mobs
             set => SetEffects(value);
         }
 
-#pragma warning disable 649
-        // Required dependencies
-        [Dependency] private readonly IOverlayManager _overlayManager;
-        [Dependency] private readonly IReflectionManager _reflectionManager;
-        [Dependency] private readonly IClientNetManager _netManager;
-#pragma warning restore 649
-
         public override void Initialize()
         {
             base.Initialize();

Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs

@@ -23,12 +23,10 @@ namespace Content.Client.GameObjects.Components.Mobs
     [ComponentReference(typeof(SharedStatusEffectsComponent))]
     public sealed class ClientStatusEffectsComponent : SharedStatusEffectsComponent
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IGameTiming _gameTiming;
-#pragma warning restore 649
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         private StatusEffectsUI _ui;
         private Dictionary<StatusEffect, StatusEffectStatus> _status = new Dictionary<StatusEffect, StatusEffectStatus>();

Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs

@@ -12,10 +12,8 @@ namespace Content.Client.GameObjects.Components.Mobs
     [ComponentReference(typeof(SharedCombatModeComponent))]
     public sealed class CombatModeComponent : SharedCombatModeComponent
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IGameHud _gameHud;
-#pragma warning restore 649
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IGameHud _gameHud = default!;
 
         public override bool IsInCombatMode
         {

Content.Client/GameObjects/Components/Observer/GhostComponent.cs

@@ -12,6 +12,10 @@ namespace Content.Client.GameObjects.Components.Observer
     [RegisterComponent]
     public class GhostComponent : SharedGhostComponent
     {
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IComponentManager _componentManager = default!;
+
         private GhostGui _gui;
 
         [ViewVariables(VVAccess.ReadOnly)]
@@ -19,12 +23,6 @@ namespace Content.Client.GameObjects.Components.Observer
 
         private bool _isAttached;
 
-#pragma warning disable 649
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private IComponentManager _componentManager;
-#pragma warning restore 649
-
         public override void OnRemove()
         {
             base.OnRemove();

Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs

@@ -19,10 +19,9 @@ namespace Content.Client.GameObjects.Components.PDA
 {
     public class PDABoundUserInterface : BoundUserInterface
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+
         private PDAMenu _menu;
         private PDAMenuPopup failPopup;
 

Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs

@@ -12,10 +12,8 @@ namespace Content.Client.GameObjects.Components.Research
 {
     public class LatheBoundUserInterface : BoundUserInterface
     {
-#pragma warning disable CS0649
-        [Dependency]
-        private IPrototypeManager _prototypeManager;
-#pragma warning restore
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
         [ViewVariables]
         private LatheMenu _menu;
         [ViewVariables]

Content.Client/GameObjects/Components/Research/LatheDatabaseComponent.cs

@@ -10,10 +10,7 @@ namespace Content.Client.GameObjects.Components.Research
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
     public class LatheDatabaseComponent : SharedLatheDatabaseComponent
     {
-#pragma warning disable CS0649
-        [Dependency]
-        private IPrototypeManager _prototypeManager;
-#pragma warning restore
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override void HandleComponentState(ComponentState curState, ComponentState nextState)
         {

Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs

@@ -11,10 +11,7 @@ namespace Content.Client.GameObjects.Components.Research
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
     public class ProtolatheDatabaseComponent : SharedProtolatheDatabaseComponent
     {
-#pragma warning disable CS0649
-        [Dependency]
-        private IPrototypeManager _prototypeManager;
-#pragma warning restore
+        [Dependency] private IPrototypeManager _prototypeManager = default!;
 
         /// <summary>
         ///     Invoked when the database gets updated.

Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs

@@ -16,11 +16,10 @@ namespace Content.Client.GameObjects.Components.Sound
     [RegisterComponent]
     public class LoopingSoundComponent : SharedLoopingSoundComponent
     {
+        [Dependency] private readonly IRobustRandom _random = default!;
+
         private readonly Dictionary<ScheduledSound, IPlayingAudioStream> _audioStreams = new Dictionary<ScheduledSound, IPlayingAudioStream>();
         private AudioSystem _audioSystem;
-        #pragma warning disable 649
-        [Dependency] private readonly IRobustRandom _random;
-        #pragma warning restore 649
 
         public override void StopAllSounds()
         {

Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs

@@ -15,9 +15,7 @@ namespace Content.Client.GameObjects.EntitySystems.AI
 #if DEBUG
     public class ClientAiDebugSystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private IEyeManager _eyeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
 
         private AiDebugMode _tooltips = AiDebugMode.None;
         private readonly Dictionary<IEntity, PanelContainer> _aiBoxes = new Dictionary<IEntity,PanelContainer>();

Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs

@@ -11,10 +11,8 @@ namespace Content.Client.GameObjects.EntitySystems
 {
     public sealed class CharacterInterfaceSystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IPlayerManager _playerManager;
-#pragma warning restore 649
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         public override void Initialize()
         {

Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs

@@ -11,10 +11,8 @@ namespace Content.Client.GameObjects.EntitySystems
 {
     public sealed class ClientInventorySystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IPlayerManager _playerManager;
-#pragma warning restore 649
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
         public override void Initialize()
         {

Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs

@@ -17,11 +17,9 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     public sealed class CombatModeSystem : SharedCombatModeSystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IGameTiming _gameTiming;
-#pragma warning restore 649
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override void Initialize()
         {

Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs

@@ -24,11 +24,9 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     public class ConstructionSystem : SharedConstructionSystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IEntityManager _entityManager;
-#pragma warning restore 649
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
 
         private int _nextId;
         private readonly Dictionary<int, ConstructionGhostComponent> _ghosts = new Dictionary<int, ConstructionGhostComponent>();

Content.Client/GameObjects/EntitySystems/DragDropSystem.cs

@@ -30,6 +30,13 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     public class DragDropSystem : EntitySystem
     {
+        [Dependency] private readonly IStateManager _stateManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
+
         // drag will be triggered when mouse leaves this deadzone around the click position.
         private const float DragDeadzone = 2f;
         // how often to recheck possible targets (prevents calling expensive
@@ -44,15 +51,6 @@ namespace Content.Client.GameObjects.EntitySystems
         private const string ShaderDropTargetInRange = "SelectionOutlineInrange";
         private const string ShaderDropTargetOutOfRange = "SelectionOutline";
 
-#pragma warning disable 649
-        [Dependency] private readonly IStateManager _stateManager;
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IMapManager _mapManager;
-#pragma warning restore 649
-
         // entity performing the drag action
         private IEntity _dragger;
         private IEntity _draggedEntity;

Content.Client/GameObjects/EntitySystems/ExamineSystem.cs

@@ -25,14 +25,12 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     internal sealed class ExamineSystem : ExamineSystemShared
     {
-        public const string StyleClassEntityTooltip = "entity-tooltip";
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
 
-#pragma warning disable 649
-        [Dependency] private IInputManager _inputManager;
-        [Dependency] private IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private IEntityManager _entityManager;
-        [Dependency] private IPlayerManager _playerManager;
-#pragma warning restore 649
+        public const string StyleClassEntityTooltip = "entity-tooltip";
 
         private Popup _examineTooltipOpen;
         private CancellationTokenSource _requestCancelTokenSource;

Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs

@@ -19,9 +19,7 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     internal sealed class IconSmoothSystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IMapManager _mapManager;
-#pragma warning restore 649
+        [Dependency] private readonly IMapManager _mapManager = default!;
 
         private readonly Queue<IEntity> _dirtyEntities = new Queue<IEntity>();
 

Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs

@@ -17,9 +17,7 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     public sealed class MeleeWeaponSystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override void Initialize()
         {

Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs

@@ -17,14 +17,11 @@ namespace Content.Client.GameObjects.EntitySystems
 {
     public class RangedWeaponSystem : EntitySystem
     {
-
-#pragma warning disable 649
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-        [Dependency] private readonly IMapManager _mapManager;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IGameTiming _gameTiming;
-#pragma warning restore 649
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         private InputSystem _inputSystem;
         private CombatModeSystem _combatModeSystem;

Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs

@@ -7,9 +7,7 @@ namespace Content.Client.GameObjects.EntitySystems
 {
     public class StatusEffectsSystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private IGameTiming _gameTiming;
-#pragma warning restore 649
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override void FrameUpdate(float frameTime)
         {

Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs

@@ -15,12 +15,10 @@ namespace Content.Client.GameObjects.EntitySystems
     /// </summary>
     internal sealed class SubFloorHideSystem : EntitySystem
     {
-        private bool _enableAll;
+        [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
 
-#pragma warning disable 649
-        [Dependency] private readonly IMapManager _mapManager;
-        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
-#pragma warning restore 649
+        private bool _enableAll;
 
         [ViewVariables(VVAccess.ReadWrite)]
         public bool EnableAll

Content.Client/GameObjects/EntitySystems/VerbSystem.cs

@@ -42,16 +42,14 @@ namespace Content.Client.GameObjects.EntitySystems
     [UsedImplicitly]
     public sealed class VerbSystem : EntitySystem
     {
-#pragma warning disable 649
-        [Dependency] private readonly IStateManager _stateManager;
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IItemSlotManager _itemSlotManager;
-        [Dependency] private readonly IGameTiming _gameTiming;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IMapManager _mapManager;
-#pragma warning restore 649
+        [Dependency] private readonly IStateManager _stateManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
 
         private EntityList _currentEntityList;
         private VerbPopup _currentVerbListRoot;

Content.Client/GameTicking/ClientGameTicker.cs

@@ -17,10 +17,8 @@ namespace Content.Client.GameTicking
 {
     public class ClientGameTicker : SharedGameTicker, IClientGameTicker
     {
-#pragma warning disable 649
-        [Dependency] private IClientNetManager _netManager;
-        [Dependency] private IStateManager _stateManager;
-#pragma warning restore 649
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+        [Dependency] private readonly IStateManager _stateManager = default!;
 
         [ViewVariables] private bool _initialized;
 

Content.Client/Graphics/Overlays/CircleMaskOverlay.cs

@@ -11,10 +11,8 @@ namespace Content.Client.Graphics.Overlays
 {
     public class CircleMaskOverlay : Overlay
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
 
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;

Content.Client/Graphics/Overlays/FlashOverlay.cs

@@ -16,11 +16,9 @@ namespace Content.Client.Graphics.Overlays
 {
     public class FlashOverlay : Overlay, IConfigurable<TimedOverlayParameter>
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IClyde _displayManager;
-        [Dependency] private readonly IGameTiming _gameTiming;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IClyde _displayManager = default!;
+        [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         public override OverlaySpace Space => OverlaySpace.ScreenSpace;
         private readonly ShaderInstance _shader;

Content.Client/Graphics/Overlays/GradientCircleMask.cs

@@ -11,10 +11,9 @@ namespace Content.Client.Graphics.Overlays
 {
     public class GradientCircleMaskOverlay : Overlay
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+
         public override OverlaySpace Space => OverlaySpace.WorldSpace;
         private readonly ShaderInstance _shader;
 

Content.Client/Instruments/InstrumentMenu.cs

@@ -20,10 +20,8 @@ namespace Content.Client.Instruments
 {
     public class InstrumentMenu : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private IMidiManager _midiManager;
-        [Dependency] private IFileDialogManager _fileDialogManager;
-#pragma warning restore 649
+        [Dependency] private readonly IMidiManager _midiManager = default!;
+        [Dependency] private readonly IFileDialogManager _fileDialogManager = default!;
 
         private InstrumentBoundUserInterface _owner;
         private Button midiLoopButton;

Content.Client/Parallax/ParallaxManager.cs

@@ -19,11 +19,9 @@ namespace Content.Client.Parallax
 {
     internal sealed class ParallaxManager : IParallaxManager, IPostInjectInit
     {
-#pragma warning disable 649
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly ILogManager _logManager;
-        [Dependency] private readonly IConfigurationManager _configurationManager;
-#pragma warning restore 649
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly ILogManager _logManager = default!;
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         private static readonly ResourcePath ParallaxConfigPath = new ResourcePath("/parallax_config.toml");
 

Content.Client/Parallax/ParallaxOverlay.cs

@@ -13,12 +13,10 @@ namespace Content.Client.Parallax
 {
     public class ParallaxOverlay : Overlay
     {
-#pragma warning disable 649
-        [Dependency] private readonly IParallaxManager _parallaxManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-        [Dependency] private readonly IClyde _displayManager;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-#pragma warning restore 649
+        [Dependency] private readonly IParallaxManager _parallaxManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IClyde _displayManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         public override bool AlwaysDirty => true;
         private const float Slowness = 0.5f;

Content.Client/Research/LatheMenu.cs

@@ -14,9 +14,7 @@ namespace Content.Client.Research
 {
     public class LatheMenu : SS14Window
     {
-#pragma warning disable CS0649
-        [Dependency] private IPrototypeManager PrototypeManager;
-#pragma warning restore
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
 
         private ItemList Items;
         private ItemList Materials;
@@ -174,7 +172,7 @@ namespace Content.Client.Research
 
             foreach (var (id, amount) in Owner.Storage)
             {
-                if (!PrototypeManager.TryIndex(id, out MaterialPrototype materialPrototype)) continue;
+                if (!_prototypeManager.TryIndex(id, out MaterialPrototype materialPrototype)) continue;
                 var material = materialPrototype.Material;
                 Materials.AddItem($"{material.Name} {amount} cm³", material.Icon.Frame0(), false);
             }

Content.Client/Research/ResearchConsoleMenu.cs

@@ -32,9 +32,7 @@ namespace Content.Client.Research
         private ItemList _unlockableTechnologies;
         private ItemList _futureTechnologies;
 
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _localizationManager;
-#pragma warning restore 649
+        [Dependency] private readonly ILocalizationManager _localizationManager = default!;
 
         public Button UnlockButton { get; private set; }
         public Button ServerSelectionButton { get; private set; }

Content.Client/Sandbox/SandboxManager.cs

@@ -74,19 +74,18 @@ namespace Content.Client.Sandbox
             vBox.AddChild(ShowBbButton);
         }
     }
+
     internal class SandboxManager : SharedSandboxManager, ISandboxManager
     {
-#pragma warning disable 649
-        [Dependency] private readonly IClientConsole _console;
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IClientNetManager _netManager;
-        [Dependency] private readonly ILocalizationManager _localization;
-        [Dependency] private readonly IPlacementManager _placementManager;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager;
-        [Dependency] private readonly IInputManager _inputManager;
-#pragma warning restore 649
+        [Dependency] private readonly IClientConsole _console = default!;
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+        [Dependency] private readonly ILocalizationManager _localization = default!;
+        [Dependency] private readonly IPlacementManager _placementManager = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
 
         public bool SandboxAllowed { get; private set; }
 

Content.Client/State/GameScreen.cs

@@ -14,12 +14,10 @@ namespace Content.Client.State
 {
     public class GameScreen : GameScreenBase
     {
-#pragma warning disable 649
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IGameHud _gameHud;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IChatManager _chatManager;
-#pragma warning restore 649
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IGameHud _gameHud = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
 
         [ViewVariables] private ChatBox _gameChat;
 

Content.Client/State/GameScreenBase.cs

@@ -28,17 +28,15 @@ namespace Content.Client.State
     // Instantiated dynamically through the StateManager, Dependencies will be resolved.
     public partial class GameScreenBase : Robust.Client.State.State
     {
-#pragma warning disable 649
-        [Dependency] protected readonly IClientEntityManager EntityManager;
-        [Dependency] protected readonly IInputManager InputManager;
-        [Dependency] protected readonly IPlayerManager PlayerManager;
-        [Dependency] protected readonly IEyeManager EyeManager;
-        [Dependency] protected readonly IEntitySystemManager EntitySystemManager;
-        [Dependency] protected readonly IGameTiming Timing;
-        [Dependency] protected readonly IMapManager MapManager;
-        [Dependency] protected readonly IUserInterfaceManager UserInterfaceManager;
-        [Dependency] protected readonly IConfigurationManager ConfigurationManager;
-#pragma warning restore 649
+        [Dependency] protected readonly IClientEntityManager EntityManager = default!;
+        [Dependency] protected readonly IInputManager InputManager = default!;
+        [Dependency] protected readonly IPlayerManager PlayerManager = default!;
+        [Dependency] protected readonly IEyeManager EyeManager = default!;
+        [Dependency] protected readonly IEntitySystemManager EntitySystemManager = default!;
+        [Dependency] protected readonly IGameTiming Timing = default!;
+        [Dependency] protected readonly IMapManager MapManager = default!;
+        [Dependency] protected readonly IUserInterfaceManager UserInterfaceManager = default!;
+        [Dependency] protected readonly IConfigurationManager ConfigurationManager = default!;
 
         private IEntity _lastHoveredEntity;
 

Content.Client/State/LauncherConnecting.cs

@@ -16,13 +16,11 @@ namespace Content.Client.State
 {
     public class LauncherConnecting : Robust.Client.State.State
     {
-#pragma warning disable 649
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IStylesheetManager _stylesheetManager;
-        [Dependency] private readonly IClientNetManager _clientNetManager;
-        [Dependency] private readonly IGameController _gameController;
-        [Dependency] private readonly IBaseClient _baseClient;
-#pragma warning restore 649
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IStylesheetManager _stylesheetManager = default!;
+        [Dependency] private readonly IClientNetManager _clientNetManager = default!;
+        [Dependency] private readonly IGameController _gameController = default!;
+        [Dependency] private readonly IBaseClient _baseClient = default!;
 
         private Control _control;
         private Label _connectStatus;

Content.Client/State/LobbyState.cs

@@ -24,19 +24,17 @@ namespace Content.Client.State
 {
     public class LobbyState : Robust.Client.State.State
     {
-#pragma warning disable 649
-        [Dependency] private readonly IBaseClient _baseClient;
-        [Dependency] private readonly IClientConsole _console;
-        [Dependency] private readonly IChatManager _chatManager;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IClientGameTicker _clientGameTicker;
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IClientPreferencesManager _preferencesManager;
-#pragma warning restore 649
+        [Dependency] private readonly IBaseClient _baseClient = default!;
+        [Dependency] private readonly IClientConsole _console = default!;
+        [Dependency] private readonly IChatManager _chatManager = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IClientGameTicker _clientGameTicker = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!;
 
         [ViewVariables] private CharacterSetupGui _characterSetup;
         [ViewVariables] private LobbyGui _lobby;
@@ -215,7 +213,7 @@ namespace Content.Client.State
 
             foreach (var session in _playerManager.Sessions.OrderBy(s => s.Name))
             {
-                
+
 
                 var readyState = "";
                 // Don't show ready state if we're ingame

Content.Client/State/MainMenu.cs

@@ -27,15 +27,13 @@ namespace Content.Client.State
     {
         private const string PublicServerAddress = "server.spacestation14.io";
 
-#pragma warning disable 649
-        [Dependency] private readonly IBaseClient _client;
-        [Dependency] private readonly IClientNetManager _netManager;
-        [Dependency] private readonly IConfigurationManager _configurationManager;
-        [Dependency] private readonly IGameController _controllerProxy;
-        [Dependency] private readonly ILocalizationManager _loc;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IUserInterfaceManager userInterfaceManager;
-#pragma warning restore 649
+        [Dependency] private readonly IBaseClient _client = default!;
+        [Dependency] private readonly IClientNetManager _netManager = default!;
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
+        [Dependency] private readonly IGameController _controllerProxy = default!;
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
 
         private MainMenuControl _mainMenuControl;
         private OptionsMenu OptionsMenu;
@@ -48,7 +46,7 @@ namespace Content.Client.State
         public override void Startup()
         {
             _mainMenuControl = new MainMenuControl(_resourceCache, _configurationManager);
-            userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
+            _userInterfaceManager.StateRoot.AddChild(_mainMenuControl);
 
             _mainMenuControl.QuitButton.OnPressed += QuitButtonPressed;
             _mainMenuControl.OptionsButton.OnPressed += OptionsButtonPressed;
@@ -108,7 +106,7 @@ namespace Content.Client.State
             if (!UsernameHelpers.IsNameValid(inputName, out var reason))
             {
                 var invalidReason = _loc.GetString(reason.ToText());
-                userInterfaceManager.Popup(
+                _userInterfaceManager.Popup(
                     _loc.GetString("Invalid username:\n{0}", invalidReason),
                     _loc.GetString("Invalid Username"));
                 return;
@@ -130,7 +128,7 @@ namespace Content.Client.State
             }
             catch (ArgumentException e)
             {
-                userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error.");
+                _userInterfaceManager.Popup($"Unable to connect: {e.Message}", "Connection error.");
                 Logger.Warning(e.ToString());
                 _netManager.ConnectFailed -= _onConnectFailed;
             }
@@ -185,7 +183,7 @@ namespace Content.Client.State
 
         private void _onConnectFailed(object _, NetConnectFailArgs args)
         {
-            userInterfaceManager.Popup($"Failed to connect:\n{args.Reason}");
+            _userInterfaceManager.Popup($"Failed to connect:\n{args.Reason}");
             _netManager.ConnectFailed -= _onConnectFailed;
             _setConnectingState(false);
         }

Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs

@@ -15,9 +15,7 @@ namespace Content.Client.UserInterface.Cargo
 {
     public class CargoConsoleMenu : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _loc;
-#pragma warning restore 649
+        [Dependency] private readonly ILocalizationManager _loc = default!;
 
         protected override Vector2? CustomSize => (400, 600);
 
@@ -287,7 +285,7 @@ namespace Content.Client.UserInterface.Cargo
         public void PopulateOrders()
         {
             _orders.RemoveAllChildren();
-            _requests.RemoveAllChildren();            
+            _requests.RemoveAllChildren();
             foreach (var order in Owner.Orders.Orders)
             {
                 var row = new CargoOrderRow();

Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs

@@ -8,9 +8,7 @@ namespace Content.Client.UserInterface.Cargo
 {
     class CargoConsoleOrderMenu : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _loc;
-#pragma warning restore 649
+        [Dependency] private readonly ILocalizationManager _loc = default!;
 
         public LineEdit Requester { get; set; }
         public LineEdit Reason { get; set; }

Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs

@@ -10,16 +10,14 @@ namespace Content.Client.UserInterface.Cargo
 {
     public class GalacticBankSelectionMenu : SS14Window
     {
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+
         private ItemList _accounts;
         private int _accountCount = 0;
         private string[] _accountNames = new string[] { };
         private int[] _accountIds = new int[] { };
         private int _selectedAccountId = -1;
 
-#pragma warning disable 649
-        [Dependency] private readonly ILocalizationManager _loc;
-#pragma warning restore 649
-
         protected override Vector2? CustomSize => (300, 300);
 
         public CargoConsoleBoundUserInterface Owner;

Content.Client/UserInterface/GameHud.cs

@@ -74,11 +74,9 @@ namespace Content.Client.UserInterface
         private Button _combatModeButton;
         private VBoxContainer _combatPanelContainer;
 
-#pragma warning disable 649
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly ILocalizationManager _loc;
-        [Dependency] private readonly IInputManager _inputManager;
-#pragma warning restore 649
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly ILocalizationManager _loc = default!;
+        [Dependency] private readonly IInputManager _inputManager = default!;
 
         public Control HandsContainer { get; private set; }
         public Control InventoryQuickButtonContainer { get; private set; }

Content.Client/UserInterface/HandsGui.cs

@@ -17,11 +17,9 @@ namespace Content.Client.UserInterface
 {
     public class HandsGui : Control
     {
-#pragma warning disable 0649
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-        [Dependency] private readonly IItemSlotManager _itemSlotManager;
-#pragma warning restore 0649
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IItemSlotManager _itemSlotManager = default!;
 
         private readonly TextureRect _activeHandRect;
 

Content.Client/UserInterface/ItemSlotManager.cs

@@ -21,15 +21,13 @@ namespace Content.Client.UserInterface
 {
     public class ItemSlotManager : IItemSlotManager
     {
-#pragma warning disable 0649
-        [Dependency] private readonly IPlayerManager _playerManager;
-        [Dependency] private readonly IGameTiming _gameTiming;
-        [Dependency] private readonly IInputManager _inputManager;
-        [Dependency] private readonly IEntitySystemManager _entitySystemManager;
-        [Dependency] private readonly IEntityManager _entityManager;
-        [Dependency] private readonly IEyeManager _eyeManager;
-        [Dependency] private readonly IMapManager _mapManager;
-#pragma warning restore 0649
+        [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 IEntityManager _entityManager = default!;
+        [Dependency] private readonly IEyeManager _eyeManager = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
 
         public bool SetItemSlot(ItemSlotButton button, IEntity entity)
         {

Content.Client/UserInterface/LateJoinGui.cs

@@ -16,10 +16,8 @@ namespace Content.Client.UserInterface
 {
     public sealed class LateJoinGui : SS14Window
     {
-#pragma warning disable 649
-        [Dependency] private readonly IPrototypeManager _prototypeManager;
-        [Dependency] private readonly IClientConsole _console;
-#pragma warning restore 649
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+        [Dependency] private readonly IClientConsole _console = default!;
 
         protected override Vector2? CustomSize => (360, 560);
 

Content.Client/UserInterface/Stylesheets/StylesheetManager.cs

@@ -7,10 +7,8 @@ namespace Content.Client.UserInterface.Stylesheets
 {
     public sealed class StylesheetManager : IStylesheetManager
     {
-#pragma warning disable 649
-        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager;
-        [Dependency] private readonly IResourceCache _resourceCache;
-#pragma warning restore 649
+        [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
 
         public Stylesheet SheetNano { get; private set; }
         public Stylesheet SheetSpace { get; private set; }

Content.Client/VendingMachines/VendingMachineMenu.cs

@@ -15,17 +15,14 @@ namespace Content.Client.VendingMachines
 {
     class VendingMachineMenu : SS14Window
     {
+        [Dependency] private readonly IResourceCache _resourceCache = default!;
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
         protected override Vector2? CustomSize => (300, 450);
 
         private readonly ItemList _items;
         private List<VendingMachineInventoryEntry> _cachedInventory;
 
-        #pragma warning disable CS0649
-        [Dependency]
-        private IResourceCache _resourceCache;
-        [Dependency]
-        private readonly IPrototypeManager _prototypeManager;
-        #pragma warning restore
         public VendingMachineBoundUserInterface Owner { get; set; }
 
         public VendingMachineMenu()