diff --git a/Content.Benchmarks/DependencyInjectBenchmark.cs b/Content.Benchmarks/DependencyInjectBenchmark.cs index 06bd45fe3f..b7c4a9de74 100644 --- a/Content.Benchmarks/DependencyInjectBenchmark.cs +++ b/Content.Benchmarks/DependencyInjectBenchmark.cs @@ -59,11 +59,11 @@ namespace Content.Benchmarks private sealed class TestDummy { - [Dependency] private readonly X1 _x1; - [Dependency] private readonly X2 _x2; - [Dependency] private readonly X3 _x3; - [Dependency] private readonly X4 _x4; - [Dependency] private readonly X5 _x5; + [Dependency] private X1 _x1; + [Dependency] private X2 _x2; + [Dependency] private X3 _x3; + [Dependency] private X4 _x4; + [Dependency] private X5 _x5; } } } diff --git a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs index e26cca0fc2..f471975ba3 100644 --- a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs +++ b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs @@ -4,11 +4,11 @@ using Robust.Shared.Console; namespace Content.Client.Access.Commands; -public sealed class ShowAccessReadersCommand : LocalizedEntityCommands +public sealed partial class ShowAccessReadersCommand : LocalizedEntityCommands { - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IResourceCache _cache = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IResourceCache _cache = default!; + [Dependency] private SharedTransformSystem _xform = default!; public override string Command => "showaccessreaders"; diff --git a/Content.Client/Access/Systems/JobStatusSystem.cs b/Content.Client/Access/Systems/JobStatusSystem.cs index 8327a6c198..e651bfdb70 100644 --- a/Content.Client/Access/Systems/JobStatusSystem.cs +++ b/Content.Client/Access/Systems/JobStatusSystem.cs @@ -6,11 +6,11 @@ using Robust.Shared.Prototypes; namespace Content.Client.Access.Systems; -public sealed class JobStatusSystem : SharedJobStatusSystem +public sealed partial class JobStatusSystem : SharedJobStatusSystem { - [Dependency] private readonly ShowJobIconsSystem _showJobIcons = default!; - [Dependency] private readonly ShowCrewIconsSystem _showCrewIcons = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private ShowJobIconsSystem _showJobIcons = default!; + [Dependency] private ShowCrewIconsSystem _showCrewIcons = default!; + [Dependency] private IPrototypeManager _prototype = default!; private static readonly ProtoId CrewBorderIcon = "CrewBorderIcon"; private static readonly ProtoId CrewUncertainBorderIcon = "CrewUncertainBorderIcon"; diff --git a/Content.Client/Access/UI/AccessLevelControl.xaml.cs b/Content.Client/Access/UI/AccessLevelControl.xaml.cs index 12487b2e5c..76edee8432 100644 --- a/Content.Client/Access/UI/AccessLevelControl.xaml.cs +++ b/Content.Client/Access/UI/AccessLevelControl.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Access.UI; [GenerateTypedNameReferences] public sealed partial class AccessLevelControl : GridContainer { - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs index d80c600c03..c93715ad23 100644 --- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs +++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs @@ -8,9 +8,9 @@ using static Content.Shared.Access.Components.AccessOverriderComponent; namespace Content.Client.Access.UI { - public sealed class AccessOverriderBoundUserInterface : BoundUserInterface + public sealed partial class AccessOverriderBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedAccessOverriderSystem _accessOverriderSystem = default!; private AccessOverriderWindow? _window; diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs index 2b8ebf53b7..6a1255d2d8 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Access.UI [GenerateTypedNameReferences] public sealed partial class AgentIDCardWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _spriteSystem; private const int JobIconColumnCount = 10; diff --git a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs index 2a85530c48..0a25e35cd4 100644 --- a/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs +++ b/Content.Client/Access/UI/GroupedAccessLevelChecklist.xaml.cs @@ -17,7 +17,7 @@ public sealed partial class GroupedAccessLevelChecklist : BoxContainer { private static readonly ProtoId GeneralAccessGroup = "General"; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; private bool _isMonotone; private string? _labelStyleClass; diff --git a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs index 31f65dc78d..3a53b85339 100644 --- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs +++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs @@ -9,9 +9,9 @@ using static Content.Shared.Access.Components.IdCardConsoleComponent; namespace Content.Client.Access.UI { - public sealed class IdCardConsoleBoundUserInterface : BoundUserInterface + public sealed partial class IdCardConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedIdCardConsoleSystem _idCardConsoleSystem = default!; private IdCardConsoleWindow? _window; diff --git a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs index 2169277f0d..57349d6840 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs @@ -16,9 +16,9 @@ namespace Content.Client.Access.UI [GenerateTypedNameReferences] public sealed partial class IdCardConsoleWindow : DefaultWindow { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ILogManager _logManager = default!; private readonly ISawmill _logMill = default!; private readonly IdCardConsoleBoundUserInterface _owner; diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index 49d90dedaf..ae37b35060 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -24,16 +24,16 @@ using YamlDotNet.RepresentationModel; namespace Content.Client.Actions { [UsedImplicitly] - public sealed class ActionsSystem : SharedActionsSystem + public sealed partial class ActionsSystem : SharedActionsSystem { public delegate void OnActionReplaced(EntityUid actionId); - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IResourceManager _resources = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IResourceManager _resources = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private ISerializationManager _serialization = default!; public event Action? OnActionAdded; public event Action? OnActionRemoved; diff --git a/Content.Client/Administration/Managers/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs index 3f072691de..3abff217f6 100644 --- a/Content.Client/Administration/Managers/ClientAdminManager.cs +++ b/Content.Client/Administration/Managers/ClientAdminManager.cs @@ -10,15 +10,15 @@ using Robust.Shared.Utility; namespace Content.Client.Administration.Managers { - public sealed class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit, ISharedAdminManager + public sealed partial class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit, ISharedAdminManager { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IClientNetManager _netMgr = default!; - [Dependency] private readonly IClientConGroupController _conGroup = default!; - [Dependency] private readonly IClientConsoleHost _host = default!; - [Dependency] private readonly IResourceManager _res = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IUserInterfaceManager _userInterface = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IClientNetManager _netMgr = default!; + [Dependency] private IClientConGroupController _conGroup = default!; + [Dependency] private IClientConsoleHost _host = default!; + [Dependency] private IResourceManager _res = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IUserInterfaceManager _userInterface = default!; private AdminData? _adminData; private readonly HashSet _availableCommands = new(); diff --git a/Content.Client/Administration/Systems/AdminSystem.Overlay.cs b/Content.Client/Administration/Systems/AdminSystem.Overlay.cs index e000bdc0ba..a07abae90c 100644 --- a/Content.Client/Administration/Systems/AdminSystem.Overlay.cs +++ b/Content.Client/Administration/Systems/AdminSystem.Overlay.cs @@ -10,15 +10,15 @@ namespace Content.Client.Administration.Systems { public sealed partial class AdminSystem { - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private IPrototypeManager _proto = default!; private AdminNameOverlay _adminNameOverlay = default!; diff --git a/Content.Client/Administration/Systems/AdminVerbSystem.cs b/Content.Client/Administration/Systems/AdminVerbSystem.cs index 1e15186706..33141c43cf 100644 --- a/Content.Client/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Client/Administration/Systems/AdminVerbSystem.cs @@ -10,11 +10,11 @@ namespace Content.Client.Administration.Systems /// /// Client-side admin verb system. These usually open some sort of UIs. /// - sealed class AdminVerbSystem : EntitySystem + sealed partial class AdminVerbSystem : EntitySystem { - [Dependency] private readonly IClientConGroupController _clientConGroupController = default!; - [Dependency] private readonly IClientConsoleHost _clientConsoleHost = default!; - [Dependency] private readonly ISharedAdminManager _admin = default!; + [Dependency] private IClientConGroupController _clientConGroupController = default!; + [Dependency] private IClientConsoleHost _clientConsoleHost = default!; + [Dependency] private ISharedAdminManager _admin = default!; public override void Initialize() { diff --git a/Content.Client/Administration/Systems/BwoinkSystem.cs b/Content.Client/Administration/Systems/BwoinkSystem.cs index 7adf0069b2..70c04f77fb 100644 --- a/Content.Client/Administration/Systems/BwoinkSystem.cs +++ b/Content.Client/Administration/Systems/BwoinkSystem.cs @@ -7,9 +7,9 @@ using Robust.Shared.Timing; namespace Content.Client.Administration.Systems { [UsedImplicitly] - public sealed class BwoinkSystem : SharedBwoinkSystem + public sealed partial class BwoinkSystem : SharedBwoinkSystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public event EventHandler? OnBwoinkTextMessageRecieved; private (TimeSpan Timestamp, bool Typing) _lastTypingUpdateSent; diff --git a/Content.Client/Administration/Systems/KillSignSystem.cs b/Content.Client/Administration/Systems/KillSignSystem.cs index f17c384c1e..8ed2891468 100644 --- a/Content.Client/Administration/Systems/KillSignSystem.cs +++ b/Content.Client/Administration/Systems/KillSignSystem.cs @@ -5,10 +5,10 @@ using Robust.Client.Player; namespace Content.Client.Administration.Systems; -public sealed class KillSignSystem : EntitySystem +public sealed partial class KillSignSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private IPlayerManager _player = default!; public override void Initialize() { diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs index 5156b7f3c1..7120550c82 100644 --- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs +++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.Administration.UI [GenerateTypedNameReferences] public sealed partial class AdminAnnounceWindow : DefaultWindow { - [Dependency] private readonly ILocalizationManager _localization = default!; + [Dependency] private ILocalizationManager _localization = default!; public AdminAnnounceWindow() { diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs index beb8344ce3..147c959b7c 100644 --- a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs +++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Administration.UI.AdminCamera; [GenerateTypedNameReferences] public sealed partial class AdminCameraControl : Control { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IClientGameTiming _timing = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IClientGameTiming _timing = default!; public event Action? OnFollow; public event Action? OnPopoutControl; diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs index 7870dae7b2..b88bd1728f 100644 --- a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs +++ b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.AdminRemarks; [GenerateTypedNameReferences] public sealed partial class AdminMessagePopupWindow : Control { - [Dependency] private readonly IStylesheetManager _styleMan = default!; + [Dependency] private IStylesheetManager _styleMan = default!; private float _timer = float.MaxValue; diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml.cs index ae77ad68cb..98333951f5 100644 --- a/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml.cs +++ b/Content.Client/Administration/UI/AdminRemarks/AdminRemarksWindow.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Administration.UI.AdminRemarks; [GenerateTypedNameReferences] public sealed partial class AdminRemarksWindow : FancyWindow { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _sprites; private readonly Dictionary<(int, NoteType), AdminNotesLine> _inputs = new(); diff --git a/Content.Client/Administration/UI/BanList/BanListEui.cs b/Content.Client/Administration/UI/BanList/BanListEui.cs index 00b27cd173..ff20e6fa89 100644 --- a/Content.Client/Administration/UI/BanList/BanListEui.cs +++ b/Content.Client/Administration/UI/BanList/BanListEui.cs @@ -11,9 +11,9 @@ using Robust.Client.UserInterface; namespace Content.Client.Administration.UI.BanList; [UsedImplicitly] -public sealed class BanListEui : BaseEui +public sealed partial class BanListEui : BaseEui { - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private IUserInterfaceManager _ui = default!; private BanListIdsPopup? _popup; diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs index cb2839f5d0..130164cf8e 100644 --- a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs +++ b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs @@ -40,11 +40,11 @@ public sealed partial class BanPanel : DefaultWindow private readonly Dictionary> _roleCheckboxes = new(); private readonly ISawmill _banPanelSawmill; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private const string ExpandedArrow = "▼"; private const string ContractedArrow = "▶"; diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs index 6ff07f6cbd..369af1d53f 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs @@ -22,10 +22,10 @@ namespace Content.Client.Administration.UI.Bwoink [GenerateTypedNameReferences] public sealed partial class BwoinkControl : Control { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IClientConsoleHost _console = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IClientConsoleHost _console = default!; + [Dependency] private IUserInterfaceManager _ui = default!; + [Dependency] private IConfigurationManager _cfg = default!; public AdminAHelpUIHandler AHelpHelper = default!; private PlayerInfo? _currentPlayer; diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs index 28aca23f75..d8323dcd5c 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs @@ -13,12 +13,12 @@ using static Content.Shared.Administration.Logs.AdminLogsEuiMsg; namespace Content.Client.Administration.UI.Logs; [UsedImplicitly] -public sealed class AdminLogsEui : BaseEui +public sealed partial class AdminLogsEui : BaseEui { - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly IFileDialogManager _dialogManager = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private IFileDialogManager _dialogManager = default!; + [Dependency] private ILogManager _log = default!; private const char CsvSeparator = ','; private const string CsvQuote = "\""; diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs index 1ded5cebb3..41c3c64166 100644 --- a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs +++ b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Administration.UI.ManageSolutions [GenerateTypedNameReferences] public sealed partial class AddReagentWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; private readonly NetEntity _targetEntity; private string _targetSolution; diff --git a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs index 89016fdf41..0fec1b71e4 100644 --- a/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs +++ b/Content.Client/Administration/UI/ManageSolutions/EditSolutionsWindow.xaml.cs @@ -18,10 +18,10 @@ namespace Content.Client.Administration.UI.ManageSolutions [GenerateTypedNameReferences] public sealed partial class EditSolutionsWindow : DefaultWindow { - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IClientGameTiming _timing = default!; - [Dependency] private readonly IClientAdminManager _admin = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IClientGameTiming _timing = default!; + [Dependency] private IClientAdminManager _admin = default!; private NetEntity _target = NetEntity.Invalid; private string? _selectedSolution; diff --git a/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml.cs index 9ad6d2e0ea..7a889a0b12 100644 --- a/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml.cs +++ b/Content.Client/Administration/UI/Notes/AdminNotesControl.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Administration.UI.Notes; [GenerateTypedNameReferences] public sealed partial class AdminNotesControl : Control { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; public event Action? NoteChanged; public event Action? NewNoteEntered; diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs index e82b85acb6..4e4027e7d4 100644 --- a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs +++ b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs @@ -14,7 +14,7 @@ public sealed partial class AdminNotesLinePopup : Popup public event Action? OnEditPressed; public event Action? OnDeletePressed; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public AdminNotesLinePopup(SharedAdminNote note, string playerName, bool showDelete, bool showEdit) { diff --git a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs index 0c27d9d646..5515600d1e 100644 --- a/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs +++ b/Content.Client/Administration/UI/Notes/NoteEdit.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.Administration.UI.Notes; [GenerateTypedNameReferences] public sealed partial class NoteEdit : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IClientConsoleHost _console = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IClientConsoleHost _console = default!; private enum Multipliers { diff --git a/Content.Client/Administration/UI/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs index 96b53babb5..71aea9f45d 100644 --- a/Content.Client/Administration/UI/PermissionsEui.cs +++ b/Content.Client/Administration/UI/PermissionsEui.cs @@ -20,11 +20,11 @@ using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.Administration.UI { [UsedImplicitly] - public sealed class PermissionsEui : BaseEui + public sealed partial class PermissionsEui : BaseEui { private const int NoRank = -1; - [Dependency] private readonly IClientAdminManager _adminManager = default!; + [Dependency] private IClientAdminManager _adminManager = default!; private readonly Menu _menu; private readonly List _subWindows = new(); diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs index 8c8183ef22..1828d34f2f 100644 --- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs +++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs @@ -9,11 +9,11 @@ using Robust.Client.UserInterface; namespace Content.Client.Administration.UI.PlayerPanel; [UsedImplicitly] -public sealed class PlayerPanelEui : BaseEui +public sealed partial class PlayerPanelEui : BaseEui { - [Dependency] private readonly IClientConsoleHost _console = default!; - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IClipboardManager _clipboard = default!; + [Dependency] private IClientConsoleHost _console = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IClipboardManager _clipboard = default!; private PlayerPanel PlayerPanel { get; } diff --git a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs index 615f1434df..3268f2aff5 100644 --- a/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs +++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Administration.UI.SetOutfit [GenerateTypedNameReferences] public sealed partial class SetOutfitMenu : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; public NetEntity? TargetEntityId { get; set; } private StartingGearPrototype? _selectedOutfit; diff --git a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs index d60094ad89..46ac390181 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs @@ -11,10 +11,10 @@ using Robust.Shared.Map.Components; namespace Content.Client.Administration.UI.SpawnExplosion; [UsedImplicitly] -public sealed class ExplosionDebugOverlay : Overlay +public sealed partial class ExplosionDebugOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; public Dictionary>? SpaceTiles; public Dictionary>> Tiles = new(); diff --git a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs index 9de177b6c7..df0305105b 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs @@ -8,10 +8,10 @@ using Robust.Shared.Map; namespace Content.Client.Administration.UI.SpawnExplosion; [UsedImplicitly] -public sealed class SpawnExplosionEui : BaseEui +public sealed partial class SpawnExplosionEui : BaseEui { - [Dependency] private readonly EntityManager _entManager = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; + [Dependency] private EntityManager _entManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; private readonly SpawnExplosionWindow _window; private ExplosionDebugOverlay? _debugOverlay; diff --git a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs index 287c17e422..ad9cb331da 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionWindow.xaml.cs @@ -18,10 +18,10 @@ namespace Content.Client.Administration.UI.SpawnExplosion; [UsedImplicitly] public sealed partial class SpawnExplosionWindow : DefaultWindow { - [Dependency] private readonly IClientConsoleHost _conHost = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IClientConsoleHost _conHost = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entMan = default!; private readonly SharedMapSystem _mapSystem; private readonly SharedTransformSystem _transform = default!; diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs index 12df72bdcf..a7985337fa 100644 --- a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.Administration.UI.Tabs.AdminbusTab [UsedImplicitly] public sealed partial class LoadBlueprintsWindow : DefaultWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public LoadBlueprintsWindow() { diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs index 72a594469d..2dacc82ec4 100644 --- a/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Administration.UI.Tabs.AtmosTab [UsedImplicitly] public sealed partial class AddAtmosWindow : DefaultWindow { - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IEntityManager _entities = default!; private readonly List> _data = new(); diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs index fa92a3e18f..4195fe7a75 100644 --- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs @@ -13,9 +13,9 @@ namespace Content.Client.Administration.UI.Tabs.ObjectsTab; [GenerateTypedNameReferences] public sealed partial class ObjectsTab : Control { - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IClientConsoleHost _console = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IClientConsoleHost _console = default!; private readonly Color _altColor = Color.FromHex("#292B38"); private readonly Color _defaultColor = Color.FromHex("#2F2F3B"); diff --git a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs index 81982452a3..894af1a173 100644 --- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Administration.UI.Tabs.PanicBunkerTab; [GenerateTypedNameReferences] public sealed partial class PanicBunkerTab : Control { - [Dependency] private readonly IConsoleHost _console = default!; + [Dependency] private IConsoleHost _console = default!; private string _minAccountAge; private string _minOverallMinutes; diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs index 5a75e7223f..3691ae1852 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs @@ -17,9 +17,9 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab; [GenerateTypedNameReferences] public sealed partial class PlayerTab : Control { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IPlayerManager _playerMan = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IPlayerManager _playerMan = default!; private const string ArrowUp = "↑"; private const string ArrowDown = "↓"; diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs index 6a2d939b4b..68516491d9 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs @@ -12,8 +12,8 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab; [GenerateTypedNameReferences] public sealed partial class PlayerTabEntry : PanelContainer { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototype = default!; public PlayerTabEntry( PlayerInfo player, diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs index 70f12bb393..cce809d35a 100644 --- a/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs @@ -8,7 +8,7 @@ namespace Content.Client.Administration.UI.Tabs [GenerateTypedNameReferences] public sealed partial class RoundTab : Control { - [Dependency] private readonly IClientConsoleHost _console = default!; + [Dependency] private IClientConsoleHost _console = default!; public RoundTab() { diff --git a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs index 7a70e42d06..c025a93d58 100644 --- a/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs @@ -10,8 +10,8 @@ namespace Content.Client.Administration.UI.Tabs [GenerateTypedNameReferences] public sealed partial class ServerTab : Control { - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IClientConsoleHost _console = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IClientConsoleHost _console = default!; public ServerTab() { diff --git a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs index 13e2ab3208..845be2e429 100644 --- a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs +++ b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs @@ -6,9 +6,9 @@ using Robust.Shared.Utility; namespace Content.Client.AlertLevel; -public sealed class AlertLevelDisplaySystem : EntitySystem +public sealed partial class AlertLevelDisplaySystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs index 43c74adc5d..29cd5da190 100644 --- a/Content.Client/Alerts/ClientAlertsSystem.cs +++ b/Content.Client/Alerts/ClientAlertsSystem.cs @@ -10,13 +10,13 @@ using Robust.Shared.Prototypes; namespace Content.Client.Alerts; [UsedImplicitly] -public sealed class ClientAlertsSystem : AlertsSystem +public sealed partial class ClientAlertsSystem : AlertsSystem { public AlertOrderPrototype? AlertOrder { get; set; } - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; public event EventHandler? ClearAlerts; public event EventHandler>? SyncAlerts; diff --git a/Content.Client/Alerts/GenericCounterAlertSystem.cs b/Content.Client/Alerts/GenericCounterAlertSystem.cs index de9d97d063..b8d2e2d0d3 100644 --- a/Content.Client/Alerts/GenericCounterAlertSystem.cs +++ b/Content.Client/Alerts/GenericCounterAlertSystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Alerts; /// /// This handles /// -public sealed class GenericCounterAlertSystem : EntitySystem +public sealed partial class GenericCounterAlertSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Animations/EntityPickupAnimationSystem.cs b/Content.Client/Animations/EntityPickupAnimationSystem.cs index 58f1740e3c..7445267ddf 100644 --- a/Content.Client/Animations/EntityPickupAnimationSystem.cs +++ b/Content.Client/Animations/EntityPickupAnimationSystem.cs @@ -11,12 +11,12 @@ namespace Content.Client.Animations; /// /// System that handles animating an entity that a player has picked up. /// -public sealed class EntityPickupAnimationSystem : EntitySystem +public sealed partial class EntityPickupAnimationSystem : EntitySystem { - [Dependency] private readonly AnimationPlayerSystem _animations = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private AnimationPlayerSystem _animations = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private TransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Client/Anomaly/AnomalyScannerSystem.cs b/Content.Client/Anomaly/AnomalyScannerSystem.cs index f80e5ead54..f30a213977 100644 --- a/Content.Client/Anomaly/AnomalyScannerSystem.cs +++ b/Content.Client/Anomaly/AnomalyScannerSystem.cs @@ -8,10 +8,10 @@ using SixLabors.ImageSharp.PixelFormats; namespace Content.Client.Anomaly; /// -public sealed class AnomalyScannerSystem : SharedAnomalyScannerSystem +public sealed partial class AnomalyScannerSystem : SharedAnomalyScannerSystem { - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private SpriteSystem _sprite = default!; private const float MaxHueDegrees = 360f; private const float GreenHueDegrees = 110f; diff --git a/Content.Client/Anomaly/AnomalySystem.cs b/Content.Client/Anomaly/AnomalySystem.cs index b4bc6efdd2..bc29ceb678 100644 --- a/Content.Client/Anomaly/AnomalySystem.cs +++ b/Content.Client/Anomaly/AnomalySystem.cs @@ -9,9 +9,9 @@ namespace Content.Client.Anomaly; public sealed partial class AnomalySystem : SharedAnomalySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly FloatingVisualizerSystem _floating = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private FloatingVisualizerSystem _floating = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs index a9dcfaf2b0..6d48254c19 100644 --- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs +++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs @@ -5,9 +5,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Anomaly.Effects; -public sealed class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem +public sealed partial class ClientInnerBodyAnomalySystem : SharedInnerBodyAnomalySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs index 82d41192dd..f26219d532 100644 --- a/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs +++ b/Content.Client/Anomaly/Ui/AnomalyGeneratorWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.Anomaly.Ui; [GenerateTypedNameReferences] public sealed partial class AnomalyGeneratorWindow : FancyWindow { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; private TimeSpan _cooldownEnd = TimeSpan.Zero; private bool _hasEnoughFuel; diff --git a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs index c012edb89e..f849ce5d33 100644 --- a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs +++ b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Anomaly.Ui; [GenerateTypedNameReferences] public sealed partial class AnomalyScannerMenu : FancyWindow { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public FormattedMessage LastMessage = new(); public TimeSpan? NextPulseTime; diff --git a/Content.Client/Atmos/AlignAtmosPipeLayers.cs b/Content.Client/Atmos/AlignAtmosPipeLayers.cs index 51a6ce0c02..c8e69bc17f 100644 --- a/Content.Client/Atmos/AlignAtmosPipeLayers.cs +++ b/Content.Client/Atmos/AlignAtmosPipeLayers.cs @@ -23,12 +23,12 @@ namespace Content.Client.Atmos; /// /// This placement mode is not on the engine because it is content specific. /// -public sealed class AlignAtmosPipeLayers : SnapgridCenter +public sealed partial class AlignAtmosPipeLayers : SnapgridCenter { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; private readonly SharedMapSystem _mapSystem; private readonly SharedTransformSystem _transformSystem; diff --git a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs index 94bfb4b4f3..1ef23ed537 100644 --- a/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs +++ b/Content.Client/Atmos/Consoles/AtmosMonitoringConsoleNavMapControl.cs @@ -11,7 +11,7 @@ namespace Content.Client.Atmos.Consoles; public sealed partial class AtmosMonitoringConsoleNavMapControl : NavMapControl { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public bool ShowPipeNetwork = true; public int? FocusNetId = null; diff --git a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index 32e8292241..07a163a000 100644 --- a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -8,9 +8,9 @@ using Robust.Client.Graphics; namespace Content.Client.Atmos.EntitySystems { [UsedImplicitly] - internal sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem + internal sealed partial class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem { - [Dependency] private readonly IOverlayManager _overlayManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; public readonly Dictionary TileData = []; diff --git a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs index 1a12c3967b..4ee3d74545 100644 --- a/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs +++ b/Content.Client/Atmos/EntitySystems/AtmosPipeAppearanceSystem.cs @@ -11,8 +11,8 @@ namespace Content.Client.Atmos.EntitySystems; [UsedImplicitly] public sealed partial class AtmosPipeAppearanceSystem : SharedAtmosPipeAppearanceSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs b/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs index f560e0b833..bdd653ad8f 100644 --- a/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs +++ b/Content.Client/Atmos/EntitySystems/AtmosPipeLayersSystem.cs @@ -14,10 +14,10 @@ namespace Content.Client.Atmos.EntitySystems; /// public sealed partial class AtmosPipeLayersSystem : SharedAtmosPipeLayersSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IReflectionManager _reflection = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IReflectionManager _reflection = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs b/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs index 431a598678..ec4500935c 100644 --- a/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs +++ b/Content.Client/Atmos/EntitySystems/FireVisualizerSystem.cs @@ -9,9 +9,9 @@ namespace Content.Client.Atmos.EntitySystems; /// /// This handles the display of fire effects on flammable entities. /// -public sealed class FireVisualizerSystem : VisualizerSystem +public sealed partial class FireVisualizerSystem : VisualizerSystem { - [Dependency] private readonly PointLightSystem _lights = default!; + [Dependency] private PointLightSystem _lights = default!; public override void Initialize() { diff --git a/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs index f16774ce24..d54f4d20a6 100644 --- a/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs +++ b/Content.Client/Atmos/EntitySystems/GasCanisterAppearanceSystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Atmos.EntitySystems; /// /// Used to change the appearance of gas canisters. /// -public sealed class GasCanisterAppearanceSystem : VisualizerSystem +public sealed partial class GasCanisterAppearanceSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; protected override void OnAppearanceChange(EntityUid uid, GasCanisterComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/Atmos/EntitySystems/GasTileFireOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileFireOverlaySystem.cs index b1bfdb70ab..f193bcb411 100644 --- a/Content.Client/Atmos/EntitySystems/GasTileFireOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/GasTileFireOverlaySystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Atmos.EntitySystems; /// System responsible for rendering atmos fire animations using . /// [UsedImplicitly] -public sealed class GasTileFireOverlaySystem : EntitySystem +public sealed partial class GasTileFireOverlaySystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private GasTileFireOverlay _fireOverlay = default!; diff --git a/Content.Client/Atmos/EntitySystems/GasTileHeatBlurOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileHeatBlurOverlaySystem.cs index a80208620b..282cd956c7 100644 --- a/Content.Client/Atmos/EntitySystems/GasTileHeatBlurOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/GasTileHeatBlurOverlaySystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Atmos.EntitySystems; /// System responsible for rendering heat distortion using . /// [UsedImplicitly] -public sealed class GasTileHeatBlurOverlaySystem : EntitySystem +public sealed partial class GasTileHeatBlurOverlaySystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private GasTileHeatBlurOverlay _gasTileHeatBlurOverlay = default!; diff --git a/Content.Client/Atmos/EntitySystems/GasTileVisibleGasOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileVisibleGasOverlaySystem.cs index 3d7f26cc30..f47e3f7d60 100644 --- a/Content.Client/Atmos/EntitySystems/GasTileVisibleGasOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/GasTileVisibleGasOverlaySystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Atmos.EntitySystems; /// System responsible for rendering visible atmos gasses (like plasma for example) using . /// [UsedImplicitly] -public sealed class GasTileVisibleGasOverlaySystem : EntitySystem +public sealed partial class GasTileVisibleGasOverlaySystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private GasTileVisibleGasOverlay _visibleGasOverlay = default!; diff --git a/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs b/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs index 72eff2b409..28081214da 100644 --- a/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs +++ b/Content.Client/Atmos/EntitySystems/MaxPressureVisualsSystem.cs @@ -10,9 +10,9 @@ namespace Content.Client.Atmos.EntitySystems; /// This system handles sprite changes for a /// with a when its changes. /// -public sealed class MaxPressureVisualsSystem : EntitySystem +public sealed partial class MaxPressureVisualsSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs index 70da57df2e..e197c72855 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Atmos.Monitor.UI.Widgets; [GenerateTypedNameReferences] public sealed partial class ScrubberControl : BoxContainer { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entMan = default!; private GasVentScrubberData _data; private string _address; diff --git a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs index d9945b1acc..ed7a9022e5 100644 --- a/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs +++ b/Content.Client/Atmos/Monitor/UI/Widgets/SensorInfo.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.Atmos.Monitor.UI.Widgets; [GenerateTypedNameReferences] public sealed partial class SensorInfo : BoxContainer { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entMan = default!; public Action? OnThresholdUpdate; public event Action? SensorDataCopied; diff --git a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs index ef24f1bee8..33fec9d985 100644 --- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs +++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs @@ -18,13 +18,13 @@ using DebugMessage = Content.Shared.Atmos.EntitySystems.SharedAtmosDebugOverlayS namespace Content.Client.Atmos.Overlays; -public sealed class AtmosDebugOverlay : Overlay +public sealed partial class AtmosDebugOverlay : Overlay { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; - [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IUserInterfaceManager _ui = default!; + [Dependency] private IResourceCache _cache = default!; private readonly SharedTransformSystem _transform; private readonly AtmosDebugOverlaySystem _system; private readonly SharedMapSystem _map; diff --git a/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs b/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs index 778a2a83b2..65d1b11e53 100644 --- a/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileDangerousTemperatureOverlay.cs @@ -14,13 +14,13 @@ namespace Content.Client.Atmos.Overlays; /// /// Renders a thermal heatmap overlay for gas tiles, used for equipment like thermal glasses. /// /// -public sealed class GasTileDangerousTemperatureOverlay : Overlay +public sealed partial class GasTileDangerousTemperatureOverlay : Overlay { public override bool RequestScreenTexture { get; set; } = false; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IClyde _clyde = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IClyde _clyde = default!; private GasTileOverlaySystem? _gasTileOverlay; private readonly SharedTransformSystem _xformSys; diff --git a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs index 310bac8669..45cebef98b 100644 --- a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs @@ -18,12 +18,12 @@ namespace Content.Client.Atmos.Overlays; /// /// Overlay responsible for rendering atmos fire animation. /// -public sealed class GasTileFireOverlay : Overlay +public sealed partial class GasTileFireOverlay : Overlay { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IMapManager _mapManager = default!; public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities | OverlaySpace.WorldSpaceBelowWorld; private static readonly ProtoId UnshadedShader = "unshaded"; diff --git a/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs b/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs index d849319875..7815bec6e4 100644 --- a/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileHeatBlurOverlay.cs @@ -21,18 +21,18 @@ namespace Content.Client.Atmos.Overlays; /// /// Overlay responsible for rendering heat distortion shader. /// -public sealed class GasTileHeatBlurOverlay : Overlay +public sealed partial class GasTileHeatBlurOverlay : Overlay { public override bool RequestScreenTexture { get; set; } = true; private static readonly ProtoId UnshadedShader = "unshaded"; private static readonly ProtoId HeatOverlayShader = "HeatBlur"; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; private readonly SharedTransformSystem _xformSys; private readonly ShaderInstance _shader; diff --git a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs index 4d909c9fc8..d5b21aeabe 100644 --- a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs @@ -20,12 +20,12 @@ namespace Content.Client.Atmos.Overlays; /// /// Overlay responsible for rendering visible atmos gasses (like plasma for example) usin. /// -public sealed class GasTileVisibleGasOverlay : Overlay +public sealed partial class GasTileVisibleGasOverlay : Overlay { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IMapManager _mapManager = default!; private static readonly ProtoId UnshadedShader = "unshaded"; diff --git a/Content.Client/Atmos/Piping/Binary/Systems/GasVolumePumpSystem.cs b/Content.Client/Atmos/Piping/Binary/Systems/GasVolumePumpSystem.cs index f615d9a892..83623a68f1 100644 --- a/Content.Client/Atmos/Piping/Binary/Systems/GasVolumePumpSystem.cs +++ b/Content.Client/Atmos/Piping/Binary/Systems/GasVolumePumpSystem.cs @@ -4,9 +4,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Atmos.Piping.Binary.Systems; -public sealed class GasVolumePumpSystem : SharedGasVolumePumpSystem +public sealed partial class GasVolumePumpSystem : SharedGasVolumePumpSystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Client/Atmos/Piping/Unary/Systems/GasThermoMachineSystem.cs b/Content.Client/Atmos/Piping/Unary/Systems/GasThermoMachineSystem.cs index bd75fa0095..647852b8a9 100644 --- a/Content.Client/Atmos/Piping/Unary/Systems/GasThermoMachineSystem.cs +++ b/Content.Client/Atmos/Piping/Unary/Systems/GasThermoMachineSystem.cs @@ -4,9 +4,9 @@ using Content.Shared.Atmos.Piping.Unary.Systems; namespace Content.Client.Atmos.Piping.Unary.Systems; -public sealed class GasThermoMachineSystem : SharedGasThermoMachineSystem +public sealed partial class GasThermoMachineSystem : SharedGasThermoMachineSystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Client/Atmos/UI/GasThermomachineWindow.xaml.cs b/Content.Client/Atmos/UI/GasThermomachineWindow.xaml.cs index dd384fa610..20205cb34d 100644 --- a/Content.Client/Atmos/UI/GasThermomachineWindow.xaml.cs +++ b/Content.Client/Atmos/UI/GasThermomachineWindow.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Atmos.UI; [GenerateTypedNameReferences] public sealed partial class GasThermomachineWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public FloatSpinBox TemperatureSpinbox; diff --git a/Content.Client/Audio/AmbientOverlayCommand.cs b/Content.Client/Audio/AmbientOverlayCommand.cs index 7bbc6c6cbf..0730cd4a14 100644 --- a/Content.Client/Audio/AmbientOverlayCommand.cs +++ b/Content.Client/Audio/AmbientOverlayCommand.cs @@ -2,9 +2,9 @@ using Robust.Shared.Console; namespace Content.Client.Audio; -public sealed class AmbientOverlayCommand : LocalizedEntityCommands +public sealed partial class AmbientOverlayCommand : LocalizedEntityCommands { - [Dependency] private readonly AmbientSoundSystem _ambient = default!; + [Dependency] private AmbientSoundSystem _ambient = default!; public override string Command => "showambient"; diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs index 92bfc677eb..967eae6ae5 100644 --- a/Content.Client/Audio/AmbientSoundSystem.cs +++ b/Content.Client/Audio/AmbientSoundSystem.cs @@ -20,16 +20,16 @@ namespace Content.Client.Audio; /// /// Samples nearby and plays audio. /// -public sealed class AmbientSoundSystem : SharedAmbientSoundSystem +public sealed partial class AmbientSoundSystem : SharedAmbientSoundSystem { - [Dependency] private readonly AmbientSoundTreeSystem _treeSys = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private AmbientSoundTreeSystem _treeSys = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IRobustRandom _random = default!; protected override void QueueUpdate(EntityUid uid, AmbientSoundComponent ambience) => _treeSys.QueueTreeUpdate(uid, ambience); diff --git a/Content.Client/Audio/AudioUIController.cs b/Content.Client/Audio/AudioUIController.cs index 16e1edd252..779f56d619 100644 --- a/Content.Client/Audio/AudioUIController.cs +++ b/Content.Client/Audio/AudioUIController.cs @@ -7,11 +7,11 @@ using Robust.Shared.Configuration; namespace Content.Client.Audio; -public sealed class AudioUIController : UIController +public sealed partial class AudioUIController : UIController { - [Dependency] private readonly IAudioManager _audioManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private IAudioManager _audioManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IResourceCache _cache = default!; private float _interfaceGain; private IAudioSource? _clickSource; diff --git a/Content.Client/Audio/ClientGlobalSoundSystem.cs b/Content.Client/Audio/ClientGlobalSoundSystem.cs index 882ab1be6d..b077c1c30f 100644 --- a/Content.Client/Audio/ClientGlobalSoundSystem.cs +++ b/Content.Client/Audio/ClientGlobalSoundSystem.cs @@ -8,10 +8,10 @@ using Robust.Shared.Player; namespace Content.Client.Audio; -public sealed class ClientGlobalSoundSystem : SharedGlobalSoundSystem +public sealed partial class ClientGlobalSoundSystem : SharedGlobalSoundSystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private SharedAudioSystem _audio = default!; // Admin music private bool _adminAudioEnabled = true; diff --git a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs index d82f6b07fb..b54513800e 100644 --- a/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.AmbientMusic.cs @@ -20,15 +20,15 @@ namespace Content.Client.Audio; public sealed partial class ContentAudioSystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IStateManager _state = default!; - [Dependency] private readonly RulesSystem _rules = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IStateManager _state = default!; + [Dependency] private RulesSystem _rules = default!; + [Dependency] private SharedAudioSystem _audio = default!; private readonly TimeSpan _minAmbienceTime = TimeSpan.FromSeconds(30); private readonly TimeSpan _maxAmbienceTime = TimeSpan.FromSeconds(60); diff --git a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs index fda2c0062c..e6056a9bc8 100644 --- a/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs +++ b/Content.Client/Audio/ContentAudioSystem.LobbyMusic.cs @@ -18,9 +18,9 @@ namespace Content.Client.Audio; // Part of ContentAudioSystem that is responsible for lobby music playing/stopping and round-end sound-effect. public sealed partial class ContentAudioSystem { - [Dependency] private readonly IBaseClient _client = default!; - [Dependency] private readonly ClientGameTicker _gameTicker = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private ClientGameTicker _gameTicker = default!; + [Dependency] private IResourceCache _resourceCache = default!; private readonly AudioParams _lobbySoundtrackParams = new(-5f, 1, 0, 0, 0, false, 0f); private readonly AudioParams _roundEndSoundEffectParams = new(-5f, 1, 0, 0, 0, false, 0f); diff --git a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs index 510b9d3def..acebfc9169 100644 --- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs +++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs @@ -6,9 +6,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Audio.Jukebox; -public sealed class JukeboxBoundUserInterface : BoundUserInterface +public sealed partial class JukeboxBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; [ViewVariables] private JukeboxMenu? _menu; diff --git a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml.cs b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml.cs index e0904eece8..d0ac6f53ad 100644 --- a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml.cs +++ b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml.cs @@ -15,7 +15,7 @@ namespace Content.Client.Audio.Jukebox; [GenerateTypedNameReferences] public sealed partial class JukeboxMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private AudioSystem _audioSystem; /// diff --git a/Content.Client/Audio/Jukebox/JukeboxSystem.cs b/Content.Client/Audio/Jukebox/JukeboxSystem.cs index feb4aef3b2..0194c1ccbd 100644 --- a/Content.Client/Audio/Jukebox/JukeboxSystem.cs +++ b/Content.Client/Audio/Jukebox/JukeboxSystem.cs @@ -6,13 +6,13 @@ using Robust.Shared.Prototypes; namespace Content.Client.Audio.Jukebox; -public sealed class JukeboxSystem : SharedJukeboxSystem +public sealed partial class JukeboxSystem : SharedJukeboxSystem { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private AnimationPlayerSystem _animationPlayer = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/BarSign/BarSignVisualizerSystem.cs b/Content.Client/BarSign/BarSignVisualizerSystem.cs index 3e641fed70..e17d264cb5 100644 --- a/Content.Client/BarSign/BarSignVisualizerSystem.cs +++ b/Content.Client/BarSign/BarSignVisualizerSystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.BarSign; -public sealed class BarSignVisualizerSystem : VisualizerSystem +public sealed partial class BarSignVisualizerSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; protected override void OnAppearanceChange(EntityUid uid, BarSignComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs b/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs index 62af75b929..39409daecb 100644 --- a/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs +++ b/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs @@ -7,9 +7,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.BarSign.Ui; [UsedImplicitly] -public sealed class BarSignBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) +public sealed partial class BarSignBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; private BarSignMenu? _menu; diff --git a/Content.Client/Beam/BeamSystem.cs b/Content.Client/Beam/BeamSystem.cs index 66975d53a7..93f5fa5b6d 100644 --- a/Content.Client/Beam/BeamSystem.cs +++ b/Content.Client/Beam/BeamSystem.cs @@ -5,9 +5,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Beam; -public sealed class BeamSystem : SharedBeamSystem +public sealed partial class BeamSystem : SharedBeamSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Body/Systems/InternalsSystem.cs b/Content.Client/Body/Systems/InternalsSystem.cs index 87daac3722..32608a6f5c 100644 --- a/Content.Client/Body/Systems/InternalsSystem.cs +++ b/Content.Client/Body/Systems/InternalsSystem.cs @@ -4,9 +4,9 @@ using Content.Shared.Body.Systems; namespace Content.Client.Body.Systems; -public sealed class InternalsSystem : SharedInternalsSystem +public sealed partial class InternalsSystem : SharedInternalsSystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Client/Body/VisualBodySystem.cs b/Content.Client/Body/VisualBodySystem.cs index cf1e09bf30..c7b5825d14 100644 --- a/Content.Client/Body/VisualBodySystem.cs +++ b/Content.Client/Body/VisualBodySystem.cs @@ -12,13 +12,13 @@ using Robust.Shared.Utility; namespace Content.Client.Body; -public sealed class VisualBodySystem : SharedVisualBodySystem +public sealed partial class VisualBodySystem : SharedVisualBodySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly DisplacementMapSystem _displacement = default!; - [Dependency] private readonly MarkingManager _marking = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private DisplacementMapSystem _displacement = default!; + [Dependency] private MarkingManager _marking = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs index 536c60ed7a..23d3b03120 100644 --- a/Content.Client/Buckle/BuckleSystem.cs +++ b/Content.Client/Buckle/BuckleSystem.cs @@ -8,12 +8,12 @@ using Robust.Client.Graphics; namespace Content.Client.Buckle; -internal sealed class BuckleSystem : SharedBuckleSystem +internal sealed partial class BuckleSystem : SharedBuckleSystem { - [Dependency] private readonly RotationVisualizerSystem _rotationVisualizerSystem = default!; - [Dependency] private readonly IEyeManager _eye = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private RotationVisualizerSystem _rotationVisualizerSystem = default!; + [Dependency] private IEyeManager _eye = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Camera/CameraRecoilSystem.cs b/Content.Client/Camera/CameraRecoilSystem.cs index 3e04cd5bf1..1a50d7ed66 100644 --- a/Content.Client/Camera/CameraRecoilSystem.cs +++ b/Content.Client/Camera/CameraRecoilSystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.Configuration; namespace Content.Client.Camera; -public sealed class CameraRecoilSystem : SharedCameraRecoilSystem +public sealed partial class CameraRecoilSystem : SharedCameraRecoilSystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; private float _intensity; diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs index a179f14a3b..f527caf678 100644 --- a/Content.Client/CardboardBox/CardboardBoxSystem.cs +++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs @@ -8,13 +8,13 @@ using Robust.Client.GameObjects; namespace Content.Client.CardboardBox; -public sealed class CardboardBoxSystem : SharedCardboardBoxSystem +public sealed partial class CardboardBoxSystem : SharedCardboardBoxSystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly EntityQuery _mobStateQuery = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private EntityQuery _mobStateQuery = default!; public override void Initialize() { diff --git a/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs index 85b2dbfb83..8bf4704300 100644 --- a/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs +++ b/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs @@ -9,8 +9,8 @@ namespace Content.Client.Cargo.Systems; public sealed partial class CargoSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; private static readonly Animation CargoTelepadBeamAnimation = new() { diff --git a/Content.Client/Cargo/Systems/CargoSystem.cs b/Content.Client/Cargo/Systems/CargoSystem.cs index 3ffb0636d0..48a3cb87e6 100644 --- a/Content.Client/Cargo/Systems/CargoSystem.cs +++ b/Content.Client/Cargo/Systems/CargoSystem.cs @@ -5,7 +5,7 @@ namespace Content.Client.Cargo.Systems; public sealed partial class CargoSystem : SharedCargoSystem { - [Dependency] private readonly AnimationPlayerSystem _player = default!; + [Dependency] private AnimationPlayerSystem _player = default!; public override void Initialize() { diff --git a/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs b/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs index 35fb2112c0..bfbe3d904e 100644 --- a/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs +++ b/Content.Client/Cargo/Systems/ClientPriceGunSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.Cargo.Systems; /// /// This handles... /// -public sealed class ClientPriceGunSystem : SharedPriceGunSystem +public sealed partial class ClientPriceGunSystem : SharedPriceGunSystem { - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private UseDelaySystem _useDelay = default!; protected override bool GetPriceOrBounty(Entity entity, EntityUid target, EntityUid user) { diff --git a/Content.Client/Cargo/UI/BountyEntry.xaml.cs b/Content.Client/Cargo/UI/BountyEntry.xaml.cs index bac7d84bf7..6a237d3b91 100644 --- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs +++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs @@ -13,7 +13,7 @@ namespace Content.Client.Cargo.UI; [GenerateTypedNameReferences] public sealed partial class BountyEntry : BoxContainer { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public Action? OnLabelButtonPressed; public Action? OnSkipButtonPressed; diff --git a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs index 98658e5f0a..950b728a5e 100644 --- a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs +++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Cargo.UI; [GenerateTypedNameReferences] public sealed partial class BountyHistoryEntry : BoxContainer { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public BountyHistoryEntry(CargoBountyHistoryData bounty) { diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs index 344596f99d..cb67ae8c17 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs @@ -18,7 +18,7 @@ namespace Content.Client.Cargo.UI [GenerateTypedNameReferences] public sealed partial class CargoConsoleMenu : FancyWindow { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; private readonly IEntityManager _entityManager; private readonly IPrototypeManager _protoManager; diff --git a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs index fdba5f5bd8..b743af1811 100644 --- a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs +++ b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs @@ -18,9 +18,9 @@ namespace Content.Client.Cargo.UI; [GenerateTypedNameReferences] public sealed partial class FundingAllocationMenu : FancyWindow { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly EntityQuery _bankQuery; diff --git a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs index 4137f6c2af..823d3e532b 100644 --- a/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs +++ b/Content.Client/CartridgeLoader/Cartridges/WantedListUiFragment.cs @@ -19,8 +19,8 @@ namespace Content.Client.CartridgeLoader.Cartridges; [GenerateTypedNameReferences] public sealed partial class WantedListUiFragment : BoxContainer { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SpriteSystem _spriteSystem; private string? _selectedTargetName; diff --git a/Content.Client/Changeling/Systems/ChangelingIdentitySystem.cs b/Content.Client/Changeling/Systems/ChangelingIdentitySystem.cs index 1dbf2ad920..7802719118 100644 --- a/Content.Client/Changeling/Systems/ChangelingIdentitySystem.cs +++ b/Content.Client/Changeling/Systems/ChangelingIdentitySystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.GameStates; namespace Content.Client.Changeling.Systems; -public sealed class ChangelingIdentitySystem : SharedChangelingIdentitySystem +public sealed partial class ChangelingIdentitySystem : SharedChangelingIdentitySystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Client/Changelog/ChangelogButton.cs b/Content.Client/Changelog/ChangelogButton.cs index da025977cf..1e1b18834a 100644 --- a/Content.Client/Changelog/ChangelogButton.cs +++ b/Content.Client/Changelog/ChangelogButton.cs @@ -3,9 +3,9 @@ using Robust.Client.UserInterface.Controls; namespace Content.Client.Changelog { - public sealed class ChangelogButton : Button + public sealed partial class ChangelogButton : Button { - [Dependency] private readonly ChangelogManager _changelogManager = default!; + [Dependency] private ChangelogManager _changelogManager = default!; public ChangelogButton() { diff --git a/Content.Client/Changelog/ChangelogManager.cs b/Content.Client/Changelog/ChangelogManager.cs index 545d001aab..1bf99af19d 100644 --- a/Content.Client/Changelog/ChangelogManager.cs +++ b/Content.Client/Changelog/ChangelogManager.cs @@ -13,10 +13,10 @@ namespace Content.Client.Changelog { public sealed partial class ChangelogManager : IPostInjectInit { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IResourceManager _resource = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IResourceManager _resource = default!; + [Dependency] private ISerializationManager _serialization = default!; + [Dependency] private IConfigurationManager _configManager = default!; private const string SawmillName = "changelog"; public const string MainChangelogName = "Changelog"; diff --git a/Content.Client/Changelog/ChangelogTab.xaml.cs b/Content.Client/Changelog/ChangelogTab.xaml.cs index 61ce509594..24d4f39036 100644 --- a/Content.Client/Changelog/ChangelogTab.xaml.cs +++ b/Content.Client/Changelog/ChangelogTab.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Changelog; [GenerateTypedNameReferences] public sealed partial class ChangelogTab : Control { - [Dependency] private readonly ChangelogManager _changelog = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private ChangelogManager _changelog = default!; + [Dependency] private IResourceCache _resourceCache = default!; public bool AdminOnly; diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs index 801d0859c3..57bbece649 100644 --- a/Content.Client/Changelog/ChangelogWindow.xaml.cs +++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Changelog [GenerateTypedNameReferences] public sealed partial class ChangelogWindow : FancyWindow { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly ChangelogManager _changelog = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private ChangelogManager _changelog = default!; public ChangelogWindow() { @@ -111,9 +111,9 @@ namespace Content.Client.Changelog } [UsedImplicitly, AnyCommand] - public sealed class ChangelogCommand : LocalizedCommands + public sealed partial class ChangelogCommand : LocalizedCommands { - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; public override string Command => "changelog"; diff --git a/Content.Client/CharacterInfo/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/CharacterInfoSystem.cs index aeaa48c6f2..bf78d684d9 100644 --- a/Content.Client/CharacterInfo/CharacterInfoSystem.cs +++ b/Content.Client/CharacterInfo/CharacterInfoSystem.cs @@ -5,9 +5,9 @@ using Robust.Client.UserInterface; namespace Content.Client.CharacterInfo; -public sealed class CharacterInfoSystem : EntitySystem +public sealed partial class CharacterInfoSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private IPlayerManager _players = default!; public event Action? OnCharacterUpdate; diff --git a/Content.Client/Charges/ChargesSystem.cs b/Content.Client/Charges/ChargesSystem.cs index 890ff207ac..0bfd5ada71 100644 --- a/Content.Client/Charges/ChargesSystem.cs +++ b/Content.Client/Charges/ChargesSystem.cs @@ -5,9 +5,9 @@ using Content.Shared.Charges.Systems; namespace Content.Client.Charges; -public sealed class ChargesSystem : SharedChargesSystem +public sealed partial class ChargesSystem : SharedChargesSystem { - [Dependency] private readonly ActionsSystem _actions = default!; + [Dependency] private ActionsSystem _actions = default!; private Dictionary _lastCharges = new(); private Dictionary _tempLastCharges = new(); diff --git a/Content.Client/Chasm/ChasmFallingVisualsSystem.cs b/Content.Client/Chasm/ChasmFallingVisualsSystem.cs index 767a9b747d..a9612add6e 100644 --- a/Content.Client/Chasm/ChasmFallingVisualsSystem.cs +++ b/Content.Client/Chasm/ChasmFallingVisualsSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Chasm; /// /// Handles the falling animation for entities that fall into a chasm. /// -public sealed class ChasmFallingVisualsSystem : EntitySystem +public sealed partial class ChasmFallingVisualsSystem : EntitySystem { - [Dependency] private readonly AnimationPlayerSystem _anim = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _anim = default!; + [Dependency] private SpriteSystem _sprite = default!; private readonly string _chasmFallAnimationKey = "chasm_fall"; diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs index 1b66bf8732..120a5d3da3 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -7,11 +7,11 @@ using Robust.Shared.Utility; namespace Content.Client.Chat.Managers; -internal sealed class ChatManager : IChatManager +internal sealed partial class ChatManager : IChatManager { - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly IClientAdminManager _adminMgr = default!; - [Dependency] private readonly IEntitySystemManager _systems = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private IClientAdminManager _adminMgr = default!; + [Dependency] private IEntitySystemManager _systems = default!; private ISawmill _sawmill = default!; diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs index be29bb2d6d..2025773b8b 100644 --- a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs +++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs @@ -7,11 +7,11 @@ using Robust.Shared.Timing; namespace Content.Client.Chat.TypingIndicator; // Client-side typing system tracks user input in chat box -public sealed class TypingIndicatorSystem : SharedTypingIndicatorSystem +public sealed partial class TypingIndicatorSystem : SharedTypingIndicatorSystem { - [Dependency] private readonly IGameTiming _time = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _time = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; private readonly TimeSpan _typingTimeout = TimeSpan.FromSeconds(2); private TimeSpan _lastTextChange; diff --git a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs index 4b4cd4b6f9..1c43b84692 100644 --- a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs +++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs @@ -5,10 +5,10 @@ using Content.Shared.Inventory; namespace Content.Client.Chat.TypingIndicator; -public sealed class TypingIndicatorVisualizerSystem : VisualizerSystem +public sealed partial class TypingIndicatorVisualizerSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private InventorySystem _inventory = default!; protected override void OnAppearanceChange(EntityUid uid, TypingIndicatorComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs index 0bfe6dc7c8..6730ba0d01 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -12,12 +12,12 @@ using Robust.Shared.Utility; namespace Content.Client.Chat.UI { - public abstract class SpeechBubble : Control + public abstract partial class SpeechBubble : Control { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] protected readonly IConfigurationManager ConfigManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] protected IConfigurationManager ConfigManager = default!; private readonly SharedTransformSystem _transformSystem; public enum SpeechType : byte diff --git a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs index 1a619a55f9..099a36754d 100644 --- a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs @@ -14,9 +14,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Chemistry.EntitySystems; /// -public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem +public sealed partial class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; private static readonly ProtoId DefaultMixingCategory = "DummyMix"; private static readonly ProtoId DefaultGrindCategory = "DummyGrind"; diff --git a/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs index ca8685eb3e..87983661f2 100644 --- a/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs @@ -6,10 +6,10 @@ using Robust.Shared.Prototypes; namespace Content.Client.Chemistry.EntitySystems; -public sealed class InjectorStatusControlSystem : EntitySystem +public sealed partial class InjectorStatusControlSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainers = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainers = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override void Initialize() diff --git a/Content.Client/Chemistry/EntitySystems/PillSystem.cs b/Content.Client/Chemistry/EntitySystems/PillSystem.cs index a5d02740be..0635b966c6 100644 --- a/Content.Client/Chemistry/EntitySystems/PillSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/PillSystem.cs @@ -3,9 +3,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Chemistry.EntitySystems; -public sealed class PillSystem : EntitySystem +public sealed partial class PillSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs b/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs index 76aab516a7..ed65577aa7 100644 --- a/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs @@ -9,9 +9,9 @@ namespace Content.Client.Chemistry.EntitySystems; /// Wires up item status logic for . /// /// -public sealed class SolutionItemStatusSystem : EntitySystem +public sealed partial class SolutionItemStatusSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public override void Initialize() { diff --git a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs index 98bfb2b9df..26bfbca8c3 100644 --- a/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ChemMasterWindow.xaml.cs @@ -23,8 +23,8 @@ namespace Content.Client.Chemistry.UI [GenerateTypedNameReferences] public sealed partial class ChemMasterWindow : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly SpriteSystem _sprite; diff --git a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs index 1b56a1b4ec..53c02b3fe1 100644 --- a/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs +++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Chemistry.UI [GenerateTypedNameReferences] public sealed partial class ReagentDispenserWindow : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public event Action? OnDispenseReagentButtonPressed; public event Action? OnEjectJugButtonPressed; diff --git a/Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs b/Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs index 06bc790696..2d9048a93c 100644 --- a/Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs +++ b/Content.Client/Chemistry/Visualizers/FoamVisualizerSystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Chemistry.Visualizers; /// /// The system responsible for ensuring plays the animation it's meant to when the foam dissolves. /// -public sealed class FoamVisualizerSystem : VisualizerSystem +public sealed partial class FoamVisualizerSystem : VisualizerSystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs index 6fc07785b2..787af592e9 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs @@ -12,10 +12,10 @@ using Robust.Shared.Prototypes; namespace Content.Client.Chemistry.Visualizers; -public sealed class SolutionContainerVisualsSystem : VisualizerSystem +public sealed partial class SolutionContainerVisualsSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly ItemSystem _itemSystem = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private ItemSystem _itemSystem = default!; public override void Initialize() { diff --git a/Content.Client/Clickable/ClickMapManager.cs b/Content.Client/Clickable/ClickMapManager.cs index 557ef57ef1..cfeb997e85 100644 --- a/Content.Client/Clickable/ClickMapManager.cs +++ b/Content.Client/Clickable/ClickMapManager.cs @@ -9,7 +9,7 @@ using SixLabors.ImageSharp.PixelFormats; namespace Content.Client.Clickable { - internal sealed class ClickMapManager : IClickMapManager, IPostInjectInit + internal sealed partial class ClickMapManager : IClickMapManager, IPostInjectInit { private static readonly string[] IgnoreTexturePaths = { @@ -23,7 +23,7 @@ namespace Content.Client.Clickable private const float Threshold = 0.1f; private const int ClickRadius = 2; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IResourceCache _resourceCache = default!; [ViewVariables] private readonly Dictionary _textureMaps = new(); diff --git a/Content.Client/Clickable/ClickableSystem.cs b/Content.Client/Clickable/ClickableSystem.cs index ae3487dc87..854cb33c47 100644 --- a/Content.Client/Clickable/ClickableSystem.cs +++ b/Content.Client/Clickable/ClickableSystem.cs @@ -10,15 +10,15 @@ namespace Content.Client.Clickable; /// /// Handles click detection for sprites. /// -public sealed class ClickableSystem : EntitySystem +public sealed partial class ClickableSystem : EntitySystem { - [Dependency] private readonly IClickMapManager _clickMapManager = default!; - [Dependency] private readonly SharedTransformSystem _transforms = default!; - [Dependency] private readonly SpriteSystem _sprites = default!; + [Dependency] private IClickMapManager _clickMapManager = default!; + [Dependency] private SharedTransformSystem _transforms = default!; + [Dependency] private SpriteSystem _sprites = default!; - [Dependency] private readonly EntityQuery _clickableQuery = default!; - [Dependency] private readonly EntityQuery _xformQuery = default!; - [Dependency] private readonly EntityQuery _fadingSpriteQuery = default!; + [Dependency] private EntityQuery _clickableQuery = default!; + [Dependency] private EntityQuery _xformQuery = default!; + [Dependency] private EntityQuery _fadingSpriteQuery = default!; /// /// Used to check whether a click worked. Will first check if the click falls inside of some explicit bounding diff --git a/Content.Client/Clock/ClockSystem.cs b/Content.Client/Clock/ClockSystem.cs index bbd86a2ef3..eb3f9db72b 100644 --- a/Content.Client/Clock/ClockSystem.cs +++ b/Content.Client/Clock/ClockSystem.cs @@ -3,9 +3,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Clock; -public sealed class ClockSystem : SharedClockSystem +public sealed partial class ClockSystem : SharedClockSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Update(float frameTime) { diff --git a/Content.Client/Clothing/ClientClothingSystem.cs b/Content.Client/Clothing/ClientClothingSystem.cs index 9c37476676..3b666c9c9a 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -18,7 +18,7 @@ using static Robust.Client.GameObjects.SpriteComponent; namespace Content.Client.Clothing; -public sealed class ClientClothingSystem : ClothingSystem +public sealed partial class ClientClothingSystem : ClothingSystem { public const string Jumpsuit = "jumpsuit"; @@ -46,10 +46,10 @@ public sealed class ClientClothingSystem : ClothingSystem {"suitstorage", "SUITSTORAGE"}, }; - [Dependency] private readonly IResourceCache _cache = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly DisplacementMapSystem _displacement = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IResourceCache _cache = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private DisplacementMapSystem _displacement = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs index d6e4508f54..94b234bc1a 100644 --- a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs +++ b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs @@ -7,9 +7,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Clothing; -public sealed class FlippableClothingVisualizerSystem : VisualizerSystem +public sealed partial class FlippableClothingVisualizerSystem : VisualizerSystem { - [Dependency] private readonly SharedItemSystem _itemSys = default!; + [Dependency] private SharedItemSystem _itemSys = default!; public override void Initialize() { diff --git a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs index 6595426d48..c46c84f42d 100644 --- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs +++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs @@ -10,9 +10,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Clothing.UI; [UsedImplicitly] -public sealed class ChameleonBoundUserInterface : BoundUserInterface +public sealed partial class ChameleonBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; private readonly ChameleonClothingSystem _chameleon; private readonly TagSystem _tag; diff --git a/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs b/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs index eb5ce3051b..2ac0402ef8 100644 --- a/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs +++ b/Content.Client/Clothing/UI/ChameleonMenu.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.Clothing.UI; [GenerateTypedNameReferences] public sealed partial class ChameleonMenu : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly SpriteSystem _sprite; public event Action? OnIdSelected; diff --git a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs index 749a6839b6..d1ecc438da 100644 --- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs +++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs @@ -6,11 +6,11 @@ using Robust.Shared.Prototypes; namespace Content.Client.CombatMode { - public sealed class ColoredScreenBorderOverlay : Overlay + public sealed partial class ColoredScreenBorderOverlay : Overlay { private static readonly ProtoId Shader = "ColoredScreenBorder"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; private readonly ShaderInstance _shader; diff --git a/Content.Client/CombatMode/CombatModeSystem.cs b/Content.Client/CombatMode/CombatModeSystem.cs index 85a33b4cfe..0e6bbced94 100644 --- a/Content.Client/CombatMode/CombatModeSystem.cs +++ b/Content.Client/CombatMode/CombatModeSystem.cs @@ -8,13 +8,13 @@ using Robust.Shared.Configuration; namespace Content.Client.CombatMode; -public sealed class CombatModeSystem : SharedCombatModeSystem +public sealed partial class CombatModeSystem : SharedCombatModeSystem { - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IEyeManager _eye = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IEyeManager _eye = default!; /// /// Raised whenever combat mode changes. diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs index c155c7a9de..56749ab1f5 100644 --- a/Content.Client/Commands/ActionsCommands.cs +++ b/Content.Client/Commands/ActionsCommands.cs @@ -34,9 +34,9 @@ public sealed class SaveActionsCommand : IConsoleCommand */ [AnyCommand] -public sealed class LoadActionsCommand : LocalizedCommands +public sealed partial class LoadActionsCommand : LocalizedCommands { - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; public override string Command => "loadacts"; diff --git a/Content.Client/Commands/AtmosDebugCommands.cs b/Content.Client/Commands/AtmosDebugCommands.cs index b6f1aab09b..2d53eeb666 100644 --- a/Content.Client/Commands/AtmosDebugCommands.cs +++ b/Content.Client/Commands/AtmosDebugCommands.cs @@ -6,9 +6,9 @@ using Robust.Shared.Console; namespace Content.Client.Commands; [UsedImplicitly] -internal sealed class AtvRangeCommand : LocalizedCommands +internal sealed partial class AtvRangeCommand : LocalizedCommands { - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; public override string Command => "atvrange"; @@ -43,9 +43,9 @@ internal sealed class AtvRangeCommand : LocalizedCommands } [UsedImplicitly] -internal sealed class AtvModeCommand : LocalizedCommands +internal sealed partial class AtvModeCommand : LocalizedCommands { - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; public override string Command => "atvmode"; @@ -102,9 +102,9 @@ internal sealed class AtvModeCommand : LocalizedCommands } [UsedImplicitly] -internal sealed class AtvCBMCommand : LocalizedCommands +internal sealed partial class AtvCBMCommand : LocalizedCommands { - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; public override string Command => "atvcbm"; diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs index ec9f74526e..59a042170d 100644 --- a/Content.Client/Commands/DebugCommands.cs +++ b/Content.Client/Commands/DebugCommands.cs @@ -5,9 +5,9 @@ using Robust.Shared.Console; namespace Content.Client.Commands; -internal sealed class ShowMarkersCommand : LocalizedEntityCommands +internal sealed partial class ShowMarkersCommand : LocalizedEntityCommands { - [Dependency] private readonly MarkerSystem _markerSystem = default!; + [Dependency] private MarkerSystem _markerSystem = default!; public override string Command => "showmarkers"; @@ -17,9 +17,9 @@ internal sealed class ShowMarkersCommand : LocalizedEntityCommands } } -internal sealed class ShowSubFloor : LocalizedEntityCommands +internal sealed partial class ShowSubFloor : LocalizedEntityCommands { - [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!; + [Dependency] private SubFloorHideSystem _subfloorSystem = default!; public override string Command => "showsubfloor"; @@ -29,9 +29,9 @@ internal sealed class ShowSubFloor : LocalizedEntityCommands } } -internal sealed class NotifyCommand : LocalizedEntityCommands +internal sealed partial class NotifyCommand : LocalizedEntityCommands { - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; public override string Command => "notify"; diff --git a/Content.Client/Commands/DebugPathfindingCommand.cs b/Content.Client/Commands/DebugPathfindingCommand.cs index b920ccc5ed..e9e6c715ac 100644 --- a/Content.Client/Commands/DebugPathfindingCommand.cs +++ b/Content.Client/Commands/DebugPathfindingCommand.cs @@ -7,9 +7,9 @@ using System.Linq; namespace Content.Client.Commands; [UsedImplicitly] -public sealed class DebugPathfindingCommand : LocalizedCommands +public sealed partial class DebugPathfindingCommand : LocalizedCommands { - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; public override string Command => "pathfinder"; diff --git a/Content.Client/Commands/GroupingEntityMenuCommand.cs b/Content.Client/Commands/GroupingEntityMenuCommand.cs index 3bd2ca41e6..e4c8c55a17 100644 --- a/Content.Client/Commands/GroupingEntityMenuCommand.cs +++ b/Content.Client/Commands/GroupingEntityMenuCommand.cs @@ -5,9 +5,9 @@ using Robust.Shared.Console; namespace Content.Client.Commands; -public sealed class GroupingEntityMenuCommand : LocalizedCommands +public sealed partial class GroupingEntityMenuCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; public override string Command => "entitymenug"; diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs index 70a383b5f6..9596600135 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -6,12 +6,12 @@ using Robust.Shared.Console; namespace Content.Client.Commands; -internal sealed class MappingClientSideSetupCommand : LocalizedEntityCommands +internal sealed partial class MappingClientSideSetupCommand : LocalizedEntityCommands { - [Dependency] private readonly ILightManager _lightManager = default!; - [Dependency] private readonly ActionsSystem _actionSystem = default!; - [Dependency] private readonly MarkerSystem _markerSystem = default!; - [Dependency] private readonly SubFloorHideSystem _subfloorSystem = default!; + [Dependency] private ILightManager _lightManager = default!; + [Dependency] private ActionsSystem _actionSystem = default!; + [Dependency] private MarkerSystem _markerSystem = default!; + [Dependency] private SubFloorHideSystem _subfloorSystem = default!; public override string Command => "mappingclientsidesetup"; diff --git a/Content.Client/Commands/OpenAHelpCommand.cs b/Content.Client/Commands/OpenAHelpCommand.cs index 114ca51bc9..c6b2c12d38 100644 --- a/Content.Client/Commands/OpenAHelpCommand.cs +++ b/Content.Client/Commands/OpenAHelpCommand.cs @@ -7,9 +7,9 @@ using Robust.Shared.Network; namespace Content.Client.Commands; [AnyCommand] -public sealed class OpenAHelpCommand : LocalizedCommands +public sealed partial class OpenAHelpCommand : LocalizedCommands { - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; public override string Command => "openahelp"; diff --git a/Content.Client/Commands/QuickInspectCommand.cs b/Content.Client/Commands/QuickInspectCommand.cs index dc3aae615a..37570bc844 100644 --- a/Content.Client/Commands/QuickInspectCommand.cs +++ b/Content.Client/Commands/QuickInspectCommand.cs @@ -11,10 +11,10 @@ namespace Content.Client.Commands; /// Sets the a CVar to the name of a component, which allows the client to quickly open a VV window for that component /// by using the Alt+C or Alt+B hotkeys. /// -public sealed class QuickInspectCommand : LocalizedEntityCommands +public sealed partial class QuickInspectCommand : LocalizedEntityCommands { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IInputManager _inputManager = default!; public override string Command => "quickinspect"; diff --git a/Content.Client/Commands/SetMenuVisibilityCommand.cs b/Content.Client/Commands/SetMenuVisibilityCommand.cs index 17a544daba..ccd1d2f2d3 100644 --- a/Content.Client/Commands/SetMenuVisibilityCommand.cs +++ b/Content.Client/Commands/SetMenuVisibilityCommand.cs @@ -6,9 +6,9 @@ using Robust.Shared.Console; namespace Content.Client.Commands; [UsedImplicitly] -internal sealed class SetMenuVisibilityCommand : LocalizedCommands +internal sealed partial class SetMenuVisibilityCommand : LocalizedCommands { - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; public override string Command => "menuvis"; diff --git a/Content.Client/Commands/ShowWallmountsCommand.cs b/Content.Client/Commands/ShowWallmountsCommand.cs index d44c13911b..a42b14da48 100644 --- a/Content.Client/Commands/ShowWallmountsCommand.cs +++ b/Content.Client/Commands/ShowWallmountsCommand.cs @@ -7,9 +7,9 @@ namespace Content.Client.Commands; /// /// Shows the area in which entities with can be interacted from. /// -public sealed class ShowWallmountsCommand : LocalizedCommands +public sealed partial class ShowWallmountsCommand : LocalizedCommands { - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IOverlayManager _overlay = default!; public override string Command => "showwallmounts"; diff --git a/Content.Client/Commands/ToggleOutlineCommand.cs b/Content.Client/Commands/ToggleOutlineCommand.cs index 834c3cc995..a526608e63 100644 --- a/Content.Client/Commands/ToggleOutlineCommand.cs +++ b/Content.Client/Commands/ToggleOutlineCommand.cs @@ -6,9 +6,9 @@ using Robust.Shared.Console; namespace Content.Client.Commands; [AnyCommand] -public sealed class ToggleOutlineCommand : LocalizedCommands +public sealed partial class ToggleOutlineCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; public override string Command => "toggleoutline"; diff --git a/Content.Client/Commands/ZoomCommand.cs b/Content.Client/Commands/ZoomCommand.cs index c63eeea836..69d7b87a6f 100644 --- a/Content.Client/Commands/ZoomCommand.cs +++ b/Content.Client/Commands/ZoomCommand.cs @@ -9,11 +9,11 @@ using System.Numerics; namespace Content.Client.Commands; [UsedImplicitly] -public sealed class ZoomCommand : LocalizedCommands +public sealed partial class ZoomCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override string Command => "zoom"; diff --git a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs index 0310e91eeb..17248a8cce 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -7,9 +7,9 @@ using Robust.Shared.Timing; namespace Content.Client.Communications.UI { - public sealed class CommunicationsConsoleBoundUserInterface : BoundUserInterface + public sealed partial class CommunicationsConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; [ViewVariables] private CommunicationsConsoleMenu? _menu; diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs index 926b8c6567..6aa938b2c6 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -12,9 +12,9 @@ namespace Content.Client.Communications.UI [GenerateTypedNameReferences] public sealed partial class CommunicationsConsoleMenu : FancyWindow { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ILocalizationManager _loc = default!; public bool CanAnnounce; public bool CanBroadcast; diff --git a/Content.Client/Configurable/ConfigurationSystem.cs b/Content.Client/Configurable/ConfigurationSystem.cs index 6594375ba2..e3395371b4 100644 --- a/Content.Client/Configurable/ConfigurationSystem.cs +++ b/Content.Client/Configurable/ConfigurationSystem.cs @@ -3,9 +3,9 @@ using Content.Shared.Configurable; namespace Content.Client.Configurable; -public sealed class ConfigurationSystem : SharedConfigurationSystem +public sealed partial class ConfigurationSystem : SharedConfigurationSystem { - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; public override void Initialize() { diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs index e2010df12c..5e4020365c 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -22,13 +22,13 @@ namespace Content.Client.Construction /// The client-side implementation of the construction system, which is used for constructing entities in game. /// [UsedImplicitly] - public sealed class ConstructionSystem : SharedConstructionSystem + public sealed partial class ConstructionSystem : SharedConstructionSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private PopupSystem _popupSystem = default!; private readonly Dictionary _ghosts = new(); private readonly Dictionary _guideCache = new(); diff --git a/Content.Client/Construction/FlatpackSystem.cs b/Content.Client/Construction/FlatpackSystem.cs index 7d9b5faaa2..4aea528298 100644 --- a/Content.Client/Construction/FlatpackSystem.cs +++ b/Content.Client/Construction/FlatpackSystem.cs @@ -6,10 +6,10 @@ using Robust.Shared.Prototypes; namespace Content.Client.Construction; /// -public sealed class FlatpackSystem : SharedFlatpackSystem +public sealed partial class FlatpackSystem : SharedFlatpackSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs index 6041b405c9..48c7ba93b3 100644 --- a/Content.Client/Construction/UI/ConstructionMenuPresenter.cs +++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs @@ -21,16 +21,16 @@ namespace Content.Client.Construction.UI /// model. This is where the bulk of UI work is done, either calling functions in the model to change state, or collecting /// data out of the model to *present* to the screen though the UI framework. /// - internal sealed class ConstructionMenuPresenter : IDisposable + internal sealed partial class ConstructionMenuPresenter : IDisposable { - [Dependency] private readonly EntityManager _entManager = default!; - [Dependency] private readonly IEntitySystemManager _systemManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlacementManager _placementManager = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private EntityManager _entManager = default!; + [Dependency] private IEntitySystemManager _systemManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlacementManager _placementManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IClientPreferencesManager _preferencesManager = default!; + [Dependency] private ILogManager _logManager = default!; private readonly SpriteSystem _spriteSystem; private readonly ISawmill _sawmill; diff --git a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs index 7db15596bd..c48b571e15 100644 --- a/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs +++ b/Content.Client/Construction/UI/FlatpackCreatorMenu.xaml.cs @@ -16,8 +16,8 @@ namespace Content.Client.Construction.UI; [GenerateTypedNameReferences] public sealed partial class FlatpackCreatorMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly ItemSlotsSystem _itemSlots; private readonly FlatpackSystem _flatpack; diff --git a/Content.Client/ContextMenu/UI/EntityMenuElement.cs b/Content.Client/ContextMenu/UI/EntityMenuElement.cs index d088f4f403..175693810a 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs @@ -11,9 +11,9 @@ namespace Content.Client.ContextMenu.UI { public sealed partial class EntityMenuElement : ContextMenuElement, IEntityControl { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; private AdminSystem _adminSystem; diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs index 1855911ca4..19c0e5cb6c 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs @@ -35,17 +35,17 @@ namespace Content.Client.ContextMenu.UI /// public sealed partial class EntityMenuUIController : UIController, IOnStateEntered, IOnStateExited { - [Dependency] private readonly IEntitySystemManager _systemManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly ContextMenuUIController _context = default!; - [Dependency] private readonly VerbMenuUIController _verb = default!; + [Dependency] private IEntitySystemManager _systemManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private ContextMenuUIController _context = default!; + [Dependency] private VerbMenuUIController _verb = default!; [UISystemDependency] private readonly VerbSystem _verbSystem = default!; [UISystemDependency] private readonly ExamineSystem _examineSystem = default!; diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs index c973b9572b..da7df88a95 100644 --- a/Content.Client/Cooldown/CooldownGraphic.cs +++ b/Content.Client/Cooldown/CooldownGraphic.cs @@ -6,12 +6,12 @@ using Robust.Shared.Timing; namespace Content.Client.Cooldown { - public sealed class CooldownGraphic : Control + public sealed partial class CooldownGraphic : Control { private static readonly ProtoId Shader = "CooldownAnimation"; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private readonly ShaderInstance _shader; diff --git a/Content.Client/Crayon/CrayonSystem.cs b/Content.Client/Crayon/CrayonSystem.cs index c0d127dd40..ec5f90b2ca 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -10,10 +10,10 @@ using Robust.Shared.Timing; namespace Content.Client.Crayon; -public sealed class CrayonSystem : SharedCrayonSystem +public sealed partial class CrayonSystem : SharedCrayonSystem { - [Dependency] private readonly SharedChargesSystem _charges = default!; - [Dependency] private readonly EntityManager _entityManager = default!; + [Dependency] private SharedChargesSystem _charges = default!; + [Dependency] private EntityManager _entityManager = default!; public override void Initialize() { diff --git a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs index 55d7c8835d..99ddb0c9aa 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -7,9 +7,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Crayon.UI { - public sealed class CrayonBoundUserInterface : BoundUserInterface + public sealed partial class CrayonBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; [ViewVariables] private CrayonWindow? _menu; diff --git a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs index 166ba01832..631984f0b3 100644 --- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs +++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs @@ -20,7 +20,7 @@ namespace Content.Client.Crayon.UI [GenerateTypedNameReferences] public sealed partial class CrayonWindow : DefaultWindow { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _spriteSystem = default!; private Dictionary>? _decals; diff --git a/Content.Client/Credits/CreditsWindow.xaml.cs b/Content.Client/Credits/CreditsWindow.xaml.cs index f34ff43afe..0b30259ec9 100644 --- a/Content.Client/Credits/CreditsWindow.xaml.cs +++ b/Content.Client/Credits/CreditsWindow.xaml.cs @@ -25,11 +25,11 @@ namespace Content.Client.Credits; [GenerateTypedNameReferences] public sealed partial class CreditsWindow : DefaultWindow { - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ISerializationManager _serialization = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private ILocalizationManager _loc = default!; private static readonly Dictionary PatronTierPriority = new() { diff --git a/Content.Client/CrewManifest/CrewManifestSystem.cs b/Content.Client/CrewManifest/CrewManifestSystem.cs index d05acb5680..2899ed4cd2 100644 --- a/Content.Client/CrewManifest/CrewManifestSystem.cs +++ b/Content.Client/CrewManifest/CrewManifestSystem.cs @@ -4,9 +4,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.CrewManifest; -public sealed class CrewManifestSystem : EntitySystem +public sealed partial class CrewManifestSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private Dictionary> _jobDepartmentLookup = new(); private HashSet _departments = new(); diff --git a/Content.Client/CrewManifest/UI/CrewManifestListing.cs b/Content.Client/CrewManifest/UI/CrewManifestListing.cs index 03d8b7168f..fb28c20ce3 100644 --- a/Content.Client/CrewManifest/UI/CrewManifestListing.cs +++ b/Content.Client/CrewManifest/UI/CrewManifestListing.cs @@ -7,10 +7,10 @@ using Robust.Shared.Utility; namespace Content.Client.CrewManifest.UI; -public sealed class CrewManifestListing : BoxContainer +public sealed partial class CrewManifestListing : BoxContainer { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SpriteSystem _spriteSystem; public CrewManifestListing() diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs index d5cc4ecfa9..b8d7f1241a 100644 --- a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs +++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs @@ -9,11 +9,11 @@ using Robust.Shared.Random; namespace Content.Client.CriminalRecords; -public sealed class CriminalRecordsConsoleBoundUserInterface : BoundUserInterface +public sealed partial class CriminalRecordsConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPlayerManager _playerManager = default!; private readonly AccessReaderSystem _accessReader; private CriminalRecordsConsoleWindow? _window; diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs index dcae68fa7e..a3033d3700 100644 --- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs +++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs @@ -28,7 +28,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow private readonly IPrototypeManager _proto; private readonly IRobustRandom _random; private readonly AccessReaderSystem _accessReader; - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private readonly SpriteSystem _spriteSystem; public readonly EntityUid Console; diff --git a/Content.Client/Cuffs/CuffableSystem.cs b/Content.Client/Cuffs/CuffableSystem.cs index 1056778712..0fb74c4087 100644 --- a/Content.Client/Cuffs/CuffableSystem.cs +++ b/Content.Client/Cuffs/CuffableSystem.cs @@ -8,10 +8,10 @@ using Robust.Shared.Utility; namespace Content.Client.Cuffs; -public sealed class CuffableSystem : SharedCuffableSystem +public sealed partial class CuffableSystem : SharedCuffableSystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Damage/DamageVisualsSystem.cs b/Content.Client/Damage/DamageVisualsSystem.cs index 2541c27e5d..cad9bf7b05 100644 --- a/Content.Client/Damage/DamageVisualsSystem.cs +++ b/Content.Client/Damage/DamageVisualsSystem.cs @@ -26,10 +26,10 @@ namespace Content.Client.Damage; /// of the sprite layer, and then passing in a bool value /// (true to enable, false to disable). /// -public sealed class DamageVisualsSystem : VisualizerSystem +public sealed partial class DamageVisualsSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Client/Damage/Systems/StaminaSystem.cs b/Content.Client/Damage/Systems/StaminaSystem.cs index 67abb77674..6eeff69936 100644 --- a/Content.Client/Damage/Systems/StaminaSystem.cs +++ b/Content.Client/Damage/Systems/StaminaSystem.cs @@ -10,10 +10,10 @@ namespace Content.Client.Damage.Systems; public sealed partial class StaminaSystem : SharedStaminaSystem { - [Dependency] private readonly AnimationPlayerSystem _animation = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly StunSystem _stun = default!; // Clientside Stun System + [Dependency] private AnimationPlayerSystem _animation = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private StunSystem _stun = default!; // Clientside Stun System private const string StaminaAnimationKey = "stamina"; diff --git a/Content.Client/DebugMon/DebugMonitorManager.cs b/Content.Client/DebugMon/DebugMonitorManager.cs index 7e1dca0d6f..c99d83cd3f 100644 --- a/Content.Client/DebugMon/DebugMonitorManager.cs +++ b/Content.Client/DebugMon/DebugMonitorManager.cs @@ -9,12 +9,12 @@ namespace Content.Client.DebugMon; /// /// This handles preventing certain debug monitors from being usable by non-admins. /// -internal sealed class DebugMonitorManager +internal sealed partial class DebugMonitorManager { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IUserInterfaceManager _userInterface = default!; - [Dependency] private readonly IBaseClient _baseClient = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IUserInterfaceManager _userInterface = default!; + [Dependency] private IBaseClient _baseClient = default!; public void FrameUpdate() { diff --git a/Content.Client/Decals/DecalPlacementSystem.cs b/Content.Client/Decals/DecalPlacementSystem.cs index db00534a38..bab9c9b688 100644 --- a/Content.Client/Decals/DecalPlacementSystem.cs +++ b/Content.Client/Decals/DecalPlacementSystem.cs @@ -15,16 +15,16 @@ namespace Content.Client.Decals; // This is shit and basically a half-rewrite of PlacementManager // TODO refactor placementmanager so this isnt shit anymore -public sealed class DecalPlacementSystem : EntitySystem +public sealed partial class DecalPlacementSystem : EntitySystem { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private InputSystem _inputSystem = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SpriteSystem _sprite = default!; public static readonly EntProtoId DecalAction = "BaseMappingDecalAction"; diff --git a/Content.Client/Decals/DecalSystem.cs b/Content.Client/Decals/DecalSystem.cs index 172a06c4cd..2b4b7c6583 100644 --- a/Content.Client/Decals/DecalSystem.cs +++ b/Content.Client/Decals/DecalSystem.cs @@ -8,10 +8,10 @@ using static Content.Shared.Decals.DecalGridComponent; namespace Content.Client.Decals { - public sealed class DecalSystem : SharedDecalSystem + public sealed partial class DecalSystem : SharedDecalSystem { - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly SpriteSystem _sprites = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private SpriteSystem _sprites = default!; private DecalOverlay? _overlay; diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs index 07b6f57bdb..e0e73af5f7 100644 --- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs +++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs @@ -8,11 +8,11 @@ using Robust.Shared.Prototypes; namespace Content.Client.Decals.Overlays; -public sealed class DecalPlacementOverlay : Overlay +public sealed partial class DecalPlacementOverlay : Overlay { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IMapManager _mapManager = default!; private readonly DecalPlacementSystem _placement; private readonly SharedTransformSystem _transform; private readonly SpriteSystem _sprite; diff --git a/Content.Client/Decals/ToggleDecalCommand.cs b/Content.Client/Decals/ToggleDecalCommand.cs index cf7113cb50..f357fa3159 100644 --- a/Content.Client/Decals/ToggleDecalCommand.cs +++ b/Content.Client/Decals/ToggleDecalCommand.cs @@ -2,9 +2,9 @@ namespace Content.Client.Decals; -public sealed class ToggleDecalCommand : LocalizedEntityCommands +public sealed partial class ToggleDecalCommand : LocalizedEntityCommands { - [Dependency] private readonly DecalSystem _decal = default!; + [Dependency] private DecalSystem _decal = default!; public override string Command => "toggledecals"; diff --git a/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs b/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs index 873fb851b7..5264b7a807 100644 --- a/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs +++ b/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs @@ -16,8 +16,8 @@ namespace Content.Client.Decals.UI; [GenerateTypedNameReferences] public sealed partial class DecalPlacerWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IEntityManager _e = default!; private readonly DecalPlacementSystem _decalPlacementSystem; private readonly SpriteSystem _sprite; diff --git a/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs b/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs index 2d6a89101c..692726732d 100644 --- a/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs +++ b/Content.Client/Decals/UI/PaletteColorPicker.xaml.cs @@ -11,8 +11,8 @@ namespace Content.Client.Decals.UI; [GenerateTypedNameReferences] public sealed partial class PaletteColorPicker : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; private readonly TextureResource _tex; diff --git a/Content.Client/Delivery/DeliveryVisualizerSystem.cs b/Content.Client/Delivery/DeliveryVisualizerSystem.cs index d5afd34533..10935f0faa 100644 --- a/Content.Client/Delivery/DeliveryVisualizerSystem.cs +++ b/Content.Client/Delivery/DeliveryVisualizerSystem.cs @@ -5,10 +5,10 @@ using Robust.Shared.Prototypes; namespace Content.Client.Delivery; -public sealed class DeliveryVisualizerSystem : VisualizerSystem +public sealed partial class DeliveryVisualizerSystem : VisualizerSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _prototype = default!; private static readonly ProtoId UnknownIcon = "JobIconUnknown"; diff --git a/Content.Client/Dice/DiceSystem.cs b/Content.Client/Dice/DiceSystem.cs index 2de552f375..0c2bbb1b43 100644 --- a/Content.Client/Dice/DiceSystem.cs +++ b/Content.Client/Dice/DiceSystem.cs @@ -3,9 +3,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Dice; -public sealed class DiceSystem : SharedDiceSystem +public sealed partial class DiceSystem : SharedDiceSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/DisplacementMap/DisplacementMapSystem.cs b/Content.Client/DisplacementMap/DisplacementMapSystem.cs index 14075caba3..be44b8fedb 100644 --- a/Content.Client/DisplacementMap/DisplacementMapSystem.cs +++ b/Content.Client/DisplacementMap/DisplacementMapSystem.cs @@ -7,10 +7,10 @@ using Robust.Shared.Serialization.Manager; namespace Content.Client.DisplacementMap; -public sealed class DisplacementMapSystem : EntitySystem +public sealed partial class DisplacementMapSystem : EntitySystem { - [Dependency] private readonly ISerializationManager _serialization = null!; - [Dependency] private readonly SpriteSystem _sprite = null!; + [Dependency] private ISerializationManager _serialization = null!; + [Dependency] private SpriteSystem _sprite = null!; //needs to be replaced later: see comment on line 48 private static readonly ProtoId UnshadedID = "unshaded"; diff --git a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs index 9e6d5e96a2..d3d5c91274 100644 --- a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs +++ b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs @@ -7,13 +7,13 @@ using Robust.Shared.Audio.Systems; namespace Content.Client.Disposal.Unit; -public sealed class DisposalUnitSystem : SharedDisposalUnitSystem +public sealed partial class DisposalUnitSystem : SharedDisposalUnitSystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private AnimationPlayerSystem _animationSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; private const string AnimationKey = "disposal_unit_animation"; diff --git a/Content.Client/DoAfter/DoAfterSystem.cs b/Content.Client/DoAfter/DoAfterSystem.cs index 407cf3e7c1..0c6bf1fb19 100644 --- a/Content.Client/DoAfter/DoAfterSystem.cs +++ b/Content.Client/DoAfter/DoAfterSystem.cs @@ -11,12 +11,12 @@ namespace Content.Client.DoAfter; /// Handles events that need to happen after a certain amount of time where the event could be cancelled by factors /// such as moving. /// -public sealed class DoAfterSystem : SharedDoAfterSystem +public sealed partial class DoAfterSystem : SharedDoAfterSystem { - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private MetaDataSystem _metadata = default!; public override void Initialize() { diff --git a/Content.Client/Doors/AirlockSystem.cs b/Content.Client/Doors/AirlockSystem.cs index 53c5061f2a..721f83d7a3 100644 --- a/Content.Client/Doors/AirlockSystem.cs +++ b/Content.Client/Doors/AirlockSystem.cs @@ -7,10 +7,10 @@ using Robust.Client.GameObjects; namespace Content.Client.Doors; -public sealed class AirlockSystem : SharedAirlockSystem +public sealed partial class AirlockSystem : SharedAirlockSystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Doors/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs index 31c98b6ab7..7b2ac18280 100644 --- a/Content.Client/Doors/DoorSystem.cs +++ b/Content.Client/Doors/DoorSystem.cs @@ -7,12 +7,12 @@ using Robust.Shared.Prototypes; namespace Content.Client.Doors; -public sealed class DoorSystem : SharedDoorSystem +public sealed partial class DoorSystem : SharedDoorSystem { - [Dependency] private readonly AnimationPlayerSystem _animationSystem = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _animationSystem = default!; + [Dependency] private IComponentFactory _componentFactory = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs index 9b7e23c03a..5add9d7cef 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs @@ -6,9 +6,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Doors.Electronics; -public sealed class DoorElectronicsBoundUserInterface : BoundUserInterface +public sealed partial class DoorElectronicsBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private DoorElectronicsConfigurationMenu? _window; diff --git a/Content.Client/Doors/FirelockSystem.cs b/Content.Client/Doors/FirelockSystem.cs index 6960f14f32..a3644a818b 100644 --- a/Content.Client/Doors/FirelockSystem.cs +++ b/Content.Client/Doors/FirelockSystem.cs @@ -5,10 +5,10 @@ using Robust.Client.GameObjects; namespace Content.Client.Doors; -public sealed class FirelockSystem : SharedFirelockSystem +public sealed partial class FirelockSystem : SharedFirelockSystem { - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Doors/TurnstileSystem.cs b/Content.Client/Doors/TurnstileSystem.cs index 4c1f79f047..9b201547a3 100644 --- a/Content.Client/Doors/TurnstileSystem.cs +++ b/Content.Client/Doors/TurnstileSystem.cs @@ -10,10 +10,10 @@ using Robust.Shared.Prototypes; namespace Content.Client.Doors; /// -public sealed class TurnstileSystem : SharedTurnstileSystem +public sealed partial class TurnstileSystem : SharedTurnstileSystem { - [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _animationPlayer = default!; + [Dependency] private SpriteSystem _sprite = default!; private static readonly EntProtoId ExamineArrow = "TurnstileArrow"; diff --git a/Content.Client/Dragon/DragonSystem.cs b/Content.Client/Dragon/DragonSystem.cs index 5a3b346458..86f9d398f3 100644 --- a/Content.Client/Dragon/DragonSystem.cs +++ b/Content.Client/Dragon/DragonSystem.cs @@ -4,10 +4,10 @@ using Robust.Shared.GameStates; namespace Content.Client.Dragon; -public sealed class DragonSystem : EntitySystem +public sealed partial class DragonSystem : EntitySystem { - [Dependency] private readonly SharedPointLightSystem _lights = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedPointLightSystem _lights = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs index 3770802302..bb74c8bec2 100644 --- a/Content.Client/Drowsiness/DrowsinessOverlay.cs +++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs @@ -8,15 +8,15 @@ using Robust.Shared.Timing; namespace Content.Client.Drowsiness; -public sealed class DrowsinessOverlay : Overlay +public sealed partial class DrowsinessOverlay : Overlay { private static readonly ProtoId Shader = "Drowsiness"; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEntitySystemManager _sysMan = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IEntitySystemManager _sysMan = default!; + [Dependency] private IGameTiming _timing = default!; private readonly StatusEffectsSystem _statusEffects = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs index 632d2134ca..5bfc0138fb 100644 --- a/Content.Client/Drowsiness/DrowsinessSystem.cs +++ b/Content.Client/Drowsiness/DrowsinessSystem.cs @@ -6,11 +6,11 @@ using Robust.Shared.Player; namespace Content.Client.Drowsiness; -public sealed class DrowsinessSystem : SharedDrowsinessSystem +public sealed partial class DrowsinessSystem : SharedDrowsinessSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; private DrowsinessOverlay _overlay = default!; diff --git a/Content.Client/Drugs/DrugOverlaySystem.cs b/Content.Client/Drugs/DrugOverlaySystem.cs index e156e616b8..c3fac46e0b 100644 --- a/Content.Client/Drugs/DrugOverlaySystem.cs +++ b/Content.Client/Drugs/DrugOverlaySystem.cs @@ -10,11 +10,11 @@ namespace Content.Client.Drugs; /// /// System to handle drug related overlays. /// -public sealed class DrugOverlaySystem : EntitySystem +public sealed partial class DrugOverlaySystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; + [Dependency] private IRobustRandom _random = default!; private RainbowOverlay _overlay = default!; diff --git a/Content.Client/Drugs/RainbowOverlay.cs b/Content.Client/Drugs/RainbowOverlay.cs index e40fcdfca2..68a00c050c 100644 --- a/Content.Client/Drugs/RainbowOverlay.cs +++ b/Content.Client/Drugs/RainbowOverlay.cs @@ -10,16 +10,16 @@ using Robust.Shared.Timing; namespace Content.Client.Drugs; -public sealed class RainbowOverlay : Overlay +public sealed partial class RainbowOverlay : Overlay { private static readonly ProtoId Shader = "Rainbow"; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEntitySystemManager _sysMan = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IEntitySystemManager _sysMan = default!; + [Dependency] private IGameTiming _timing = default!; private readonly StatusEffectsSystem _statusEffects = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/Drunk/DrunkOverlay.cs b/Content.Client/Drunk/DrunkOverlay.cs index 44d82f3794..12974049f5 100644 --- a/Content.Client/Drunk/DrunkOverlay.cs +++ b/Content.Client/Drunk/DrunkOverlay.cs @@ -9,15 +9,15 @@ using Robust.Shared.Timing; namespace Content.Client.Drunk; -public sealed class DrunkOverlay : Overlay +public sealed partial class DrunkOverlay : Overlay { private static readonly ProtoId DrunkShader = "Drunk"; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _configManager = default!; private readonly Shared.StatusEffectNew.StatusEffectsSystem _statusEffectsSystem; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/Drunk/DrunkSystem.cs b/Content.Client/Drunk/DrunkSystem.cs index 2e1f8157aa..e4200c8ba9 100644 --- a/Content.Client/Drunk/DrunkSystem.cs +++ b/Content.Client/Drunk/DrunkSystem.cs @@ -7,11 +7,11 @@ using Robust.Shared.Random; namespace Content.Client.Drunk; -public sealed class DrunkSystem : SharedDrunkSystem +public sealed partial class DrunkSystem : SharedDrunkSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; + [Dependency] private IRobustRandom _random = default!; private DrunkOverlay _overlay = default!; diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs index 10a0fbbc11..9372c78b5a 100644 --- a/Content.Client/Effects/ColorFlashEffectSystem.cs +++ b/Content.Client/Effects/ColorFlashEffectSystem.cs @@ -9,11 +9,11 @@ using Robust.Shared.Utility; namespace Content.Client.Effects; -public sealed class ColorFlashEffectSystem : SharedColorFlashEffectSystem +public sealed partial class ColorFlashEffectSystem : SharedColorFlashEffectSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AnimationPlayerSystem _animation = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AnimationPlayerSystem _animation = default!; + [Dependency] private SpriteSystem _sprite = default!; /// /// It's a little on the long side but given we use multiple colours denoting what happened it makes it easier to register. diff --git a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs index 65b70727c0..9ff184d6b4 100644 --- a/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs +++ b/Content.Client/Electrocution/ElectrocutionHUDVisualizerSystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Electrocution; /// /// Shows the Electrocution HUD to entities with the ShowElectrocutionHUDComponent. /// -public sealed class ElectrocutionHUDVisualizerSystem : VisualizerSystem +public sealed partial class ElectrocutionHUDVisualizerSystem : VisualizerSystem { - [Dependency] private readonly IPlayerManager _playerMan = default!; + [Dependency] private IPlayerManager _playerMan = default!; public override void Initialize() { diff --git a/Content.Client/Emp/EmpSystem.cs b/Content.Client/Emp/EmpSystem.cs index b32e370f1e..af9304ba7a 100644 --- a/Content.Client/Emp/EmpSystem.cs +++ b/Content.Client/Emp/EmpSystem.cs @@ -3,9 +3,9 @@ using Robust.Shared.Random; namespace Content.Client.Emp; -public sealed class EmpSystem : SharedEmpSystem +public sealed partial class EmpSystem : SharedEmpSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Client/Ensnaring/EnsnareableSystem.cs b/Content.Client/Ensnaring/EnsnareableSystem.cs index ae853fb55c..373821e580 100644 --- a/Content.Client/Ensnaring/EnsnareableSystem.cs +++ b/Content.Client/Ensnaring/EnsnareableSystem.cs @@ -5,10 +5,10 @@ using Robust.Shared.Utility; namespace Content.Client.Ensnaring; -public sealed class EnsnareableSystem : SharedEnsnareableSystem +public sealed partial class EnsnareableSystem : SharedEnsnareableSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index aa1dfaebe2..582a768e76 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -46,43 +46,43 @@ using Robust.Shared.Timing; namespace Content.Client.Entry { - public sealed class EntryPoint : GameClient + public sealed partial class EntryPoint : GameClient { - [Dependency] private readonly IBaseClient _baseClient = default!; - [Dependency] private readonly IGameController _gameController = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IClientAdminManager _adminManager = default!; + [Dependency] private IBaseClient _baseClient = default!; + [Dependency] private IGameController _gameController = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private IComponentFactory _componentFactory = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IParallaxManager _parallaxManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IStylesheetManager _stylesheetManager = default!; + [Dependency] private IScreenshotHook _screenshotHook = default!; + [Dependency] private FullscreenHook _fullscreenHook = default!; + [Dependency] private ChangelogManager _changelogManager = default!; + [Dependency] private ViewportManager _viewportManager = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IClientPreferencesManager _clientPreferencesManager = default!; + [Dependency] private EuiManager _euiManager = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private DocumentParsingManager _documentParsingManager = default!; + [Dependency] private GhostKickManager _ghostKick = default!; + [Dependency] private ExtendedDisconnectInformationManager _extendedDisconnectInformation = default!; + [Dependency] private JobRequirementsManager _jobRequirements = default!; + [Dependency] private ContentLocalizationManager _contentLoc = default!; + [Dependency] private ContentReplayPlaybackManager _playbackMan = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private IReplayLoadManager _replayLoad = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private DebugMonitorManager _debugMonitorManager = default!; + [Dependency] private TitleWindowManager _titleWindowManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; + [Dependency] private ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!; + [Dependency] private ClientFeedbackManager _feedbackManager = null!; [Dependency] private readonly EntityScreenshotGenerator _entityScreenshotGenerator = default!; // Corvax-Wiki - [Dependency] private readonly IParallaxManager _parallaxManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IStylesheetManager _stylesheetManager = default!; - [Dependency] private readonly IScreenshotHook _screenshotHook = default!; - [Dependency] private readonly FullscreenHook _fullscreenHook = default!; - [Dependency] private readonly ChangelogManager _changelogManager = default!; - [Dependency] private readonly ViewportManager _viewportManager = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IClientPreferencesManager _clientPreferencesManager = default!; - [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly DocumentParsingManager _documentParsingManager = default!; - [Dependency] private readonly GhostKickManager _ghostKick = default!; - [Dependency] private readonly ExtendedDisconnectInformationManager _extendedDisconnectInformation = default!; - [Dependency] private readonly JobRequirementsManager _jobRequirements = default!; - [Dependency] private readonly ContentLocalizationManager _contentLoc = default!; - [Dependency] private readonly ContentReplayPlaybackManager _playbackMan = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly IReplayLoadManager _replayLoad = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly DebugMonitorManager _debugMonitorManager = default!; - [Dependency] private readonly TitleWindowManager _titleWindowManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; - [Dependency] private readonly ClientsidePlaytimeTrackingManager _clientsidePlaytimeManager = default!; - [Dependency] private readonly ClientFeedbackManager _feedbackManager = null!; public override void PreInit() { diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs index c11ba5a9b6..73f746698a 100644 --- a/Content.Client/Eui/BaseEui.cs +++ b/Content.Client/Eui/BaseEui.cs @@ -4,9 +4,9 @@ using Robust.Shared.Network; namespace Content.Client.Eui { - public abstract class BaseEui + public abstract partial class BaseEui { - [Dependency] private readonly IClientNetManager _netManager = default!; + [Dependency] private IClientNetManager _netManager = default!; public EuiManager Manager { get; private set; } = default!; public uint Id { get; private set; } diff --git a/Content.Client/Eui/EuiManager.cs b/Content.Client/Eui/EuiManager.cs index 001493c537..03ab3d2f7e 100644 --- a/Content.Client/Eui/EuiManager.cs +++ b/Content.Client/Eui/EuiManager.cs @@ -10,11 +10,11 @@ using Robust.Shared.Utility; namespace Content.Client.Eui { - public sealed class EuiManager + public sealed partial class EuiManager { - [Dependency] private readonly IClientNetManager _net = default!; - [Dependency] private readonly IReflectionManager _refl = default!; - [Dependency] private readonly IDynamicTypeFactory _dtf = default!; + [Dependency] private IClientNetManager _net = default!; + [Dependency] private IReflectionManager _refl = default!; + [Dependency] private IDynamicTypeFactory _dtf = default!; private readonly Dictionary _openUis = new(); diff --git a/Content.Client/Examine/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs index 0385672977..1fce277251 100644 --- a/Content.Client/Examine/ExamineSystem.cs +++ b/Content.Client/Examine/ExamineSystem.cs @@ -24,13 +24,13 @@ using Direction = Robust.Shared.Maths.Direction; namespace Content.Client.Examine { [UsedImplicitly] - public sealed class ExamineSystem : ExamineSystemShared + public sealed partial class ExamineSystem : ExamineSystemShared { - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly VerbSystem _verbSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private VerbSystem _verbSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; private List _verbList = new(); diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs index 18cb8f647a..ffaf9a7db6 100644 --- a/Content.Client/Explosion/ExplosionOverlay.cs +++ b/Content.Client/Explosion/ExplosionOverlay.cs @@ -11,13 +11,13 @@ using Robust.Shared.Random; namespace Content.Client.Explosion; [UsedImplicitly] -public sealed class ExplosionOverlay : Overlay +public sealed partial class ExplosionOverlay : Overlay { private static readonly ProtoId UnshadedShader = "unshaded"; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _proto = default!; private readonly SharedTransformSystem _transformSystem; private SharedAppearanceSystem _appearance; diff --git a/Content.Client/Explosion/ExplosionOverlaySystem.cs b/Content.Client/Explosion/ExplosionOverlaySystem.cs index 8a4ce99f14..98923a48dd 100644 --- a/Content.Client/Explosion/ExplosionOverlaySystem.cs +++ b/Content.Client/Explosion/ExplosionOverlaySystem.cs @@ -12,14 +12,14 @@ namespace Content.Client.Explosion; /// This system is responsible for showing the client-side explosion effects (light source & fire-overlay). The /// fire overlay code is just a bastardized version of the atmos plasma fire overlay and uses the same texture. /// -public sealed class ExplosionOverlaySystem : EntitySystem +public sealed partial class ExplosionOverlaySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IResourceCache _resCache = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; - [Dependency] private readonly SharedPointLightSystem _lights = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IResourceCache _resCache = default!; + [Dependency] private IOverlayManager _overlayMan = default!; + [Dependency] private SharedPointLightSystem _lights = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Client/Eye/Blinding/BlindOverlay.cs b/Content.Client/Eye/Blinding/BlindOverlay.cs index 906f9c954c..f316b23678 100644 --- a/Content.Client/Eye/Blinding/BlindOverlay.cs +++ b/Content.Client/Eye/Blinding/BlindOverlay.cs @@ -10,15 +10,15 @@ using Content.Shared.Movement.Systems; namespace Content.Client.Eye.Blinding { - public sealed class BlindOverlay : Overlay + public sealed partial class BlindOverlay : Overlay { private static readonly ProtoId GreyscaleShader = "GreyscaleFullscreen"; private static readonly ProtoId CircleShader = "CircleMask"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly ILightManager _lightManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private ILightManager _lightManager = default!; public override bool RequestScreenTexture => true; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/Eye/Blinding/BlindingSystem.cs b/Content.Client/Eye/Blinding/BlindingSystem.cs index 99d215b758..5b46617936 100644 --- a/Content.Client/Eye/Blinding/BlindingSystem.cs +++ b/Content.Client/Eye/Blinding/BlindingSystem.cs @@ -6,10 +6,10 @@ using Robust.Shared.Player; namespace Content.Client.Eye.Blinding; -public sealed class BlindingSystem : EntitySystem +public sealed partial class BlindingSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; [Dependency] ILightManager _lightManager = default!; diff --git a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs index dccdac2758..ee7c9eef01 100644 --- a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs +++ b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs @@ -8,15 +8,15 @@ using Robust.Shared.Configuration; namespace Content.Client.Eye.Blinding { - public sealed class BlurryVisionOverlay : Overlay + public sealed partial class BlurryVisionOverlay : Overlay { private static readonly ProtoId CataractsShader = "Cataracts"; private static readonly ProtoId CircleShader = "CircleMask"; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; public override bool RequestScreenTexture => true; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs index ba687ead4e..d495c8982d 100644 --- a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs +++ b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs @@ -5,10 +5,10 @@ using Robust.Shared.Player; namespace Content.Client.Eye.Blinding; -public sealed class BlurryVisionSystem : EntitySystem +public sealed partial class BlurryVisionSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private BlurryVisionOverlay _overlay = default!; public override void Initialize() diff --git a/Content.Client/Eye/EyeLerpingSystem.cs b/Content.Client/Eye/EyeLerpingSystem.cs index c0a7c01696..10a802ac6d 100644 --- a/Content.Client/Eye/EyeLerpingSystem.cs +++ b/Content.Client/Eye/EyeLerpingSystem.cs @@ -10,13 +10,13 @@ using Robust.Shared.Timing; namespace Content.Client.Eye; -public sealed class EyeLerpingSystem : EntitySystem +public sealed partial class EyeLerpingSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedEyeSystem _eye = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedTransformSystem _transform = default!; // Convenience variable for for VV. [ViewVariables, UsedImplicitly] diff --git a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs index 698b3114b7..8a60f2d979 100644 --- a/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs +++ b/Content.Client/Fax/AdminUI/AdminFaxWindow.xaml.cs @@ -17,7 +17,7 @@ public sealed partial class AdminFaxWindow : DefaultWindow public Action<(NetEntity entity, string title, string stampedBy, string message, string stampSprite, Color stampColor, bool locked)>? OnMessageSend; public Action? OnFollowFax; - [Dependency] private readonly IResourceCache _resCache = default!; + [Dependency] private IResourceCache _resCache = default!; public AdminFaxWindow() { diff --git a/Content.Client/Fax/System/FaxVisualsSystem.cs b/Content.Client/Fax/System/FaxVisualsSystem.cs index e752fbf48e..19b18da8da 100644 --- a/Content.Client/Fax/System/FaxVisualsSystem.cs +++ b/Content.Client/Fax/System/FaxVisualsSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Fax.System; /// /// Visualizer for the fax machine which displays the correct sprite based on the inserted entity. /// -public sealed class FaxVisualsSystem : EntitySystem +public sealed partial class FaxVisualsSystem : EntitySystem { - [Dependency] private readonly AnimationPlayerSystem _player = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private AnimationPlayerSystem _player = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Client/Fax/UI/FaxBoundUi.cs b/Content.Client/Fax/UI/FaxBoundUi.cs index d9265736c3..da1cfd96bf 100644 --- a/Content.Client/Fax/UI/FaxBoundUi.cs +++ b/Content.Client/Fax/UI/FaxBoundUi.cs @@ -8,9 +8,9 @@ using Robust.Client.UserInterface; namespace Content.Client.Fax.UI; [UsedImplicitly] -public sealed class FaxBoundUi : BoundUserInterface +public sealed partial class FaxBoundUi : BoundUserInterface { - [Dependency] private readonly IFileDialogManager _fileDialogManager = default!; + [Dependency] private IFileDialogManager _fileDialogManager = default!; [ViewVariables] private FaxWindow? _window; diff --git a/Content.Client/FeedbackPopup/FeedbackPopupUIController.cs b/Content.Client/FeedbackPopup/FeedbackPopupUIController.cs index 19ec95a700..fc474a71dd 100644 --- a/Content.Client/FeedbackPopup/FeedbackPopupUIController.cs +++ b/Content.Client/FeedbackPopup/FeedbackPopupUIController.cs @@ -11,11 +11,11 @@ namespace Content.Client.FeedbackPopup; /// This handles getting feedback popup messages from the server and making a popup in the client. /// [UsedImplicitly] -public sealed class FeedbackPopupUIController : UIController +public sealed partial class FeedbackPopupUIController : UIController { - [Dependency] private readonly ClientFeedbackManager _feedbackManager = null!; - [Dependency] private readonly IPrototypeManager _proto = null!; - [Dependency] private readonly IUriOpener _uri = null!; + [Dependency] private ClientFeedbackManager _feedbackManager = null!; + [Dependency] private IPrototypeManager _proto = null!; + [Dependency] private IUriOpener _uri = null!; private FeedbackPopupWindow _window = null!; diff --git a/Content.Client/Flash/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs index 72567530c0..c833ad69ac 100644 --- a/Content.Client/Flash/FlashOverlay.cs +++ b/Content.Client/Flash/FlashOverlay.cs @@ -11,15 +11,15 @@ using Robust.Shared.Timing; namespace Content.Client.Flash { - public sealed class FlashOverlay : Overlay + public sealed partial class FlashOverlay : Overlay { private static readonly ProtoId FlashedEffectShader = "FlashedEffect"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _configManager = default!; private readonly SharedFlashSystem _flash; private readonly StatusEffectsSystem _statusSys; @@ -86,7 +86,7 @@ namespace Content.Client.Flash { // TODO: This is a very simple placeholder. // Replace it with a proper shader once we come up with something good. - // Turns out making an effect that is supposed to be a bright, sudden, and disorienting flash + // Turns out making an effect that is supposed to be a bright, sudden, and disorienting flash // not do any of that while also being equivalent in terms of game balance is hard. var alpha = 1 - MathF.Pow(PercentComplete, 8f); // similar falloff curve to the flash shader worldHandle.DrawRect(args.WorldBounds, new Color(0f, 0f, 0f, alpha)); diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs index ffabab9453..22631b7ec5 100644 --- a/Content.Client/Flash/FlashSystem.cs +++ b/Content.Client/Flash/FlashSystem.cs @@ -6,10 +6,10 @@ using Robust.Shared.Player; namespace Content.Client.Flash; -public sealed class FlashSystem : SharedFlashSystem +public sealed partial class FlashSystem : SharedFlashSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private FlashOverlay _overlay = default!; diff --git a/Content.Client/Fluids/PuddleDebugOverlaySystem.cs b/Content.Client/Fluids/PuddleDebugOverlaySystem.cs index cec372cb0b..d6b1e6cd25 100644 --- a/Content.Client/Fluids/PuddleDebugOverlaySystem.cs +++ b/Content.Client/Fluids/PuddleDebugOverlaySystem.cs @@ -4,9 +4,9 @@ using Robust.Client.Graphics; namespace Content.Client.Fluids; -public sealed class PuddleDebugOverlaySystem : SharedPuddleDebugOverlaySystem +public sealed partial class PuddleDebugOverlaySystem : SharedPuddleDebugOverlaySystem { - [Dependency] private readonly IOverlayManager _overlayManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; public readonly Dictionary TileData = new(); private PuddleOverlay? _overlay; diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs index caa5a92580..f389ef80a7 100644 --- a/Content.Client/Fluids/PuddleOverlay.cs +++ b/Content.Client/Fluids/PuddleOverlay.cs @@ -8,11 +8,11 @@ using Robust.Shared.Map.Components; namespace Content.Client.Fluids; -public sealed class PuddleOverlay : Overlay +public sealed partial class PuddleOverlay : Overlay { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; private readonly PuddleDebugOverlaySystem _debugOverlaySystem; private readonly SharedTransformSystem _transformSystem; diff --git a/Content.Client/Fluids/PuddleSystem.cs b/Content.Client/Fluids/PuddleSystem.cs index ab96d24d85..bf1a8cb50b 100644 --- a/Content.Client/Fluids/PuddleSystem.cs +++ b/Content.Client/Fluids/PuddleSystem.cs @@ -7,10 +7,10 @@ using Robust.Shared.Map; namespace Content.Client.Fluids; -public sealed class PuddleSystem : SharedPuddleSystem +public sealed partial class PuddleSystem : SharedPuddleSystem { - [Dependency] private readonly IconSmoothSystem _smooth = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IconSmoothSystem _smooth = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs index 08596b04e6..2e94497131 100644 --- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs +++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs @@ -5,9 +5,9 @@ using Robust.Client.UserInterface; namespace Content.Client.Forensics { - public sealed class ForensicScannerBoundUserInterface : BoundUserInterface + public sealed partial class ForensicScannerBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; [ViewVariables] private ForensicScannerMenu? _window; diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs index dd013ed235..8e1462bf21 100644 --- a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs +++ b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Forensics [GenerateTypedNameReferences] public sealed partial class ForensicScannerMenu : DefaultWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public ForensicScannerMenu() { diff --git a/Content.Client/Fullscreen/FullscreenHook.cs b/Content.Client/Fullscreen/FullscreenHook.cs index 7917fddfbb..b3559f9c3f 100644 --- a/Content.Client/Fullscreen/FullscreenHook.cs +++ b/Content.Client/Fullscreen/FullscreenHook.cs @@ -7,11 +7,11 @@ using Robust.Shared.Configuration; using Robust.Shared.Player; namespace Content.Client.Fullscreen; -public sealed class FullscreenHook +public sealed partial class FullscreenHook { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; public void Initialize() diff --git a/Content.Client/GameTicking/Managers/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs index 443c6c20a8..c10e743e82 100644 --- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs +++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs @@ -16,12 +16,12 @@ using Content.Shared.GameTicking.Prototypes; namespace Content.Client.GameTicking.Managers { [UsedImplicitly] - public sealed class ClientGameTicker : SharedGameTicker + public sealed partial class ClientGameTicker : SharedGameTicker { - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; private Dictionary, int?>> _jobsAvailable = new(); private Dictionary _stationNames = new(); diff --git a/Content.Client/GameTicking/Managers/TitleWindowManager.cs b/Content.Client/GameTicking/Managers/TitleWindowManager.cs index bc33e78411..b223070630 100644 --- a/Content.Client/GameTicking/Managers/TitleWindowManager.cs +++ b/Content.Client/GameTicking/Managers/TitleWindowManager.cs @@ -6,12 +6,12 @@ using Robust.Shared.Configuration; namespace Content.Client.GameTicking.Managers; -public sealed class TitleWindowManager +public sealed partial class TitleWindowManager { - [Dependency] private readonly IBaseClient _client = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameController _gameController = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameController _gameController = default!; public void Initialize() { diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs index 0ce6436f2d..c782190709 100644 --- a/Content.Client/Gameplay/GameplayState.cs +++ b/Content.Client/Gameplay/GameplayState.cs @@ -17,14 +17,14 @@ using Robust.Shared.Timing; namespace Content.Client.Gameplay { [Virtual] - public class GameplayState : GameplayStateBase, IMainViewportState + public partial class GameplayState : GameplayStateBase, IMainViewportState { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly ChangelogManager _changelog = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private ChangelogManager _changelog = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; private FpsCounter _fpsCounter = default!; private Label _version = default!; diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs index c2b10fd01a..23798bce8e 100644 --- a/Content.Client/Gameplay/GameplayStateBase.cs +++ b/Content.Client/Gameplay/GameplayStateBase.cs @@ -30,19 +30,19 @@ namespace Content.Client.Gameplay // Ok actually it's fine. // Instantiated dynamically through the StateManager, Dependencies will be resolved. [Virtual] - public class GameplayStateBase : State, IEntityEventSubscriber + public partial class GameplayStateBase : State, IEntityEventSubscriber { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] protected readonly IUserInterfaceManager UserInterfaceManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IViewVariablesManager _vvm = default!; - [Dependency] private readonly IConsoleHost _conHost = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] protected IUserInterfaceManager UserInterfaceManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IViewVariablesManager _vvm = default!; + [Dependency] private IConsoleHost _conHost = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; private ClickableEntityComparer _comparer = default!; diff --git a/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs b/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs index 3dacc81f21..0d846bdc9a 100644 --- a/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs +++ b/Content.Client/Ghost/Commands/ToggleGhostVisibilityCommand.cs @@ -2,9 +2,9 @@ namespace Content.Client.Ghost.Commands; -public sealed class ToggleGhostVisibilityCommand : LocalizedEntityCommands +public sealed partial class ToggleGhostVisibilityCommand : LocalizedEntityCommands { - [Dependency] private readonly GhostSystem _ghost = default!; + [Dependency] private GhostSystem _ghost = default!; public override string Command => "toggleghostvisibility"; diff --git a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs index 9334c85536..f25fdeef4c 100644 --- a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs +++ b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs @@ -6,9 +6,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Ghost; -public sealed class GhostRoleRadioBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) +public sealed partial class GhostRoleRadioBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey) { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private SimpleRadialMenu? _ghostRoleRadioMenu; diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs index 58758f54f2..d4b1dfca0e 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/Content.Client/Ghost/GhostSystem.cs @@ -8,14 +8,14 @@ using Robust.Shared.Player; namespace Content.Client.Ghost { - public sealed class GhostSystem : SharedGhostSystem + public sealed partial class GhostSystem : SharedGhostSystem { - [Dependency] private readonly IClientConsoleHost _console = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly PointLightSystem _pointLightSystem = default!; - [Dependency] private readonly ContentEyeSystem _contentEye = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IClientConsoleHost _console = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private PointLightSystem _pointLightSystem = default!; + [Dependency] private ContentEyeSystem _contentEye = default!; + [Dependency] private SpriteSystem _sprite = default!; public int AvailableGhostRoleCount { get; private set; } diff --git a/Content.Client/Ghost/GhostToggleSelfVisibility.cs b/Content.Client/Ghost/GhostToggleSelfVisibility.cs index fea9a2fc0d..100f242eab 100644 --- a/Content.Client/Ghost/GhostToggleSelfVisibility.cs +++ b/Content.Client/Ghost/GhostToggleSelfVisibility.cs @@ -4,9 +4,9 @@ using Robust.Shared.Console; namespace Content.Client.Ghost; -public sealed class GhostToggleSelfVisibility : LocalizedEntityCommands +public sealed partial class GhostToggleSelfVisibility : LocalizedEntityCommands { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override string Command => "toggleselfghost"; diff --git a/Content.Client/GhostKick/GhostKickManager.cs b/Content.Client/GhostKick/GhostKickManager.cs index 7ca2385e4b..16fe700e79 100644 --- a/Content.Client/GhostKick/GhostKickManager.cs +++ b/Content.Client/GhostKick/GhostKickManager.cs @@ -6,13 +6,13 @@ using Robust.Shared.Network; namespace Content.Client.GhostKick; -public sealed class GhostKickManager +public sealed partial class GhostKickManager { private bool _fakeLossEnabled; - [Dependency] private readonly IBaseClient _baseClient = default!; - [Dependency] private readonly IClientNetManager _netManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IBaseClient _baseClient = default!; + [Dependency] private IClientNetManager _netManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; public void Initialize() { diff --git a/Content.Client/Gravity/FloatingVisualizerSystem.cs b/Content.Client/Gravity/FloatingVisualizerSystem.cs index a7cb3333b2..8bff714b9a 100644 --- a/Content.Client/Gravity/FloatingVisualizerSystem.cs +++ b/Content.Client/Gravity/FloatingVisualizerSystem.cs @@ -7,9 +7,9 @@ using Robust.Shared.Animations; namespace Content.Client.Gravity; /// -public sealed class FloatingVisualizerSystem : SharedFloatingVisualizerSystem +public sealed partial class FloatingVisualizerSystem : SharedFloatingVisualizerSystem { - [Dependency] private readonly AnimationPlayerSystem AnimationSystem = default!; + [Dependency] private AnimationPlayerSystem AnimationSystem = default!; public override void Initialize() { diff --git a/Content.Client/Gravity/GravitySystem.Shake.cs b/Content.Client/Gravity/GravitySystem.Shake.cs index 9b9918ca3e..96905172a7 100644 --- a/Content.Client/Gravity/GravitySystem.Shake.cs +++ b/Content.Client/Gravity/GravitySystem.Shake.cs @@ -11,10 +11,10 @@ namespace Content.Client.Gravity; public sealed partial class GravitySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedCameraRecoilSystem _sharedCameraRecoil = default!; private void InitializeShake() { diff --git a/Content.Client/Gravity/GravitySystem.cs b/Content.Client/Gravity/GravitySystem.cs index f1e09fdb44..ab47c5ed23 100644 --- a/Content.Client/Gravity/GravitySystem.cs +++ b/Content.Client/Gravity/GravitySystem.cs @@ -6,8 +6,8 @@ namespace Content.Client.Gravity; public sealed partial class GravitySystem : SharedGravitySystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs index fee397b27d..4c5394199e 100644 --- a/Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs @@ -26,10 +26,10 @@ namespace Content.Client.Guidebook.Controls; [GenerateTypedNameReferences] public sealed partial class GuideEntityEmbed : BoxContainer, IDocumentTag { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntitySystemManager _systemManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntitySystemManager _systemManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; private readonly TagSystem _tagSystem; private readonly ExamineSystem _examineSystem; diff --git a/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs index 86f7dce9e3..1738c7f758 100644 --- a/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs @@ -20,7 +20,7 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideLawsetEmbed : Control, IDocumentTag, ISearchableControl, IPrototypeRepresentationControl { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; private ISawmill _logging = default!; diff --git a/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs index 108f066c39..4d8ed55615 100644 --- a/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs @@ -17,7 +17,7 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideLawsetListEmbed : Control, IDocumentTag { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public GuideLawsetListEmbed() { diff --git a/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs index d6f20d5a25..e54892d634 100644 --- a/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideMicrowaveEmbed.xaml.cs @@ -21,8 +21,8 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideMicrowaveEmbed : PanelContainer, IDocumentTag, ISearchableControl, IPrototypeRepresentationControl { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private ILogManager _logManager = default!; private readonly ISawmill _sawmill = default!; diff --git a/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs b/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs index 7c2a0ecfe1..9fe70faaaa 100644 --- a/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs +++ b/Content.Client/Guidebook/Controls/GuideMicrowaveGroupEmbed.cs @@ -15,8 +15,8 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly] public sealed partial class GuideMicrowaveGroupEmbed : BoxContainer, IDocumentTag { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; private readonly ISawmill _sawmill; diff --git a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs index 0879bfda58..3f816f2d50 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideReagentEmbed.xaml.cs @@ -28,10 +28,10 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISearchableControl, IPrototypeRepresentationControl { - [Dependency] private readonly IEntitySystemManager _systemManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IConfigurationManager _config = default!; + [Dependency] private IEntitySystemManager _systemManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IConfigurationManager _config = default!; private readonly ChemistryGuideDataSystem _chemistryGuideData; private readonly ContrabandSystem _contraband; @@ -231,14 +231,14 @@ public sealed partial class GuideReagentEmbed : BoxContainer, IDocumentTag, ISea { description.PushNewline(); description.AddMarkupPermissive( - _contraband.GenerateDepartmentExamineMessage(reagent.AllowedDepartments, reagent.AllowedJobs, ContrabandItemType.Reagent)); + _contraband.GenerateDepartmentExamineMessage(reagent.AllowedDepartments, reagent.AllowedJobs, Color.Yellow, ContrabandItemType.Reagent)); } // Other contraband text else if (reagent.ContrabandSeverity != null && _prototype.Resolve(reagent.ContrabandSeverity.Value, out var severity)) { description.PushNewline(); - description.AddMarkupPermissive(Loc.GetString(severity.ExamineText, ("type", ContrabandItemType.Reagent))); + description.AddMarkupPermissive(Loc.GetString(severity.ExamineText, ("type", ContrabandItemType.Reagent), ("color", severity.Color))); } } diff --git a/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs index 5373034b42..a32700e5a4 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideReagentGroupEmbed : BoxContainer, IDocumentTag { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; private readonly ISawmill _sawmill; diff --git a/Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml.cs index a01f2a8f17..d97ad6b039 100644 --- a/Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideTechDisciplineEmbed.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideTechDisciplineEmbed : BoxContainer, IDocumentTag { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; private readonly ISawmill _sawmill; diff --git a/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml.cs index 7d205f7cea..c34a352b59 100644 --- a/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideTechnologyEmbed.xaml.cs @@ -21,9 +21,9 @@ namespace Content.Client.Guidebook.Controls; [UsedImplicitly, GenerateTypedNameReferences] public sealed partial class GuideTechnologyEmbed : BoxContainer, IDocumentTag, ISearchableControl { - [Dependency] private readonly IEntitySystemManager _systemManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IEntitySystemManager _systemManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; private readonly ResearchSystem _research; private readonly SpriteSystem _sprite; diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs index 677105df00..f01bc59a95 100644 --- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs @@ -18,8 +18,8 @@ namespace Content.Client.Guidebook.Controls; [GenerateTypedNameReferences] public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler, IAnchorClickHandler { - [Dependency] private readonly DocumentParsingManager _parsingMan = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; + [Dependency] private DocumentParsingManager _parsingMan = default!; + [Dependency] private IResourceManager _resourceManager = default!; private Dictionary, GuideEntry> _entries = new(); diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs index 0d73b26381..d207d8cd5a 100644 --- a/Content.Client/Guidebook/DocumentParsingManager.cs +++ b/Content.Client/Guidebook/DocumentParsingManager.cs @@ -18,10 +18,10 @@ namespace Content.Client.Guidebook; /// public sealed partial class DocumentParsingManager { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IReflectionManager _reflectionManager = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly ISandboxHelper _sandboxHelper = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IReflectionManager _reflectionManager = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private ISandboxHelper _sandboxHelper = default!; private readonly Dictionary> _tagControlParsers = new(); private Parser _controlParser = default!; diff --git a/Content.Client/Guidebook/GuidebookSystem.cs b/Content.Client/Guidebook/GuidebookSystem.cs index e08c335f2c..df4ab0cbb9 100644 --- a/Content.Client/Guidebook/GuidebookSystem.cs +++ b/Content.Client/Guidebook/GuidebookSystem.cs @@ -20,14 +20,14 @@ namespace Content.Client.Guidebook; /// /// This system handles the help-verb and interactions with various client-side entities that are embedded into guidebooks. /// -public sealed class GuidebookSystem : EntitySystem +public sealed partial class GuidebookSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly VerbSystem _verbSystem = default!; - [Dependency] private readonly RgbLightControllerSystem _rgbLightControllerSystem = default!; - [Dependency] private readonly SharedPointLightSystem _pointLightSystem = default!; - [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private VerbSystem _verbSystem = default!; + [Dependency] private RgbLightControllerSystem _rgbLightControllerSystem = default!; + [Dependency] private SharedPointLightSystem _pointLightSystem = default!; + [Dependency] private TagSystem _tags = default!; public event Action>, List>?, diff --git a/Content.Client/Guidebook/Richtext/KeyBindTag.cs b/Content.Client/Guidebook/Richtext/KeyBindTag.cs index ab74ddf1a0..e190882fab 100644 --- a/Content.Client/Guidebook/Richtext/KeyBindTag.cs +++ b/Content.Client/Guidebook/Richtext/KeyBindTag.cs @@ -6,9 +6,9 @@ using Robust.Shared.Utility; namespace Content.Client.Guidebook.Richtext; [UsedImplicitly] -public sealed class KeyBindTag : IMarkupTagHandler +public sealed partial class KeyBindTag : IMarkupTagHandler { - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IInputManager _inputManager = default!; public string Name => "keybind"; diff --git a/Content.Client/Guidebook/Richtext/ProtodataTag.cs b/Content.Client/Guidebook/Richtext/ProtodataTag.cs index 9d7d46e246..883b93f2fb 100644 --- a/Content.Client/Guidebook/Richtext/ProtodataTag.cs +++ b/Content.Client/Guidebook/Richtext/ProtodataTag.cs @@ -9,10 +9,10 @@ namespace Content.Client.Guidebook.RichText; /// To be accessed by this tag, the desired field/property must /// be tagged with . /// -public sealed class ProtodataTag : IMarkupTagHandler +public sealed partial class ProtodataTag : IMarkupTagHandler { - [Dependency] private readonly ILogManager _logMan = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private ILogManager _logMan = default!; + [Dependency] private IEntityManager _entMan = default!; public string Name => "protodata"; private ISawmill Log => _log ??= _logMan.GetSawmill("protodata_tag"); diff --git a/Content.Client/Hands/ShowHandItemOverlay.cs b/Content.Client/Hands/ShowHandItemOverlay.cs index 3cb0cd58ff..624a8ee443 100644 --- a/Content.Client/Hands/ShowHandItemOverlay.cs +++ b/Content.Client/Hands/ShowHandItemOverlay.cs @@ -13,12 +13,12 @@ using Direction = Robust.Shared.Maths.Direction; namespace Content.Client.Hands { - public sealed class ShowHandItemOverlay : Overlay + public sealed partial class ShowHandItemOverlay : Overlay { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IEntityManager _entMan = default!; private HandsSystem? _hands; private readonly IRenderTexture _renderBackbuffer; diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs index 2613313585..dc33db2fc2 100644 --- a/Content.Client/Hands/Systems/HandsSystem.cs +++ b/Content.Client/Hands/Systems/HandsSystem.cs @@ -21,15 +21,15 @@ using Robust.Shared.Utility; namespace Content.Client.Hands.Systems { [UsedImplicitly] - public sealed class HandsSystem : SharedHandsSystem + public sealed partial class HandsSystem : SharedHandsSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; - [Dependency] private readonly StrippableSystem _stripSys = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly ExamineSystem _examine = default!; - [Dependency] private readonly DisplacementMapSystem _displacement = default!; + [Dependency] private StrippableSystem _stripSys = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private ExamineSystem _examine = default!; + [Dependency] private DisplacementMapSystem _displacement = default!; public event Action? OnPlayerSetActiveHand; public event Action>? OnPlayerHandsAdded; diff --git a/Content.Client/Holiday/HolidaySystem.cs b/Content.Client/Holiday/HolidaySystem.cs index 8424d5ec44..bb38a41593 100644 --- a/Content.Client/Holiday/HolidaySystem.cs +++ b/Content.Client/Holiday/HolidaySystem.cs @@ -7,11 +7,11 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations; namespace Content.Client.Holiday; -public sealed class HolidaySystem : EntitySystem +public sealed partial class HolidaySystem : EntitySystem { - [Dependency] private readonly IResourceCache _rescache = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IResourceCache _rescache = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Holopad/HolopadBoundUserInterface.cs b/Content.Client/Holopad/HolopadBoundUserInterface.cs index e0a263cb0e..71241f20c9 100644 --- a/Content.Client/Holopad/HolopadBoundUserInterface.cs +++ b/Content.Client/Holopad/HolopadBoundUserInterface.cs @@ -6,9 +6,9 @@ using System.Numerics; namespace Content.Client.Holopad; -public sealed class HolopadBoundUserInterface : BoundUserInterface +public sealed partial class HolopadBoundUserInterface : BoundUserInterface { - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; [ViewVariables] private HolopadWindow? _window; diff --git a/Content.Client/Holopad/HolopadSystem.cs b/Content.Client/Holopad/HolopadSystem.cs index 51491de98f..81a04cf36b 100644 --- a/Content.Client/Holopad/HolopadSystem.cs +++ b/Content.Client/Holopad/HolopadSystem.cs @@ -10,11 +10,11 @@ using DrawDepth = Content.Shared.DrawDepth.DrawDepth; namespace Content.Client.Holopad; -public sealed class HolopadSystem : SharedHolopadSystem +public sealed partial class HolopadSystem : SharedHolopadSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Holopad/HolopadWindow.xaml.cs b/Content.Client/Holopad/HolopadWindow.xaml.cs index cb618484e2..16ec37bb7e 100644 --- a/Content.Client/Holopad/HolopadWindow.xaml.cs +++ b/Content.Client/Holopad/HolopadWindow.xaml.cs @@ -17,9 +17,9 @@ namespace Content.Client.Holopad; [GenerateTypedNameReferences] public sealed partial class HolopadWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _timing = default!; private readonly SharedHolopadSystem _holopadSystem = default!; private readonly SharedTelephoneSystem _telephoneSystem = default!; diff --git a/Content.Client/HotPotato/HotPotatoSystem.cs b/Content.Client/HotPotato/HotPotatoSystem.cs index a1495ab994..f88e3da40c 100644 --- a/Content.Client/HotPotato/HotPotatoSystem.cs +++ b/Content.Client/HotPotato/HotPotatoSystem.cs @@ -5,11 +5,11 @@ using Robust.Shared.Timing; namespace Content.Client.HotPotato; -public sealed class HotPotatoSystem : SharedHotPotatoSystem +public sealed partial class HotPotatoSystem : SharedHotPotatoSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; private readonly EntProtoId _hotPotatoEffectId = "HotPotatoEffect"; diff --git a/Content.Client/Humanoid/HideableHumanoidLayersSystem.cs b/Content.Client/Humanoid/HideableHumanoidLayersSystem.cs index 9d034a7a63..1dbae023ae 100644 --- a/Content.Client/Humanoid/HideableHumanoidLayersSystem.cs +++ b/Content.Client/Humanoid/HideableHumanoidLayersSystem.cs @@ -4,9 +4,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Humanoid; -public sealed class HideableHumanoidLayersSystem : SharedHideableHumanoidLayersSystem +public sealed partial class HideableHumanoidLayersSystem : SharedHideableHumanoidLayersSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Humanoid/LayerMarkingItem.xaml.cs b/Content.Client/Humanoid/LayerMarkingItem.xaml.cs index 65458eb7d1..dce951d86e 100644 --- a/Content.Client/Humanoid/LayerMarkingItem.xaml.cs +++ b/Content.Client/Humanoid/LayerMarkingItem.xaml.cs @@ -18,7 +18,7 @@ namespace Content.Client.Humanoid; [GenerateTypedNameReferences] public sealed partial class LayerMarkingItem : BoxContainer, ISearchableControl { - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IEntityManager _entity = default!; private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors private readonly SpriteSystem _sprite; diff --git a/Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs b/Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs index c3275ca885..ba6a698903 100644 --- a/Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs +++ b/Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs @@ -24,7 +24,7 @@ public sealed partial class LayerMarkingOrderer : BoxContainer private readonly List _beacons = new(); private LayerDragDropBeacon? _dragTarget; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public LayerMarkingOrderer(MarkingsViewModel markingsModel, ProtoId organ, HumanoidVisualLayers layer) { diff --git a/Content.Client/Humanoid/MarkingsViewModel.cs b/Content.Client/Humanoid/MarkingsViewModel.cs index ed62c3d62d..14dfc72909 100644 --- a/Content.Client/Humanoid/MarkingsViewModel.cs +++ b/Content.Client/Humanoid/MarkingsViewModel.cs @@ -10,10 +10,10 @@ namespace Content.Client.Humanoid; /// /// View model for UIs manipulating a set of markings, responsible for applying markings logic and keeping state synchronized. /// -public sealed class MarkingsViewModel +public sealed partial class MarkingsViewModel { - [Dependency] private readonly MarkingManager _marking = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private MarkingManager _marking = default!; + [Dependency] private IPrototypeManager _prototype = default!; private bool _enforceLimits = true; diff --git a/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs b/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs index 42ed510af2..7b574505fb 100644 --- a/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.Humanoid; [GenerateTypedNameReferences] public sealed partial class OrganMarkingPicker : Control { - [Dependency] private readonly MarkingManager _marking = default!; - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private MarkingManager _marking = default!; + [Dependency] private IEntityManager _entity = default!; private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors private readonly SpriteSystem _sprite; diff --git a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs index 73db9e1ab9..ab0923ab73 100644 --- a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs @@ -3,10 +3,10 @@ using Robust.Client.GameObjects; namespace Content.Client.IconSmoothing; -public sealed class ClientRandomIconSmoothSystem : SharedRandomIconSmoothSystem +public sealed partial class ClientRandomIconSmoothSystem : SharedRandomIconSmoothSystem { - [Dependency] private readonly IconSmoothSystem _iconSmooth = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; + [Dependency] private IconSmoothSystem _iconSmooth = default!; + [Dependency] private AppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Client/IconSmoothing/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs index 4b8ec7be79..1028554f4d 100644 --- a/Content.Client/IconSmoothing/IconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs @@ -16,10 +16,10 @@ namespace Content.Client.IconSmoothing [UsedImplicitly] public sealed partial class IconSmoothSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly EntityQuery _iconSmoothQuery = default!; - [Dependency] private readonly EntityQuery _spriteQuery = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private EntityQuery _iconSmoothQuery = default!; + [Dependency] private EntityQuery _spriteQuery = default!; private readonly Queue _dirtyEntities = new(); private readonly Queue _anchorChangedEntities = new(); diff --git a/Content.Client/Implants/ImplanterSystem.cs b/Content.Client/Implants/ImplanterSystem.cs index a8c501daf1..c46c958349 100644 --- a/Content.Client/Implants/ImplanterSystem.cs +++ b/Content.Client/Implants/ImplanterSystem.cs @@ -6,10 +6,10 @@ using Robust.Shared.Prototypes; namespace Content.Client.Implants; -public sealed class ImplanterSystem : SharedImplanterSystem +public sealed partial class ImplanterSystem : SharedImplanterSystem { - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private IPrototypeManager _proto = default!; public override void Initialize() { diff --git a/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs b/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs index 6f66990b4e..296d02946f 100644 --- a/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs +++ b/Content.Client/Implants/UI/ChameleonControllerMenu.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Implants.UI; [GenerateTypedNameReferences] public sealed partial class ChameleonControllerMenu : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly SpriteSystem _sprite; private readonly JobSystem _job; diff --git a/Content.Client/Implants/UI/ImplanterStatusControl.cs b/Content.Client/Implants/UI/ImplanterStatusControl.cs index 43579ae6be..dcb278f355 100644 --- a/Content.Client/Implants/UI/ImplanterStatusControl.cs +++ b/Content.Client/Implants/UI/ImplanterStatusControl.cs @@ -9,9 +9,9 @@ using Robust.Shared.Timing; namespace Content.Client.Implants.UI; -public sealed class ImplanterStatusControl : Control +public sealed partial class ImplanterStatusControl : Control { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; private readonly ImplanterComponent _parent; private readonly RichTextLabel _label; diff --git a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs index 98241b2cca..91fb16b601 100644 --- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs +++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs @@ -11,7 +11,7 @@ namespace Content.Client.Info.PlaytimeStats; [GenerateTypedNameReferences] public sealed partial class PlaytimeStatsWindow : FancyWindow { - [Dependency] private readonly JobRequirementsManager _jobRequirementsManager = default!; + [Dependency] private JobRequirementsManager _jobRequirementsManager = default!; private ISawmill _sawmill = Logger.GetSawmill("PlaytimeStatsWindow"); private readonly Color _altColor = Color.FromHex("#292B38"); private readonly Color _defaultColor = Color.FromHex("#2F2F3B"); diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs index 4f483cf26c..025e7224c2 100644 --- a/Content.Client/Info/RulesAndInfoWindow.cs +++ b/Content.Client/Info/RulesAndInfoWindow.cs @@ -7,9 +7,9 @@ using Robust.Shared.ContentPack; namespace Content.Client.Info { - public sealed class RulesAndInfoWindow : DefaultWindow + public sealed partial class RulesAndInfoWindow : DefaultWindow { - [Dependency] private readonly IResourceManager _resourceManager = default!; + [Dependency] private IResourceManager _resourceManager = default!; public RulesAndInfoWindow() { diff --git a/Content.Client/Info/RulesControl.xaml.cs b/Content.Client/Info/RulesControl.xaml.cs index 22a520d539..2d4f6fce7b 100644 --- a/Content.Client/Info/RulesControl.xaml.cs +++ b/Content.Client/Info/RulesControl.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Info; [GenerateTypedNameReferences] public sealed partial class RulesControl : BoxContainer, ILinkClickHandler { - [Dependency] private readonly DocumentParsingManager _parsingMan = default!; + [Dependency] private DocumentParsingManager _parsingMan = default!; private string? _currentEntry; private readonly Stack _priorEntries = new(); diff --git a/Content.Client/Instruments/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs index c01845bb13..17f6d0c65d 100644 --- a/Content.Client/Instruments/InstrumentSystem.cs +++ b/Content.Client/Instruments/InstrumentSystem.cs @@ -15,10 +15,10 @@ namespace Content.Client.Instruments; public sealed partial class InstrumentSystem : SharedInstrumentSystem { - [Dependency] private readonly IClientNetManager _netManager = default!; - [Dependency] private readonly IMidiManager _midiManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IClientNetManager _netManager = default!; + [Dependency] private IMidiManager _midiManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IConfigurationManager _cfg = default!; public readonly TimeSpan OneSecAgo = TimeSpan.FromSeconds(-1); public int MaxMidiEventsPerBatch { get; private set; } diff --git a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs index 0f51c76f8f..513c07d9a5 100644 --- a/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs +++ b/Content.Client/Instruments/UI/ChannelsMenu.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.Instruments.UI; [GenerateTypedNameReferences] public sealed partial class ChannelsMenu : DefaultWindow { - [Dependency] private readonly IEntityManager _entityManager = null!; + [Dependency] private IEntityManager _entityManager = null!; private readonly InstrumentBoundUserInterface _owner; diff --git a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs index ffdb67f626..fc932825e8 100644 --- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs +++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs @@ -8,12 +8,12 @@ using Robust.Client.UserInterface; namespace Content.Client.Instruments.UI { - public sealed class InstrumentBoundUserInterface : BoundUserInterface + public sealed partial class InstrumentBoundUserInterface : BoundUserInterface { public IEntityManager Entities => EntMan; - [Dependency] public readonly IMidiManager MidiManager = default!; - [Dependency] public readonly IFileDialogManager FileDialogManager = default!; - [Dependency] public readonly ILocalizationManager Loc = default!; + [Dependency] public IMidiManager MidiManager = default!; + [Dependency] public IFileDialogManager FileDialogManager = default!; + [Dependency] public ILocalizationManager Loc = default!; public readonly InstrumentSystem Instruments; public readonly ActionBlockerSystem ActionBlocker; diff --git a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs index 16dec590f9..7cd6a41fdf 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -20,9 +20,9 @@ namespace Content.Client.Instruments.UI [GenerateTypedNameReferences] public sealed partial class InstrumentMenu : DefaultWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IFileDialogManager _dialogs = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IFileDialogManager _dialogs = default!; + [Dependency] private IPlayerManager _player = default!; private bool _isMidiFileDialogueWindowOpen; diff --git a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs index 8d1d8cd07d..3c0e0091b2 100644 --- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs +++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs @@ -10,8 +10,8 @@ namespace Content.Client.Interactable.Components private static readonly ProtoId ShaderInRange = "SelectionOutlineInrange"; private static readonly ProtoId ShaderOutOfRange = "SelectionOutline"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entMan = default!; private const float DefaultWidth = 1; diff --git a/Content.Client/Interaction/DragDropHelper.cs b/Content.Client/Interaction/DragDropHelper.cs index aace5c8cf9..162e84eb5f 100644 --- a/Content.Client/Interaction/DragDropHelper.cs +++ b/Content.Client/Interaction/DragDropHelper.cs @@ -20,10 +20,10 @@ namespace Content.Client.Interaction; /// If for any reason the drag is ended, OnEndDrag is invoked. /// /// thing being dragged and dropped -public sealed class DragDropHelper +public sealed partial class DragDropHelper { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; private readonly OnBeginDrag _onBeginDrag; private readonly OnEndDrag _onEndDrag; diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs index 7ff8dd150f..467c138b2a 100644 --- a/Content.Client/Interaction/DragDropSystem.cs +++ b/Content.Client/Interaction/DragDropSystem.cs @@ -27,28 +27,28 @@ namespace Content.Client.Interaction; /// /// Handles clientside drag and drop logic /// -public sealed class DragDropSystem : SharedDragDropSystem +public sealed partial class DragDropSystem : SharedDragDropSystem { private static readonly ProtoId ShaderDropTargetInRange = "SelectionOutlineInrange"; private static readonly ProtoId ShaderDropTargetOutOfRange = "SelectionOutline"; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _cfgMan = default!; - [Dependency] private readonly InteractionOutlineSystem _outline = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly CombatModeSystem _combatMode = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly EntityQuery _spriteQuery = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _cfgMan = default!; + [Dependency] private InteractionOutlineSystem _outline = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private CombatModeSystem _combatMode = default!; + [Dependency] private InputSystem _inputSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private EntityQuery _spriteQuery = default!; // how often to recheck possible targets (prevents calling expensive // check logic each update) diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs index 8cbb33d165..00b9548aa9 100644 --- a/Content.Client/Inventory/ClientInventorySystem.cs +++ b/Content.Client/Inventory/ClientInventorySystem.cs @@ -17,12 +17,12 @@ using Robust.Shared.Timing; namespace Content.Client.Inventory { [UsedImplicitly] - public sealed class ClientInventorySystem : InventorySystem + public sealed partial class ClientInventorySystem : InventorySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; - [Dependency] private readonly ClientClothingSystem _clothingVisualsSystem = default!; - [Dependency] private readonly ExamineSystem _examine = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; + [Dependency] private ClientClothingSystem _clothingVisualsSystem = default!; + [Dependency] private ExamineSystem _examine = default!; public Action? EntitySlotUpdate = null; public Action? OnSlotAdded = null; diff --git a/Content.Client/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs index b86d022bcd..52df7f81aa 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -1,12 +1,15 @@ using System.Linq; using System.Numerics; +using Content.Client.Administration.Managers; using Content.Client.Examine; using Content.Client.Hands.Systems; using Content.Client.Strip; -using Content.Client.Stylesheets; using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Systems.Hands.Controls; using Content.Client.Verbs.UI; +using Content.Shared.CCVar; +using Content.Shared.Clothing.Components; +using Content.Shared.Contraband; using Content.Shared.Cuffs; using Content.Shared.Ensnaring; using Content.Shared.Ensnaring.Components; @@ -21,18 +24,24 @@ using Robust.Client.GameObjects; using Robust.Client.Player; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; +using Robust.Shared.Configuration; using Robust.Shared.Input; using Robust.Shared.Map; +using Robust.Shared.Prototypes; +using Robust.Shared.Utility; using static Content.Client.Inventory.ClientInventorySystem; using static Robust.Client.UserInterface.Control; namespace Content.Client.Inventory { [UsedImplicitly] - public sealed class StrippableBoundUserInterface : BoundUserInterface + public sealed partial class StrippableBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IUserInterfaceManager _ui = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IConfigurationManager _cvar = default!; private readonly ExamineSystem _examine; private readonly HandsSystem _hands; @@ -40,6 +49,20 @@ namespace Content.Client.Inventory private readonly SharedCuffableSystem _cuffable; private readonly StrippableSystem _strippable; private readonly SharedEnsnareableSystem _snare; + private readonly ContrabandSystem _contraband; + + // Is the BUI in admin view? If in admin view, has custom UI elements to help admins see things + // (E.g contraband status icon, is the item chameleon etc...) + private bool _isAdminView; + + #region Admin overlay vars + + private readonly ResPath _chameleonClothingTexturePath = new("/Textures/Interface/Default/Slots/camo.png"); + private readonly ResPath _contrabandTexturePath = new("/Textures/Interface/Default/Slots/contra.png"); + + private readonly Color _chameleonColor = new(147, 112, 219); + + #endregion [ViewVariables] private const int ButtonSeparation = 4; @@ -72,9 +95,12 @@ namespace Content.Client.Inventory _inv = EntMan.System(); _cuffable = EntMan.System(); _strippable = EntMan.System(); + _contraband = EntMan.System(); _snare = EntMan.System(); _virtualHiddenEntity = EntMan.SpawnEntity(HiddenPocketEntityId, MapCoordinates.Nullspace); + + _isAdminView = _cvar.GetCVar(CCVars.AdminStripMenuOverlayDefault); } protected override void Open() @@ -156,12 +182,31 @@ namespace Content.Client.Inventory var button = new Button() { Text = Loc.GetString("strippable-bound-user-interface-stripping-menu-ensnare-button"), - StyleClasses = { StyleClass.ButtonOpenRight } }; button.OnPressed += (_) => SendPredictedMessage(new StrippingEnsnareButtonPressed()); - _strippingMenu.SnareContainer.AddChild(button); + _strippingMenu.ButtonContainer.AddChild(button); + } + + if (_admin.IsAdmin()) + { + var adminButton = new Button() + { + Text = Loc.GetString("strippable-bound-user-interface-stripping-menu-admin-button"), + ToggleMode = true, + Pressed = _isAdminView, + ToolTip = Loc.GetString("strippable-bound-user-interface-stripping-menu-admin-button-tooltip") + }; + + adminButton.OnToggled += args => + { + _isAdminView = !_isAdminView; + args.Button.Pressed = _isAdminView; + UpdateMenu(); + }; + + _strippingMenu.ButtonContainer.AddChild(adminButton); } // TODO fix layout container measuring (its broken atm). @@ -177,8 +222,7 @@ namespace Content.Client.Inventory // +27 vertically from the window header var horizontalMenuSize = Math.Max(200, Math.Max(_handCount, _inventoryDimensions.X + 1) * (SlotControl.DefaultButtonSize + ButtonSeparation) + 20); var verticalMenuSize = Math.Max(200, (_inventoryDimensions.Y + (_handCount > 0 ? 2 : 1)) * (SlotControl.DefaultButtonSize + ButtonSeparation) + 53); - if (_snare.IsEnsnared(Owner)) - verticalMenuSize += 20; + verticalMenuSize += 25 * _strippingMenu.ButtonContainer.Children.Count(); _strippingMenu.SetSize = new Vector2(horizontalMenuSize, verticalMenuSize); } @@ -196,8 +240,10 @@ namespace Content.Client.Inventory button.BlockedRect.MouseFilter = MouseFilterMode.Ignore; } - UpdateEntityIcon(button, heldEntity); _strippingMenu!.HandsContainer.AddChild(button); + + UpdateEntityIcon(button, heldEntity); + LayoutContainer.SetPosition(button, new Vector2i(_handCount, 0) * (SlotControl.DefaultButtonSize + ButtonSeparation)); _handCount++; } @@ -275,6 +321,16 @@ namespace Content.Client.Inventory return; button.SetEntity(viewEnt); + + if (_admin.IsAdmin() && _isAdminView && EntMan.HasComponent(entity)) + { + button.AddAdminOverlay(_chameleonClothingTexturePath, _chameleonColor); + } + + if (_admin.IsAdmin() && _isAdminView && _contraband.IsContraband(entity.Value, Owner, out var contraProtoId)) + { + button.AddAdminOverlay(_contrabandTexturePath, _proto.Index(contraProtoId).Color); + } } } } diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs index a8e168c55e..f827e7340e 100644 --- a/Content.Client/Items/Systems/ItemSystem.cs +++ b/Content.Client/Items/Systems/ItemSystem.cs @@ -10,10 +10,10 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations; namespace Content.Client.Items.Systems; -public sealed class ItemSystem : SharedItemSystem +public sealed partial class ItemSystem : SharedItemSystem { - [Dependency] private readonly IResourceCache _resCache = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IResourceCache _resCache = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Jittering/JitteringSystem.cs b/Content.Client/Jittering/JitteringSystem.cs index 36f1843d5d..8e95bcd740 100644 --- a/Content.Client/Jittering/JitteringSystem.cs +++ b/Content.Client/Jittering/JitteringSystem.cs @@ -6,11 +6,11 @@ using Robust.Shared.Random; namespace Content.Client.Jittering { - public sealed class JitteringSystem : SharedJitteringSystem + public sealed partial class JitteringSystem : SharedJitteringSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AnimationPlayerSystem _animationPlayer = default!; + [Dependency] private SpriteSystem _sprite = default!; private readonly float[] _sign = { -1, 1 }; private readonly string _jitterAnimationKey = "jittering"; diff --git a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs index c8c2dc90bb..3dafecbc89 100644 --- a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -4,9 +4,9 @@ using Content.Shared.Kitchen.EntitySystems; namespace Content.Client.Kitchen.EntitySystems; -public sealed class ReagentGrinderSystem : SharedReagentGrinderSystem +public sealed partial class ReagentGrinderSystem : SharedReagentGrinderSystem { - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; public override void Initialize() { diff --git a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs index a773a5a27a..2770e163d3 100644 --- a/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/GrinderMenu.xaml.cs @@ -18,8 +18,8 @@ namespace Content.Client.Kitchen.UI; [GenerateTypedNameReferences] public sealed partial class GrinderMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly ItemSlotsSystem _slots = default!; private readonly SharedPowerReceiverSystem _power = default!; private readonly SharedReagentGrinderSystem _grinder = default!; diff --git a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs index 13029e3846..0716a1f5a8 100644 --- a/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs +++ b/Content.Client/Kitchen/UI/MicrowaveMenu.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client.Kitchen.UI [GenerateTypedNameReferences] public sealed partial class MicrowaveMenu : FancyWindow { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public event Action? OnCookTimeSelected; diff --git a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs index 95d5cc7ab3..f4f6168dff 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -8,9 +8,9 @@ namespace Content.Client.Labels.UI /// /// Initializes a and updates it when new server messages are received. /// - public sealed class HandLabelerBoundUserInterface : BoundUserInterface + public sealed partial class HandLabelerBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [ViewVariables] private HandLabelerWindow? _window; diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs index 5d39407ccf..d947aff9e7 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -21,15 +21,15 @@ using static Robust.Client.UserInterface.Controls.BoxContainer; namespace Content.Client.LateJoin { - public sealed class LateJoinGui : DefaultWindow + public sealed partial class LateJoinGui : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; - [Dependency] private readonly JobRequirementsManager _jobRequirements = default!; - [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; + [Dependency] private JobRequirementsManager _jobRequirements = default!; + [Dependency] private IClientPreferencesManager _preferencesManager = default!; + [Dependency] private ILogManager _logManager = default!; public event Action<(NetEntity, string)> SelectedId; diff --git a/Content.Client/Lathe/LatheSystem.cs b/Content.Client/Lathe/LatheSystem.cs index 71e43a4c2e..f8795a2630 100644 --- a/Content.Client/Lathe/LatheSystem.cs +++ b/Content.Client/Lathe/LatheSystem.cs @@ -6,10 +6,10 @@ using Content.Shared.Research.Prototypes; namespace Content.Client.Lathe; -public sealed class LatheSystem : SharedLatheSystem +public sealed partial class LatheSystem : SharedLatheSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs index adb115d352..6e58af4415 100644 --- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs +++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs @@ -18,8 +18,8 @@ namespace Content.Client.Lathe.UI; [GenerateTypedNameReferences] public sealed partial class LatheMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SpriteSystem _spriteSystem; private readonly LatheSystem _lathe; diff --git a/Content.Client/Launcher/ExtendedDisconnectInformationManager.cs b/Content.Client/Launcher/ExtendedDisconnectInformationManager.cs index 0fc2eabc32..89df0b1a33 100644 --- a/Content.Client/Launcher/ExtendedDisconnectInformationManager.cs +++ b/Content.Client/Launcher/ExtendedDisconnectInformationManager.cs @@ -12,9 +12,9 @@ namespace Content.Client.Launcher; /// But honestly, given that content might have additional flags (i.e. hide disconnect button for bans)? /// This is responsible for collecting any extended disconnect information. /// -public sealed class ExtendedDisconnectInformationManager +public sealed partial class ExtendedDisconnectInformationManager { - [Dependency] private readonly IClientNetManager _clientNetManager = default!; + [Dependency] private IClientNetManager _clientNetManager = default!; private NetDisconnectedArgs? _lastNetDisconnectedArgs = null; diff --git a/Content.Client/Launcher/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs index 9b9c472781..2e1223c833 100644 --- a/Content.Client/Launcher/LauncherConnecting.cs +++ b/Content.Client/Launcher/LauncherConnecting.cs @@ -10,17 +10,17 @@ using Robust.Shared.Random; namespace Content.Client.Launcher { - public sealed class LauncherConnecting : Robust.Client.State.State + public sealed partial class LauncherConnecting : Robust.Client.State.State { - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IClientNetManager _clientNetManager = default!; - [Dependency] private readonly IGameController _gameController = default!; - [Dependency] private readonly IBaseClient _baseClient = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IClipboardManager _clipboard = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IClientNetManager _clientNetManager = default!; + [Dependency] private IGameController _gameController = default!; + [Dependency] private IBaseClient _baseClient = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IClipboardManager _clipboard = default!; + [Dependency] private ILogManager _logManager = default!; private LauncherConnectingGui? _control; private ISawmill _sawmill = default!; diff --git a/Content.Client/Light/AfterLightTargetOverlay.cs b/Content.Client/Light/AfterLightTargetOverlay.cs index 8f19ce922d..c73133b6a9 100644 --- a/Content.Client/Light/AfterLightTargetOverlay.cs +++ b/Content.Client/Light/AfterLightTargetOverlay.cs @@ -7,11 +7,11 @@ namespace Content.Client.Light; /// /// This exists just to copy to the light render target /// -public sealed class AfterLightTargetOverlay : Overlay +public sealed partial class AfterLightTargetOverlay : Overlay { public override OverlaySpace Space => OverlaySpace.BeforeLighting; - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IOverlayManager _overlay = default!; public const int ContentZIndex = LightBlurOverlay.ContentZIndex + 1; diff --git a/Content.Client/Light/AmbientOcclusionOverlay.cs b/Content.Client/Light/AmbientOcclusionOverlay.cs index aa8c3b52a1..ef510a2d26 100644 --- a/Content.Client/Light/AmbientOcclusionOverlay.cs +++ b/Content.Client/Light/AmbientOcclusionOverlay.cs @@ -14,17 +14,17 @@ namespace Content.Client.Light; /// /// Applies ambient-occlusion to the viewport. /// -public sealed class AmbientOcclusionOverlay : Overlay +public sealed partial class AmbientOcclusionOverlay : Overlay { private static readonly ProtoId UnshadedShader = "unshaded"; private static readonly ProtoId StencilMaskShader = "StencilMask"; private static readonly ProtoId StencilEqualDrawShader = "StencilEqualDraw"; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _proto = default!; public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowEntities; diff --git a/Content.Client/Light/BeforeLightTargetOverlay.cs b/Content.Client/Light/BeforeLightTargetOverlay.cs index 6afaebc146..1e56d9a872 100644 --- a/Content.Client/Light/BeforeLightTargetOverlay.cs +++ b/Content.Client/Light/BeforeLightTargetOverlay.cs @@ -7,11 +7,11 @@ namespace Content.Client.Light; /// /// Handles an enlarged lighting target so content can use large blur radii. /// -public sealed class BeforeLightTargetOverlay : Overlay +public sealed partial class BeforeLightTargetOverlay : Overlay { public override OverlaySpace Space => OverlaySpace.BeforeLighting; - [Dependency] private readonly IClyde _clyde = default!; + [Dependency] private IClyde _clyde = default!; private readonly OverlayResourceCache _resources = new(); diff --git a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs index e47430677d..da50cff84b 100644 --- a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs @@ -5,11 +5,11 @@ using Robust.Shared.Audio.Systems; namespace Content.Client.Light.EntitySystems; -public sealed class ExpendableLightSystem : VisualizerSystem +public sealed partial class ExpendableLightSystem : VisualizerSystem { - [Dependency] private readonly PointLightSystem _pointLightSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly LightBehaviorSystem _lightBehavior = default!; + [Dependency] private PointLightSystem _pointLightSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private LightBehaviorSystem _lightBehavior = default!; public override void Initialize() { diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs index 3e5c1dc069..05dea10f87 100644 --- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs +++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs @@ -9,10 +9,10 @@ using Robust.Shared.Animations; namespace Content.Client.Light.EntitySystems; -public sealed class LightBehaviorSystem : EntitySystem +public sealed partial class LightBehaviorSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AnimationPlayerSystem _player = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AnimationPlayerSystem _player = default!; public override void Initialize() { diff --git a/Content.Client/Light/EntitySystems/LightBulbSystem.cs b/Content.Client/Light/EntitySystems/LightBulbSystem.cs index a3698fc199..be28189818 100644 --- a/Content.Client/Light/EntitySystems/LightBulbSystem.cs +++ b/Content.Client/Light/EntitySystems/LightBulbSystem.cs @@ -4,10 +4,10 @@ using Robust.Client.GameObjects; namespace Content.Client.Light.EntitySystems; -public sealed class LightBulbSystem : SharedLightBulbSystem +public sealed partial class LightBulbSystem : SharedLightBulbSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Light/EntitySystems/LightFadeSystem.cs b/Content.Client/Light/EntitySystems/LightFadeSystem.cs index c4e4fff5fb..1c1ea5dde6 100644 --- a/Content.Client/Light/EntitySystems/LightFadeSystem.cs +++ b/Content.Client/Light/EntitySystems/LightFadeSystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.Animations; namespace Content.Client.Light.EntitySystems; -public sealed class LightFadeSystem : EntitySystem +public sealed partial class LightFadeSystem : EntitySystem { - [Dependency] private readonly AnimationPlayerSystem _player = default!; + [Dependency] private AnimationPlayerSystem _player = default!; private const string FadeTrack = "light-fade"; diff --git a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs index deabadaddf..81dd9b32d3 100644 --- a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs +++ b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs @@ -4,10 +4,10 @@ using Robust.Shared.Configuration; namespace Content.Client.Light.EntitySystems; -public sealed class PlanetLightSystem : EntitySystem +public sealed partial class PlanetLightSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IOverlayManager _overlayMan = default!; /// /// Enables / disables the ambient occlusion overlay. diff --git a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs index 1e20d7041a..c8e6d40a2f 100644 --- a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs +++ b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs @@ -6,9 +6,9 @@ using Robust.Shared.Animations; namespace Content.Client.Light.EntitySystems; -public sealed class RotatingLightSystem : SharedRotatingLightSystem +public sealed partial class RotatingLightSystem : SharedRotatingLightSystem { - [Dependency] private readonly AnimationPlayerSystem _animations = default!; + [Dependency] private AnimationPlayerSystem _animations = default!; private Animation GetAnimation(float speed) { diff --git a/Content.Client/Light/EntitySystems/SunShadowSystem.cs b/Content.Client/Light/EntitySystems/SunShadowSystem.cs index 6f7a965a61..873abd5817 100644 --- a/Content.Client/Light/EntitySystems/SunShadowSystem.cs +++ b/Content.Client/Light/EntitySystems/SunShadowSystem.cs @@ -8,11 +8,11 @@ using Robust.Shared.Utility; namespace Content.Client.Light.EntitySystems; -public sealed class SunShadowSystem : SharedSunShadowSystem +public sealed partial class SunShadowSystem : SharedSunShadowSystem { - [Dependency] private readonly ClientGameTicker _ticker = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private ClientGameTicker _ticker = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MetaDataSystem _metadata = default!; public override void Update(float frameTime) { diff --git a/Content.Client/Light/HandheldLightSystem.cs b/Content.Client/Light/HandheldLightSystem.cs index 2a5aa949ff..f5e7209b1b 100644 --- a/Content.Client/Light/HandheldLightSystem.cs +++ b/Content.Client/Light/HandheldLightSystem.cs @@ -8,10 +8,10 @@ using Content.Client.Light.EntitySystems; namespace Content.Client.Light; -public sealed class HandheldLightSystem : SharedHandheldLightSystem +public sealed partial class HandheldLightSystem : SharedHandheldLightSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly LightBehaviorSystem _lightBehavior = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private LightBehaviorSystem _lightBehavior = default!; public override void Initialize() { diff --git a/Content.Client/Light/LightBlurOverlay.cs b/Content.Client/Light/LightBlurOverlay.cs index eab4a95c07..9a5b2b4465 100644 --- a/Content.Client/Light/LightBlurOverlay.cs +++ b/Content.Client/Light/LightBlurOverlay.cs @@ -7,12 +7,12 @@ namespace Content.Client.Light; /// /// Essentially handles blurring for content-side light overlays. /// -public sealed class LightBlurOverlay : Overlay +public sealed partial class LightBlurOverlay : Overlay { public override OverlaySpace Space => OverlaySpace.BeforeLighting; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IOverlayManager _overlay = default!; public const int ContentZIndex = TileEmissionOverlay.ContentZIndex + 1; diff --git a/Content.Client/Light/LightCycleSystem.cs b/Content.Client/Light/LightCycleSystem.cs index 8de0165fd2..373431e2ef 100644 --- a/Content.Client/Light/LightCycleSystem.cs +++ b/Content.Client/Light/LightCycleSystem.cs @@ -8,11 +8,11 @@ using Robust.Shared.Timing; namespace Content.Client.Light; /// -public sealed class LightCycleSystem : SharedLightCycleSystem +public sealed partial class LightCycleSystem : SharedLightCycleSystem { - [Dependency] private readonly ClientGameTicker _ticker = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private ClientGameTicker _ticker = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MetaDataSystem _metadata = default!; public override void Update(float frameTime) { diff --git a/Content.Client/Light/RgbLightControllerSystem.cs b/Content.Client/Light/RgbLightControllerSystem.cs index 292820ec27..d129f49944 100644 --- a/Content.Client/Light/RgbLightControllerSystem.cs +++ b/Content.Client/Light/RgbLightControllerSystem.cs @@ -14,12 +14,12 @@ using static Robust.Client.GameObjects.SpriteComponent; namespace Content.Client.Light { - public sealed class RgbLightControllerSystem : SharedRgbLightControllerSystem + public sealed partial class RgbLightControllerSystem : SharedRgbLightControllerSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ItemSystem _itemSystem = default!; - [Dependency] private readonly SharedPointLightSystem _lights = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ItemSystem _itemSystem = default!; + [Dependency] private SharedPointLightSystem _lights = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Light/RoofOverlay.cs b/Content.Client/Light/RoofOverlay.cs index 01e9bf0961..7923601fa9 100644 --- a/Content.Client/Light/RoofOverlay.cs +++ b/Content.Client/Light/RoofOverlay.cs @@ -11,11 +11,11 @@ using Robust.Shared.Physics; namespace Content.Client.Light; -public sealed class RoofOverlay : Overlay +public sealed partial class RoofOverlay : Overlay { private readonly IEntityManager _entManager; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IOverlayManager _overlay = default!; private readonly EntityLookupSystem _lookup; private readonly SharedMapSystem _mapSystem; diff --git a/Content.Client/Light/SunShadowOverlay.cs b/Content.Client/Light/SunShadowOverlay.cs index 59ac0a5efb..abdd69d667 100644 --- a/Content.Client/Light/SunShadowOverlay.cs +++ b/Content.Client/Light/SunShadowOverlay.cs @@ -10,16 +10,16 @@ using Robust.Shared.Prototypes; namespace Content.Client.Light; -public sealed class SunShadowOverlay : Overlay +public sealed partial class SunShadowOverlay : Overlay { private static readonly ProtoId MixShader = "Mix"; public override OverlaySpace Space => OverlaySpace.BeforeLighting; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; private readonly EntityLookupSystem _lookup; private readonly SharedTransformSystem _xformSys; diff --git a/Content.Client/Light/TileEmissionOverlay.cs b/Content.Client/Light/TileEmissionOverlay.cs index 2acb0ee609..448a5b3639 100644 --- a/Content.Client/Light/TileEmissionOverlay.cs +++ b/Content.Client/Light/TileEmissionOverlay.cs @@ -7,12 +7,12 @@ using Robust.Shared.Map.Components; namespace Content.Client.Light; -public sealed class TileEmissionOverlay : Overlay +public sealed partial class TileEmissionOverlay : Overlay { public override OverlaySpace Space => OverlaySpace.BeforeLighting; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IOverlayManager _overlay = default!; private SharedMapSystem _mapSystem; private SharedTransformSystem _xformSystem; diff --git a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs index 7ed1fb2dde..561cda1aa3 100644 --- a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs +++ b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs @@ -7,10 +7,10 @@ using Robust.Shared.Random; namespace Content.Client.Light.Visualizers; -public sealed class PoweredLightVisualizerSystem : VisualizerSystem +public sealed partial class PoweredLightVisualizerSystem : VisualizerSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Client/Lobby/ClientPreferencesManager.cs b/Content.Client/Lobby/ClientPreferencesManager.cs index 910471f60f..f261d12b29 100644 --- a/Content.Client/Lobby/ClientPreferencesManager.cs +++ b/Content.Client/Lobby/ClientPreferencesManager.cs @@ -15,11 +15,11 @@ namespace Content.Client.Lobby /// connection. /// Stores preferences on the server through and . /// - public sealed class ClientPreferencesManager : IClientPreferencesManager + public sealed partial class ClientPreferencesManager : IClientPreferencesManager { - [Dependency] private readonly IClientNetManager _netManager = default!; - [Dependency] private readonly IBaseClient _baseClient = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IClientNetManager _netManager = default!; + [Dependency] private IBaseClient _baseClient = default!; + [Dependency] private IPlayerManager _playerManager = default!; private ISharedSponsorsManager? _sponsorsManager; // Corvax-Sponsors public event Action? OnServerDataLoaded; diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 9696da3bc2..6e8b00a3b2 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -18,18 +18,18 @@ using Robust.Shared.Timing; namespace Content.Client.Lobby { - public sealed class LobbyState : Robust.Client.State.State + public sealed partial class LobbyState : Robust.Client.State.State { - [Dependency] private readonly IBaseClient _baseClient = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly ClientsidePlaytimeTrackingManager _playtimeTracking = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IBaseClient _baseClient = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private ClientsidePlaytimeTrackingManager _playtimeTracking = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private ClientGameTicker _gameTicker = default!; private ContentAudioSystem _contentAudioSystem = default!; diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs index 3dca26dee2..4ac976419f 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -24,15 +24,15 @@ namespace Content.Client.Lobby; public sealed partial class LobbyUIController : UIController, IOnStateEntered, IOnStateExited { - [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IFileDialogManager _dialogManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly JobRequirementsManager _requirements = default!; - [Dependency] private readonly MarkingManager _markings = default!; + [Dependency] private IClientPreferencesManager _preferencesManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IFileDialogManager _dialogManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private JobRequirementsManager _requirements = default!; + [Dependency] private MarkingManager _markings = default!; [UISystemDependency] private readonly GuidebookSystem _guide = default!; private CharacterSetupGui? _characterSetup; diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs index 7e703dfa69..69df710c4a 100644 --- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs +++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs @@ -22,11 +22,11 @@ namespace Content.Client.Lobby.UI [GenerateTypedNameReferences] public sealed partial class CharacterSetupGui : Control { - [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!; - [Dependency] private readonly IPrototypeManager _protomanager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IClientPreferencesManager _preferencesManager = default!; + [Dependency] private IPrototypeManager _protomanager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; private readonly Button _createNewCharacterButton; diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs index 035f4a3c1a..14a5d97fec 100644 --- a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs +++ b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Lobby.UI.Loadouts; [GenerateTypedNameReferences] public sealed partial class LoadoutContainer : BoxContainer { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; private readonly EntityUid? _entity; diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs index 61f9f5f64b..e325fc6b39 100644 --- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs +++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Lobby.UI [GenerateTypedNameReferences] public sealed partial class LobbyGui : UIScreen { - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; public LobbyGui() { diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs index a002043ab1..04d86dab3d 100644 --- a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs +++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs @@ -11,8 +11,8 @@ namespace Content.Client.Lobby.UI; [UsedImplicitly] public sealed partial class ObserveWarningWindow : DefaultWindow { - [Dependency] private readonly ISharedAdminManager _adminManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private ISharedAdminManager _adminManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public ObserveWarningWindow() { diff --git a/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.cs b/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.cs index 7f3a12a7cc..6be2d06ba8 100644 --- a/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.cs +++ b/Content.Client/Lobby/UI/ProfileEditorControls/ProfilePreviewSpriteView.cs @@ -8,8 +8,8 @@ namespace Content.Client.Lobby.UI.ProfileEditorControls; public sealed partial class ProfilePreviewSpriteView : SpriteView { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; /// /// Entity used for the profile editor preview diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs index 441ca9ea36..2e0d6aecaa 100644 --- a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs +++ b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.MachineLinking.UI; [GenerateTypedNameReferences] public sealed partial class SignalTimerWindow : DefaultWindow { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; private const int MaxTextLength = 5; diff --git a/Content.Client/Machines/EntitySystems/MultipartMachineSystem.cs b/Content.Client/Machines/EntitySystems/MultipartMachineSystem.cs index 0f583898de..8c3ed88ee4 100644 --- a/Content.Client/Machines/EntitySystems/MultipartMachineSystem.cs +++ b/Content.Client/Machines/EntitySystems/MultipartMachineSystem.cs @@ -15,15 +15,15 @@ namespace Content.Client.Machines.EntitySystems; /// Handles client side examination events to show the expected layout of the machine /// based on the origin of the main entity. /// -public sealed class MultipartMachineSystem : SharedMultipartMachineSystem +public sealed partial class MultipartMachineSystem : SharedMultipartMachineSystem { private readonly EntProtoId _ghostPrototype = "MultipartMachineGhost"; private readonly Color _partiallyTransparent = new Color(255, 255, 255, 180); - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly ISerializationManager _serialization= default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private ISerializationManager _serialization= default!; public override void Initialize() { diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs index 3c709d2d15..78a2876632 100644 --- a/Content.Client/MainMenu/MainMenu.cs +++ b/Content.Client/MainMenu/MainMenu.cs @@ -17,15 +17,15 @@ namespace Content.Client.MainMenu /// Main menu screen that is the first screen to be displayed when the game starts. /// // Instantiated dynamically through the StateManager, Dependencies will be resolved. - public sealed class MainScreen : Robust.Client.State.State + public sealed partial class MainScreen : Robust.Client.State.State { - [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 IResourceCache _resourceCache = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private IClientNetManager _netManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IGameController _controllerProxy = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Client/MapText/MapTextSystem.cs b/Content.Client/MapText/MapTextSystem.cs index 96ce8f93c2..c94969ad1b 100644 --- a/Content.Client/MapText/MapTextSystem.cs +++ b/Content.Client/MapText/MapTextSystem.cs @@ -11,14 +11,14 @@ using Robust.Shared.Utility; namespace Content.Client.MapText; /// -public sealed class MapTextSystem : SharedMapTextSystem +public sealed partial class MapTextSystem : SharedMapTextSystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; private MapTextOverlay _overlay = default!; diff --git a/Content.Client/Mapping/MappingManager.cs b/Content.Client/Mapping/MappingManager.cs index 1aac02be71..17cc629c59 100644 --- a/Content.Client/Mapping/MappingManager.cs +++ b/Content.Client/Mapping/MappingManager.cs @@ -7,10 +7,10 @@ using Robust.Shared.Network; namespace Content.Client.Mapping; -public sealed class MappingManager : IPostInjectInit +public sealed partial class MappingManager : IPostInjectInit { - [Dependency] private readonly IFileDialogManager _file = default!; - [Dependency] private readonly IClientNetManager _net = default!; + [Dependency] private IFileDialogManager _file = default!; + [Dependency] private IClientNetManager _net = default!; private Stream? _saveStream; private MappingMapDataMessage? _mapData; diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs index e461440996..026f50450c 100644 --- a/Content.Client/Mapping/MappingOverlay.cs +++ b/Content.Client/Mapping/MappingOverlay.cs @@ -9,13 +9,13 @@ using static Content.Client.Mapping.MappingState; namespace Content.Client.Mapping; -public sealed class MappingOverlay : Overlay +public sealed partial class MappingOverlay : Overlay { private static readonly ProtoId UnshadedShader = "unshaded"; - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private readonly SpriteSystem _sprite; diff --git a/Content.Client/Mapping/MappingScreen.xaml.cs b/Content.Client/Mapping/MappingScreen.xaml.cs index 20e2528a44..6ef9ce578b 100644 --- a/Content.Client/Mapping/MappingScreen.xaml.cs +++ b/Content.Client/Mapping/MappingScreen.xaml.cs @@ -18,7 +18,7 @@ namespace Content.Client.Mapping; [GenerateTypedNameReferences] public sealed partial class MappingScreen : InGameScreen { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public DecalPlacementSystem DecalSystem = default!; diff --git a/Content.Client/Mapping/MappingState.cs b/Content.Client/Mapping/MappingState.cs index 190ae09676..bddfe27d80 100644 --- a/Content.Client/Mapping/MappingState.cs +++ b/Content.Client/Mapping/MappingState.cs @@ -35,23 +35,23 @@ using static Robust.Shared.Input.Binding.PointerInputCmdHandler; namespace Content.Client.Mapping; -public sealed class MappingState : GameplayStateBase +public sealed partial class MappingState : GameplayStateBase { #if !FULL_RELEASE - [Dependency] private readonly IClientAdminManager _admin = default!; + [Dependency] private IClientAdminManager _admin = default!; #endif - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntityNetworkManager _entityNetwork = default!; - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly MappingManager _mapping = default!; - [Dependency] private readonly IOverlayManager _overlays = default!; - [Dependency] private readonly IPlacementManager _placement = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IResourceCache _resources = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntityNetworkManager _entityNetwork = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private MappingManager _mapping = default!; + [Dependency] private IOverlayManager _overlays = default!; + [Dependency] private IPlacementManager _placement = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IResourceCache _resources = default!; + [Dependency] private IGameTiming _timing = default!; private EntityMenuUIController _entityMenuController = default!; diff --git a/Content.Client/Mapping/MappingSystem.cs b/Content.Client/Mapping/MappingSystem.cs index 627977a526..494f45e6a8 100644 --- a/Content.Client/Mapping/MappingSystem.cs +++ b/Content.Client/Mapping/MappingSystem.cs @@ -11,10 +11,10 @@ namespace Content.Client.Mapping; public sealed partial class MappingSystem : EntitySystem { - [Dependency] private readonly IPlacementManager _placementMan = default!; - [Dependency] private readonly ITileDefinitionManager _tileMan = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private IPlacementManager _placementMan = default!; + [Dependency] private ITileDefinitionManager _tileMan = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedActionsSystem _actions = default!; public static readonly EntProtoId SpawnAction = "BaseMappingSpawnAction"; public static readonly EntProtoId EraserAction = "ActionMappingEraser"; diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs index 5440f1624f..f78f96c547 100644 --- a/Content.Client/Maps/GridDraggingSystem.cs +++ b/Content.Client/Maps/GridDraggingSystem.cs @@ -11,14 +11,14 @@ using Robust.Shared.Timing; namespace Content.Client.Maps; /// -public sealed class GridDraggingSystem : SharedGridDraggingSystem +public sealed partial class GridDraggingSystem : SharedGridDraggingSystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private InputSystem _inputSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public bool Enabled { get; set; } diff --git a/Content.Client/Markers/MarkerSystem.cs b/Content.Client/Markers/MarkerSystem.cs index 37888d16c2..325a72159d 100644 --- a/Content.Client/Markers/MarkerSystem.cs +++ b/Content.Client/Markers/MarkerSystem.cs @@ -3,9 +3,9 @@ using Robust.Shared.GameObjects; namespace Content.Client.Markers; -public sealed class MarkerSystem : EntitySystem +public sealed partial class MarkerSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; private bool _markersVisible; diff --git a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs index af1f9a9441..7129840956 100644 --- a/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs +++ b/Content.Client/MassMedia/Ui/NewsWriterMenu.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.MassMedia.Ui; [GenerateTypedNameReferences] public sealed partial class NewsWriterMenu : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; private TimeSpan? _nextPublish; diff --git a/Content.Client/Materials/MaterialStorageSystem.cs b/Content.Client/Materials/MaterialStorageSystem.cs index f9078a9032..2825f457ab 100644 --- a/Content.Client/Materials/MaterialStorageSystem.cs +++ b/Content.Client/Materials/MaterialStorageSystem.cs @@ -3,11 +3,11 @@ using Robust.Client.GameObjects; namespace Content.Client.Materials; -public sealed class MaterialStorageSystem : SharedMaterialStorageSystem +public sealed partial class MaterialStorageSystem : SharedMaterialStorageSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Materials/UI/MaterialDisplay.xaml.cs b/Content.Client/Materials/UI/MaterialDisplay.xaml.cs index 8a6c18feea..d40f896b09 100644 --- a/Content.Client/Materials/UI/MaterialDisplay.xaml.cs +++ b/Content.Client/Materials/UI/MaterialDisplay.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Materials.UI; [GenerateTypedNameReferences] public sealed partial class MaterialDisplay : PanelContainer { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly MaterialStorageSystem _materialStorage; diff --git a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs index fd698d890f..441b6f286e 100644 --- a/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs +++ b/Content.Client/Materials/UI/MaterialStorageControl.xaml.cs @@ -15,7 +15,7 @@ namespace Content.Client.Materials.UI; [GenerateTypedNameReferences] public sealed partial class MaterialStorageControl : ScrollContainer { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly MaterialStorageSystem _materialStorage; private EntityUid? _owner; diff --git a/Content.Client/Mech/MechSystem.cs b/Content.Client/Mech/MechSystem.cs index 816342ad95..5320f29aea 100644 --- a/Content.Client/Mech/MechSystem.cs +++ b/Content.Client/Mech/MechSystem.cs @@ -7,10 +7,10 @@ using DrawDepth = Content.Shared.DrawDepth.DrawDepth; namespace Content.Client.Mech; /// -public sealed class MechSystem : SharedMechSystem +public sealed partial class MechSystem : SharedMechSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs b/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs index 94f86e74a0..ad95bf2fbd 100644 --- a/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs +++ b/Content.Client/Mech/Ui/Equipment/MechGrabberUiFragment.xaml.cs @@ -8,7 +8,7 @@ namespace Content.Client.Mech.Ui.Equipment; [GenerateTypedNameReferences] public sealed partial class MechGrabberUiFragment : BoxContainer { - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IEntityManager _entity = default!; public event Action? OnEjectAction; diff --git a/Content.Client/Mech/Ui/MechMenu.xaml.cs b/Content.Client/Mech/Ui/MechMenu.xaml.cs index 7ce863b7cd..6807451511 100644 --- a/Content.Client/Mech/Ui/MechMenu.xaml.cs +++ b/Content.Client/Mech/Ui/MechMenu.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Mech.Ui; [GenerateTypedNameReferences] public sealed partial class MechMenu : FancyWindow { - [Dependency] private readonly IEntityManager _ent = default!; + [Dependency] private IEntityManager _ent = default!; private EntityUid _mech; diff --git a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs index 3872fa50cc..ad7c2dad02 100644 --- a/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs +++ b/Content.Client/Medical/CrewMonitoring/CrewMonitoringWindow.xaml.cs @@ -23,8 +23,8 @@ namespace Content.Client.Medical.CrewMonitoring; [GenerateTypedNameReferences] public sealed partial class CrewMonitoringWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedTransformSystem _transformSystem; private readonly SpriteSystem _spriteSystem; diff --git a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs index 63c95a63d8..d24f59579b 100644 --- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs +++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs @@ -4,9 +4,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Medical.Cryogenics; -public sealed class CryoPodSystem : SharedCryoPodSystem +public sealed partial class CryoPodSystem : SharedCryoPodSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs index 211225119b..76b1c876d3 100644 --- a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs +++ b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Medical.Cryogenics; [GenerateTypedNameReferences] public sealed partial class CryoPodWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedAtmosphereSystem _atmosphere = default!; public event Action? OnEjectPatientPressed; diff --git a/Content.Client/Mining/MiningOverlay.cs b/Content.Client/Mining/MiningOverlay.cs index f4140f064f..bb5302f825 100644 --- a/Content.Client/Mining/MiningOverlay.cs +++ b/Content.Client/Mining/MiningOverlay.cs @@ -9,11 +9,11 @@ using Robust.Shared.Utility; namespace Content.Client.Mining; -public sealed class MiningOverlay : Overlay +public sealed partial class MiningOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; private readonly EntityLookupSystem _lookup; private readonly SpriteSystem _sprite; private readonly TransformSystem _xform; diff --git a/Content.Client/Mining/MiningOverlaySystem.cs b/Content.Client/Mining/MiningOverlaySystem.cs index 294cab30ca..158dd76a59 100644 --- a/Content.Client/Mining/MiningOverlaySystem.cs +++ b/Content.Client/Mining/MiningOverlaySystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Mining; /// /// This handles the lifetime of the for a given entity. /// -public sealed class MiningOverlaySystem : EntitySystem +public sealed partial class MiningOverlaySystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private MiningOverlay _overlay = default!; diff --git a/Content.Client/MouseRotator/MouseRotatorSystem.cs b/Content.Client/MouseRotator/MouseRotatorSystem.cs index 2ee6e43368..cea4c5b0b8 100644 --- a/Content.Client/MouseRotator/MouseRotatorSystem.cs +++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs @@ -8,13 +8,13 @@ using Robust.Shared.Timing; namespace Content.Client.MouseRotator; /// -public sealed class MouseRotatorSystem : SharedMouseRotatorSystem +public sealed partial class MouseRotatorSystem : SharedMouseRotatorSystem { - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IEyeManager _eye = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IEyeManager _eye = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Update(float frameTime) { diff --git a/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs b/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs index c806ae5aed..ff706ea35e 100644 --- a/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs +++ b/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs @@ -7,10 +7,10 @@ namespace Content.Client.Movement.Systems; /// /// Controls the switching of motion and standing still animation /// -public sealed class ClientSpriteMovementSystem : SharedSpriteMovementSystem +public sealed partial class ClientSpriteMovementSystem : SharedSpriteMovementSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly EntityQuery _spriteQuery = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private EntityQuery _spriteQuery = default!; public override void Initialize() { diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs index a332d25f9a..dc517920fa 100644 --- a/Content.Client/Movement/Systems/ContentEyeSystem.cs +++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs @@ -5,9 +5,9 @@ using Robust.Client.Player; namespace Content.Client.Movement.Systems; -public sealed class ContentEyeSystem : SharedContentEyeSystem +public sealed partial class ContentEyeSystem : SharedContentEyeSystem { - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IPlayerManager _player = default!; public void RequestZoom(EntityUid uid, Vector2 zoom, bool ignoreLimit, bool scalePvs, ContentEyeComponent? content = null) { diff --git a/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs b/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs index 174ae2dd97..f54aaa8403 100644 --- a/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs +++ b/Content.Client/Movement/Systems/EyeCursorOffsetSystem.cs @@ -10,8 +10,8 @@ namespace Content.Client.Movement.Systems; public sealed partial class EyeCursorOffsetSystem : EntitySystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; // This value is here to make sure the user doesn't have to move their mouse // all the way out to the edge of the screen to get the full offset. diff --git a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs index 3e1084bebb..e160a06fb1 100644 --- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs +++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs @@ -6,13 +6,13 @@ using Robust.Shared.Prototypes; namespace Content.Client.Movement.Systems; -public sealed class FloorOcclusionSystem : SharedFloorOcclusionSystem +public sealed partial class FloorOcclusionSystem : SharedFloorOcclusionSystem { private static readonly ProtoId HorizontalCut = "HorizontalCut"; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; - [Dependency] private readonly EntityQuery _spriteQuery = default!; + [Dependency] private EntityQuery _spriteQuery = default!; public override void Initialize() { diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs index c9e759e129..ed48b18de8 100644 --- a/Content.Client/Movement/Systems/JetpackSystem.cs +++ b/Content.Client/Movement/Systems/JetpackSystem.cs @@ -10,12 +10,12 @@ using Robust.Shared.Timing; namespace Content.Client.Movement.Systems; -public sealed class JetpackSystem : SharedJetpackSystem +public sealed partial class JetpackSystem : SharedJetpackSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ClothingSystem _clothing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ClothingSystem _clothing = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; public override void Initialize() { diff --git a/Content.Client/Movement/Systems/MobCollisionSystem.cs b/Content.Client/Movement/Systems/MobCollisionSystem.cs index b7d464afab..476150acb1 100644 --- a/Content.Client/Movement/Systems/MobCollisionSystem.cs +++ b/Content.Client/Movement/Systems/MobCollisionSystem.cs @@ -8,10 +8,10 @@ using Robust.Shared.Timing; namespace Content.Client.Movement.Systems; -public sealed class MobCollisionSystem : SharedMobCollisionSystem +public sealed partial class MobCollisionSystem : SharedMobCollisionSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; public override void Update(float frameTime) { diff --git a/Content.Client/NPC/NPCSteeringSystem.cs b/Content.Client/NPC/NPCSteeringSystem.cs index 9ca3ec1a7e..f6272a1f79 100644 --- a/Content.Client/NPC/NPCSteeringSystem.cs +++ b/Content.Client/NPC/NPCSteeringSystem.cs @@ -9,9 +9,9 @@ using Robust.Shared.Enums; namespace Content.Client.NPC; -public sealed class NPCSteeringSystem : SharedNPCSteeringSystem +public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem { - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IOverlayManager _overlay = default!; public bool DebugEnabled { diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs index dc8fd98433..3cca80198d 100644 --- a/Content.Client/NPC/PathfindingSystem.cs +++ b/Content.Client/NPC/PathfindingSystem.cs @@ -14,17 +14,17 @@ using Robust.Shared.Utility; namespace Content.Client.NPC { - public sealed class PathfindingSystem : SharedPathfindingSystem + public sealed partial class PathfindingSystem : SharedPathfindingSystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; - [Dependency] private readonly NPCSteeringSystem _steering = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IResourceCache _cache = default!; + [Dependency] private NPCSteeringSystem _steering = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public PathfindingDebugMode Modes { diff --git a/Content.Client/NPC/ShowHTNCommand.cs b/Content.Client/NPC/ShowHTNCommand.cs index c1f0027087..c420be13a6 100644 --- a/Content.Client/NPC/ShowHTNCommand.cs +++ b/Content.Client/NPC/ShowHTNCommand.cs @@ -3,9 +3,9 @@ using Robust.Shared.Console; namespace Content.Client.NPC; -public sealed class ShowHtnCommand : LocalizedEntityCommands +public sealed partial class ShowHtnCommand : LocalizedEntityCommands { - [Dependency] private readonly HTNSystem _htnSystem = default!; + [Dependency] private HTNSystem _htnSystem = default!; public override string Command => "showhtn"; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs index d7c010e2e3..729351a756 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkMenu.xaml.cs @@ -15,7 +15,7 @@ namespace Content.Client.NetworkConfigurator; [GenerateTypedNameReferences] public sealed partial class NetworkConfiguratorLinkMenu : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private const string PanelBgColor = "#202023"; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs index cd57c3b5fb..5f415a48c4 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs @@ -7,10 +7,10 @@ using Robust.Shared.Random; namespace Content.Client.NetworkConfigurator; -public sealed class NetworkConfiguratorLinkOverlay : Overlay +public sealed partial class NetworkConfiguratorLinkOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IRobustRandom _random = default!; private readonly DeviceListSystem _deviceListSystem; private readonly SharedTransformSystem _transformSystem; diff --git a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs index 0a55cf0db8..ae39e9ae4a 100644 --- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs @@ -16,12 +16,12 @@ using Robust.Shared.Timing; namespace Content.Client.NetworkConfigurator.Systems; -public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem +public sealed partial class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private IInputManager _inputManager = default!; private static readonly EntProtoId Action = "ActionClearNetworkLinkOverlays"; @@ -136,9 +136,9 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem } } -public sealed class ClearAllNetworkLinkOverlays : LocalizedEntityCommands +public sealed partial class ClearAllNetworkLinkOverlays : LocalizedEntityCommands { - [Dependency] private readonly NetworkConfiguratorSystem _network = default!; + [Dependency] private NetworkConfiguratorSystem _network = default!; public override string Command => "clearnetworklinkoverlays"; diff --git a/Content.Client/NodeContainer/NodeGroupSystem.cs b/Content.Client/NodeContainer/NodeGroupSystem.cs index 0a3d7ddad0..cbba584a59 100644 --- a/Content.Client/NodeContainer/NodeGroupSystem.cs +++ b/Content.Client/NodeContainer/NodeGroupSystem.cs @@ -12,13 +12,13 @@ using Robust.Shared.Map; namespace Content.Client.NodeContainer { [UsedImplicitly] - public sealed class NodeGroupSystem : EntitySystem + public sealed partial class NodeGroupSystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; public bool VisEnabled { get; private set; } diff --git a/Content.Client/NodeContainer/NodeVisCommand.cs b/Content.Client/NodeContainer/NodeVisCommand.cs index e5f0f8f5fa..8a3160f757 100644 --- a/Content.Client/NodeContainer/NodeVisCommand.cs +++ b/Content.Client/NodeContainer/NodeVisCommand.cs @@ -4,10 +4,10 @@ using Robust.Shared.Console; namespace Content.Client.NodeContainer { - public sealed class NodeVisCommand : LocalizedEntityCommands + public sealed partial class NodeVisCommand : LocalizedEntityCommands { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly NodeGroupSystem _nodeSystem = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private NodeGroupSystem _nodeSystem = default!; public override string Command => "nodevis"; @@ -23,9 +23,9 @@ namespace Content.Client.NodeContainer } } - public sealed class NodeVisFilterCommand : LocalizedEntityCommands + public sealed partial class NodeVisFilterCommand : LocalizedEntityCommands { - [Dependency] private readonly NodeGroupSystem _nodeSystem = default!; + [Dependency] private NodeGroupSystem _nodeSystem = default!; public override string Command => "nodevisfilter"; diff --git a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs index ad4f1a75d4..af7a11319d 100644 --- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs +++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs @@ -9,9 +9,9 @@ using Robust.Shared.Timing; namespace Content.Client.NukeOps; [UsedImplicitly] -public sealed class WarDeclaratorBoundUserInterface : BoundUserInterface +public sealed partial class WarDeclaratorBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; [ViewVariables] private WarDeclaratorWindow? _window; diff --git a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs index 68487e98bd..b030badc67 100644 --- a/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs +++ b/Content.Client/NukeOps/WarDeclaratorWindow.xaml.cs @@ -11,8 +11,8 @@ namespace Content.Client.NukeOps; [GenerateTypedNameReferences] public sealed partial class WarDeclaratorWindow : FancyWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILocalizationManager _localizationManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ILocalizationManager _localizationManager = default!; public event Action? OnActivated; diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs index 46d71917c2..224e596e8b 100644 --- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs +++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs @@ -4,9 +4,9 @@ using Robust.Client.GameObjects; namespace Content.Client.Nutrition.EntitySystems; -public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem +public sealed partial class ClientFoodSequenceSystem : SharedFoodSequenceSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Client/Nutrition/EntitySystems/CreamPieSystem.cs index 96a63cc694..5dd5192537 100644 --- a/Content.Client/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Client/Nutrition/EntitySystems/CreamPieSystem.cs @@ -4,10 +4,10 @@ using Robust.Client.GameObjects; namespace Content.Client.Nutrition.EntitySystems; -public sealed class CreamPieSystem : SharedCreamPieSystem +public sealed partial class CreamPieSystem : SharedCreamPieSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Client/Nutrition/EntitySystems/InfantSystem.cs b/Content.Client/Nutrition/EntitySystems/InfantSystem.cs index b003a24f09..d6fef2ddd8 100644 --- a/Content.Client/Nutrition/EntitySystems/InfantSystem.cs +++ b/Content.Client/Nutrition/EntitySystems/InfantSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Nutrition.EntitySystems; /// /// This handles visuals for /// -public sealed class InfantSystem : EntitySystem +public sealed partial class InfantSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; /// public override void Initialize() diff --git a/Content.Client/Options/OptionsVisualizerSystem.cs b/Content.Client/Options/OptionsVisualizerSystem.cs index 1876b9bf55..15af9eb08b 100644 --- a/Content.Client/Options/OptionsVisualizerSystem.cs +++ b/Content.Client/Options/OptionsVisualizerSystem.cs @@ -8,7 +8,7 @@ namespace Content.Client.Options; /// /// Implements . /// -public sealed class OptionsVisualizerSystem : EntitySystem +public sealed partial class OptionsVisualizerSystem : EntitySystem { private static readonly (OptionVisualizerOptions, CVarDef)[] OptionVars = { @@ -16,9 +16,9 @@ public sealed class OptionsVisualizerSystem : EntitySystem (OptionVisualizerOptions.ReducedMotion, CCVars.ReducedMotion), }; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IReflectionManager _reflection = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IReflectionManager _reflection = default!; + [Dependency] private SpriteSystem _sprite = default!; private OptionVisualizerOptions _currentOptions; diff --git a/Content.Client/Options/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs index 9efd04fd0b..0952360b16 100644 --- a/Content.Client/Options/UI/OptionsMenu.xaml.cs +++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs @@ -8,7 +8,7 @@ namespace Content.Client.Options.UI [GenerateTypedNameReferences] public sealed partial class OptionsMenu : DefaultWindow { - [Dependency] private readonly IClientAdminManager _adminManager = default!; + [Dependency] private IClientAdminManager _adminManager = default!; public OptionsMenu() { diff --git a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs index 32680dfcc2..26c7b79bfc 100644 --- a/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs +++ b/Content.Client/Options/UI/OptionsTabControlRow.xaml.cs @@ -48,8 +48,8 @@ namespace Content.Client.Options.UI; [GenerateTypedNameReferences] public sealed partial class OptionsTabControlRow : Control { - [Dependency] private readonly ILocalizationManager _loc = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private ILocalizationManager _loc = default!; + [Dependency] private IConfigurationManager _cfg = default!; private ValueList _options; diff --git a/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml b/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml index ca22d7206b..fb95236806 100644 --- a/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml +++ b/Content.Client/Options/UI/Tabs/AdminOptionsTab.xaml @@ -18,6 +18,9 @@ +