diff --git a/.editorconfig b/.editorconfig index fa740a7511d..4a1ff438d3f 100644 --- a/.editorconfig +++ b/.editorconfig @@ -202,6 +202,9 @@ csharp_preserve_single_line_blocks = true #dotnet_naming_style.begins_with_i.capitalization = pascal_case dotnet_diagnostic.ide0055.severity = warning +dotnet_diagnostic.CS0618.severity = none +dotnet_diagnostic.CS0612.severity = none +dotnet_diagnostic.CS0672.severity = none dotnet_naming_rule.constants_rule.severity = warning dotnet_naming_rule.constants_rule.style = upper_camel_case_style diff --git a/Content.Benchmarks/ColorInterpolateBenchmark.cs b/Content.Benchmarks/ColorInterpolateBenchmark.cs index eb182328d46..45f2c21b9a0 100644 --- a/Content.Benchmarks/ColorInterpolateBenchmark.cs +++ b/Content.Benchmarks/ColorInterpolateBenchmark.cs @@ -30,7 +30,8 @@ public class ColorInterpolateBenchmark [GlobalSetup] public void Setup() { - var random = new Random(3005); + var random = new RobustRandom(); + random.SetSeed(3005); _colors = new (Color, Color)[N]; _output = new Color[N]; diff --git a/Content.Benchmarks/DependencyInjectBenchmark.cs b/Content.Benchmarks/DependencyInjectBenchmark.cs index 06bd45fe3f2..7ff0af42ae8 100644 --- a/Content.Benchmarks/DependencyInjectBenchmark.cs +++ b/Content.Benchmarks/DependencyInjectBenchmark.cs @@ -57,13 +57,13 @@ private sealed class X3 { } private sealed class X4 { } private sealed class X5 { } - private sealed class TestDummy + private sealed partial 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 e26cca0fc26..f471975ba36 100644 --- a/Content.Client/Access/Commands/ShowAccessReadersCommand.cs +++ b/Content.Client/Access/Commands/ShowAccessReadersCommand.cs @@ -4,11 +4,11 @@ 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 034ee8c2299..5d8a72a92a7 100644 --- a/Content.Client/Access/Systems/JobStatusSystem.cs +++ b/Content.Client/Access/Systems/JobStatusSystem.cs @@ -6,11 +6,11 @@ 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 45d5abdf701..4a06fe35d5b 100644 --- a/Content.Client/Access/UI/AccessLevelControl.xaml.cs +++ b/Content.Client/Access/UI/AccessLevelControl.xaml.cs @@ -9,7 +9,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 e4baf44a13b..a23b94f3365 100644 --- a/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs +++ b/Content.Client/Access/UI/AccessOverriderBoundUserInterface.cs @@ -11,9 +11,9 @@ 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 e764bac7d4a..67d8f0cebc5 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 2a85530c482..0a25e35cd4f 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 902341148fe..6d4b0591042 100644 --- a/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs +++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs @@ -10,9 +10,9 @@ 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 ff9425f5d65..60e4a53bda4 100644 --- a/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs +++ b/Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs @@ -19,7 +19,7 @@ namespace Content.Client.Access.UI [GenerateTypedNameReferences] public sealed partial class IdCardConsoleWindow : DefaultWindow { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; private readonly IdCardConsoleBoundUserInterface _owner; diff --git a/Content.Client/Access/UI/IdPrinterConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdPrinterConsoleBoundUserInterface.cs index 74a330588d6..f9e254a6461 100644 --- a/Content.Client/Access/UI/IdPrinterConsoleBoundUserInterface.cs +++ b/Content.Client/Access/UI/IdPrinterConsoleBoundUserInterface.cs @@ -13,9 +13,9 @@ namespace Content.Client.Access.UI { - public sealed class IdPrinterConsoleBoundUserInterface : BoundUserInterface + public sealed partial class IdPrinterConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private IdPrinterConsoleWindow? _window; diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index afb8037ee30..61d53248315 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -24,16 +24,16 @@ 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 3f072691de6..3abff217f64 100644 --- a/Content.Client/Administration/Managers/ClientAdminManager.cs +++ b/Content.Client/Administration/Managers/ClientAdminManager.cs @@ -10,15 +10,15 @@ 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 e000bdc0ba0..a07abae90ce 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 1e15186706c..33141c43cf9 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 b4de9b99b06..5de8d8dd0e6 100644 --- a/Content.Client/Administration/Systems/BwoinkSystem.cs +++ b/Content.Client/Administration/Systems/BwoinkSystem.cs @@ -7,9 +7,9 @@ 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 c48c0791671..f5771423045 100644 --- a/Content.Client/Administration/Systems/KillSignSystem.cs +++ b/Content.Client/Administration/Systems/KillSignSystem.cs @@ -5,10 +5,10 @@ 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 5156b7f3c1f..7120550c828 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 ca23c39c188..8a0f8c6d9db 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/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs index 879a6c000b4..2f9c87f381c 100644 --- a/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs +++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs @@ -36,6 +36,7 @@ private void OnTabChanged(int tabIndex) protected override void Dispose(bool disposing) { OnDisposed?.Invoke(); +#pragma warning disable 0618 base.Dispose(disposing); OnDisposed = null; } diff --git a/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs b/Content.Client/Administration/UI/AdminRemarks/AdminMessagePopupWindow.xaml.cs index f8021e606c3..9f3dfac72bf 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 fdffa0058fa..8a00efcf61c 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 a2ac7502ae1..c2fc2a4b74a 100644 --- a/Content.Client/Administration/UI/BanList/BanListEui.cs +++ b/Content.Client/Administration/UI/BanList/BanListEui.cs @@ -11,9 +11,9 @@ 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/BanList/Bans/BanListLine.xaml.cs b/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs index dc42fea2173..fe78efbe079 100644 --- a/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs +++ b/Content.Client/Administration/UI/BanList/Bans/BanListLine.xaml.cs @@ -27,9 +27,10 @@ private void IdsPressed(ButtonEventArgs buttonEventArgs) { IdsClicked?.Invoke(this); } - +#pragma warning disable 0672 protected override void Dispose(bool disposing) { +#pragma warning disable 0618 base.Dispose(disposing); IdsHidden.OnPressed -= IdsPressed; diff --git a/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs b/Content.Client/Administration/UI/BanPanel/BanPanel.xaml.cs index 07e696a99a2..630acbdb77e 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 bcff14cf8e6..682243ae905 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/CustomControls/CommandButton.cs b/Content.Client/Administration/UI/CustomControls/CommandButton.cs index 44e2963e135..b9466b59fc3 100644 --- a/Content.Client/Administration/UI/CustomControls/CommandButton.cs +++ b/Content.Client/Administration/UI/CustomControls/CommandButton.cs @@ -9,6 +9,7 @@ namespace Content.Client.Administration.UI.CustomControls [Virtual] public class CommandButton : Button, IDocumentTag { + private ISawmill _sawmill = default!; public string? Command { get; set; } public CommandButton() @@ -41,7 +42,7 @@ public bool TryParseTag(Dictionary args, [NotNullWhen(true)] out { if (args.Count != 2 || !args.TryGetValue("Text", out var text) || !args.TryGetValue("Command", out var command)) { - Logger.Error($"Invalid arguments passed to {nameof(CommandButton)}"); + _sawmill.Error($"Invalid arguments passed to {nameof(CommandButton)}"); control = null; return false; } diff --git a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs index e0973827382..5916bd0c07f 100644 --- a/Content.Client/Administration/UI/Logs/AdminLogsEui.cs +++ b/Content.Client/Administration/UI/Logs/AdminLogsEui.cs @@ -13,12 +13,12 @@ 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 = "\""; @@ -255,9 +255,9 @@ public override void Closed() ClydeWindow.RequestClosed -= OnRequestClosed; } - LogsControl.Dispose(); - LogsWindow?.Dispose(); - Root?.Dispose(); + LogsControl.Orphan(); + LogsWindow?.Orphan(); + Root?.Orphan(); ClydeWindow?.Dispose(); } } diff --git a/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs b/Content.Client/Administration/UI/ManageSolutions/AddReagentWindow.xaml.cs index 0517b093632..1e1ab9ad610 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 8138659e28d..f0d74eb227f 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 7876dbca7cb..26a42bc3565 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/AdminNotesLine.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs index 9757d2982bd..d9125f0a5e8 100644 --- a/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs +++ b/Content.Client/Administration/UI/Notes/AdminNotesLine.xaml.cs @@ -14,6 +14,7 @@ namespace Content.Client.Administration.UI.Notes; [GenerateTypedNameReferences] public sealed partial class AdminNotesLine : BoxContainer { + private ISawmill _sawmill = default!; private readonly SpriteSystem _sprites; private const string AdminNotesTextureBase = "/Textures/Interface/AdminNotes/"; @@ -61,7 +62,7 @@ private void Refresh() if (iconPath is null) { SeverityRect.Visible = false; - Logger.WarningS("admin.notes", $"Could not find an icon for note ID {Note.Id}"); + _sawmill.Warning("admin.notes", $"Could not find an icon for note ID {Note.Id}"); } else { diff --git a/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs b/Content.Client/Administration/UI/Notes/AdminNotesLinePopup.xaml.cs index 12e1c4d0431..5883c762278 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 c7287942337..063b0735fe8 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 09b09c57dc8..88cfe1754ac 100644 --- a/Content.Client/Administration/UI/PermissionsEui.cs +++ b/Content.Client/Administration/UI/PermissionsEui.cs @@ -20,11 +20,11 @@ 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 8c8183ef22a..1828d34f2f2 100644 --- a/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs +++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs @@ -9,11 +9,11 @@ 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 69d329f9eb9..17b32adc008 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 d17dc5a9f6f..cf5c78f7065 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/ExplosionDebugOverlay.cs @@ -11,10 +11,10 @@ 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 9de177b6c71..df0305105bb 100644 --- a/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs +++ b/Content.Client/Administration/UI/SpawnExplosion/SpawnExplosionEui.cs @@ -8,10 +8,10 @@ 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 bbfa98244ed..54002c60924 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/AdminTab/AdminSectorWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminSectorWindow.xaml.cs index 758fdbfcaec..b56eba47fc8 100644 --- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminSectorWindow.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminSectorWindow.xaml.cs @@ -16,9 +16,9 @@ namespace Content.Client.Administration.UI.Tabs.AdminTab; [GenerateTypedNameReferences] public sealed partial class AdminSectorWindow : DefaultWindow { - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IPrototypeManager _prototypes = default!; public AdminSectorWindow() { diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/LoadBlueprintsWindow.xaml.cs index b0884b2e20b..f4dacf9c5ac 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 72a594469d2..2dacc82ec46 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 fa92a3e18fb..4195fe7a759 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 ea8dca09cfd..53d6d5d623c 100644 --- a/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PanicBunkerTab/PanicBunkerTab.xaml.cs @@ -9,7 +9,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 95877acd628..2e627db64ce 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 5e59b1024d4..0d31686a0eb 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 478a9209933..a5c45001486 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 b085331ad2a..e363b3458a8 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 90d60cd86d0..ee9753979ae 100644 --- a/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs +++ b/Content.Client/AlertLevel/AlertLevelDisplaySystem.cs @@ -4,9 +4,9 @@ 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 2cac72f9010..69d70dd46ab 100644 --- a/Content.Client/Alerts/ClientAlertsSystem.cs +++ b/Content.Client/Alerts/ClientAlertsSystem.cs @@ -10,13 +10,13 @@ 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 d2de4372f22..0c46c172e7a 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 69bef6ae7fb..23b659f2bf2 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 b7c8a17e133..d003b13a7ad 100644 --- a/Content.Client/Anomaly/AnomalyScannerSystem.cs +++ b/Content.Client/Anomaly/AnomalyScannerSystem.cs @@ -8,10 +8,10 @@ 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 72241e9366d..780ab498f78 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 a9dcfaf2b06..6d48254c190 100644 --- a/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs +++ b/Content.Client/Anomaly/Effects/ClientInnerBodySystem.cs @@ -5,9 +5,9 @@ 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 dd8fa1f4132..d9ad8bf937a 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 c63eca76bf7..38ebc99ea09 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 c9076b9536d..402d9395861 100644 --- a/Content.Client/Atmos/AlignAtmosPipeLayers.cs +++ b/Content.Client/Atmos/AlignAtmosPipeLayers.cs @@ -22,12 +22,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 94bfb4b4f37..1ef23ed5376 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 32e82922418..07a163a0001 100644 --- a/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -8,9 +8,9 @@ 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 1a12c3967b5..4ee3d74545f 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 f560e0b833b..bdd653ad8f2 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 431a598678d..ec4500935cc 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 f16774ce249..d54f4d20a64 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 b1bfdb70abf..f193bcb4117 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/GasTileVisibleGasOverlaySystem.cs b/Content.Client/Atmos/EntitySystems/GasTileVisibleGasOverlaySystem.cs index 3d7f26cc30d..f47e3f7d602 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/Monitor/UI/Widgets/ScrubberControl.xaml.cs b/Content.Client/Atmos/Monitor/UI/Widgets/ScrubberControl.xaml.cs index e72db2c0798..258b27d341c 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 8ecc5d17908..5a4a44aa6d2 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 ebd1796a906..e35163ef20a 100644 --- a/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs +++ b/Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs @@ -18,13 +18,13 @@ 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 778a2a83b21..65d1b11e539 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 584664ea743..5de297198d4 100644 --- a/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileFireOverlay.cs @@ -16,12 +16,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/GasTileVisibleGasOverlay.cs b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs index 374fbb63f5c..4b0086bf4a8 100644 --- a/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs +++ b/Content.Client/Atmos/Overlays/GasTileVisibleGasOverlay.cs @@ -19,12 +19,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 f615d9a8927..83623a68f12 100644 --- a/Content.Client/Atmos/Piping/Binary/Systems/GasVolumePumpSystem.cs +++ b/Content.Client/Atmos/Piping/Binary/Systems/GasVolumePumpSystem.cs @@ -4,9 +4,9 @@ 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 bd75fa00956..647852b8a98 100644 --- a/Content.Client/Atmos/Piping/Unary/Systems/GasThermoMachineSystem.cs +++ b/Content.Client/Atmos/Piping/Unary/Systems/GasThermoMachineSystem.cs @@ -4,9 +4,9 @@ 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 dd384fa6104..20205cb34d3 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 7bbc6c6cbfe..0730cd4a144 100644 --- a/Content.Client/Audio/AmbientOverlayCommand.cs +++ b/Content.Client/Audio/AmbientOverlayCommand.cs @@ -2,9 +2,9 @@ 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 759320ab0a4..161fdc54862 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 16e1edd2523..779f56d619c 100644 --- a/Content.Client/Audio/AudioUIController.cs +++ b/Content.Client/Audio/AudioUIController.cs @@ -7,11 +7,11 @@ 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 3506657bf51..afebba50fa9 100644 --- a/Content.Client/Audio/ClientGlobalSoundSystem.cs +++ b/Content.Client/Audio/ClientGlobalSoundSystem.cs @@ -8,10 +8,10 @@ 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 09112e1f7fe..02f23f5864d 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 17b41eea06a..14fe62e5caf 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 de6e94bee8e..53f77be2b0a 100644 --- a/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs +++ b/Content.Client/Audio/Jukebox/JukeboxBoundUserInterface.cs @@ -6,9 +6,9 @@ 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 8898b9e4880..6c478e36ec5 100644 --- a/Content.Client/Audio/Jukebox/JukeboxMenu.xaml.cs +++ b/Content.Client/Audio/Jukebox/JukeboxMenu.xaml.cs @@ -13,7 +13,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 feb4aef3b21..0194c1ccbdf 100644 --- a/Content.Client/Audio/Jukebox/JukeboxSystem.cs +++ b/Content.Client/Audio/Jukebox/JukeboxSystem.cs @@ -6,13 +6,13 @@ 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 3e641fed70e..e17d264cb51 100644 --- a/Content.Client/BarSign/BarSignVisualizerSystem.cs +++ b/Content.Client/BarSign/BarSignVisualizerSystem.cs @@ -5,9 +5,9 @@ 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 6db009963b5..b77f6f548b7 100644 --- a/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs +++ b/Content.Client/BarSign/Ui/BarSignBoundUserInterface.cs @@ -7,9 +7,9 @@ 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 a71cc953242..b04d18afa1b 100644 --- a/Content.Client/Beam/BeamSystem.cs +++ b/Content.Client/Beam/BeamSystem.cs @@ -5,9 +5,9 @@ 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 87daac37223..32608a6f5c4 100644 --- a/Content.Client/Body/Systems/InternalsSystem.cs +++ b/Content.Client/Body/Systems/InternalsSystem.cs @@ -4,9 +4,9 @@ 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 fba936ee58a..bb48d944cbc 100644 --- a/Content.Client/Body/VisualBodySystem.cs +++ b/Content.Client/Body/VisualBodySystem.cs @@ -11,12 +11,12 @@ 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 MarkingManager _marking = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _prototype = 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 536c60ed7a2..23d3b03120e 100644 --- a/Content.Client/Buckle/BuckleSystem.cs +++ b/Content.Client/Buckle/BuckleSystem.cs @@ -8,12 +8,12 @@ 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 8cbe27954cb..0827e9e7779 100644 --- a/Content.Client/Camera/CameraRecoilSystem.cs +++ b/Content.Client/Camera/CameraRecoilSystem.cs @@ -5,9 +5,9 @@ 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 88cbe7060e6..b8d92b40fc2 100644 --- a/Content.Client/CardboardBox/CardboardBoxSystem.cs +++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs @@ -8,12 +8,12 @@ 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 EntityLookupSystem _entityLookup = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private SpriteSystem _sprite = default!; private EntityQuery _mobStateQuery; diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs index 02b721b9020..994381e7771 100644 --- a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs @@ -8,9 +8,9 @@ namespace Content.Client.Cargo.BUI; [UsedImplicitly] -public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface +public sealed partial class CargoShuttleConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; [ViewVariables] private CargoShuttleMenu? _menu; diff --git a/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs index 85b2dbfb834..8bf47043003 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 3ffb0636d01..48a3cb87e6c 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 cdfc538d0a1..0e56c2fbf7c 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 42fb74853ef..390b8755da7 100644 --- a/Content.Client/Cargo/UI/BountyEntry.xaml.cs +++ b/Content.Client/Cargo/UI/BountyEntry.xaml.cs @@ -12,7 +12,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 76880bb9603..125618f998b 100644 --- a/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs +++ b/Content.Client/Cargo/UI/BountyHistoryEntry.xaml.cs @@ -10,7 +10,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/CargoBountyMenu.xaml.cs b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs index 7a0e73c88ec..a3de9eb3085 100644 --- a/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoBountyMenu.xaml.cs @@ -18,7 +18,7 @@ public sealed partial class CargoBountyMenu : FancyWindow public Action? OnSkipButtonPressed; public TimeSpan UntilNextSkip = TimeSpan.Zero; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; public CargoBountyMenu() { RobustXamlLoader.Load(this); diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs index 1ec60e9423a..36b58ec650f 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs @@ -22,8 +22,8 @@ namespace Content.Client.Cargo.UI [GenerateTypedNameReferences] public sealed partial class CargoConsoleMenu : FancyWindow { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _playerManager = default!; private readonly IEntityManager _entityManager; private readonly IPrototypeManager _protoManager; private readonly CargoSystem _cargoSystem; diff --git a/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs b/Content.Client/Cargo/UI/FundingAllocationMenu.xaml.cs index 797dfea8777..7782ea129a8 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 8b1e605a938..f8f2c64e00a 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 348cfee0f81..df091b0bb85 100644 --- a/Content.Client/Changeling/Systems/ChangelingIdentitySystem.cs +++ b/Content.Client/Changeling/Systems/ChangelingIdentitySystem.cs @@ -4,9 +4,9 @@ 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 785bcb65558..013f52926a2 100644 --- a/Content.Client/Changelog/ChangelogButton.cs +++ b/Content.Client/Changelog/ChangelogButton.cs @@ -3,9 +3,9 @@ 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 b6d824b1d8e..621fac036ca 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 3fa6c949c4c..16712334105 100644 --- a/Content.Client/Changelog/ChangelogTab.xaml.cs +++ b/Content.Client/Changelog/ChangelogTab.xaml.cs @@ -16,8 +16,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 a9a63cce65f..18c4607c13b 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 @@ private void TabsUpdated() } [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 98d11d8a348..28851f4b1cf 100644 --- a/Content.Client/CharacterInfo/CharacterInfoSystem.cs +++ b/Content.Client/CharacterInfo/CharacterInfoSystem.cs @@ -5,9 +5,9 @@ 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 9fe063766c2..ab3a24190f3 100644 --- a/Content.Client/Charges/ChargesSystem.cs +++ b/Content.Client/Charges/ChargesSystem.cs @@ -5,9 +5,9 @@ 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 767a9b747d0..a9612add6e6 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 3c357b8bb5d..c2eef37bab3 100644 --- a/Content.Client/Chat/Managers/ChatManager.cs +++ b/Content.Client/Chat/Managers/ChatManager.cs @@ -7,11 +7,11 @@ 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 be29bb2d6d6..2025773b8be 100644 --- a/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs +++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorSystem.cs @@ -7,11 +7,11 @@ 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 4b4cd4b6f97..1c43b846925 100644 --- a/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs +++ b/Content.Client/Chat/TypingIndicator/TypingIndicatorVisualizerSystem.cs @@ -5,10 +5,10 @@ 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 366b351c026..816ef9701bf 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -12,12 +12,12 @@ 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 bb2adbc02a5..0d7e578a907 100644 --- a/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs @@ -14,9 +14,9 @@ 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 b509c38006c..9549ae09169 100644 --- a/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/InjectorStatusControlSystem.cs @@ -6,10 +6,10 @@ 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 a5d02740be7..0635b966c61 100644 --- a/Content.Client/Chemistry/EntitySystems/PillSystem.cs +++ b/Content.Client/Chemistry/EntitySystems/PillSystem.cs @@ -3,9 +3,9 @@ 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 8664ef377ea..2b9d9b86595 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 b3a5361dd8b..b746f05e5b4 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 7f1ec11ef3c..3f31d0f7e5e 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 06bc790696d..2d9048a93c8 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 6fc07785b2d..787af592e96 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs @@ -12,10 +12,10 @@ 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 6ecbac95e01..60e4e7e0aba 100644 --- a/Content.Client/Clickable/ClickMapManager.cs +++ b/Content.Client/Clickable/ClickMapManager.cs @@ -9,7 +9,7 @@ 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 @@ internal sealed class ClickMapManager : IClickMapManager, IPostInjectInit 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 69c41b9cef6..dfb9d07aa46 100644 --- a/Content.Client/Clickable/ClickableSystem.cs +++ b/Content.Client/Clickable/ClickableSystem.cs @@ -10,11 +10,11 @@ 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!; private EntityQuery _clickableQuery; private EntityQuery _xformQuery; diff --git a/Content.Client/Clock/ClockSystem.cs b/Content.Client/Clock/ClockSystem.cs index bbd86a2ef3e..eb3f9db72be 100644 --- a/Content.Client/Clock/ClockSystem.cs +++ b/Content.Client/Clock/ClockSystem.cs @@ -3,9 +3,9 @@ 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 46332840b4f..b470b5473c7 100644 --- a/Content.Client/Clothing/ClientClothingSystem.cs +++ b/Content.Client/Clothing/ClientClothingSystem.cs @@ -18,7 +18,7 @@ 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 d6e4508f541..94b234bc1a5 100644 --- a/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs +++ b/Content.Client/Clothing/FlippableClothingVisualizerSystem.cs @@ -7,9 +7,9 @@ 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 02eed8f41e1..2d9ec49c847 100644 --- a/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs +++ b/Content.Client/Clothing/UI/ChameleonBoundUserInterface.cs @@ -10,9 +10,9 @@ 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 a69eeabfb75..9b6a8c7af6b 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 a6a97d70df6..98ffed6d808 100644 --- a/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs +++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs @@ -4,11 +4,11 @@ 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 85a33b4cfe3..0e6bbced94e 100644 --- a/Content.Client/CombatMode/CombatModeSystem.cs +++ b/Content.Client/CombatMode/CombatModeSystem.cs @@ -8,13 +8,13 @@ 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 d4e656b34c1..d75ff17a02f 100644 --- a/Content.Client/Commands/ActionsCommands.cs +++ b/Content.Client/Commands/ActionsCommands.cs @@ -34,9 +34,9 @@ public void Execute(IConsoleShell shell, string argStr, string[] args) */ [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 b6f1aab09be..2d53eeb666e 100644 --- a/Content.Client/Commands/AtmosDebugCommands.cs +++ b/Content.Client/Commands/AtmosDebugCommands.cs @@ -6,9 +6,9 @@ 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 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [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 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [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 ec9f74526e4..59a042170d4 100644 --- a/Content.Client/Commands/DebugCommands.cs +++ b/Content.Client/Commands/DebugCommands.cs @@ -5,9 +5,9 @@ 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 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } } -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 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } } -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 b920ccc5edf..e9e6c715ac5 100644 --- a/Content.Client/Commands/DebugPathfindingCommand.cs +++ b/Content.Client/Commands/DebugPathfindingCommand.cs @@ -7,9 +7,9 @@ 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 3bd2ca41e66..e4c8c55a17a 100644 --- a/Content.Client/Commands/GroupingEntityMenuCommand.cs +++ b/Content.Client/Commands/GroupingEntityMenuCommand.cs @@ -5,9 +5,9 @@ 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 70a383b5f6e..9596600135c 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -6,12 +6,12 @@ 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 114ca51bc92..c6b2c12d38d 100644 --- a/Content.Client/Commands/OpenAHelpCommand.cs +++ b/Content.Client/Commands/OpenAHelpCommand.cs @@ -7,9 +7,9 @@ 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 6386ab451a6..f5fbd19f1d3 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 17a544dabaf..ccd1d2f2d34 100644 --- a/Content.Client/Commands/SetMenuVisibilityCommand.cs +++ b/Content.Client/Commands/SetMenuVisibilityCommand.cs @@ -6,9 +6,9 @@ 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 d44c13911b5..a42b14da480 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 834c3cc995c..a526608e63b 100644 --- a/Content.Client/Commands/ToggleOutlineCommand.cs +++ b/Content.Client/Commands/ToggleOutlineCommand.cs @@ -6,9 +6,9 @@ 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 c63eeea8369..69d7b87a6f5 100644 --- a/Content.Client/Commands/ZoomCommand.cs +++ b/Content.Client/Commands/ZoomCommand.cs @@ -9,11 +9,11 @@ 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 d3533c1b590..a074ae6b322 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs @@ -6,9 +6,9 @@ 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 6295f0ce0c4..23004d7aa2c 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -11,8 +11,8 @@ namespace Content.Client.Communications.UI [GenerateTypedNameReferences] public sealed partial class CommunicationsConsoleMenu : FancyWindow { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IConfigurationManager _cfg = 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 6594375ba20..e3395371b48 100644 --- a/Content.Client/Configurable/ConfigurationSystem.cs +++ b/Content.Client/Configurable/ConfigurationSystem.cs @@ -3,9 +3,9 @@ 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 76526ed75c4..bcd75a47f95 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -21,13 +21,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 7d9b5faaa25..4aea5282986 100644 --- a/Content.Client/Construction/FlatpackSystem.cs +++ b/Content.Client/Construction/FlatpackSystem.cs @@ -6,10 +6,10 @@ 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 8d1990f360c..2bfbf3fe269 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 c25fbb97114..e45f2249261 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 0ef25dfa4ec..33766e81a39 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs @@ -10,9 +10,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 6d8c1815db2..b403a23f09f 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!; @@ -340,7 +340,7 @@ private void UpdateElement(EntityMenuElement element) if (entity == null) { // This whole element has no associated entities. We should remove it - element.Dispose(); + element.Orphan(); return; } @@ -352,7 +352,7 @@ private void UpdateElement(EntityMenuElement element) // There was only one entity in the sub-menu. So we will just remove the sub-menu and point directly to // that entity. element.Entity = entity; - element.SubMenu.Dispose(); + element.SubMenu.Orphan(); element.SubMenu = null; Elements[entity.Value] = element; } diff --git a/Content.Client/Cooldown/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs index 4d356410c5e..376fb9fba1a 100644 --- a/Content.Client/Cooldown/CooldownGraphic.cs +++ b/Content.Client/Cooldown/CooldownGraphic.cs @@ -6,12 +6,12 @@ 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 ae517692dc2..21949715e07 100644 --- a/Content.Client/Crayon/CrayonSystem.cs +++ b/Content.Client/Crayon/CrayonSystem.cs @@ -10,10 +10,10 @@ 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 b6137963961..0dd673dd1a6 100644 --- a/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs +++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs @@ -7,9 +7,9 @@ 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 db96fdc4328..2320920d447 100644 --- a/Content.Client/Crayon/UI/CrayonWindow.xaml.cs +++ b/Content.Client/Crayon/UI/CrayonWindow.xaml.cs @@ -16,7 +16,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 d8fed4b4ec7..cc3fa95858c 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/CrewAssignments/UI/JobNetMenu.xaml.cs b/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs index 31a45f7a341..27db8aafd84 100644 --- a/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs +++ b/Content.Client/CrewAssignments/UI/JobNetMenu.xaml.cs @@ -29,8 +29,8 @@ namespace Content.Client.CrewAssignments.UI; [GenerateTypedNameReferences] public sealed partial class JobNetMenu : DefaultWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public TimeSpan UntilNextPay = TimeSpan.Zero; public TimeSpan UntilNextPrec = TimeSpan.Zero; public TimeSpan UntilNextRogue = TimeSpan.Zero; @@ -257,9 +257,9 @@ public void UpdateState(JobNetUpdateState state) List level2 = new(); List level3 = new(); List level4 = new(); - if(_spriteSystem != null) + if (_spriteSystem != null) { - + foreach (var prod in _prototypeManager.EnumeratePrototypes()) { if (prod.Group == "syndicatemarket") @@ -293,7 +293,7 @@ public void UpdateState(JobNetUpdateState state) PointCost = { Text = $"P {prototype.Cost}" }, Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) }, }; - if(itemLevel < 1) + if (itemLevel < 1) { button.MainButton.Disabled = true; button.MainButton.ToolTip = "Requires Rogue Level 2"; @@ -367,7 +367,7 @@ public void UpdateState(JobNetUpdateState state) }; Rank5Content.AddChild(button); } - if(state.KillTarget == null) + if (state.KillTarget == null) { HuntPanel.Visible = false; } @@ -377,7 +377,7 @@ public void UpdateState(JobNetUpdateState state) } } - if(state.DealerObjective == null) + if (state.DealerObjective == null) { DealerObjectives.RemoveAllChildren(); } diff --git a/Content.Client/CrewAssignments/UI/WorldObjectiveEntryFragment.xaml.cs b/Content.Client/CrewAssignments/UI/WorldObjectiveEntryFragment.xaml.cs index 633464cc5e8..bef4cf96549 100644 --- a/Content.Client/CrewAssignments/UI/WorldObjectiveEntryFragment.xaml.cs +++ b/Content.Client/CrewAssignments/UI/WorldObjectiveEntryFragment.xaml.cs @@ -15,7 +15,7 @@ namespace Content.Client.CrewAssignments.UI; [GenerateTypedNameReferences] public sealed partial class WorldObjectiveEntryFragment : BoxContainer { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; public WorldObjectiveEntryFragment(string title, string desc, string? reward = null, DateTime? completedTime = null, string? completedDesc = null) diff --git a/Content.Client/CrewManifest/CrewManifestSystem.cs b/Content.Client/CrewManifest/CrewManifestSystem.cs index d05acb56802..2899ed4cd27 100644 --- a/Content.Client/CrewManifest/CrewManifestSystem.cs +++ b/Content.Client/CrewManifest/CrewManifestSystem.cs @@ -4,9 +4,9 @@ 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 83f7afe1a84..b983c3d8849 100644 --- a/Content.Client/CrewManifest/UI/CrewManifestListing.cs +++ b/Content.Client/CrewManifest/UI/CrewManifestListing.cs @@ -7,10 +7,10 @@ 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 37e7b30f428..4abf875fe5b 100644 --- a/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs +++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleBoundUserInterface.cs @@ -8,11 +8,11 @@ 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 78eaac0c0f6..b9455828cec 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 10567787120..0fb74c40879 100644 --- a/Content.Client/Cuffs/CuffableSystem.cs +++ b/Content.Client/Cuffs/CuffableSystem.cs @@ -8,10 +8,10 @@ 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 43a00f54af0..456891b161e 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 234551e27a0..bf64d3e35c0 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 c52dff9361a..9e2b43e32ee 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 cfb61ecd68e..9c5eaf6271b 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 b49ff7246bf..c2a06add954 100644 --- a/Content.Client/Decals/DecalSystem.cs +++ b/Content.Client/Decals/DecalSystem.cs @@ -8,10 +8,10 @@ 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 7e4c1e6b6b4..a106d822e50 100644 --- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs +++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs @@ -7,11 +7,11 @@ 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 d2eb4c64569..573cfd4b485 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 09a00b73abd..2de6b031c53 100644 --- a/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs +++ b/Content.Client/Decals/UI/DecalPlacerWindow.xaml.cs @@ -15,8 +15,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 d9dc2889e1b..8ae272c1c49 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 d5afd34533d..10935f0faaf 100644 --- a/Content.Client/Delivery/DeliveryVisualizerSystem.cs +++ b/Content.Client/Delivery/DeliveryVisualizerSystem.cs @@ -5,10 +5,10 @@ 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/DeltaV/TapeRecorder/UI/TapeRecorderWindow.xaml.cs b/Content.Client/DeltaV/TapeRecorder/UI/TapeRecorderWindow.xaml.cs index 98bf8a3f9c0..22c5031d163 100644 --- a/Content.Client/DeltaV/TapeRecorder/UI/TapeRecorderWindow.xaml.cs +++ b/Content.Client/DeltaV/TapeRecorder/UI/TapeRecorderWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.DeltaV.TapeRecorder.UI; [GenerateTypedNameReferences] public sealed partial class TapeRecorderWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; public EntityUid Owner; private bool _onCooldown; diff --git a/Content.Client/Dice/DiceSystem.cs b/Content.Client/Dice/DiceSystem.cs index 2de552f375b..0c2bbb1b430 100644 --- a/Content.Client/Dice/DiceSystem.cs +++ b/Content.Client/Dice/DiceSystem.cs @@ -3,9 +3,9 @@ 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 3e1dc7ec14c..681329f03b2 100644 --- a/Content.Client/DisplacementMap/DisplacementMapSystem.cs +++ b/Content.Client/DisplacementMap/DisplacementMapSystem.cs @@ -6,10 +6,10 @@ namespace Content.Client.DisplacementMap; -public sealed class DisplacementMapSystem : EntitySystem +public sealed partial class DisplacementMapSystem : EntitySystem { - [Dependency] private readonly ISerializationManager _serialization = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private ISerializationManager _serialization = default!; + [Dependency] private SpriteSystem _sprite = default!; private static string? BuildDisplacementLayerKey(object key) { diff --git a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs index 9e6d5e96a2d..d3d5c912741 100644 --- a/Content.Client/Disposal/Unit/DisposalUnitSystem.cs +++ b/Content.Client/Disposal/Unit/DisposalUnitSystem.cs @@ -7,13 +7,13 @@ 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 ebb2e916356..549bfea961e 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 e06491d7da0..58986e45a44 100644 --- a/Content.Client/Doors/AirlockSystem.cs +++ b/Content.Client/Doors/AirlockSystem.cs @@ -7,10 +7,10 @@ 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 451d6ccbdc7..4db8aebb6ef 100644 --- a/Content.Client/Doors/DoorSystem.cs +++ b/Content.Client/Doors/DoorSystem.cs @@ -7,12 +7,12 @@ 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 badcb2e9772..79b0c4749e1 100644 --- a/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs +++ b/Content.Client/Doors/Electronics/DoorElectronicsBoundUserInterface.cs @@ -8,9 +8,9 @@ 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 e82bb8244f5..26226c33181 100644 --- a/Content.Client/Doors/FirelockSystem.cs +++ b/Content.Client/Doors/FirelockSystem.cs @@ -5,10 +5,10 @@ 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 4c1f79f0479..9b201547a3c 100644 --- a/Content.Client/Doors/TurnstileSystem.cs +++ b/Content.Client/Doors/TurnstileSystem.cs @@ -10,10 +10,10 @@ 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 5a3b346458d..86f9d398f3f 100644 --- a/Content.Client/Dragon/DragonSystem.cs +++ b/Content.Client/Dragon/DragonSystem.cs @@ -4,10 +4,10 @@ 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 37708023026..bb74c8bec26 100644 --- a/Content.Client/Drowsiness/DrowsinessOverlay.cs +++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs @@ -8,15 +8,15 @@ 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 632d2134ca9..5bfc0138fb2 100644 --- a/Content.Client/Drowsiness/DrowsinessSystem.cs +++ b/Content.Client/Drowsiness/DrowsinessSystem.cs @@ -6,11 +6,11 @@ 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 e156e616b8f..c3fac46e0bb 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 e40fcdfca2d..68a00c050c3 100644 --- a/Content.Client/Drugs/RainbowOverlay.cs +++ b/Content.Client/Drugs/RainbowOverlay.cs @@ -10,16 +10,16 @@ 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 421379b8ba1..7515f91c03b 100644 --- a/Content.Client/Drunk/DrunkOverlay.cs +++ b/Content.Client/Drunk/DrunkOverlay.cs @@ -9,15 +9,15 @@ namespace Content.Client.Drunk; -public sealed class DrunkOverlay : Overlay +public sealed partial class DrunkOverlay : Overlay { private static readonly ProtoId Shader = "Drunk"; - [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!; public override OverlaySpace Space => OverlaySpace.WorldSpace; public override bool RequestScreenTexture => true; diff --git a/Content.Client/Drunk/DrunkSystem.cs b/Content.Client/Drunk/DrunkSystem.cs index c5fab75e7dd..108eb481188 100644 --- a/Content.Client/Drunk/DrunkSystem.cs +++ b/Content.Client/Drunk/DrunkSystem.cs @@ -6,10 +6,10 @@ 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 IPlayerManager _player = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private DrunkOverlay _overlay = default!; diff --git a/Content.Client/Effects/ColorFlashEffectSystem.cs b/Content.Client/Effects/ColorFlashEffectSystem.cs index 10a0fbbc11c..9372c78b5aa 100644 --- a/Content.Client/Effects/ColorFlashEffectSystem.cs +++ b/Content.Client/Effects/ColorFlashEffectSystem.cs @@ -9,11 +9,11 @@ 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 65b70727c06..9ff184d6b45 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 b32e370f1e6..af9304ba7a2 100644 --- a/Content.Client/Emp/EmpSystem.cs +++ b/Content.Client/Emp/EmpSystem.cs @@ -3,9 +3,9 @@ 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 ae853fb55c8..373821e5804 100644 --- a/Content.Client/Ensnaring/EnsnareableSystem.cs +++ b/Content.Client/Ensnaring/EnsnareableSystem.cs @@ -5,10 +5,10 @@ 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 89e5907d992..2c96d565eaf 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -43,42 +43,42 @@ 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 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!; + [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!; public override void PreInit() { diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs index e1a2e4faaff..96737aab713 100644 --- a/Content.Client/Eui/BaseEui.cs +++ b/Content.Client/Eui/BaseEui.cs @@ -3,9 +3,9 @@ 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 5a186baef1c..d6aeaa870ae 100644 --- a/Content.Client/Eui/EuiManager.cs +++ b/Content.Client/Eui/EuiManager.cs @@ -10,11 +10,11 @@ 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 e795deeac34..05b270ec097 100644 --- a/Content.Client/Examine/ExamineSystem.cs +++ b/Content.Client/Examine/ExamineSystem.cs @@ -24,13 +24,13 @@ 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 06ebe8ff332..ac96ee9165e 100644 --- a/Content.Client/Explosion/ExplosionOverlay.cs +++ b/Content.Client/Explosion/ExplosionOverlay.cs @@ -11,13 +11,13 @@ 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 8a4ce99f143..98923a48dd7 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 5d6130c722b..c4c8715bd1c 100644 --- a/Content.Client/Eye/Blinding/BlindOverlay.cs +++ b/Content.Client/Eye/Blinding/BlindOverlay.cs @@ -10,15 +10,15 @@ 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 7e893cfbf73..7ff9c645048 100644 --- a/Content.Client/Eye/Blinding/BlindingSystem.cs +++ b/Content.Client/Eye/Blinding/BlindingSystem.cs @@ -6,10 +6,10 @@ 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 b2b4db645b2..7475aaa0452 100644 --- a/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs +++ b/Content.Client/Eye/Blinding/BlurryVisionOverlay.cs @@ -8,15 +8,15 @@ 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 ba687ead4eb..d495c8982da 100644 --- a/Content.Client/Eye/Blinding/BlurryVisionSystem.cs +++ b/Content.Client/Eye/Blinding/BlurryVisionSystem.cs @@ -5,10 +5,10 @@ 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 45551414f39..165355fe6fc 100644 --- a/Content.Client/Eye/EyeLerpingSystem.cs +++ b/Content.Client/Eye/EyeLerpingSystem.cs @@ -10,13 +10,13 @@ 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 a97dc03a555..5cb0a5a3e67 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 49d5d26e9d8..5908d4a7f9e 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 a2480193e4a..25571047f2f 100644 --- a/Content.Client/Fax/UI/FaxBoundUi.cs +++ b/Content.Client/Fax/UI/FaxBoundUi.cs @@ -6,9 +6,9 @@ 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 be3465a2d49..4402315ba04 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 72567530c08..1bb5f6c48c9 100644 --- a/Content.Client/Flash/FlashOverlay.cs +++ b/Content.Client/Flash/FlashOverlay.cs @@ -11,15 +11,15 @@ 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; diff --git a/Content.Client/Flash/FlashSystem.cs b/Content.Client/Flash/FlashSystem.cs index ffabab94539..22631b7ec53 100644 --- a/Content.Client/Flash/FlashSystem.cs +++ b/Content.Client/Flash/FlashSystem.cs @@ -6,10 +6,10 @@ 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 107c486524b..e1905a543e2 100644 --- a/Content.Client/Fluids/PuddleDebugOverlaySystem.cs +++ b/Content.Client/Fluids/PuddleDebugOverlaySystem.cs @@ -4,9 +4,9 @@ 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 a44e93c54ed..6e26dc5f8d0 100644 --- a/Content.Client/Fluids/PuddleOverlay.cs +++ b/Content.Client/Fluids/PuddleOverlay.cs @@ -8,11 +8,11 @@ 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 ab96d24d85a..bf1a8cb50bc 100644 --- a/Content.Client/Fluids/PuddleSystem.cs +++ b/Content.Client/Fluids/PuddleSystem.cs @@ -7,10 +7,10 @@ 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 6110715c763..5e4168e6a7f 100644 --- a/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs +++ b/Content.Client/Forensics/ForensicScannerBoundUserInterface.cs @@ -4,9 +4,9 @@ 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 16702165e03..2edf0a3b0fd 100644 --- a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs +++ b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs @@ -11,7 +11,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 bd13461994c..b01df83b1d2 100644 --- a/Content.Client/Fullscreen/FullscreenHook.cs +++ b/Content.Client/Fullscreen/FullscreenHook.cs @@ -8,11 +8,11 @@ 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 4151d70a2b4..ee2cb2608c7 100644 --- a/Content.Client/GameTicking/Managers/ClientGameTicker.cs +++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs @@ -16,12 +16,12 @@ 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 b3093ff9654..67fd001dfb2 100644 --- a/Content.Client/GameTicking/Managers/TitleWindowManager.cs +++ b/Content.Client/GameTicking/Managers/TitleWindowManager.cs @@ -6,12 +6,12 @@ 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 b3de61b1946..151f762c13e 100644 --- a/Content.Client/Gameplay/GameplayState.cs +++ b/Content.Client/Gameplay/GameplayState.cs @@ -17,14 +17,14 @@ 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 a261801a5bf..3f58b3e9a33 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 6a908355e65..69a66797743 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 9334c855364..f25fdeef4cb 100644 --- a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs +++ b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs @@ -6,9 +6,9 @@ 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 58758f54f24..d4b1dfca0e6 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/Content.Client/Ghost/GhostSystem.cs @@ -8,14 +8,14 @@ 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 6bb1b50dc6e..35e83132adc 100644 --- a/Content.Client/Ghost/GhostToggleSelfVisibility.cs +++ b/Content.Client/Ghost/GhostToggleSelfVisibility.cs @@ -4,9 +4,9 @@ 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 0793f81b40f..9004e958f08 100644 --- a/Content.Client/GhostKick/GhostKickManager.cs +++ b/Content.Client/GhostKick/GhostKickManager.cs @@ -6,13 +6,13 @@ 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 ee5763854d0..7066e64b088 100644 --- a/Content.Client/Gravity/FloatingVisualizerSystem.cs +++ b/Content.Client/Gravity/FloatingVisualizerSystem.cs @@ -7,9 +7,9 @@ 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 8f9ac1a5326..4d5ccbbfcc7 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 f1e09fdb44d..ab47c5ed238 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/GridControl/UI/GridConfigBoundUserInterface.cs b/Content.Client/GridControl/UI/GridConfigBoundUserInterface.cs index b6e281eeec3..508699120ba 100644 --- a/Content.Client/GridControl/UI/GridConfigBoundUserInterface.cs +++ b/Content.Client/GridControl/UI/GridConfigBoundUserInterface.cs @@ -14,9 +14,9 @@ namespace Content.Client.GridControl.UI { - public sealed class GridConfigBoundUserInterface : BoundUserInterface + public sealed partial class GridConfigBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedGridConfigSystem _gridConfigSystem = default!; private GridConfigWindow? _window; diff --git a/Content.Client/GridControl/UI/GridControlConsoleBoundUserInterface.cs b/Content.Client/GridControl/UI/GridControlConsoleBoundUserInterface.cs index 31b0d24507f..9865c6ff19f 100644 --- a/Content.Client/GridControl/UI/GridControlConsoleBoundUserInterface.cs +++ b/Content.Client/GridControl/UI/GridControlConsoleBoundUserInterface.cs @@ -13,9 +13,9 @@ namespace Content.Client.GridControl.UI { - public sealed class GridControlConsoleBoundUserInterface : BoundUserInterface + public sealed partial class GridControlConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private GridControlConsoleWindow? _window; diff --git a/Content.Client/GridControl/UI/StationTaggerBoundUserInterface.cs b/Content.Client/GridControl/UI/StationTaggerBoundUserInterface.cs index 6844452237a..516da847666 100644 --- a/Content.Client/GridControl/UI/StationTaggerBoundUserInterface.cs +++ b/Content.Client/GridControl/UI/StationTaggerBoundUserInterface.cs @@ -16,9 +16,9 @@ namespace Content.Client.GridControl.UI { - public sealed class StationTaggerBoundUserInterface : BoundUserInterface + public sealed partial class StationTaggerBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedGridConfigSystem _gridConfigSystem = default!; private StationTaggerWindow? _window; diff --git a/Content.Client/GridControl/UIBSP/BSPAnchorKeyWindow.xaml.cs b/Content.Client/GridControl/UIBSP/BSPAnchorKeyWindow.xaml.cs index f8f9e778ef7..14a3b05c005 100644 --- a/Content.Client/GridControl/UIBSP/BSPAnchorKeyWindow.xaml.cs +++ b/Content.Client/GridControl/UIBSP/BSPAnchorKeyWindow.xaml.cs @@ -11,8 +11,8 @@ namespace Content.Client.GridControl.UIBSP; [GenerateTypedNameReferences] public sealed partial class BSPAnchorKeyWindow : DefaultWindow { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IEntityManager _entMan = default!; private readonly SharedTransformSystem _xform = default!; diff --git a/Content.Client/GridControl/UISC/StationCreatorBoundUserInterface.cs b/Content.Client/GridControl/UISC/StationCreatorBoundUserInterface.cs index 58ca2950ad4..d5c9af687ac 100644 --- a/Content.Client/GridControl/UISC/StationCreatorBoundUserInterface.cs +++ b/Content.Client/GridControl/UISC/StationCreatorBoundUserInterface.cs @@ -16,9 +16,9 @@ namespace Content.Client.GridControl.UISC { - public sealed class StationCreatorBoundUserInterface : BoundUserInterface + public sealed partial class StationCreatorBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly SharedGridConfigSystem _gridConfigSystem = default!; private StationCreatorWindow? _window; diff --git a/Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideEntityEmbed.xaml.cs index 44dbe9df08f..e9bd204aff4 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 9ae23e6eb75..eb475a1a2e5 100644 --- a/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideLawsetEmbed.xaml.cs @@ -19,7 +19,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 0c43866fff2..2f2554d8d49 100644 --- a/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideLawsetListEmbed.xaml.cs @@ -16,7 +16,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 778f0ac8712..55f6267297a 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 2a1f38bc8f0..fa02751aed2 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 1823bbe8b68..484ad0b0e5c 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; diff --git a/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs b/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs index 68b947b7586..22c0d1b6afd 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuideReagentGroupEmbed.xaml.cs @@ -18,8 +18,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 d845c1ce745..fd50a12d711 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 ad5a06a7279..5d29159a657 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/GuidebookRichPrototypeLink.cs b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs index 5746960af86..fc86cad0af4 100644 --- a/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs +++ b/Content.Client/Guidebook/Controls/GuidebookRichPrototypeLink.cs @@ -15,6 +15,7 @@ namespace Content.Client.Guidebook.Controls; /// public sealed class GuidebookRichPrototypeLink : Control, IPrototypeLinkControl { + private ISawmill _sawmill = default!; private bool _linkActive = false; private FormattedMessage? _message; private readonly RichTextLabel _richTextLabel; @@ -61,7 +62,7 @@ private void HandleClick(GUIBoundKeyEventArgs args) args.Handle(); } else - Logger.Warning("Warning! No valid IAnchorClickHandler found."); + _sawmill.Warning("Warning! No valid IAnchorClickHandler found."); } } diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs index c3073ed8433..81ef3597ab1 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 2f93d9e314c..3e28417f3a2 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 9f555076b05..63b64acade4 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 ab74ddf1a09..e190882fab0 100644 --- a/Content.Client/Guidebook/Richtext/KeyBindTag.cs +++ b/Content.Client/Guidebook/Richtext/KeyBindTag.cs @@ -6,9 +6,9 @@ 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 2a8b74c9843..4c74558810a 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/Guidebook/Richtext/Table.cs b/Content.Client/Guidebook/Richtext/Table.cs index 8700bc441a2..1f240a9d8ca 100644 --- a/Content.Client/Guidebook/Richtext/Table.cs +++ b/Content.Client/Guidebook/Richtext/Table.cs @@ -8,6 +8,7 @@ namespace Content.Client.Guidebook.Richtext; [UsedImplicitly] public sealed class Table : TableContainer, IDocumentTag { + private ISawmill _sawmill = default!; public bool TryParseTag(Dictionary args, [NotNullWhen(true)] out Control? control) { HorizontalExpand = true; @@ -15,7 +16,7 @@ public bool TryParseTag(Dictionary args, [NotNullWhen(true)] out if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount)) { - Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\""); + _sawmill.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\""); control = null; return false; } diff --git a/Content.Client/Guidebook/Richtext/TextLinkTag.cs b/Content.Client/Guidebook/Richtext/TextLinkTag.cs index 3e4df0c1880..6c6a272f5b9 100644 --- a/Content.Client/Guidebook/Richtext/TextLinkTag.cs +++ b/Content.Client/Guidebook/Richtext/TextLinkTag.cs @@ -12,6 +12,7 @@ namespace Content.Client.Guidebook.RichText; [UsedImplicitly] public sealed class TextLinkTag : IMarkupTagHandler { + private ISawmill _sawmill = default!; public static Color LinkColor => Color.CornflowerBlue; public string Name => "textlink"; @@ -53,7 +54,7 @@ private void OnKeybindDown(GUIBoundKeyEventArgs args, string link, Control? cont if (control.TryGetParentHandler(out var handler)) handler.HandleClick(link); else - Logger.Warning("Warning! No valid ILinkClickHandler found."); + _sawmill.Warning("Warning! No valid ILinkClickHandler found."); } } diff --git a/Content.Client/Hands/ShowHandItemOverlay.cs b/Content.Client/Hands/ShowHandItemOverlay.cs index 166315c77f4..5a97781c48a 100644 --- a/Content.Client/Hands/ShowHandItemOverlay.cs +++ b/Content.Client/Hands/ShowHandItemOverlay.cs @@ -13,12 +13,12 @@ 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 efb31145f0f..18a015aebb1 100644 --- a/Content.Client/Hands/Systems/HandsSystem.cs +++ b/Content.Client/Hands/Systems/HandsSystem.cs @@ -21,15 +21,15 @@ 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 743e08cbf7e..3c56847f47e 100644 --- a/Content.Client/Holiday/HolidaySystem.cs +++ b/Content.Client/Holiday/HolidaySystem.cs @@ -5,11 +5,11 @@ 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 e0a263cb0e9..71241f20c98 100644 --- a/Content.Client/Holopad/HolopadBoundUserInterface.cs +++ b/Content.Client/Holopad/HolopadBoundUserInterface.cs @@ -6,9 +6,9 @@ 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 51491de98fd..81a04cf36bd 100644 --- a/Content.Client/Holopad/HolopadSystem.cs +++ b/Content.Client/Holopad/HolopadSystem.cs @@ -10,11 +10,11 @@ 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 25982b901c2..00759257e4e 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 f1796b65f76..8059db4b2b6 100644 --- a/Content.Client/HotPotato/HotPotatoSystem.cs +++ b/Content.Client/HotPotato/HotPotatoSystem.cs @@ -5,11 +5,11 @@ 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 9d034a7a639..1dbae023ae4 100644 --- a/Content.Client/Humanoid/HideableHumanoidLayersSystem.cs +++ b/Content.Client/Humanoid/HideableHumanoidLayersSystem.cs @@ -4,9 +4,9 @@ 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 dd5f421c3b8..f5ed8d7c60b 100644 --- a/Content.Client/Humanoid/LayerMarkingItem.xaml.cs +++ b/Content.Client/Humanoid/LayerMarkingItem.xaml.cs @@ -17,7 +17,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 readonly SpriteSystem _sprite; diff --git a/Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs b/Content.Client/Humanoid/LayerMarkingOrderer.xaml.cs index b62067d4a85..e2871e63f52 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 7f887f65049..88ea8766037 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 7a69bef7eb3..e91b3ee4b45 100644 --- a/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs +++ b/Content.Client/Humanoid/OrganMarkingPicker.xaml.cs @@ -12,8 +12,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 readonly SpriteSystem _sprite; diff --git a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs index 73db9e1ab95..ab0923ab73a 100644 --- a/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/ClientRandomIconSmoothSystem.cs @@ -3,10 +3,10 @@ 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 19ce08994ed..3ce82a7244d 100644 --- a/Content.Client/IconSmoothing/IconSmoothSystem.cs +++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs @@ -16,8 +16,8 @@ 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 SharedMapSystem _mapSystem = default!; + [Dependency] private SpriteSystem _sprite = 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 b61f3249355..a7930fad1f3 100644 --- a/Content.Client/Implants/ImplanterSystem.cs +++ b/Content.Client/Implants/ImplanterSystem.cs @@ -6,10 +6,10 @@ 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 37e177dd8e4..4a47edf3b53 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 43579ae6bea..dcb278f3550 100644 --- a/Content.Client/Implants/UI/ImplanterStatusControl.cs +++ b/Content.Client/Implants/UI/ImplanterStatusControl.cs @@ -9,9 +9,9 @@ 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 84b319e55b7..4e60e23bef4 100644 --- a/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs +++ b/Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs @@ -10,7 +10,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 e4ac63f4c29..d1a9a75ba49 100644 --- a/Content.Client/Info/RulesAndInfoWindow.cs +++ b/Content.Client/Info/RulesAndInfoWindow.cs @@ -7,9 +7,9 @@ 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 f1b08e34797..7acb68ec5d2 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 221251f91b0..bfe3ae3528a 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 0f51c76f8fc..513c07d9a57 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 2d278318386..44be61fab81 100644 --- a/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs +++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs @@ -8,12 +8,12 @@ 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 d5fa15d468e..ea8dc8aa931 100644 --- a/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs +++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs @@ -19,9 +19,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 8d1d8cd07d1..3c0e0091b2c 100644 --- a/Content.Client/Interactable/Components/InteractionOutlineComponent.cs +++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs @@ -10,8 +10,8 @@ public sealed partial class InteractionOutlineComponent : Component 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 a3eacf83fdf..a0109ff7754 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 cdfb33ff305..725a05ec3f5 100644 --- a/Content.Client/Interaction/DragDropSystem.cs +++ b/Content.Client/Interaction/DragDropSystem.cs @@ -27,27 +27,27 @@ 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 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!; // 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 8eb328eee46..db099849a91 100644 --- a/Content.Client/Inventory/ClientInventorySystem.cs +++ b/Content.Client/Inventory/ClientInventorySystem.cs @@ -16,12 +16,12 @@ 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 9b47032e461..ff0cae85be2 100644 --- a/Content.Client/Inventory/StrippableBoundUserInterface.cs +++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs @@ -28,10 +28,10 @@ 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!; private readonly ExamineSystem _examine; private readonly HandsSystem _hands; diff --git a/Content.Client/Invoices/UI/InvoiceBoundUserInterface.cs b/Content.Client/Invoices/UI/InvoiceBoundUserInterface.cs index 00c951e159c..d0907fd4336 100644 --- a/Content.Client/Invoices/UI/InvoiceBoundUserInterface.cs +++ b/Content.Client/Invoices/UI/InvoiceBoundUserInterface.cs @@ -17,9 +17,9 @@ namespace Content.Client.Invoices.UI { - public sealed class InvoiceBoundUserInterface : BoundUserInterface + public sealed partial class InvoiceBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private InvoiceWindow? _window; diff --git a/Content.Client/Invoices/UI/InvoicePrinterConsoleBoundUserInterface.cs b/Content.Client/Invoices/UI/InvoicePrinterConsoleBoundUserInterface.cs index f35386024f6..7d79f1991a2 100644 --- a/Content.Client/Invoices/UI/InvoicePrinterConsoleBoundUserInterface.cs +++ b/Content.Client/Invoices/UI/InvoicePrinterConsoleBoundUserInterface.cs @@ -15,9 +15,9 @@ namespace Content.Client.Invoices.UI { - public sealed class InvoicePrinterConsoleBoundUserInterface : BoundUserInterface + public sealed partial class InvoicePrinterConsoleBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private InvoicePrinterConsoleWindow? _window; diff --git a/Content.Client/Invoices/UI/InvoicePrinterConsoleWindow.xaml.cs b/Content.Client/Invoices/UI/InvoicePrinterConsoleWindow.xaml.cs index a925016a321..898d6df34cd 100644 --- a/Content.Client/Invoices/UI/InvoicePrinterConsoleWindow.xaml.cs +++ b/Content.Client/Invoices/UI/InvoicePrinterConsoleWindow.xaml.cs @@ -18,7 +18,7 @@ namespace Content.Client.Invoices.UI [GenerateTypedNameReferences] public sealed partial class InvoicePrinterConsoleWindow : DefaultWindow { - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private ILogManager _logManager = default!; private readonly ISawmill _logMill = default!; private readonly InvoicePrinterConsoleBoundUserInterface _owner; diff --git a/Content.Client/Invoices/UI/InvoiceWindow.xaml.cs b/Content.Client/Invoices/UI/InvoiceWindow.xaml.cs index 9ba16d96fd9..660fcd1fe31 100644 --- a/Content.Client/Invoices/UI/InvoiceWindow.xaml.cs +++ b/Content.Client/Invoices/UI/InvoiceWindow.xaml.cs @@ -19,7 +19,7 @@ namespace Content.Client.Invoices.UI [GenerateTypedNameReferences] public sealed partial class InvoiceWindow : DefaultWindow { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; private readonly InvoiceBoundUserInterface _owner; diff --git a/Content.Client/Items/Systems/ItemSystem.cs b/Content.Client/Items/Systems/ItemSystem.cs index 1d322f6ec1e..7649dcef059 100644 --- a/Content.Client/Items/Systems/ItemSystem.cs +++ b/Content.Client/Items/Systems/ItemSystem.cs @@ -10,10 +10,10 @@ 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 e4cf9bdff2c..4660b43513a 100644 --- a/Content.Client/Jittering/JitteringSystem.cs +++ b/Content.Client/Jittering/JitteringSystem.cs @@ -6,11 +6,11 @@ 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 c8c2dc90bbe..3dafecbc896 100644 --- a/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs +++ b/Content.Client/Kitchen/EntitySystems/ReagentGrinderSystem.cs @@ -4,9 +4,9 @@ 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 5d7b07aa502..c80b44ac7e1 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 fea8b90fbfc..719394f57ea 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 fcb58ed6511..52849504c89 100644 --- a/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs +++ b/Content.Client/Labels/UI/HandLabelerBoundUserInterface.cs @@ -7,9 +7,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 8eca4704a51..534725212d8 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -21,15 +21,15 @@ 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 bc77556c899..8bcd85a5b30 100644 --- a/Content.Client/Lathe/LatheSystem.cs +++ b/Content.Client/Lathe/LatheSystem.cs @@ -6,10 +6,10 @@ 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 63e8d49349c..f0929a6575a 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 : DefaultWindow { - [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 6187282c5e8..cd1547dde2f 100644 --- a/Content.Client/Launcher/ExtendedDisconnectInformationManager.cs +++ b/Content.Client/Launcher/ExtendedDisconnectInformationManager.cs @@ -7,9 +7,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 a1740ef9080..ea88d4c07d6 100644 --- a/Content.Client/Launcher/LauncherConnecting.cs +++ b/Content.Client/Launcher/LauncherConnecting.cs @@ -7,17 +7,17 @@ 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 84739f12dfa..37261a66f67 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 c8cd2bface7..08202ddc0b6 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 abfda1cdc53..6442a56c302 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 e47430677d3..da50cff84b1 100644 --- a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs @@ -5,11 +5,11 @@ 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 e72f61ed385..79f33147645 100644 --- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs +++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs @@ -7,10 +7,10 @@ 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 a3698fc199d..be28189818b 100644 --- a/Content.Client/Light/EntitySystems/LightBulbSystem.cs +++ b/Content.Client/Light/EntitySystems/LightBulbSystem.cs @@ -4,10 +4,10 @@ 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 c4e4fff5fb0..1c1ea5dde60 100644 --- a/Content.Client/Light/EntitySystems/LightFadeSystem.cs +++ b/Content.Client/Light/EntitySystems/LightFadeSystem.cs @@ -5,9 +5,9 @@ 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 deabadaddff..81dd9b32d37 100644 --- a/Content.Client/Light/EntitySystems/PlanetLightSystem.cs +++ b/Content.Client/Light/EntitySystems/PlanetLightSystem.cs @@ -4,10 +4,10 @@ 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 1e20d7041a7..c8e6d40a2fe 100644 --- a/Content.Client/Light/EntitySystems/RotatingLightSystem.cs +++ b/Content.Client/Light/EntitySystems/RotatingLightSystem.cs @@ -6,9 +6,9 @@ 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 050c838c9d8..5155367eeb1 100644 --- a/Content.Client/Light/EntitySystems/SunShadowSystem.cs +++ b/Content.Client/Light/EntitySystems/SunShadowSystem.cs @@ -8,11 +8,11 @@ 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 432d7edac08..47a42f49f4f 100644 --- a/Content.Client/Light/HandheldLightSystem.cs +++ b/Content.Client/Light/HandheldLightSystem.cs @@ -8,10 +8,10 @@ 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 eab4a95c07f..9a5b2b44654 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 db37bf193ea..da6e98877da 100644 --- a/Content.Client/Light/LightCycleSystem.cs +++ b/Content.Client/Light/LightCycleSystem.cs @@ -8,11 +8,11 @@ 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 8fbb24939c5..6576a346d9d 100644 --- a/Content.Client/Light/RgbLightControllerSystem.cs +++ b/Content.Client/Light/RgbLightControllerSystem.cs @@ -14,12 +14,12 @@ 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 7b38ab8bfa1..c437f77cc01 100644 --- a/Content.Client/Light/RoofOverlay.cs +++ b/Content.Client/Light/RoofOverlay.cs @@ -11,11 +11,11 @@ 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 57044996e73..b8fa78e8380 100644 --- a/Content.Client/Light/SunShadowOverlay.cs +++ b/Content.Client/Light/SunShadowOverlay.cs @@ -10,16 +10,16 @@ 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 ad69b2f70ee..af1d16a13cc 100644 --- a/Content.Client/Light/TileEmissionOverlay.cs +++ b/Content.Client/Light/TileEmissionOverlay.cs @@ -7,12 +7,12 @@ 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 7ed1fb2dde1..561cda1aa37 100644 --- a/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs +++ b/Content.Client/Light/Visualizers/PoweredLightVisualizerSystem.cs @@ -7,10 +7,10 @@ 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 07463beb690..1682a17148d 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!; public event Action? OnServerDataLoaded; diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs index 4e2326e55c1..82005af3ee9 100644 --- a/Content.Client/Lobby/LobbyState.cs +++ b/Content.Client/Lobby/LobbyState.cs @@ -18,18 +18,18 @@ 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 9b650239965..0a297c9f070 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -21,17 +21,17 @@ namespace Content.Client.Lobby; -public sealed class LobbyUIController : UIController, IOnStateEntered, IOnStateExited +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!; private CharacterSetupGui? _characterSetup; private HumanoidProfileEditor? _profileEditor; private CharacterSetupGuiSavePanel? _savePanel; diff --git a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs index 1522ddec76f..f99380b75a9 100644 --- a/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs +++ b/Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs @@ -21,11 +21,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!; public event Action? SelectCharacter; diff --git a/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs b/Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs index 035f4a3c1a8..14a5d97fec6 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 0fe852df314..a3bfa28fad0 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 a002043ab11..04d86dab3df 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 7f3a12a7cc1..6be2d06ba8d 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/MCTN/UI/MCTNPlugCard.xaml.cs b/Content.Client/MCTN/UI/MCTNPlugCard.xaml.cs index e1812c7493e..c6ceb10be00 100644 --- a/Content.Client/MCTN/UI/MCTNPlugCard.xaml.cs +++ b/Content.Client/MCTN/UI/MCTNPlugCard.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.MCTN.UI; [GenerateTypedNameReferences] public sealed partial class MCTNPlugCard : PanelContainer { - [Dependency] private readonly ILocalizationManager _loc = default!; - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; + [Dependency] private ILocalizationManager _loc = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; private readonly SpriteSystem _sprite; public MCTNPlugCard(MCTNBoundUserInterface bui, MCTNBasePlugState plug) diff --git a/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs b/Content.Client/MachineLinking/UI/SignalTimerWindow.xaml.cs index 18488077334..d17dcf0e34e 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 639e6f06925..c910ad97e47 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 d90383cf8a2..142c50000b7 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 840c457f158..a1bf926980b 100644 --- a/Content.Client/MapText/MapTextSystem.cs +++ b/Content.Client/MapText/MapTextSystem.cs @@ -11,14 +11,14 @@ 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 9bfd822e0b5..13bc7cb77fe 100644 --- a/Content.Client/Mapping/MappingManager.cs +++ b/Content.Client/Mapping/MappingManager.cs @@ -7,10 +7,10 @@ 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 ccdf02459df..41bbcd6924b 100644 --- a/Content.Client/Mapping/MappingOverlay.cs +++ b/Content.Client/Mapping/MappingOverlay.cs @@ -9,13 +9,13 @@ 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 648c2ffbd1f..a6d2ebfa5a3 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 b827397e924..60ce1cc6103 100644 --- a/Content.Client/Mapping/MappingState.cs +++ b/Content.Client/Mapping/MappingState.cs @@ -35,23 +35,23 @@ 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 be3c253c1c6..448a7db8809 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 513a89fd5c3..12f4fd4c7e1 100644 --- a/Content.Client/Maps/GridDraggingSystem.cs +++ b/Content.Client/Maps/GridDraggingSystem.cs @@ -11,14 +11,14 @@ 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 8cc643ca063..fc8807d52e5 100644 --- a/Content.Client/Markers/MarkerSystem.cs +++ b/Content.Client/Markers/MarkerSystem.cs @@ -2,9 +2,9 @@ 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 45259784b07..89d94975c3e 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 f9078a9032f..2825f457ab7 100644 --- a/Content.Client/Materials/MaterialStorageSystem.cs +++ b/Content.Client/Materials/MaterialStorageSystem.cs @@ -3,11 +3,11 @@ 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 29cc511c37f..286646f4d0a 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 b229516cf5c..3fcaa3a6f4a 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 28bd57d6fb5..965adea621c 100644 --- a/Content.Client/Mech/MechSystem.cs +++ b/Content.Client/Mech/MechSystem.cs @@ -7,10 +7,10 @@ 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 29f69cf3493..41d6e643eea 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 ea9dced5e5b..2935f248be8 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 88fd64ec207..0e215b08107 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 4f7533b5671..e413458f385 100644 --- a/Content.Client/Medical/Cryogenics/CryoPodSystem.cs +++ b/Content.Client/Medical/Cryogenics/CryoPodSystem.cs @@ -4,9 +4,9 @@ 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 88970fda2e0..d665f363ac3 100644 --- a/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs +++ b/Content.Client/Medical/Cryogenics/CryoPodWindow.xaml.cs @@ -18,8 +18,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!; public event Action? OnEjectPatientPressed; public event Action? OnEjectBeakerPressed; diff --git a/Content.Client/MessageBoard/UI/EntryWindow.xaml.cs b/Content.Client/MessageBoard/UI/EntryWindow.xaml.cs index e9002de72b8..cd6faade7bb 100644 --- a/Content.Client/MessageBoard/UI/EntryWindow.xaml.cs +++ b/Content.Client/MessageBoard/UI/EntryWindow.xaml.cs @@ -13,7 +13,7 @@ namespace Content.Client.MessageBoard.UI; [GenerateTypedNameReferences] public sealed partial class EntryWindow : DefaultWindow { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public MessageBoardEntry Entry; private bool _isAdmin; diff --git a/Content.Client/MessageBoard/UI/MessageBoardBoundUserInterface.cs b/Content.Client/MessageBoard/UI/MessageBoardBoundUserInterface.cs index d1d0a993fa4..5e6076dba7a 100644 --- a/Content.Client/MessageBoard/UI/MessageBoardBoundUserInterface.cs +++ b/Content.Client/MessageBoard/UI/MessageBoardBoundUserInterface.cs @@ -20,10 +20,10 @@ namespace Content.Client.MessageBoard.UI; [UsedImplicitly] -public sealed class MessageBoardBoundUserInterface : BoundUserInterface +public sealed partial class MessageBoardBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IConfigurationManager _cfg = default!; private MessageBoard? _menu; private CreateEntry? _createEntry; private EntryWindow? _entryWindow; @@ -39,7 +39,7 @@ protected override void UpdateState(BoundUserInterfaceState state) if (player == null) return; var playerName = Identity.Name(player.Value, EntMan); base.UpdateState(state); - if(_menu == null) + if (_menu == null) { return; } @@ -60,7 +60,7 @@ protected override void UpdateState(BoundUserInterfaceState state) }; header.ViewButton.OnPressed += (args) => { - if(_entryWindow != null) + if (_entryWindow != null) { _entryWindow.Dispose(); } @@ -98,7 +98,7 @@ protected override void Open() public void CreateEntryPublic(BaseButton.ButtonEventArgs args) { - if(_createEntry != null) + if (_createEntry != null) { _createEntry.Dispose(); } @@ -114,7 +114,7 @@ public void FinalizeEntryPublic(BaseButton.ButtonEventArgs args) return; var title = _createEntry.MainTitleLabel.Text; var content = Rope.Collapse(_createEntry.DescriptionLabel.TextRope); - if(title == string.Empty || content == string.Empty) + if (title == string.Empty || content == string.Empty) { return; } diff --git a/Content.Client/Mining/MiningOverlay.cs b/Content.Client/Mining/MiningOverlay.cs index 1bab7dbc3d0..d29f0b08ce8 100644 --- a/Content.Client/Mining/MiningOverlay.cs +++ b/Content.Client/Mining/MiningOverlay.cs @@ -9,11 +9,11 @@ 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 294cab30ca8..158dd76a59a 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 75be075d5ce..0fe88ff74b0 100644 --- a/Content.Client/MouseRotator/MouseRotatorSystem.cs +++ b/Content.Client/MouseRotator/MouseRotatorSystem.cs @@ -8,13 +8,13 @@ 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 eb60e4fbb6d..8c3222484e4 100644 --- a/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs +++ b/Content.Client/Movement/Systems/ClientSpriteMovementSystem.cs @@ -7,9 +7,9 @@ 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 SpriteSystem _sprite = default!; private EntityQuery _spriteQuery; diff --git a/Content.Client/Movement/Systems/ContentEyeSystem.cs b/Content.Client/Movement/Systems/ContentEyeSystem.cs index 1f34f153a12..32f5beaee2c 100644 --- a/Content.Client/Movement/Systems/ContentEyeSystem.cs +++ b/Content.Client/Movement/Systems/ContentEyeSystem.cs @@ -5,9 +5,9 @@ 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 538682c18d3..e51e69627d6 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 6520d98ac93..a2a867c0b57 100644 --- a/Content.Client/Movement/Systems/FloorOcclusionSystem.cs +++ b/Content.Client/Movement/Systems/FloorOcclusionSystem.cs @@ -6,11 +6,11 @@ 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!; private EntityQuery _spriteQuery; diff --git a/Content.Client/Movement/Systems/JetpackSystem.cs b/Content.Client/Movement/Systems/JetpackSystem.cs index c9e759e129a..ed48b18de88 100644 --- a/Content.Client/Movement/Systems/JetpackSystem.cs +++ b/Content.Client/Movement/Systems/JetpackSystem.cs @@ -10,12 +10,12 @@ 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 f588c300629..646785d31d5 100644 --- a/Content.Client/Movement/Systems/MobCollisionSystem.cs +++ b/Content.Client/Movement/Systems/MobCollisionSystem.cs @@ -6,10 +6,10 @@ 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 9dc74b97904..22c736b76a9 100644 --- a/Content.Client/NPC/NPCSteeringSystem.cs +++ b/Content.Client/NPC/NPCSteeringSystem.cs @@ -8,9 +8,9 @@ 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 850324257ea..ccbde3f1807 100644 --- a/Content.Client/NPC/PathfindingSystem.cs +++ b/Content.Client/NPC/PathfindingSystem.cs @@ -14,17 +14,17 @@ 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 c1f00270877..c420be13a6c 100644 --- a/Content.Client/NPC/ShowHTNCommand.cs +++ b/Content.Client/NPC/ShowHTNCommand.cs @@ -3,9 +3,9 @@ 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 a72e2e769be..78394c04d05 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 cd57c3b5fbc..5f415a48c4a 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs @@ -7,10 +7,10 @@ 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 441f99a209b..cee69373c66 100644 --- a/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs @@ -16,12 +16,12 @@ 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 @@ protected override void FrameUpdate(FrameEventArgs args) } } -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 f7722330b59..70e2ffbaa0c 100644 --- a/Content.Client/NodeContainer/NodeGroupSystem.cs +++ b/Content.Client/NodeContainer/NodeGroupSystem.cs @@ -12,13 +12,13 @@ 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 0a4b950e6c3..ba905de42be 100644 --- a/Content.Client/NodeContainer/NodeVisCommand.cs +++ b/Content.Client/NodeContainer/NodeVisCommand.cs @@ -4,10 +4,10 @@ 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 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } } - 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 5ad0ff1f6a9..d86e142cbe0 100644 --- a/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs +++ b/Content.Client/NukeOps/WarDeclaratorBoundUserInterface.cs @@ -9,9 +9,9 @@ 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 c73d62326c7..a6cee15e4d9 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 46d71917c29..224e596e8bf 100644 --- a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs +++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs @@ -4,9 +4,9 @@ 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/InfantSystem.cs b/Content.Client/Nutrition/EntitySystems/InfantSystem.cs index 120e662f55a..99ddb2fdc50 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 be2ffb2218f..25feffbcf20 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 @@ private static readonly (OptionVisualizerOptions, CVarDef)[] OptionVars = (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 9efd04fd0b8..0952360b16f 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 e6043698eaa..84a58a95e1f 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/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs index d57f36e74f8..948517a8b21 100644 --- a/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs @@ -13,9 +13,9 @@ namespace Content.Client.Options.UI.Tabs; [GenerateTypedNameReferences] public sealed partial class AudioTab : Control { - [Dependency] private readonly IAudioManager _audio = default!; - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IAudioManager _audio = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IConfigurationManager _cfg = default!; public AudioTab() { diff --git a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs index 4e2eb45fce1..d5898a2b47c 100644 --- a/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Options.UI.Tabs; [GenerateTypedNameReferences] public sealed partial class GraphicsTab : Control { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public GraphicsTab() { diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 728cbaa6690..883094f4554 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -26,8 +26,8 @@ public sealed partial class KeyRebindTab : Control EngineKeyFunctions.HideUI, }; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; private BindButton? _currentlyRebinding; diff --git a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs index 5217f1cb1b0..13a542875dc 100644 --- a/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/MiscTab.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.Options.UI.Tabs; [GenerateTypedNameReferences] public sealed partial class MiscTab : Control { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public MiscTab() { diff --git a/Content.Client/Orbit/OrbitVisualsSystem.cs b/Content.Client/Orbit/OrbitVisualsSystem.cs index 71fc75675de..9f8ddfdb9f1 100644 --- a/Content.Client/Orbit/OrbitVisualsSystem.cs +++ b/Content.Client/Orbit/OrbitVisualsSystem.cs @@ -8,12 +8,12 @@ namespace Content.Client.Orbit; -public sealed class OrbitVisualsSystem : EntitySystem +public sealed partial class OrbitVisualsSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly AnimationPlayerSystem _animations = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private AnimationPlayerSystem _animations = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SpriteSystem _sprite = default!; private readonly string _orbitStopKey = "orbiting_stop"; diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs index 40cb5dfd4a6..c3b1ec8e1e0 100644 --- a/Content.Client/Outline/InteractionOutlineSystem.cs +++ b/Content.Client/Outline/InteractionOutlineSystem.cs @@ -14,15 +14,15 @@ namespace Content.Client.Outline; -public sealed class InteractionOutlineSystem : EntitySystem +public sealed partial class InteractionOutlineSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; /// /// Whether to currently draw the outline. The outline may be temporarily disabled by other systems diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs index bf74c9dd95b..18e2c14ca48 100644 --- a/Content.Client/Outline/TargetOutlineSystem.cs +++ b/Content.Client/Outline/TargetOutlineSystem.cs @@ -13,20 +13,20 @@ namespace Content.Client.Outline; /// /// System used to indicate whether an entity is a valid target based on some criteria. /// -public sealed class TargetOutlineSystem : EntitySystem +public sealed partial class TargetOutlineSystem : EntitySystem { private static readonly ProtoId ShaderTargetValid = "SelectionOutlineInrange"; private static readonly ProtoId ShaderTargetInvalid = "SelectionOutline"; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; private bool _enabled = false; diff --git a/Content.Client/Overlays/BlackAndWhiteOverlay.cs b/Content.Client/Overlays/BlackAndWhiteOverlay.cs index 251a9534a2a..402162628ec 100644 --- a/Content.Client/Overlays/BlackAndWhiteOverlay.cs +++ b/Content.Client/Overlays/BlackAndWhiteOverlay.cs @@ -8,7 +8,7 @@ public sealed partial class BlackAndWhiteOverlay : Overlay { private static readonly ProtoId Shader = "GreyscaleFullscreen"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; public override bool RequestScreenTexture => true; diff --git a/Content.Client/Overlays/BlackAndWhiteOverlaySystem.cs b/Content.Client/Overlays/BlackAndWhiteOverlaySystem.cs index 7f5cd33a1f6..f90ceb6b60b 100644 --- a/Content.Client/Overlays/BlackAndWhiteOverlaySystem.cs +++ b/Content.Client/Overlays/BlackAndWhiteOverlaySystem.cs @@ -6,7 +6,7 @@ namespace Content.Client.Overlays; public sealed partial class BlackAndWhiteOverlaySystem : EquipmentHudSystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private BlackAndWhiteOverlay _overlay = default!; diff --git a/Content.Client/Overlays/EquipmentHudSystem.cs b/Content.Client/Overlays/EquipmentHudSystem.cs index 734ad8a7686..0502c674048 100644 --- a/Content.Client/Overlays/EquipmentHudSystem.cs +++ b/Content.Client/Overlays/EquipmentHudSystem.cs @@ -10,9 +10,9 @@ namespace Content.Client.Overlays; /// This is a base system to make it easier to enable or disabling UI elements based on whether or not the player has /// some component, either on their controlled entity on some worn piece of equipment. /// -public abstract class EquipmentHudSystem : EntitySystem where T : IComponent +public abstract partial class EquipmentHudSystem : EntitySystem where T : IComponent { - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IPlayerManager _player = default!; [ViewVariables] public bool IsActive { get; private set; } diff --git a/Content.Client/Overlays/NoirOverlay.cs b/Content.Client/Overlays/NoirOverlay.cs index f9e468f9959..4978dae3b43 100644 --- a/Content.Client/Overlays/NoirOverlay.cs +++ b/Content.Client/Overlays/NoirOverlay.cs @@ -8,7 +8,7 @@ public sealed partial class NoirOverlay : Overlay { private static readonly ProtoId Shader = "Noir"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; public override bool RequestScreenTexture => true; diff --git a/Content.Client/Overlays/NoirOverlaySystem.cs b/Content.Client/Overlays/NoirOverlaySystem.cs index d51a3234190..fb5db9a0f56 100644 --- a/Content.Client/Overlays/NoirOverlaySystem.cs +++ b/Content.Client/Overlays/NoirOverlaySystem.cs @@ -6,7 +6,7 @@ namespace Content.Client.Overlays; public sealed partial class NoirOverlaySystem : EquipmentHudSystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private NoirOverlay _overlay = default!; diff --git a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs index ba193cbc754..bfa2011fc2a 100644 --- a/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs +++ b/Content.Client/Overlays/ShowCriminalRecordIconsSystem.cs @@ -5,9 +5,9 @@ namespace Content.Client.Overlays; -public sealed class ShowCriminalRecordIconsSystem : EquipmentHudSystem +public sealed partial class ShowCriminalRecordIconsSystem : EquipmentHudSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Client/Overlays/ShowHealthBarsSystem.cs b/Content.Client/Overlays/ShowHealthBarsSystem.cs index a25e08d1fe9..a208a4cfca1 100644 --- a/Content.Client/Overlays/ShowHealthBarsSystem.cs +++ b/Content.Client/Overlays/ShowHealthBarsSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Overlays; /// /// Adds a health bar overlay. /// -public sealed class ShowHealthBarsSystem : EquipmentHudSystem +public sealed partial class ShowHealthBarsSystem : EquipmentHudSystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IOverlayManager _overlayMan = default!; + [Dependency] private IPrototypeManager _prototype = default!; private EntityHealthBarOverlay _overlay = default!; diff --git a/Content.Client/Overlays/ShowHealthIconsSystem.cs b/Content.Client/Overlays/ShowHealthIconsSystem.cs index 65f00be98df..77854d15c8e 100644 --- a/Content.Client/Overlays/ShowHealthIconsSystem.cs +++ b/Content.Client/Overlays/ShowHealthIconsSystem.cs @@ -12,9 +12,9 @@ namespace Content.Client.Overlays; /// /// Shows a healthy icon on mobs. /// -public sealed class ShowHealthIconsSystem : EquipmentHudSystem +public sealed partial class ShowHealthIconsSystem : EquipmentHudSystem { - [Dependency] private readonly IPrototypeManager _prototypeMan = default!; + [Dependency] private IPrototypeManager _prototypeMan = default!; [ViewVariables] public HashSet DamageContainers = new(); diff --git a/Content.Client/Overlays/ShowHungerIconsSystem.cs b/Content.Client/Overlays/ShowHungerIconsSystem.cs index 20e7126efa5..3fcc1b995c8 100644 --- a/Content.Client/Overlays/ShowHungerIconsSystem.cs +++ b/Content.Client/Overlays/ShowHungerIconsSystem.cs @@ -5,9 +5,9 @@ namespace Content.Client.Overlays; -public sealed class ShowHungerIconsSystem : EquipmentHudSystem +public sealed partial class ShowHungerIconsSystem : EquipmentHudSystem { - [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private HungerSystem _hunger = default!; public override void Initialize() { diff --git a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs index 29bf542fa7d..584ac742d74 100644 --- a/Content.Client/Overlays/ShowMindShieldIconsSystem.cs +++ b/Content.Client/Overlays/ShowMindShieldIconsSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Overlays; -public sealed class ShowMindShieldIconsSystem : EquipmentHudSystem +public sealed partial class ShowMindShieldIconsSystem : EquipmentHudSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs index bac182042e7..923ea7e518c 100644 --- a/Content.Client/Overlays/ShowSyndicateIconsSystem.cs +++ b/Content.Client/Overlays/ShowSyndicateIconsSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Overlays; -public sealed class ShowSyndicateIconsSystem : EquipmentHudSystem +public sealed partial class ShowSyndicateIconsSystem : EquipmentHudSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Client/Overlays/ShowThirstIconsSystem.cs b/Content.Client/Overlays/ShowThirstIconsSystem.cs index b13b5418a68..698d591823f 100644 --- a/Content.Client/Overlays/ShowThirstIconsSystem.cs +++ b/Content.Client/Overlays/ShowThirstIconsSystem.cs @@ -5,9 +5,9 @@ namespace Content.Client.Overlays; -public sealed class ShowThirstIconsSystem : EquipmentHudSystem +public sealed partial class ShowThirstIconsSystem : EquipmentHudSystem { - [Dependency] private readonly ThirstSystem _thirst = default!; + [Dependency] private ThirstSystem _thirst = default!; public override void Initialize() { diff --git a/Content.Client/Overlays/StencilOverlay.cs b/Content.Client/Overlays/StencilOverlay.cs index 45f7f44bd13..e37f02f8cbe 100644 --- a/Content.Client/Overlays/StencilOverlay.cs +++ b/Content.Client/Overlays/StencilOverlay.cs @@ -24,11 +24,11 @@ public sealed partial class StencilOverlay : Overlay private static readonly ProtoId StencilMask = "StencilMask"; private static readonly ProtoId StencilDraw = "StencilDraw"; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = 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 IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; private readonly ParallaxSystem _parallax; private readonly SharedTransformSystem _transform; private readonly SharedMapSystem _map; diff --git a/Content.Client/Overlays/StencilOverlaySystem.cs b/Content.Client/Overlays/StencilOverlaySystem.cs index 95243fe6f99..1241d4cae3b 100644 --- a/Content.Client/Overlays/StencilOverlaySystem.cs +++ b/Content.Client/Overlays/StencilOverlaySystem.cs @@ -6,15 +6,15 @@ namespace Content.Client.Overlays; -public sealed class StencilOverlaySystem : EntitySystem +public sealed partial class StencilOverlaySystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly ParallaxSystem _parallax = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly WeatherSystem _weather = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private ParallaxSystem _parallax = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private WeatherSystem _weather = default!; + [Dependency] private StatusEffectsSystem _status = default!; public override void Initialize() { diff --git a/Content.Client/Overlays/ThermalSightOverlaySystem.cs b/Content.Client/Overlays/ThermalSightOverlaySystem.cs index bd4d21d3dcc..c17d4daa9a6 100644 --- a/Content.Client/Overlays/ThermalSightOverlaySystem.cs +++ b/Content.Client/Overlays/ThermalSightOverlaySystem.cs @@ -7,7 +7,7 @@ namespace Content.Client.Overlays; public sealed partial class ThermalSightOverlaySystem : EquipmentHudSystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; private GasTileDangerousTemperatureOverlay _temperatureOverlay = default!; diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs index 8803872af24..a102e183aeb 100644 --- a/Content.Client/PDA/PdaMenu.xaml.cs +++ b/Content.Client/PDA/PdaMenu.xaml.cs @@ -15,9 +15,9 @@ namespace Content.Client.PDA [GenerateTypedNameReferences] public sealed partial class PdaMenu : PdaWindow { - [Dependency] private readonly IClipboardManager _clipboard = null!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; + [Dependency] private IClipboardManager _clipboard = null!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; private readonly ClientGameTicker _gameTicker; public const int HomeView = 0; diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index 1b5a4370dcb..8b2a26632a5 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -19,8 +19,8 @@ namespace Content.Client.Paper.UI public sealed partial class PaperWindow : BaseWindow { private string _currentRawText = string.Empty; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IResourceCache _resCache = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IResourceCache _resCache = default!; private static readonly Color DefaultTextColor = new(25, 25, 25); diff --git a/Content.Client/Paper/UI/StampCollection.xaml.cs b/Content.Client/Paper/UI/StampCollection.xaml.cs index a0960591ca9..0d895d07971 100644 --- a/Content.Client/Paper/UI/StampCollection.xaml.cs +++ b/Content.Client/Paper/UI/StampCollection.xaml.cs @@ -40,7 +40,8 @@ public void AddStamp(StampWidget s) protected override Vector2 ArrangeOverride(Vector2 finalSize) { - var random = new Random(PlacementSeed); + var random = new RobustRandom(); + random.SetSeed(PlacementSeed); var r = (finalSize * 0.5f).Length(); var dtheta = -MathHelper.DegreesToRadians(90); var theta0 = random.Next(0, 3) * dtheta; diff --git a/Content.Client/Parallax/BiomeDebugOverlay.cs b/Content.Client/Parallax/BiomeDebugOverlay.cs index bf12178b229..e6df37a0184 100644 --- a/Content.Client/Parallax/BiomeDebugOverlay.cs +++ b/Content.Client/Parallax/BiomeDebugOverlay.cs @@ -10,15 +10,15 @@ namespace Content.Client.Parallax; -public sealed class BiomeDebugOverlay : Overlay +public sealed partial class BiomeDebugOverlay : Overlay { public override OverlaySpace Space => OverlaySpace.ScreenSpace; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IResourceCache _cache = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; private BiomeSystem _biomes; private SharedMapSystem _maps; diff --git a/Content.Client/Parallax/Commands/ShowBiomeCommand.cs b/Content.Client/Parallax/Commands/ShowBiomeCommand.cs index 2a628dd9316..6588416105d 100644 --- a/Content.Client/Parallax/Commands/ShowBiomeCommand.cs +++ b/Content.Client/Parallax/Commands/ShowBiomeCommand.cs @@ -3,9 +3,9 @@ namespace Content.Client.Parallax.Commands; -public sealed class ShowBiomeCommand : LocalizedCommands +public sealed partial class ShowBiomeCommand : LocalizedCommands { - [Dependency] private readonly IOverlayManager _overlayMgr = default!; + [Dependency] private IOverlayManager _overlayMgr = default!; public override string Command => "showbiome"; public override void Execute(IConsoleShell shell, string argStr, string[] args) diff --git a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs index 57af83471e2..6aaa46997c0 100644 --- a/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs +++ b/Content.Client/Parallax/Managers/GeneratedParallaxCache.cs @@ -17,11 +17,11 @@ namespace Content.Client.Parallax.Managers; /// /// Caches the textures generated by /// -public sealed class GeneratedParallaxCache : IPostInjectInit +public sealed partial class GeneratedParallaxCache : IPostInjectInit { - [Dependency] private readonly IConfigurationManager _cfg = null!; - [Dependency] private readonly IResourceManager _res = null!; - [Dependency] private readonly ILogManager _logManager = null!; + [Dependency] private IConfigurationManager _cfg = null!; + [Dependency] private IResourceManager _res = null!; + [Dependency] private ILogManager _logManager = null!; private readonly Dictionary _data = new(); diff --git a/Content.Client/Parallax/Managers/ParallaxManager.cs b/Content.Client/Parallax/Managers/ParallaxManager.cs index 4881c21dae3..826cd336ab1 100644 --- a/Content.Client/Parallax/Managers/ParallaxManager.cs +++ b/Content.Client/Parallax/Managers/ParallaxManager.cs @@ -8,11 +8,11 @@ namespace Content.Client.Parallax.Managers; -public sealed class ParallaxManager : IParallaxManager +public sealed partial class ParallaxManager : IParallaxManager { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IDependencyCollection _deps = null!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IDependencyCollection _deps = null!; private ISawmill _sawmill = Logger.GetSawmill("parallax"); diff --git a/Content.Client/Parallax/ParallaxControl.cs b/Content.Client/Parallax/ParallaxControl.cs index 0fa4ade4754..b969ab3017d 100644 --- a/Content.Client/Parallax/ParallaxControl.cs +++ b/Content.Client/Parallax/ParallaxControl.cs @@ -13,11 +13,11 @@ namespace Content.Client.Parallax; /// /// Renders the parallax background as a UI control. /// -public sealed class ParallaxControl : Control +public sealed partial class ParallaxControl : Control { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IParallaxManager _parallaxManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IParallaxManager _parallaxManager = default!; + [Dependency] private IRobustRandom _random = default!; private string _parallaxPrototype = "FastSpace"; diff --git a/Content.Client/Parallax/ParallaxGenerator.cs b/Content.Client/Parallax/ParallaxGenerator.cs index 7eac80d2049..ed4525718e0 100644 --- a/Content.Client/Parallax/ParallaxGenerator.cs +++ b/Content.Client/Parallax/ParallaxGenerator.cs @@ -408,7 +408,8 @@ public override void Apply(Image bitmap) private void GenPoints(Image buffer) { var o = PointSize - 1; - var random = new Random(Seed); + var random = new RobustRandom(); + random.SetSeed(Seed); var span = buffer.GetPixelSpan(); for (var i = 0; i < PointCount; i++) @@ -435,7 +436,8 @@ private void GenPoints(Image buffer) private void GenPointsMasked(Image buffer) { var o = PointSize - 1; - var random = new Random(Seed); + var random = new RobustRandom(); + random.SetSeed(Seed); var noise = new FastNoiseLite((int)MaskSeed); noise.SetFractalType(MaskNoiseType); noise.SetFractalLacunarity(MaskLacunarity); diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs index db7b2e5915a..ac00a153bbf 100644 --- a/Content.Client/Parallax/ParallaxOverlay.cs +++ b/Content.Client/Parallax/ParallaxOverlay.cs @@ -12,18 +12,18 @@ namespace Content.Client.Parallax; -public sealed class ParallaxOverlay : Overlay +public sealed partial class ParallaxOverlay : Overlay { private const float FadeDuration = 5.0f; // seconds private string? _lastParallax; private float _fadeTimer = 0f; private bool _fading = false; private float _lastFadeStartTime = 0f; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IParallaxManager _manager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IParallaxManager _manager = default!; private readonly SharedMapSystem _mapSystem; private readonly ParallaxSystem _parallax; diff --git a/Content.Client/Parallax/ParallaxSystem.cs b/Content.Client/Parallax/ParallaxSystem.cs index 8fbed8a0200..fac01367a42 100644 --- a/Content.Client/Parallax/ParallaxSystem.cs +++ b/Content.Client/Parallax/ParallaxSystem.cs @@ -8,11 +8,11 @@ namespace Content.Client.Parallax; -public sealed class ParallaxSystem : SharedParallaxSystem +public sealed partial class ParallaxSystem : SharedParallaxSystem { - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IParallaxManager _parallax = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IParallaxManager _parallax = default!; + [Dependency] private SharedMapSystem _map = default!; private static readonly ProtoId Fallback = "Default"; private string? _localWeatherParallaxOverride; diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs index 553968fa3dc..796e77036f0 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs @@ -21,10 +21,10 @@ namespace Content.Client.ParticleAccelerator.UI; [GenerateTypedNameReferences] public sealed partial class ParticleAcceleratorControlMenu : FancyWindow { - [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private IResourceCache _cache = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _player = default!; private readonly AccessReaderSystem _accessReader; diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs index de0c5fdb060..1c2630308ba 100644 --- a/Content.Client/Physics/Controllers/MoverController.cs +++ b/Content.Client/Physics/Controllers/MoverController.cs @@ -12,12 +12,12 @@ namespace Content.Client.PhysicsSystem.Controllers; -public sealed class MoverController : SharedMoverController +public sealed partial class MoverController : SharedMoverController { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override void Initialize() { diff --git a/Content.Client/Physics/JointVisualsSystem.cs b/Content.Client/Physics/JointVisualsSystem.cs index 2e4e2e4c616..6de0d709e9a 100644 --- a/Content.Client/Physics/JointVisualsSystem.cs +++ b/Content.Client/Physics/JointVisualsSystem.cs @@ -2,9 +2,9 @@ namespace Content.Client.Physics; -public sealed class JointVisualsSystem : EntitySystem +public sealed partial class JointVisualsSystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlay = default!; + [Dependency] private IOverlayManager _overlay = default!; public override void Initialize() { diff --git a/Content.Client/Pinpointer/PinpointerSystem.cs b/Content.Client/Pinpointer/PinpointerSystem.cs index 5cab0639582..a835160d58e 100644 --- a/Content.Client/Pinpointer/PinpointerSystem.cs +++ b/Content.Client/Pinpointer/PinpointerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Client.Pinpointer; -public sealed class PinpointerSystem : SharedPinpointerSystem +public sealed partial class PinpointerSystem : SharedPinpointerSystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Update(float frameTime) { diff --git a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs index 65e29ff5c95..02620e047ee 100644 --- a/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/NavMapBeaconWindow.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class NavMapBeaconWindow : FancyWindow { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; private string? _defaultLabel; private bool _defaultEnabled; private Color _defaultColor; diff --git a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs index 7eb5261c7a8..ef8199032b0 100644 --- a/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs +++ b/Content.Client/Pinpointer/UI/StationMapWindow.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Pinpointer.UI; [GenerateTypedNameReferences] public sealed partial class StationMapWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; private readonly List _buttons = new(); diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs index 15d144b45fb..5283f3c08a1 100644 --- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs +++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs @@ -15,14 +15,14 @@ namespace Content.Client.Players.PlayTimeTracking; -public sealed class JobRequirementsManager : ISharedPlaytimeManager +public sealed partial class JobRequirementsManager : ISharedPlaytimeManager { - [Dependency] private readonly IBaseClient _client = default!; - [Dependency] private readonly IClientNetManager _net = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private IClientNetManager _net = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private readonly Dictionary _roles = new(); private readonly List> _jobBans = new(); diff --git a/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs b/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs index fa4c08ab89e..2e9e367f5d6 100644 --- a/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs +++ b/Content.Client/Playtime/ClientsidePlaytimeTrackingManager.cs @@ -15,13 +15,13 @@ namespace Content.Client.Playtime; /// This notably excludes scenarios like the lobby. /// /// -public sealed class ClientsidePlaytimeTrackingManager +public sealed partial class ClientsidePlaytimeTrackingManager { - [Dependency] private readonly IClientNetManager _clientNetManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IClientNetManager _clientNetManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; private ISawmill _sawmill = default!; diff --git a/Content.Client/Pointing/PointingSystem.Visualizer.cs b/Content.Client/Pointing/PointingSystem.Visualizer.cs index e15923618ad..720544852d3 100644 --- a/Content.Client/Pointing/PointingSystem.Visualizer.cs +++ b/Content.Client/Pointing/PointingSystem.Visualizer.cs @@ -10,9 +10,9 @@ namespace Content.Client.Pointing; public sealed partial class PointingSystem : SharedPointingSystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private AnimationPlayerSystem _animationPlayer = default!; + [Dependency] private TransformSystem _transformSystem = default!; public void InitializeVisualizer() { diff --git a/Content.Client/Pointing/PointingSystem.cs b/Content.Client/Pointing/PointingSystem.cs index 12c1aa69c5a..e833fff60f9 100644 --- a/Content.Client/Pointing/PointingSystem.cs +++ b/Content.Client/Pointing/PointingSystem.cs @@ -10,7 +10,7 @@ namespace Content.Client.Pointing; public sealed partial class PointingSystem : SharedPointingSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Points/PointSystem.cs b/Content.Client/Points/PointSystem.cs index 20278e63db8..8616e6859ca 100644 --- a/Content.Client/Points/PointSystem.cs +++ b/Content.Client/Points/PointSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.Points; /// -public sealed class PointSystem : SharedPointSystem +public sealed partial class PointSystem : SharedPointSystem { - [Dependency] private readonly CharacterInfoSystem _characterInfo = default!; + [Dependency] private CharacterInfoSystem _characterInfo = default!; /// public override void Initialize() diff --git a/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs b/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs index 5639df16ac8..1049b5a3a70 100644 --- a/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs +++ b/Content.Client/Polymorph/Systems/ChameleonProjectorSystem.cs @@ -7,10 +7,10 @@ namespace Content.Client.Polymorph.Systems; -public sealed class ChameleonProjectorSystem : SharedChameleonProjectorSystem +public sealed partial class ChameleonProjectorSystem : SharedChameleonProjectorSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; private EntityQuery _appearanceQuery; private EntityQuery _spriteQuery; diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index b3ae5554e45..09fa09a3271 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -17,18 +17,18 @@ namespace Content.Client.Popups { - public sealed class PopupSystem : SharedPopupSystem + public sealed partial class PopupSystem : SharedPopupSystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly IReplayRecordingManager _replayRecording = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private IReplayRecordingManager _replayRecording = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private SharedTransformSystem _transform = default!; public IReadOnlyCollection WorldLabels => _aliveWorldLabels.Values; public IReadOnlyCollection CursorLabels => _aliveCursorLabels.Values; diff --git a/Content.Client/Power/APC/ApcVisualizerSystem.cs b/Content.Client/Power/APC/ApcVisualizerSystem.cs index 0000055e3ae..1abf7dfa90e 100644 --- a/Content.Client/Power/APC/ApcVisualizerSystem.cs +++ b/Content.Client/Power/APC/ApcVisualizerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Client.Power.APC; -public sealed class ApcVisualizerSystem : VisualizerSystem +public sealed partial class ApcVisualizerSystem : VisualizerSystem { - [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private SharedPointLightSystem _lights = default!; protected override void OnAppearanceChange(EntityUid uid, ApcVisualsComponent comp, ref AppearanceChangeEvent args) { diff --git a/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs b/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs index 357ca9eaa16..36b00bf50a9 100644 --- a/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs +++ b/Content.Client/Power/ActivatableUIRequiresPowerSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Power; -public sealed class ActivatableUIRequiresPowerSystem : SharedActivatableUIRequiresPowerSystem +public sealed partial class ActivatableUIRequiresPowerSystem : SharedActivatableUIRequiresPowerSystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; protected override void OnActivate(Entity ent, ref ActivatableUIOpenAttemptEvent args) { diff --git a/Content.Client/Power/Battery/BatteryBoundUserInterface.cs b/Content.Client/Power/Battery/BatteryBoundUserInterface.cs index 51818374629..5f765ae1c59 100644 --- a/Content.Client/Power/Battery/BatteryBoundUserInterface.cs +++ b/Content.Client/Power/Battery/BatteryBoundUserInterface.cs @@ -12,9 +12,9 @@ namespace Content.Client.Power.Battery; /// /// [UsedImplicitly] -public sealed class BatteryBoundUserInterface : BoundUserInterface, IBuiPreTickUpdate +public sealed partial class BatteryBoundUserInterface : BoundUserInterface, IBuiPreTickUpdate { - [Dependency] private readonly IClientGameTiming _gameTiming = null!; + [Dependency] private IClientGameTiming _gameTiming = null!; [ViewVariables] private BatteryMenu? _menu; diff --git a/Content.Client/Power/Battery/BatteryMenu.xaml.cs b/Content.Client/Power/Battery/BatteryMenu.xaml.cs index ec33e09e884..df3f15632f6 100644 --- a/Content.Client/Power/Battery/BatteryMenu.xaml.cs +++ b/Content.Client/Power/Battery/BatteryMenu.xaml.cs @@ -50,8 +50,8 @@ public sealed partial class BatteryMenu : FancyWindow private const float PowerPulseFactor = 4; // Dependencies - [Dependency] private readonly IEntityManager _entityManager = null!; - [Dependency] private readonly ILocalizationManager _loc = null!; + [Dependency] private IEntityManager _entityManager = null!; + [Dependency] private ILocalizationManager _loc = null!; // Active and inactive style boxes for power lines. // We modify _activePowerLineStyleBox's properties programmatically to implement the pulsing animation. diff --git a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs index db70ee1c340..bcdf1ef3b64 100644 --- a/Content.Client/Power/Generator/GeneratorWindow.xaml.cs +++ b/Content.Client/Power/Generator/GeneratorWindow.xaml.cs @@ -10,8 +10,8 @@ namespace Content.Client.Power.Generator; [GenerateTypedNameReferences] public sealed partial class GeneratorWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private ILocalizationManager _loc = default!; private EntityUid _entity; diff --git a/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs b/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs index 1a11378238a..1aa5ed908ac 100644 --- a/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs +++ b/Content.Client/Power/PowerMonitoringConsoleNavMapControl.cs @@ -11,7 +11,7 @@ namespace Content.Client.Power; public sealed partial class PowerMonitoringConsoleNavMapControl : NavMapControl { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; // Cable indexing // 0: CableType.HighVoltage diff --git a/Content.Client/Power/SolarControlWindow.xaml.cs b/Content.Client/Power/SolarControlWindow.xaml.cs index 3b025d3f7db..c59ed67bfbb 100644 --- a/Content.Client/Power/SolarControlWindow.xaml.cs +++ b/Content.Client/Power/SolarControlWindow.xaml.cs @@ -96,11 +96,11 @@ public void UpdateState(SolarControlConsoleBoundInterfaceState scc) } - public sealed class SolarControlNotARadar : Control + public sealed partial class SolarControlNotARadar : Control { // This is used for client-side prediction of the panel rotation. // This makes the display feel a lot smoother. - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; private SolarControlConsoleBoundInterfaceState _lastState = new(0, 0, 0, 0, false); diff --git a/Content.Client/Power/Visualizers/CableVisualizerSystem.cs b/Content.Client/Power/Visualizers/CableVisualizerSystem.cs index 1af57e76409..4dcaacc3817 100644 --- a/Content.Client/Power/Visualizers/CableVisualizerSystem.cs +++ b/Content.Client/Power/Visualizers/CableVisualizerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Client.Power.Visualizers; -public sealed class CableVisualizerSystem : EntitySystem +public sealed partial class CableVisualizerSystem : EntitySystem { - [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/Projectiles/ProjectileSystem.cs b/Content.Client/Projectiles/ProjectileSystem.cs index 2adafdce306..23a09f9584d 100644 --- a/Content.Client/Projectiles/ProjectileSystem.cs +++ b/Content.Client/Projectiles/ProjectileSystem.cs @@ -6,10 +6,10 @@ namespace Content.Client.Projectiles; -public sealed class ProjectileSystem : SharedProjectileSystem +public sealed partial class ProjectileSystem : SharedProjectileSystem { - [Dependency] private readonly AnimationPlayerSystem _player = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _player = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/RCD/AlignRCDConstruction.cs b/Content.Client/RCD/AlignRCDConstruction.cs index 223ac823d22..8ef60cfcc7c 100644 --- a/Content.Client/RCD/AlignRCDConstruction.cs +++ b/Content.Client/RCD/AlignRCDConstruction.cs @@ -12,16 +12,16 @@ namespace Content.Client.RCD; -public sealed class AlignRCDConstruction : PlacementMode +public sealed partial class AlignRCDConstruction : PlacementMode { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IMapManager _mapManager = default!; private readonly SharedMapSystem _mapSystem; private readonly HandsSystem _handsSystem; private readonly RCDSystem _rcdSystem; private readonly SharedTransformSystem _transformSystem; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IStateManager _stateManager = default!; private const float SearchBoxSize = 2f; private const float PlaceColorBaseAlpha = 0.5f; diff --git a/Content.Client/RCD/RCDConstructionGhostSystem.cs b/Content.Client/RCD/RCDConstructionGhostSystem.cs index d0af28da8aa..2b9a31e77b0 100644 --- a/Content.Client/RCD/RCDConstructionGhostSystem.cs +++ b/Content.Client/RCD/RCDConstructionGhostSystem.cs @@ -12,14 +12,14 @@ namespace Content.Client.RCD; /// /// System for handling structure ghost placement in places where RCD can create objects. /// -public sealed class RCDConstructionGhostSystem : EntitySystem +public sealed partial class RCDConstructionGhostSystem : EntitySystem { private const string PlacementMode = nameof(AlignRCDConstruction); - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPlacementManager _placementManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly HandsSystem _hands = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPlacementManager _placementManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private HandsSystem _hands = default!; private Direction _placementDirection = default; diff --git a/Content.Client/RCD/RCDMenuBoundUserInterface.cs b/Content.Client/RCD/RCDMenuBoundUserInterface.cs index 3f847c8beb6..d8b60667d9e 100644 --- a/Content.Client/RCD/RCDMenuBoundUserInterface.cs +++ b/Content.Client/RCD/RCDMenuBoundUserInterface.cs @@ -12,7 +12,7 @@ namespace Content.Client.RCD; [UsedImplicitly] -public sealed class RCDMenuBoundUserInterface : BoundUserInterface +public sealed partial class RCDMenuBoundUserInterface : BoundUserInterface { private const string TopLevelActionCategory = "Main"; @@ -26,8 +26,8 @@ public sealed class RCDMenuBoundUserInterface : BoundUserInterface ["Lighting"] = ("rcd-component-lighting", new SpriteSpecifier.Texture(new ResPath("/Textures/Interface/Radial/RCD/lighting.png"))), }; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; private SimpleRadialMenu? _menu; diff --git a/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs b/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs index 1f49dc556d6..00f8c35a84a 100644 --- a/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs +++ b/Content.Client/Radiation/Overlays/RadiationDebugOverlay.cs @@ -8,10 +8,10 @@ namespace Content.Client.Radiation.Overlays; -public sealed class RadiationDebugOverlay : Overlay +public sealed partial class RadiationDebugOverlay : Overlay { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IResourceCache _cache = default!; private readonly SharedMapSystem _mapSystem; private readonly RadiationSystem _radiation; diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs index a7462a154a4..0b53ea95059 100644 --- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs +++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs @@ -10,13 +10,13 @@ namespace Content.Client.Radiation.Overlays { - public sealed class RadiationPulseOverlay : Overlay + public sealed partial class RadiationPulseOverlay : Overlay { private static readonly ProtoId RadiationShader = "Radiation"; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; private TransformSystem? _transform; private const float MaxDist = 15.0f; diff --git a/Content.Client/Radiation/Systems/RadiationSystem.cs b/Content.Client/Radiation/Systems/RadiationSystem.cs index f4f109adc7c..7d3c1663aaf 100644 --- a/Content.Client/Radiation/Systems/RadiationSystem.cs +++ b/Content.Client/Radiation/Systems/RadiationSystem.cs @@ -5,9 +5,9 @@ namespace Content.Client.Radiation.Systems; -public sealed class RadiationSystem : EntitySystem +public sealed partial class RadiationSystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlayMan = default!; + [Dependency] private IOverlayManager _overlayMan = default!; public List? Rays; public Dictionary>? ResistanceGrids; diff --git a/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs index a2711a8257c..505c4d6503f 100644 --- a/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Client/Radio/EntitySystems/RadioDeviceSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Radio.EntitySystems; -public sealed class RadioDeviceSystem : SharedRadioDeviceSystem +public sealed partial class RadioDeviceSystem : SharedRadioDeviceSystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private UserInterfaceSystem _ui = default!; /// public override void Initialize() diff --git a/Content.Client/Radio/Ui/HeadsetMenuBoundUserInterface.cs b/Content.Client/Radio/Ui/HeadsetMenuBoundUserInterface.cs index 1a9bc7d97e7..f87f06dbf44 100644 --- a/Content.Client/Radio/Ui/HeadsetMenuBoundUserInterface.cs +++ b/Content.Client/Radio/Ui/HeadsetMenuBoundUserInterface.cs @@ -8,9 +8,9 @@ namespace Content.Client.Radio.Ui { - public sealed class HeadsetMenuBoundUserInterface : BoundUserInterface + public sealed partial class HeadsetMenuBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private HeadsetMenuWindow? _window; diff --git a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs index 4a9c3741afb..897ba3be71d 100644 --- a/Content.Client/Radio/Ui/IntercomMenu.xaml.cs +++ b/Content.Client/Radio/Ui/IntercomMenu.xaml.cs @@ -10,7 +10,7 @@ namespace Content.Client.Radio.Ui; [GenerateTypedNameReferences] public sealed partial class IntercomMenu : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public event Action? OnMicPressed; public event Action? OnSpeakerPressed; diff --git a/Content.Client/Replay/ContentReplayPlaybackManager.cs b/Content.Client/Replay/ContentReplayPlaybackManager.cs index 9c6749d858e..3190a15b9d7 100644 --- a/Content.Client/Replay/ContentReplayPlaybackManager.cs +++ b/Content.Client/Replay/ContentReplayPlaybackManager.cs @@ -32,21 +32,21 @@ namespace Content.Client.Replay; -public sealed class ContentReplayPlaybackManager +public sealed partial class ContentReplayPlaybackManager { - [Dependency] private readonly IStateManager _stateMan = default!; - [Dependency] private readonly IClientGameTiming _timing = default!; - [Dependency] private readonly IReplayLoadManager _loadMan = default!; - [Dependency] private readonly IGameController _controller = default!; - [Dependency] private readonly IClientEntityManager _entMan = default!; - [Dependency] private readonly IUserInterfaceManager _uiMan = default!; - [Dependency] private readonly IReplayPlaybackManager _playback = default!; - [Dependency] private readonly IClientConGroupController _conGrp = default!; - [Dependency] private readonly IClientAdminManager _adminMan = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IBaseClient _client = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IResourceManager _resMan = default!; + [Dependency] private IStateManager _stateMan = default!; + [Dependency] private IClientGameTiming _timing = default!; + [Dependency] private IReplayLoadManager _loadMan = default!; + [Dependency] private IGameController _controller = default!; + [Dependency] private IClientEntityManager _entMan = default!; + [Dependency] private IUserInterfaceManager _uiMan = default!; + [Dependency] private IReplayPlaybackManager _playback = default!; + [Dependency] private IClientConGroupController _conGrp = default!; + [Dependency] private IClientAdminManager _adminMan = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IResourceManager _resMan = default!; /// /// UI state to return to when stopping a replay or loading fails. diff --git a/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs b/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs index 993a26693c7..b6711eae9b9 100644 --- a/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs +++ b/Content.Client/Replay/ReplayToggleScreenshotModeCommand.cs @@ -7,10 +7,10 @@ namespace Content.Client.Replay; -public sealed class ReplayToggleScreenshotModeCommand : BaseReplayCommand +public sealed partial class ReplayToggleScreenshotModeCommand : BaseReplayCommand { - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly ContentReplayPlaybackManager _replayManager = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private ContentReplayPlaybackManager _replayManager = default!; public override string Command => "replay_toggle_screenshot_mode"; diff --git a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.cs b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.cs index 8a3b8587206..3758c5a9e21 100644 --- a/Content.Client/Replay/Spectator/ReplaySpectatorSystem.cs +++ b/Content.Client/Replay/Spectator/ReplaySpectatorSystem.cs @@ -22,13 +22,13 @@ namespace Content.Client.Replay.Spectator; /// public sealed partial class ReplaySpectatorSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IConsoleHost _conHost = default!; - [Dependency] private readonly IStateManager _stateMan = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedContentEyeSystem _eye = default!; - [Dependency] private readonly IReplayPlaybackManager _replayPlayback = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IConsoleHost _conHost = default!; + [Dependency] private IStateManager _stateMan = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedContentEyeSystem _eye = default!; + [Dependency] private IReplayPlaybackManager _replayPlayback = default!; private SpectatorData? _spectatorData; public const string SpectateCmd = "replay_spectate"; diff --git a/Content.Client/Replay/UI/Loading/LoadingScreen.cs b/Content.Client/Replay/UI/Loading/LoadingScreen.cs index f3f75a2950d..e99b8990d32 100644 --- a/Content.Client/Replay/UI/Loading/LoadingScreen.cs +++ b/Content.Client/Replay/UI/Loading/LoadingScreen.cs @@ -7,10 +7,10 @@ namespace Content.Client.Replay.UI.Loading; [Virtual] -public class LoadingScreen : State +public partial class LoadingScreen : State { - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; public event Action? OnJobFinished; private LoadingScreenControl _screen = default!; diff --git a/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs b/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs index f9995addb62..e00307036c0 100644 --- a/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs +++ b/Content.Client/Replay/UI/Loading/ReplayLoadingFailed.cs @@ -10,10 +10,10 @@ namespace Content.Client.Replay.UI.Loading; /// /// /// -public sealed class ReplayLoadingFailed : State +public sealed partial class ReplayLoadingFailed : State { - [Dependency] private readonly IStylesheetManager _stylesheetManager = default!; - [Dependency] private readonly IUserInterfaceManager _userInterface = default!; + [Dependency] private IStylesheetManager _stylesheetManager = default!; + [Dependency] private IUserInterfaceManager _userInterface = default!; private ReplayLoadingFailedControl? _control; diff --git a/Content.Client/Replay/UI/ReplaySpectateEntityState.cs b/Content.Client/Replay/UI/ReplaySpectateEntityState.cs index c64201bc036..5f386f8853e 100644 --- a/Content.Client/Replay/UI/ReplaySpectateEntityState.cs +++ b/Content.Client/Replay/UI/ReplaySpectateEntityState.cs @@ -10,9 +10,9 @@ namespace Content.Client.Replay.UI; /// Gameplay state when observing/spectating an entity during a replay. /// [Virtual] -public class ReplaySpectateEntityState : GameplayState +public partial class ReplaySpectateEntityState : GameplayState { - [Dependency] private readonly ContentReplayPlaybackManager _replayManager = default!; + [Dependency] private ContentReplayPlaybackManager _replayManager = default!; protected override void Startup() { diff --git a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs index 5bdb730d6c7..08b96bba3d0 100644 --- a/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs +++ b/Content.Client/Research/UI/ResearchConsoleMenu.xaml.cs @@ -22,9 +22,9 @@ public sealed partial class ResearchConsoleMenu : FancyWindow public Action? OnTechnologyCardPressed; public Action? OnServerButtonPressed; - [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IEntityManager _entity = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IPlayerManager _player = default!; private readonly ResearchSystem _research; private readonly SpriteSystem _sprite; private readonly AccessReaderSystem _accessReader; diff --git a/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs b/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs index 7c548f5f1cb..c6018d45a4a 100644 --- a/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs +++ b/Content.Client/Revenant/RevenantOverloadedLightsSystem.cs @@ -4,9 +4,9 @@ namespace Content.Client.Revenant; -public sealed class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLightsSystem +public sealed partial class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLightsSystem { - [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private SharedPointLightSystem _lights = default!; public override void Initialize() { diff --git a/Content.Client/Revenant/RevenantSystem.cs b/Content.Client/Revenant/RevenantSystem.cs index 07b1ab84bfb..7747268dc69 100644 --- a/Content.Client/Revenant/RevenantSystem.cs +++ b/Content.Client/Revenant/RevenantSystem.cs @@ -5,10 +5,10 @@ namespace Content.Client.Revenant; -public sealed class RevenantSystem : EntitySystem +public sealed partial class RevenantSystem : EntitySystem { - [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/Revolutionary/RevolutionarySystem.cs b/Content.Client/Revolutionary/RevolutionarySystem.cs index 48258d425fc..4230ab73093 100644 --- a/Content.Client/Revolutionary/RevolutionarySystem.cs +++ b/Content.Client/Revolutionary/RevolutionarySystem.cs @@ -8,9 +8,9 @@ namespace Content.Client.Revolutionary; /// /// Used for the client to get status icons from other revs. /// -public sealed class RevolutionarySystem : SharedRevolutionarySystem +public sealed partial class RevolutionarySystem : SharedRevolutionarySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs index 22dda070390..38eafcbef5b 100644 --- a/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs +++ b/Content.Client/Robotics/UI/RoboticsConsoleWindow.xaml.cs @@ -15,8 +15,8 @@ namespace Content.Client.Robotics.UI; [GenerateTypedNameReferences] public sealed partial class RoboticsConsoleWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IGameTiming _timing = default!; private readonly LockSystem _lock; private readonly SpriteSystem _sprite; diff --git a/Content.Client/Rotation/RotationVisualizerSystem.cs b/Content.Client/Rotation/RotationVisualizerSystem.cs index b5be4d0b179..066431be130 100644 --- a/Content.Client/Rotation/RotationVisualizerSystem.cs +++ b/Content.Client/Rotation/RotationVisualizerSystem.cs @@ -5,11 +5,11 @@ namespace Content.Client.Rotation; -public sealed class RotationVisualizerSystem : SharedRotationVisualsSystem +public sealed partial class RotationVisualizerSystem : SharedRotationVisualsSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly AnimationPlayerSystem _animation = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private AnimationPlayerSystem _animation = default!; public override void Initialize() { diff --git a/Content.Client/RoundEnd/RoundEndSummaryUIController.cs b/Content.Client/RoundEnd/RoundEndSummaryUIController.cs index cf824833efb..bb85d98353b 100644 --- a/Content.Client/RoundEnd/RoundEndSummaryUIController.cs +++ b/Content.Client/RoundEnd/RoundEndSummaryUIController.cs @@ -10,10 +10,10 @@ namespace Content.Client.RoundEnd; [UsedImplicitly] -public sealed class RoundEndSummaryUIController : UIController, +public sealed partial class RoundEndSummaryUIController : UIController, IOnSystemLoaded { - [Dependency] private readonly IInputManager _input = default!; + [Dependency] private IInputManager _input = default!; private RoundEndSummaryWindow? _window; diff --git a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs index 47eec84eae3..46f8ac42682 100644 --- a/Content.Client/SSDIndicator/SSDIndicatorSystem.cs +++ b/Content.Client/SSDIndicator/SSDIndicatorSystem.cs @@ -13,11 +13,11 @@ namespace Content.Client.SSDIndicator; /// /// Handles displaying SSD indicator as status icon /// -public sealed class SSDIndicatorSystem : EntitySystem +public sealed partial class SSDIndicatorSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Client/Salvage/FultonSystem.cs b/Content.Client/Salvage/FultonSystem.cs index bd8a631ecb5..a7498591a56 100644 --- a/Content.Client/Salvage/FultonSystem.cs +++ b/Content.Client/Salvage/FultonSystem.cs @@ -10,11 +10,11 @@ namespace Content.Client.Salvage; -public sealed class FultonSystem : SharedFultonSystem +public sealed partial class FultonSystem : SharedFultonSystem { - [Dependency] private readonly ISerializationManager _serManager = default!; - [Dependency] private readonly AnimationPlayerSystem _player = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private ISerializationManager _serManager = default!; + [Dependency] private AnimationPlayerSystem _player = default!; + [Dependency] private SpriteSystem _sprite = default!; private static readonly TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.4); diff --git a/Content.Client/Salvage/SalvageSystem.cs b/Content.Client/Salvage/SalvageSystem.cs index e1bce367cae..0bb809acf90 100644 --- a/Content.Client/Salvage/SalvageSystem.cs +++ b/Content.Client/Salvage/SalvageSystem.cs @@ -6,10 +6,10 @@ namespace Content.Client.Salvage; -public sealed class SalvageSystem : SharedSalvageSystem +public sealed partial class SalvageSystem : SharedSalvageSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly ContentAudioSystem _audio = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private ContentAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Client/Salvage/UI/OfferingWindow.xaml.cs b/Content.Client/Salvage/UI/OfferingWindow.xaml.cs index df11056dd89..463d299253c 100644 --- a/Content.Client/Salvage/UI/OfferingWindow.xaml.cs +++ b/Content.Client/Salvage/UI/OfferingWindow.xaml.cs @@ -15,7 +15,7 @@ namespace Content.Client.Salvage.UI; public sealed partial class OfferingWindow : FancyWindow, IComputerWindow { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public bool Claimed; public TimeSpan NextOffer; diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs index d853cbfbde1..5f582853497 100644 --- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs @@ -13,15 +13,15 @@ namespace Content.Client.Salvage.UI; [UsedImplicitly] -public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterface +public sealed partial class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterface { [ViewVariables] private OfferingWindow? _window; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; private readonly ISawmill _sawmill; diff --git a/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml.cs b/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml.cs index 73fb4bb4832..480b99ced43 100644 --- a/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml.cs +++ b/Content.Client/Salvage/UI/SalvageJobBoardMenu.xaml.cs @@ -10,8 +10,8 @@ namespace Content.Client.Salvage.UI; [GenerateTypedNameReferences] public sealed partial class SalvageJobBoardMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public Action? OnLabelButtonPressed; diff --git a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs index 682a43601a1..ec93acca2fb 100644 --- a/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs @@ -7,9 +7,9 @@ namespace Content.Client.Salvage.UI; -public sealed class SalvageMagnetBoundUserInterface : BoundUserInterface +public sealed partial class SalvageMagnetBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private OfferingWindow? _window; diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs index 039f2fed69e..3965779b621 100644 --- a/Content.Client/Sandbox/SandboxSystem.cs +++ b/Content.Client/Sandbox/SandboxSystem.cs @@ -9,15 +9,15 @@ namespace Content.Client.Sandbox { - public sealed class SandboxSystem : SharedSandboxSystem + public sealed partial class SandboxSystem : SharedSandboxSystem { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly IMapManager _map = default!; - [Dependency] private readonly IPlacementManager _placement = default!; - [Dependency] private readonly ContentEyeSystem _contentEye = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private IMapManager _map = default!; + [Dependency] private IPlacementManager _placement = default!; + [Dependency] private ContentEyeSystem _contentEye = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; private bool _sandboxEnabled; public bool SandboxAllowed { get; private set; } diff --git a/Content.Client/Screenshot/ScreenshotHook.cs b/Content.Client/Screenshot/ScreenshotHook.cs index 6810322de25..dfae6c876e0 100644 --- a/Content.Client/Screenshot/ScreenshotHook.cs +++ b/Content.Client/Screenshot/ScreenshotHook.cs @@ -13,14 +13,14 @@ namespace Content.Client.Screenshot { - internal sealed class ScreenshotHook : IScreenshotHook + internal sealed partial class ScreenshotHook : IScreenshotHook { private static readonly ResPath BaseScreenshotPath = new("/Screenshots"); - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private IStateManager _stateManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Client/Sectors/Overlays/SectorEventOverlay.cs b/Content.Client/Sectors/Overlays/SectorEventOverlay.cs index ed0a526cc64..77948a8640e 100644 --- a/Content.Client/Sectors/Overlays/SectorEventOverlay.cs +++ b/Content.Client/Sectors/Overlays/SectorEventOverlay.cs @@ -6,13 +6,13 @@ namespace Content.Client.Sectors.Overlays; -public sealed class SectorEventOverlay : Overlay +public sealed partial class SectorEventOverlay : Overlay { private static readonly ProtoId ShaderProto = "SectorEventTint"; - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private readonly ShaderInstance _shader; diff --git a/Content.Client/Sectors/Systems/SectorEventVisualsSystem.cs b/Content.Client/Sectors/Systems/SectorEventVisualsSystem.cs index 8f934957205..2e35f667d95 100644 --- a/Content.Client/Sectors/Systems/SectorEventVisualsSystem.cs +++ b/Content.Client/Sectors/Systems/SectorEventVisualsSystem.cs @@ -9,13 +9,13 @@ namespace Content.Client.Sectors.Systems; -public sealed class SectorEventVisualsSystem : EntitySystem +public sealed partial class SectorEventVisualsSystem : EntitySystem { - [Dependency] private readonly IOverlayManager _overlays = default!; - [Dependency] private readonly ParallaxSystem _parallaxSystem = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly SharedSectorSystem _sectors = default!; + [Dependency] private IOverlayManager _overlays = default!; + [Dependency] private ParallaxSystem _parallaxSystem = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private SharedSectorSystem _sectors = default!; private readonly Dictionary _activeWeather = new(); private SectorEventOverlay _overlay = default!; diff --git a/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs b/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs index a655bb496b0..db29a0ed5dd 100644 --- a/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs +++ b/Content.Client/Security/Ui/GenpopLockerMenu.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.Security.Ui; [GenerateTypedNameReferences] public sealed partial class GenpopLockerMenu : FancyWindow { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; public event Action? OnConfigurationComplete; diff --git a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs index a7f49e39603..4356e7615d1 100644 --- a/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs +++ b/Content.Client/SensorMonitoring/SensorMonitoringWindow.xaml.cs @@ -19,8 +19,8 @@ namespace Content.Client.SensorMonitoring; [GenerateTypedNameReferences] public sealed partial class SensorMonitoringWindow : FancyWindow, IComputerWindow { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ILocalizationManager _loc = default!; private TimeSpan _retentionTime; private readonly Dictionary _sensorData = new(); diff --git a/Content.Client/Shuttles/Commands/ShowEmergencyShuttleCommand.cs b/Content.Client/Shuttles/Commands/ShowEmergencyShuttleCommand.cs index d14136957fc..7eaf601c835 100644 --- a/Content.Client/Shuttles/Commands/ShowEmergencyShuttleCommand.cs +++ b/Content.Client/Shuttles/Commands/ShowEmergencyShuttleCommand.cs @@ -3,9 +3,9 @@ namespace Content.Client.Shuttles.Commands; -public sealed class ShowEmergencyShuttleCommand : LocalizedEntityCommands +public sealed partial class ShowEmergencyShuttleCommand : LocalizedEntityCommands { - [Dependency] private readonly ShuttleSystem _shuttle = default!; + [Dependency] private ShuttleSystem _shuttle = default!; public override string Command => "showemergencyshuttle"; diff --git a/Content.Client/Shuttles/FtlArrivalOverlay.cs b/Content.Client/Shuttles/FtlArrivalOverlay.cs index 6c0208f50cf..be716e6f952 100644 --- a/Content.Client/Shuttles/FtlArrivalOverlay.cs +++ b/Content.Client/Shuttles/FtlArrivalOverlay.cs @@ -12,7 +12,7 @@ namespace Content.Client.Shuttles; /// /// Plays a visualization whenever a shuttle is arriving from FTL. /// -public sealed class FtlArrivalOverlay : Overlay +public sealed partial class FtlArrivalOverlay : Overlay { private static readonly ProtoId UnshadedShader = "unshaded"; @@ -22,9 +22,9 @@ public sealed class FtlArrivalOverlay : Overlay private SharedMapSystem _maps; private SharedTransformSystem _transforms; private SpriteSystem _sprites; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _protos = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _protos = default!; private readonly HashSet> _visualizers = new(); diff --git a/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs index 3bf4bc966a5..a3a9d2c1c92 100644 --- a/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Client/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -7,10 +7,10 @@ namespace Content.Client.Shuttles.Systems { - public sealed class ShuttleConsoleSystem : SharedShuttleConsoleSystem + public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem { - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override void Initialize() { diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs index 140b0ef813b..3a24a932114 100644 --- a/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs +++ b/Content.Client/Shuttles/Systems/ShuttleSystem.Console.cs @@ -11,7 +11,7 @@ namespace Content.Client.Shuttles.Systems; public sealed partial class ShuttleSystem { - [Dependency] private readonly IResourceCache _resource = default!; + [Dependency] private IResourceCache _resource = default!; /// /// Gets the parallax to use for the specified map or uses the fallback if not available. diff --git a/Content.Client/Shuttles/Systems/ShuttleSystem.cs b/Content.Client/Shuttles/Systems/ShuttleSystem.cs index a2c048ff90e..c2812cdc4db 100644 --- a/Content.Client/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Client/Shuttles/Systems/ShuttleSystem.cs @@ -4,7 +4,7 @@ namespace Content.Client.Shuttles.Systems; public sealed partial class ShuttleSystem { - [Dependency] private readonly IOverlayManager _overlays = default!; + [Dependency] private IOverlayManager _overlays = default!; public override void Initialize() { diff --git a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs index f583acbda7e..4fcc3a5a159 100644 --- a/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs +++ b/Content.Client/Shuttles/UI/BaseShuttleControl.xaml.cs @@ -20,7 +20,7 @@ namespace Content.Client.Shuttles.UI; [Virtual] public partial class BaseShuttleControl : MapGridControl { - [Dependency] private readonly IParallelManager _parallel = default!; + [Dependency] private IParallelManager _parallel = default!; protected readonly SharedMapSystem Maps; protected readonly Font Font; diff --git a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs index 7a90c7c4a55..0d05467d466 100644 --- a/Content.Client/Shuttles/UI/DockingScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/DockingScreen.xaml.cs @@ -11,7 +11,7 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class DockingScreen : BoxContainer { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private readonly SharedShuttleSystem _shuttles; /// diff --git a/Content.Client/Shuttles/UI/MapScreen.xaml.cs b/Content.Client/Shuttles/UI/MapScreen.xaml.cs index 9f9a3dcdb4a..e591cc3dd0a 100644 --- a/Content.Client/Shuttles/UI/MapScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/MapScreen.xaml.cs @@ -26,10 +26,10 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class MapScreen : BoxContainer { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IRobustRandom _random = default!; private readonly SharedAudioSystem _audio; private readonly SharedMapSystem _maps; private readonly ShuttleSystem _shuttles; diff --git a/Content.Client/Shuttles/UI/NavScreen.xaml.cs b/Content.Client/Shuttles/UI/NavScreen.xaml.cs index b3ba58cca54..70a04d82003 100644 --- a/Content.Client/Shuttles/UI/NavScreen.xaml.cs +++ b/Content.Client/Shuttles/UI/NavScreen.xaml.cs @@ -16,8 +16,8 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class NavScreen : BoxContainer { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private SharedTransformSystem _xformSystem; private SharedSectorSystem _sectorSystem; diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs index 93ee392d201..a1204d5dc8a 100644 --- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs +++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs @@ -14,7 +14,7 @@ namespace Content.Client.Shuttles.UI; public sealed partial class ShuttleConsoleWindow : FancyWindow, IComputerWindow { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private ShuttleConsoleMode _mode = ShuttleConsoleMode.Nav; diff --git a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs index b5f5161261a..c924b4038d0 100644 --- a/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs +++ b/Content.Client/Shuttles/UI/ShuttleDockControl.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class ShuttleDockControl : BaseShuttleControl { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; private readonly DockingSystem _dockSystem; private readonly SharedShuttleSystem _shuttles; private readonly SharedTransformSystem _xformSystem; diff --git a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs index d522f7a2e76..7faf79f1c70 100644 --- a/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs +++ b/Content.Client/Shuttles/UI/ShuttleMapControl.xaml.cs @@ -22,8 +22,8 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class ShuttleMapControl : BaseShuttleControl { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IInputManager _inputs = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IInputManager _inputs = default!; private readonly SharedMapSystem _mapSystem; private readonly ShuttleSystem _shuttles; private readonly SharedTransformSystem _xformSystem; diff --git a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs index f2abcb4d7ab..b45edfb4224 100644 --- a/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs +++ b/Content.Client/Shuttles/UI/ShuttleNavControl.xaml.cs @@ -24,9 +24,9 @@ namespace Content.Client.Shuttles.UI; [GenerateTypedNameReferences] public sealed partial class ShuttleNavControl : BaseShuttleControl { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private readonly SharedShuttleSystem _shuttles; private readonly SharedSectorSystem _sectors; private readonly SharedTransformSystem _transform; @@ -473,7 +473,7 @@ private void DrawSectorBoundaries(DrawingHandleScreen handle, Matrix3x2 worldToV DrawSectorBoundaryRay(handle, worldToView, centerRadius, maxRadius, firstBoundary, weatherColor); DrawSectorBoundaryRay(handle, worldToView, centerRadius, maxRadius, secondBoundary, weatherColor); - DrawSectorArc(handle, worldToView, centerRadius, firstBoundary, secondBoundary, weatherColor); + DrawSectorArc(handle, worldToView, centerRadius, firstBoundary, secondBoundary, weatherColor); } } @@ -536,31 +536,31 @@ private static void DrawSectorBoundaryRay( handle.DrawLine(startView, endpointView, color); } - private static void DrawSectorArc( - DrawingHandleScreen handle, - Matrix3x2 worldToView, - float centerRadius, - float startDegrees, - float endDegrees, - Color color) + private static void DrawSectorArc( + DrawingHandleScreen handle, + Matrix3x2 worldToView, + float centerRadius, + float startDegrees, + float endDegrees, + Color color) + { + const int segments = 12; + // Handle wrap-around (e.g. East sector: 337.5° → 22.5°) + var range = endDegrees > startDegrees + ? endDegrees - startDegrees + : endDegrees + 360f - startDegrees; + + Vector2? prev = null; + for (var i = 0; i <= segments; i++) { - const int segments = 12; - // Handle wrap-around (e.g. East sector: 337.5° → 22.5°) - var range = endDegrees > startDegrees - ? endDegrees - startDegrees - : endDegrees + 360f - startDegrees; - - Vector2? prev = null; - for (var i = 0; i <= segments; i++) - { - var t = i / (float) segments; - var dir = Angle.FromDegrees(startDegrees + range * t).ToVec(); - var viewPos = Vector2.Transform(dir * centerRadius, worldToView); - if (prev.HasValue) - handle.DrawLine(prev.Value, viewPos, color); - prev = viewPos; - } + var t = i / (float)segments; + var dir = Angle.FromDegrees(startDegrees + range * t).ToVec(); + var viewPos = Vector2.Transform(dir * centerRadius, worldToView); + if (prev.HasValue) + handle.DrawLine(prev.Value, viewPos, color); + prev = viewPos; } + } private void DrawDocks(DrawingHandleScreen handle, EntityUid uid, Matrix3x2 gridToView) { diff --git a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs index eee45bacc8a..0ec3e9fdcbc 100644 --- a/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs +++ b/Content.Client/Silicons/Borgs/BorgMenu.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Silicons.Borgs; [GenerateTypedNameReferences] public sealed partial class BorgMenu : FancyWindow { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IEntityManager _entity = default!; private readonly NameModifierSystem _nameModifier; private readonly PowerCellSystem _powerCell; private readonly SharedBatterySystem _battery; diff --git a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs index 0cb130e308a..e1ff5b9fa5f 100644 --- a/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs +++ b/Content.Client/Silicons/Borgs/BorgSelectTypeMenu.xaml.cs @@ -19,7 +19,7 @@ namespace Content.Client.Silicons.Borgs; [GenerateTypedNameReferences] public sealed partial class BorgSelectTypeMenu : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private BorgTypePrototype? _selectedBorgType; diff --git a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs index ae1b2cb1343..2e071f91ad6 100644 --- a/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs +++ b/Content.Client/Silicons/Borgs/BorgSwitchableTypeSystem.cs @@ -10,11 +10,11 @@ namespace Content.Client.Silicons.Borgs; /// /// /// -public sealed class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem +public sealed partial class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem { - [Dependency] private readonly BorgSystem _borgSystem = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private BorgSystem _borgSystem = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Silicons/Borgs/BorgSystem.cs b/Content.Client/Silicons/Borgs/BorgSystem.cs index 1db13be2fad..9a105c4f007 100644 --- a/Content.Client/Silicons/Borgs/BorgSystem.cs +++ b/Content.Client/Silicons/Borgs/BorgSystem.cs @@ -14,14 +14,14 @@ namespace Content.Client.Silicons.Borgs; /// public sealed partial class BorgSystem : SharedBorgSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; public override void Initialize() { diff --git a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs index 83f463a3d44..4686035fc7a 100644 --- a/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs +++ b/Content.Client/Silicons/Laws/Ui/LawDisplay.xaml.cs @@ -17,10 +17,10 @@ namespace Content.Client.Silicons.Laws.Ui; [GenerateTypedNameReferences] public sealed partial class LawDisplay : Control { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly EntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private EntityManager _entityManager = default!; private static readonly TimeSpan PressCooldown = TimeSpan.FromSeconds(3); diff --git a/Content.Client/Silicons/StationAi/StationAiCustomizationMenu.xaml.cs b/Content.Client/Silicons/StationAi/StationAiCustomizationMenu.xaml.cs index 3c5375a8e46..3238d560454 100644 --- a/Content.Client/Silicons/StationAi/StationAiCustomizationMenu.xaml.cs +++ b/Content.Client/Silicons/StationAi/StationAiCustomizationMenu.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Silicons.StationAi; [GenerateTypedNameReferences] public sealed partial class StationAiCustomizationMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; private Dictionary, StationAiCustomizationGroupContainer> _groupContainers = new(); private Dictionary, ButtonGroup> _buttonGroups = new(); diff --git a/Content.Client/Silicons/StationAi/StationAiFixerConsoleSystem.cs b/Content.Client/Silicons/StationAi/StationAiFixerConsoleSystem.cs index 5a7f6ee8206..e23d194f173 100644 --- a/Content.Client/Silicons/StationAi/StationAiFixerConsoleSystem.cs +++ b/Content.Client/Silicons/StationAi/StationAiFixerConsoleSystem.cs @@ -5,7 +5,7 @@ namespace Content.Client.Silicons.StationAi; public sealed partial class StationAiFixerConsoleSystem : SharedStationAiFixerConsoleSystem { - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; public override void Initialize() { diff --git a/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml.cs b/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml.cs index 0c3140a13e3..8e96f9a9a5d 100644 --- a/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml.cs +++ b/Content.Client/Silicons/StationAi/StationAiFixerConsoleWindow.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Silicons.StationAi; [GenerateTypedNameReferences] public sealed partial class StationAiFixerConsoleWindow : FancyWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _timing = default!; private readonly StationAiFixerConsoleSystem _stationAiFixerConsole; private readonly SharedStationAiSystem _stationAi; diff --git a/Content.Client/Silicons/StationAi/StationAiOverlay.cs b/Content.Client/Silicons/StationAi/StationAiOverlay.cs index be3c9067c09..3a66edd7ec0 100644 --- a/Content.Client/Silicons/StationAi/StationAiOverlay.cs +++ b/Content.Client/Silicons/StationAi/StationAiOverlay.cs @@ -11,17 +11,17 @@ namespace Content.Client.Silicons.StationAi; -public sealed class StationAiOverlay : Overlay +public sealed partial class StationAiOverlay : Overlay { private static readonly ProtoId CameraStaticShader = "CameraStatic"; private static readonly ProtoId StencilMaskShader = "StencilMask"; private static readonly ProtoId StencilDrawShader = "StencilDraw"; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _proto = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/Silicons/StationAi/StationAiSystem.cs b/Content.Client/Silicons/StationAi/StationAiSystem.cs index d4a8b9dbd81..4613a3bf7b7 100644 --- a/Content.Client/Silicons/StationAi/StationAiSystem.cs +++ b/Content.Client/Silicons/StationAi/StationAiSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Silicons.StationAi; public sealed partial class StationAiSystem : SharedStationAiSystem { - [Dependency] private readonly IOverlayManager _overlayMgr = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IOverlayManager _overlayMgr = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; private StationAiOverlay? _overlay; diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs index 6b374887c9c..d218245f09d 100644 --- a/Content.Client/Singularity/SingularityOverlay.cs +++ b/Content.Client/Singularity/SingularityOverlay.cs @@ -7,12 +7,12 @@ namespace Content.Client.Singularity { - public sealed class SingularityOverlay : Overlay, IEntityEventSubscriber + public sealed partial class SingularityOverlay : Overlay, IEntityEventSubscriber { private static readonly ProtoId Shader = "Singularity"; - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private SharedTransformSystem? _xformSystem = null; /// diff --git a/Content.Client/Singularity/Systems/EmitterSystem.cs b/Content.Client/Singularity/Systems/EmitterSystem.cs index 0bafdc301eb..9f39fe3bc48 100644 --- a/Content.Client/Singularity/Systems/EmitterSystem.cs +++ b/Content.Client/Singularity/Systems/EmitterSystem.cs @@ -4,10 +4,10 @@ namespace Content.Client.Singularity.Systems; -public sealed class EmitterSystem : SharedEmitterSystem +public sealed partial class EmitterSystem : SharedEmitterSystem { - [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/SmartFridge/SmartFridgeMenu.xaml.cs b/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs index df64a36bd6c..cd4f557d70e 100644 --- a/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs +++ b/Content.Client/SmartFridge/SmartFridgeMenu.xaml.cs @@ -13,7 +13,7 @@ public record SmartFridgeListData(EntityUid Representative, SmartFridgeEntry Ent [GenerateTypedNameReferences] public sealed partial class SmartFridgeMenu : FancyWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public event Action? OnItemSelected; public event Action? OnRemoveButtonPressed; diff --git a/Content.Client/SmartFridge/SmartFridgeSystem.cs b/Content.Client/SmartFridge/SmartFridgeSystem.cs index cd3aeb6958e..766b110fd05 100644 --- a/Content.Client/SmartFridge/SmartFridgeSystem.cs +++ b/Content.Client/SmartFridge/SmartFridgeSystem.cs @@ -2,9 +2,9 @@ namespace Content.Client.SmartFridge; -public sealed class SmartFridgeSystem : SharedSmartFridgeSystem +public sealed partial class SmartFridgeSystem : SharedSmartFridgeSystem { - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; protected override void UpdateUI(Entity ent) { diff --git a/Content.Client/SprayPainter/PaintableItemAppearanceSystem.cs b/Content.Client/SprayPainter/PaintableItemAppearanceSystem.cs index 1a116df32f7..149616184e5 100644 --- a/Content.Client/SprayPainter/PaintableItemAppearanceSystem.cs +++ b/Content.Client/SprayPainter/PaintableItemAppearanceSystem.cs @@ -10,9 +10,9 @@ namespace Content.Client.SprayPainter; /// /// Updates item sprites when they are repainted via the spray painter. /// -public sealed class PaintableItemAppearanceSystem : VisualizerSystem +public sealed partial class PaintableItemAppearanceSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; protected override void OnAppearanceChange(EntityUid uid, ItemComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/SprayPainter/SprayPainterSystem.cs b/Content.Client/SprayPainter/SprayPainterSystem.cs index 8b4c29707a3..2ce6687b1be 100644 --- a/Content.Client/SprayPainter/SprayPainterSystem.cs +++ b/Content.Client/SprayPainter/SprayPainterSystem.cs @@ -18,9 +18,9 @@ namespace Content.Client.SprayPainter; /// /// Client-side spray painter functions. Caches information for spray painter windows and updates the UI to reflect component state. /// -public sealed class SprayPainterSystem : SharedSprayPainterSystem +public sealed partial class SprayPainterSystem : SharedSprayPainterSystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public List Decals = []; public Dictionary> PaintableGroupsByCategory = new(); diff --git a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs index 7be7e79290f..1362c0a2879 100644 --- a/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs +++ b/Content.Client/SprayPainter/UI/SprayPainterWindow.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.SprayPainter.UI; [GenerateTypedNameReferences] public sealed partial class SprayPainterWindow : DefaultWindow { - [Dependency] private readonly IEntitySystemManager _sysMan = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IEntitySystemManager _sysMan = default!; + [Dependency] private ILocalizationManager _loc = default!; private readonly SpriteSystem _spriteSystem; diff --git a/Content.Client/Sprite/ContentSpriteSystem.cs b/Content.Client/Sprite/ContentSpriteSystem.cs index 755f2e4f0c1..3c358e3d39a 100644 --- a/Content.Client/Sprite/ContentSpriteSystem.cs +++ b/Content.Client/Sprite/ContentSpriteSystem.cs @@ -17,14 +17,14 @@ namespace Content.Client.Sprite; -public sealed class ContentSpriteSystem : EntitySystem +public sealed partial class ContentSpriteSystem : EntitySystem { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IResourceManager _resManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; - [Dependency] private readonly IRuntimeLog _runtimeLog = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IResourceManager _resManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; + [Dependency] private IRuntimeLog _runtimeLog = default!; private ContentSpriteControl _control = new(); @@ -139,11 +139,11 @@ private void GetVerbs(GetVerbsEvent ev) /// This is horrible. I asked PJB if there's an easy way to render straight to a texture outside of the render loop /// and she also mentioned this as a bad possibility. /// - private sealed class ContentSpriteControl : Control + private sealed partial class ContentSpriteControl : Control { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ILogManager _logMan = default!; - [Dependency] private readonly IResourceManager _resManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private ILogManager _logMan = default!; + [Dependency] private IResourceManager _resManager = default!; internal Queue<( IRenderTexture Texture, diff --git a/Content.Client/Sprite/RandomSpriteSystem.cs b/Content.Client/Sprite/RandomSpriteSystem.cs index bd87705a3ed..dca1ef8be69 100644 --- a/Content.Client/Sprite/RandomSpriteSystem.cs +++ b/Content.Client/Sprite/RandomSpriteSystem.cs @@ -7,11 +7,11 @@ namespace Content.Client.Sprite; -public sealed class RandomSpriteSystem : SharedRandomSpriteSystem +public sealed partial class RandomSpriteSystem : SharedRandomSpriteSystem { - [Dependency] private readonly IReflectionManager _reflection = default!; - [Dependency] private readonly ClientClothingSystem _clothing = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IReflectionManager _reflection = default!; + [Dependency] private ClientClothingSystem _clothing = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Sprite/ScaleVisualsSystem.cs b/Content.Client/Sprite/ScaleVisualsSystem.cs index 0ffcc49b486..006dbb86f57 100644 --- a/Content.Client/Sprite/ScaleVisualsSystem.cs +++ b/Content.Client/Sprite/ScaleVisualsSystem.cs @@ -4,9 +4,9 @@ namespace Content.Client.Sprite; -public sealed class ScaleVisualsSystem : SharedScaleVisualsSystem +public sealed partial class ScaleVisualsSystem : SharedScaleVisualsSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Sprite/SpriteFadeSystem.cs b/Content.Client/Sprite/SpriteFadeSystem.cs index 1055f490042..18cf6932a6a 100644 --- a/Content.Client/Sprite/SpriteFadeSystem.cs +++ b/Content.Client/Sprite/SpriteFadeSystem.cs @@ -12,21 +12,21 @@ namespace Content.Client.Sprite; -public sealed class SpriteFadeSystem : EntitySystem +public sealed partial class SpriteFadeSystem : EntitySystem { /* * If the player entity is obstructed under the specified components then it will drop the alpha for that entity * so the player is still visible. */ - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SpriteSystem _sprite = default!; private List<(MapCoordinates Point, bool ExcludeBoundingBox)> _points = new(); diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs index 9396c76df59..0d583a0ed87 100644 --- a/Content.Client/Stack/StackSystem.cs +++ b/Content.Client/Stack/StackSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Stack { /// [UsedImplicitly] - public sealed class StackSystem : SharedStackSystem + public sealed partial class StackSystem : SharedStackSystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly ItemCounterSystem _counterSystem = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private ItemCounterSystem _counterSystem = default!; public override void Initialize() { diff --git a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs index 951928325d5..350af7d353a 100644 --- a/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs +++ b/Content.Client/StationRecords/GeneralStationRecordConsoleWindow.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client.StationRecords; [GenerateTypedNameReferences] public sealed partial class GeneralStationRecordConsoleWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public Action? OnKeySelected; diff --git a/Content.Client/StatusIcon/StatusIconOverlay.cs b/Content.Client/StatusIcon/StatusIconOverlay.cs index 7064be5bab2..12451bf1928 100644 --- a/Content.Client/StatusIcon/StatusIconOverlay.cs +++ b/Content.Client/StatusIcon/StatusIconOverlay.cs @@ -9,13 +9,13 @@ namespace Content.Client.StatusIcon; -public sealed class StatusIconOverlay : Overlay +public sealed partial class StatusIconOverlay : Overlay { private static readonly ProtoId UnshadedShader = "unshaded"; - [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _entity = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IGameTiming _timing = default!; private readonly SpriteSystem _sprite; private readonly TransformSystem _transform; diff --git a/Content.Client/StatusIcon/StatusIconSystem.cs b/Content.Client/StatusIcon/StatusIconSystem.cs index 50128baf5f3..72b52c19ab1 100644 --- a/Content.Client/StatusIcon/StatusIconSystem.cs +++ b/Content.Client/StatusIcon/StatusIconSystem.cs @@ -14,12 +14,12 @@ namespace Content.Client.StatusIcon; /// /// This handles rendering gathering and rendering icons on entities. /// -public sealed class StatusIconSystem : SharedStatusIconSystem +public sealed partial class StatusIconSystem : SharedStatusIconSystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; private bool _globalEnabled; private bool _localEnabled; diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs index 56df0f32c06..daf4cce5b1d 100644 --- a/Content.Client/Stealth/StealthSystem.cs +++ b/Content.Client/Stealth/StealthSystem.cs @@ -7,13 +7,13 @@ namespace Content.Client.Stealth; -public sealed class StealthSystem : SharedStealthSystem +public sealed partial class StealthSystem : SharedStealthSystem { private static readonly ProtoId Shader = "Stealth"; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; private ShaderInstance _shader = default!; diff --git a/Content.Client/Storage/Systems/ItemCounterSystem.cs b/Content.Client/Storage/Systems/ItemCounterSystem.cs index 25a93abdbc2..e3ce7a7fc73 100644 --- a/Content.Client/Storage/Systems/ItemCounterSystem.cs +++ b/Content.Client/Storage/Systems/ItemCounterSystem.cs @@ -7,10 +7,10 @@ namespace Content.Client.Storage.Systems; -public sealed class ItemCounterSystem : SharedItemCounterSystem +public sealed partial class ItemCounterSystem : SharedItemCounterSystem { - [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/Storage/Systems/ItemMapperSystem.cs b/Content.Client/Storage/Systems/ItemMapperSystem.cs index 0d24c3ad5fe..56744c34006 100644 --- a/Content.Client/Storage/Systems/ItemMapperSystem.cs +++ b/Content.Client/Storage/Systems/ItemMapperSystem.cs @@ -6,10 +6,10 @@ namespace Content.Client.Storage.Systems; -public sealed class ItemMapperSystem : SharedItemMapperSystem +public sealed partial class ItemMapperSystem : SharedItemMapperSystem { - [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/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs index 9cda0a59ad9..cbe877a1d02 100644 --- a/Content.Client/Storage/Systems/StorageSystem.cs +++ b/Content.Client/Storage/Systems/StorageSystem.cs @@ -11,11 +11,11 @@ namespace Content.Client.Storage.Systems; -public sealed class StorageSystem : SharedStorageSystem +public sealed partial class StorageSystem : SharedStorageSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly EntityPickupAnimationSystem _entityPickupAnimation = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private EntityPickupAnimationSystem _entityPickupAnimation = default!; private Dictionary _oldStoredItems = new(); diff --git a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs index ea0b800ccc4..5d70d077fd9 100644 --- a/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs +++ b/Content.Client/Storage/Visualizers/EntityStorageVisualizerSystem.cs @@ -5,10 +5,10 @@ namespace Content.Client.Storage.Visualizers; -public sealed class EntityStorageVisualizerSystem : VisualizerSystem +public sealed partial class EntityStorageVisualizerSystem : VisualizerSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IComponentFactory _componentFactory = default!; public override void Initialize() { diff --git a/Content.Client/Store/Ui/StoreListingControl.xaml.cs b/Content.Client/Store/Ui/StoreListingControl.xaml.cs index b6a2b981074..bb323edef21 100644 --- a/Content.Client/Store/Ui/StoreListingControl.xaml.cs +++ b/Content.Client/Store/Ui/StoreListingControl.xaml.cs @@ -12,9 +12,9 @@ namespace Content.Client.Store.Ui; [GenerateTypedNameReferences] public sealed partial class StoreListingControl : Control { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IEntityManager _entity = default!; + [Dependency] private IGameTiming _timing = default!; private readonly ClientGameTicker _ticker; private readonly ListingDataWithCostModifiers _data; diff --git a/Content.Client/Store/Ui/StoreMenu.xaml.cs b/Content.Client/Store/Ui/StoreMenu.xaml.cs index b1baa1c1676..48ec549d938 100644 --- a/Content.Client/Store/Ui/StoreMenu.xaml.cs +++ b/Content.Client/Store/Ui/StoreMenu.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.Store.Ui; [GenerateTypedNameReferences] public sealed partial class StoreMenu : DefaultWindow { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private StoreWithdrawWindow? _withdrawWindow; diff --git a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs index 4e9701f748c..ef5edd10daf 100644 --- a/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs +++ b/Content.Client/Store/Ui/StoreWithdrawWindow.xaml.cs @@ -16,7 +16,7 @@ namespace Content.Client.Store.Ui; [GenerateTypedNameReferences] public sealed partial class StoreWithdrawWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private Dictionary _validCurrencies = new(); private HashSet _buttons = new(); diff --git a/Content.Client/Stunnable/StunSystem.cs b/Content.Client/Stunnable/StunSystem.cs index 1e0aae861dc..20f8f9a2b3b 100644 --- a/Content.Client/Stunnable/StunSystem.cs +++ b/Content.Client/Stunnable/StunSystem.cs @@ -11,11 +11,11 @@ namespace Content.Client.Stunnable; -public sealed class StunSystem : SharedStunSystem +public sealed partial class StunSystem : SharedStunSystem { - [Dependency] private readonly SharedCombatModeSystem _combat = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SpriteSystem _spriteSystem = default!; + [Dependency] private SharedCombatModeSystem _combat = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SpriteSystem _spriteSystem = default!; private readonly int[] _sign = [-1, 1]; diff --git a/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs b/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs index eb288af9539..38f14d10755 100644 --- a/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs +++ b/Content.Client/Stylesheets/BaseStylesheet.Fonts.cs @@ -10,9 +10,9 @@ namespace Content.Client.Stylesheets; public abstract partial class BaseStylesheet : IStyleResources { - [Dependency] protected readonly ISandboxHelper SandboxHelper = default!; - [Dependency] protected readonly IReflectionManager ReflectionManager = default!; - [Dependency] protected internal readonly IResourceCache ResCache = default!; + [Dependency] protected ISandboxHelper SandboxHelper = default!; + [Dependency] protected IReflectionManager ReflectionManager = default!; + [Dependency] protected internal IResourceCache ResCache = default!; public Stylesheet Stylesheet { get; init; } diff --git a/Content.Client/Stylesheets/Sheetlet.cs b/Content.Client/Stylesheets/Sheetlet.cs index 151f2047ae6..f46cd7f4a3d 100644 --- a/Content.Client/Stylesheets/Sheetlet.cs +++ b/Content.Client/Stylesheets/Sheetlet.cs @@ -3,9 +3,9 @@ namespace Content.Client.Stylesheets; -public abstract class Sheetlet +public abstract partial class Sheetlet { - [Dependency] protected readonly IResourceCache ResCache = default!; + [Dependency] protected IResourceCache ResCache = default!; protected Sheetlet() { diff --git a/Content.Client/Stylesheets/StylesheetManager.cs b/Content.Client/Stylesheets/StylesheetManager.cs index 1465402bc2c..ca744b16896 100644 --- a/Content.Client/Stylesheets/StylesheetManager.cs +++ b/Content.Client/Stylesheets/StylesheetManager.cs @@ -8,14 +8,14 @@ namespace Content.Client.Stylesheets { - public sealed class StylesheetManager : IStylesheetManager + public sealed partial class StylesheetManager : IStylesheetManager { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly IReflectionManager _reflection = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private IReflectionManager _reflection = default!; [Dependency] - private readonly IResourceCache + private IResourceCache _resCache = default!; // TODO: REMOVE (obsolete; used to construct StyleNano/StyleSpace) public Stylesheet SheetNanotrasen { get; private set; } = default!; diff --git a/Content.Client/SubFloor/SubFloorHideSystem.cs b/Content.Client/SubFloor/SubFloorHideSystem.cs index d545461c375..64ebc97b27e 100644 --- a/Content.Client/SubFloor/SubFloorHideSystem.cs +++ b/Content.Client/SubFloor/SubFloorHideSystem.cs @@ -6,11 +6,11 @@ namespace Content.Client.SubFloor; -public sealed class SubFloorHideSystem : SharedSubFloorHideSystem +public sealed partial class SubFloorHideSystem : SharedSubFloorHideSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private IUserInterfaceManager _ui = default!; private bool _showAll; diff --git a/Content.Client/SubFloor/TrayScanRevealSystem.cs b/Content.Client/SubFloor/TrayScanRevealSystem.cs index e6fcbd437a5..6ef7783be0b 100644 --- a/Content.Client/SubFloor/TrayScanRevealSystem.cs +++ b/Content.Client/SubFloor/TrayScanRevealSystem.cs @@ -4,10 +4,10 @@ namespace Content.Client.SubFloor; -public sealed class TrayScanRevealSystem : EntitySystem +public sealed partial class TrayScanRevealSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; public bool IsUnderRevealingEntity(EntityUid uid) { diff --git a/Content.Client/SubFloor/TrayScannerSystem.cs b/Content.Client/SubFloor/TrayScannerSystem.cs index 4c67890f6a5..68953e801ff 100644 --- a/Content.Client/SubFloor/TrayScannerSystem.cs +++ b/Content.Client/SubFloor/TrayScannerSystem.cs @@ -8,18 +8,18 @@ namespace Content.Client.SubFloor; -public sealed class TrayScannerSystem : SharedTrayScannerSystem +public sealed partial class TrayScannerSystem : SharedTrayScannerSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly AnimationPlayerSystem _animation = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly TrayScanRevealSystem _trayScanReveal = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private AnimationPlayerSystem _animation = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private TrayScanRevealSystem _trayScanReveal = default!; private const string TRayAnimationKey = "trays"; private const double AnimationLength = 0.3; diff --git a/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs b/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs index 15732fb1a20..432f09d4cae 100644 --- a/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs +++ b/Content.Client/SurveillanceCamera/SurveillanceCameraVisualsSystem.cs @@ -3,9 +3,9 @@ namespace Content.Client.SurveillanceCamera; -public sealed class SurveillanceCameraVisualsSystem : EntitySystem +public sealed partial class SurveillanceCameraVisualsSystem : EntitySystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs index ad0fe5b8cf4..d1ee60b6e32 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraMonitorWindow.xaml.cs @@ -20,9 +20,9 @@ public sealed partial class SurveillanceCameraMonitorWindow : DefaultWindow { private static readonly ProtoId CameraStaticShader = "CameraStatic"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IEntityManager _entityManager = default!; /// /// Triggered when a camera is selected. diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs index aeca6c34e9f..133698460d9 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraNavMapControl.cs @@ -7,10 +7,10 @@ namespace Content.Client.SurveillanceCamera.UI; -public sealed class SurveillanceCameraNavMapControl : NavMapControl +public sealed partial class SurveillanceCameraNavMapControl : NavMapControl { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; private static readonly Color CameraActiveColor = Color.FromHex("#FF00FF"); private static readonly Color CameraInactiveColor = Color.FromHex("#a09f9fff"); diff --git a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs index 1c8568b2bdc..5943b4c7189 100644 --- a/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs +++ b/Content.Client/SurveillanceCamera/UI/SurveillanceCameraSetupWindow.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client.SurveillanceCamera.UI; [GenerateTypedNameReferences] public sealed partial class SurveillanceCameraSetupWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public Action? OnNameConfirm; public Action? OnNetworkConfirm; diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs index 5cb51e12a1f..07a6a3aa43c 100644 --- a/Content.Client/Tabletop/TabletopSystem.cs +++ b/Content.Client/Tabletop/TabletopSystem.cs @@ -20,15 +20,15 @@ namespace Content.Client.Tabletop { [UsedImplicitly] - public sealed class TabletopSystem : SharedTabletopSystem + public sealed partial class TabletopSystem : SharedTabletopSystem { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IUserInterfaceManager _uiManger = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IUserInterfaceManager _uiManger = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; // Time in seconds to wait until sending the location of a dragged entity to the server again private const float Delay = 1f / 10; // 10 Hz diff --git a/Content.Client/TextScreen/TextScreenSystem.cs b/Content.Client/TextScreen/TextScreenSystem.cs index 41f2d59fbd8..5cec5d06a48 100644 --- a/Content.Client/TextScreen/TextScreenSystem.cs +++ b/Content.Client/TextScreen/TextScreenSystem.cs @@ -24,9 +24,9 @@ namespace Content.Client.TextScreen; /// /// The TextScreenSystem draws text in the game world using 3x5 sprite states for each character. /// -public sealed class TextScreenSystem : VisualizerSystem +public sealed partial class TextScreenSystem : VisualizerSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; /// /// Contains char/state Key/Value pairs.
diff --git a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs index e725574fd99..d7c3541736a 100644 --- a/Content.Client/Thief/ThiefBackpackMenu.xaml.cs +++ b/Content.Client/Thief/ThiefBackpackMenu.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client.Thief; [GenerateTypedNameReferences] public sealed partial class ThiefBackpackMenu : FancyWindow { - [Dependency] private readonly IEntitySystemManager _sysMan = default!; + [Dependency] private IEntitySystemManager _sysMan = default!; private readonly SpriteSystem _spriteSystem; public event Action? OnApprove; diff --git a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs index 798384dfdfa..ba9017efd5d 100644 --- a/Content.Client/Throwing/ThrownItemVisualizerSystem.cs +++ b/Content.Client/Throwing/ThrownItemVisualizerSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Throwing; /// /// Handles animating thrown items. /// -public sealed class ThrownItemVisualizerSystem : EntitySystem +public sealed partial class ThrownItemVisualizerSystem : EntitySystem { - [Dependency] private readonly AnimationPlayerSystem _anim = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _anim = default!; + [Dependency] private SpriteSystem _sprite = default!; private const string AnimationKey = "thrown-item"; diff --git a/Content.Client/Tips/TippyUIController.cs b/Content.Client/Tips/TippyUIController.cs index d77496fd9f1..741db7ffcf8 100644 --- a/Content.Client/Tips/TippyUIController.cs +++ b/Content.Client/Tips/TippyUIController.cs @@ -17,10 +17,10 @@ namespace Content.Client.Tips; -public sealed class TippyUIController : UIController +public sealed partial class TippyUIController : UIController { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IResourceCache _resCache = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IResourceCache _resCache = default!; [UISystemDependency] private readonly AudioSystem _audio = default!; [UISystemDependency] private readonly SpriteSystem _sprite = default!; diff --git a/Content.Client/Toggleable/ToggleableVisualsSystem.cs b/Content.Client/Toggleable/ToggleableVisualsSystem.cs index 0f553d7ce77..5ada7c12125 100644 --- a/Content.Client/Toggleable/ToggleableVisualsSystem.cs +++ b/Content.Client/Toggleable/ToggleableVisualsSystem.cs @@ -18,10 +18,10 @@ namespace Content.Client.Toggleable; /// in-hand visuals; and for the clothing visuals. /// /// -public sealed class ToggleableVisualsSystem : VisualizerSystem +public sealed partial class ToggleableVisualsSystem : VisualizerSystem { - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedPointLightSystem _pointLight = default!; public override void Initialize() { diff --git a/Content.Client/Tools/ToolSystem.cs b/Content.Client/Tools/ToolSystem.cs index 39d6e67ac96..22c87b8b317 100644 --- a/Content.Client/Tools/ToolSystem.cs +++ b/Content.Client/Tools/ToolSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.Tools { - public sealed class ToolSystem : SharedToolSystem + public sealed partial class ToolSystem : SharedToolSystem { - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Traits/ParacusiaSystem.cs b/Content.Client/Traits/ParacusiaSystem.cs index 8393aa5ac7a..db330eec431 100644 --- a/Content.Client/Traits/ParacusiaSystem.cs +++ b/Content.Client/Traits/ParacusiaSystem.cs @@ -8,12 +8,12 @@ namespace Content.Client.Traits; -public sealed class ParacusiaSystem : SharedParacusiaSystem +public sealed partial class ParacusiaSystem : SharedParacusiaSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs b/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs index a36cad7c320..c2c67f86907 100644 --- a/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs +++ b/Content.Client/Trigger/Systems/LightBehaviorOnTriggerSystem.cs @@ -8,10 +8,10 @@ namespace Content.Client.Trigger.Systems; /// /// This handles... /// -public sealed class LightBehaviorOnTriggerSystem : XOnTriggerSystem +public sealed partial class LightBehaviorOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly LightBehaviorSystem _light = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private LightBehaviorSystem _light = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs index 79543995051..16e186dc9fe 100644 --- a/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs +++ b/Content.Client/Trigger/Systems/ProximityTriggerAnimationSystem.cs @@ -6,11 +6,11 @@ namespace Content.Client.Trigger.Systems; -public sealed class ProximityTriggerAnimationSystem : EntitySystem +public sealed partial class ProximityTriggerAnimationSystem : EntitySystem { - [Dependency] private readonly AnimationPlayerSystem _player = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _player = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SpriteSystem _sprite = default!; /* * Currently all of the appearance stuff is hardcoded for portable flashers diff --git a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs index 7c977c75897..23ebf503331 100644 --- a/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs +++ b/Content.Client/Trigger/Systems/TimerTriggerVisualizerSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Trigger.Systems; -public sealed class TimerTriggerVisualizerSystem : VisualizerSystem +public sealed partial class TimerTriggerVisualizerSystem : VisualizerSystem { - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; public override void Initialize() { diff --git a/Content.Client/TurretController/TurretControllerWindow.xaml.cs b/Content.Client/TurretController/TurretControllerWindow.xaml.cs index 2f6d81ff706..17e362e258c 100644 --- a/Content.Client/TurretController/TurretControllerWindow.xaml.cs +++ b/Content.Client/TurretController/TurretControllerWindow.xaml.cs @@ -18,9 +18,9 @@ namespace Content.Client.TurretController; [GenerateTypedNameReferences] public sealed partial class TurretControllerWindow : BaseWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IResourceCache _cache = default!; private readonly AccessReaderSystem _accessReaderSystem; diff --git a/Content.Client/Turrets/DeployableTurretSystem.cs b/Content.Client/Turrets/DeployableTurretSystem.cs index 05cacba6f1e..c5709eac480 100644 --- a/Content.Client/Turrets/DeployableTurretSystem.cs +++ b/Content.Client/Turrets/DeployableTurretSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.Turrets; public sealed partial class DeployableTurretSystem : SharedDeployableTurretSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly AnimationPlayerSystem _animation = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private AnimationPlayerSystem _animation = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs b/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs index 632894c2aaa..0e3ae8487a8 100644 --- a/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs +++ b/Content.Client/UserInterface/BuiPreTickUpdateSystem.cs @@ -28,11 +28,11 @@ public interface IBuiPreTickUpdate /// /// Implements . /// -public sealed class BuiPreTickUpdateSystem : EntitySystem +public sealed partial class BuiPreTickUpdateSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _playerManager = null!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = null!; - [Dependency] private readonly IGameTiming _gameTiming = null!; + [Dependency] private IPlayerManager _playerManager = null!; + [Dependency] private UserInterfaceSystem _uiSystem = null!; + [Dependency] private IGameTiming _gameTiming = null!; private EntityQuery _userQuery; diff --git a/Content.Client/UserInterface/Controls/ConfirmButton.cs b/Content.Client/UserInterface/Controls/ConfirmButton.cs index b1a55b92a3a..5ba1733a5bd 100644 --- a/Content.Client/UserInterface/Controls/ConfirmButton.cs +++ b/Content.Client/UserInterface/Controls/ConfirmButton.cs @@ -14,9 +14,9 @@ namespace Content.Client.UserInterface.Controls; /// /// Colors for the different states need to be set in the stylesheet /// -public sealed class ConfirmButton : Button +public sealed partial class ConfirmButton : Button { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public const string ConfirmPrefix = "confirm-"; diff --git a/Content.Client/UserInterface/Controls/FancyTree/FancyTree.xaml.cs b/Content.Client/UserInterface/Controls/FancyTree/FancyTree.xaml.cs index 471a2ad2345..e7dd6f27bdd 100644 --- a/Content.Client/UserInterface/Controls/FancyTree/FancyTree.xaml.cs +++ b/Content.Client/UserInterface/Controls/FancyTree/FancyTree.xaml.cs @@ -18,7 +18,7 @@ namespace Content.Client.UserInterface.Controls.FancyTree; [GenerateTypedNameReferences] public sealed partial class FancyTree : Control { - [Dependency] private readonly IResourceCache _resCache = default!; + [Dependency] private IResourceCache _resCache = default!; public const string StylePropertyLineWidth = "LineWidth"; public const string StylePropertyLineColor = "LineColor"; diff --git a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs index 2b959643e9f..1ab3b442a9f 100644 --- a/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs +++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs @@ -14,8 +14,8 @@ namespace Content.Client.UserInterface.Controls [Virtual] public partial class FancyWindow : BaseWindow { - [Dependency] private readonly IEntitySystemManager _sysMan = default!; - [Dependency] private readonly IStylesheetManager _styleMan = default!; + [Dependency] private IEntitySystemManager _sysMan = default!; + [Dependency] private IStylesheetManager _styleMan = default!; private GuidebookSystem? _guidebookSystem; private const int DRAG_MARGIN_SIZE = 7; diff --git a/Content.Client/UserInterface/Controls/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs index f61d54d0df4..da81e55c98b 100644 --- a/Content.Client/UserInterface/Controls/MainViewport.cs +++ b/Content.Client/UserInterface/Controls/MainViewport.cs @@ -11,10 +11,10 @@ namespace Content.Client.UserInterface.Controls /// Wrapper for that listens to configuration variables. /// Also does NN-snapping within tolerances. /// - public sealed class MainViewport : UIWidget + public sealed partial class MainViewport : UIWidget { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ViewportManager _vpManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ViewportManager _vpManager = default!; public ScalingViewport Viewport { get; } diff --git a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs index fcc3c779e05..cb6b315aae5 100644 --- a/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs +++ b/Content.Client/UserInterface/Controls/MapGridControl.xaml.cs @@ -17,8 +17,8 @@ namespace Content.Client.UserInterface.Controls; [Virtual] public partial class MapGridControl : LayoutContainer { - [Dependency] protected readonly IEntityManager EntManager = default!; - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IEntityManager EntManager = default!; + [Dependency] protected IGameTiming Timing = default!; protected static readonly Color BackingColor = new Color(0.08f, 0.08f, 0.08f); diff --git a/Content.Client/UserInterface/Controls/MenuButton.cs b/Content.Client/UserInterface/Controls/MenuButton.cs index 1c202dafec8..68df8fb7a48 100644 --- a/Content.Client/UserInterface/Controls/MenuButton.cs +++ b/Content.Client/UserInterface/Controls/MenuButton.cs @@ -9,9 +9,9 @@ namespace Content.Client.UserInterface.Controls; -public sealed class MenuButton : ContainerButton +public sealed partial class MenuButton : ContainerButton { - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IInputManager _inputManager = default!; public const string StyleClassLabelTopButton = "topButtonLabel"; // public const string StyleClassRedTopButton = "topButtonLabel"; diff --git a/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs b/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs index 60ff8c481a1..b6d0c07b187 100644 --- a/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs +++ b/Content.Client/UserInterface/Controls/SimpleRadialMenu.xaml.cs @@ -17,9 +17,9 @@ public sealed partial class SimpleRadialMenu : RadialMenu { private EntityUid? _attachMenuToEntity; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IInputManager _inputManager = default!; public SimpleRadialMenu() { diff --git a/Content.Client/UserInterface/RichText/MonoTag.cs b/Content.Client/UserInterface/RichText/MonoTag.cs index 0acf6bfce47..0bd6f8cf9ce 100644 --- a/Content.Client/UserInterface/RichText/MonoTag.cs +++ b/Content.Client/UserInterface/RichText/MonoTag.cs @@ -8,12 +8,12 @@ namespace Content.Client.UserInterface.RichText; /// /// Sets the font to a monospaced variant /// -public sealed class MonoTag : IMarkupTagHandler +public sealed partial class MonoTag : IMarkupTagHandler { public static readonly ProtoId MonoFont = "Monospace"; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public string Name => "mono"; diff --git a/Content.Client/UserInterface/RichText/ScrambleTag.cs b/Content.Client/UserInterface/RichText/ScrambleTag.cs index 27e9f1a6170..72bd2dec78c 100644 --- a/Content.Client/UserInterface/RichText/ScrambleTag.cs +++ b/Content.Client/UserInterface/RichText/ScrambleTag.cs @@ -10,9 +10,9 @@ namespace Content.Client.UserInterface.RichText; /// Adds a specified length of random characters that scramble at a set rate. /// [UsedImplicitly] -public sealed class ScrambleTag : IMarkupTagHandler +public sealed partial class ScrambleTag : IMarkupTagHandler { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; private const int MaxScrambleLength = 32; diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs index a12364839bc..17127530864 100644 --- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs +++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs @@ -39,12 +39,12 @@ namespace Content.Client.UserInterface.Systems.Actions; -public sealed class ActionUIController : UIController, IOnStateChanged, IOnSystemChanged +public sealed partial class ActionUIController : UIController, IOnStateChanged, IOnSystemChanged { - [Dependency] private readonly IOverlayManager _overlays = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IInputManager _input = default!; + [Dependency] private IOverlayManager _overlays = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IInputManager _input = default!; [UISystemDependency] private readonly ActionsSystem? _actionsSystem = default; [UISystemDependency] private readonly InteractionOutlineSystem? _interactionOutline = default; diff --git a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs index 66fee4b8f70..1256fe7af1e 100644 --- a/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs +++ b/Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs @@ -9,10 +9,10 @@ namespace Content.Client.UserInterface.Systems.Actions.Controls; [Virtual] -public class ActionButtonContainer : GridContainer +public partial class ActionButtonContainer : GridContainer { - [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IInputManager _input = default!; + [Dependency] private IEntityManager _entity = default!; + [Dependency] private IInputManager _input = default!; public event Action? ActionPressed; public event Action? ActionUnpressed; diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs index d00c08306b2..34f9a7e8e81 100644 --- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs +++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs @@ -23,16 +23,16 @@ namespace Content.Client.UserInterface.Systems.Admin; [UsedImplicitly] -public sealed class AdminUIController : UIController, +public sealed partial class AdminUIController : UIController, IOnStateEntered, IOnStateEntered, IOnSystemChanged { - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IClientConGroupController _conGroups = default!; - [Dependency] private readonly IClientConsoleHost _conHost = default!; - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly VerbMenuUIController _verb = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IClientConGroupController _conGroups = default!; + [Dependency] private IClientConsoleHost _conHost = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private VerbMenuUIController _verb = default!; private AdminMenuWindow? _window; private MenuButton? AdminButton => UIManager.GetActiveUIWidgetOrNull()?.AdminButton; diff --git a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs index 3fe553be3b7..fb6005ffc6c 100644 --- a/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs +++ b/Content.Client/UserInterface/Systems/Alerts/AlertsUIController.cs @@ -11,9 +11,9 @@ namespace Content.Client.UserInterface.Systems.Alerts; -public sealed class AlertsUIController : UIController, IOnStateEntered, IOnSystemChanged +public sealed partial class AlertsUIController : UIController, IOnStateEntered, IOnSystemChanged { - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IPlayerManager _player = default!; [UISystemDependency] private readonly ClientAlertsSystem? _alertsSystem = default; diff --git a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs index 0517a7c1a8c..26fcb44312c 100644 --- a/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs +++ b/Content.Client/UserInterface/Systems/Alerts/Controls/AlertControl.cs @@ -10,9 +10,9 @@ namespace Content.Client.UserInterface.Systems.Alerts.Controls { - public sealed class AlertControl : BaseButton + public sealed partial class AlertControl : BaseButton { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly SpriteSystem _sprite; diff --git a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs index 29add69f2e6..62135b39e56 100644 --- a/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs +++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs @@ -15,11 +15,11 @@ namespace Content.Client.UserInterface.Systems.Atmos.GasTank; -public sealed class GasTankWindow +public sealed partial class GasTankWindow : BaseWindow { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IResourceCache _cache = default!; private readonly RichTextLabel _lblPressure; private readonly FloatSpinBox _spbPressure; diff --git a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs index 2b4475dec34..2b2963250ae 100644 --- a/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs +++ b/Content.Client/UserInterface/Systems/Bwoink/AHelpUIController.cs @@ -31,14 +31,14 @@ namespace Content.Client.UserInterface.Systems.Bwoink; [UsedImplicitly] -public sealed class AHelpUIController : UIController, IOnSystemChanged, IOnStateChanged, IOnStateChanged +public sealed partial class AHelpUIController : UIController, IOnSystemChanged, IOnStateChanged, IOnStateChanged { - [Dependency] private readonly IClientAdminManager _adminManager = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; - [Dependency] private readonly IInputManager _input = default!; + [Dependency] private IClientAdminManager _adminManager = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; + [Dependency] private IInputManager _input = default!; [UISystemDependency] private readonly AudioSystem _audio = default!; private BwoinkSystem? _bwoinkSystem; diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs index b9e643a5e60..c10423a429f 100644 --- a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs +++ b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs @@ -25,11 +25,11 @@ namespace Content.Client.UserInterface.Systems.Character; [UsedImplicitly] -public sealed class CharacterUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged +public sealed partial class CharacterUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged { - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; [UISystemDependency] private readonly CharacterInfoSystem _characterInfo = default!; [UISystemDependency] private readonly SpriteSystem _sprite = default!; diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs index 4bd2784f24e..8e7ca54a15f 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.Highlighting.cs @@ -14,7 +14,7 @@ namespace Content.Client.UserInterface.Systems.Chat; /// public sealed partial class ChatUIController : IOnSystemChanged { - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private ILocalizationManager _loc = default!; [UISystemDependency] private readonly CharacterInfoSystem _characterInfo = default!; private static readonly Regex StartDoubleQuote = new("\"$"); diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 018b7dd20cd..1894f4f62fb 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -46,18 +46,18 @@ namespace Content.Client.UserInterface.Systems.Chat; public sealed partial class ChatUIController : UIController { - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IChatManager _manager = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IEyeManager _eye = default!; - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IClientNetManager _net = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IStateManager _state = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IReplayRecordingManager _replayRecording = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IChatManager _manager = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IEyeManager _eye = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IClientNetManager _net = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IStateManager _state = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IReplayRecordingManager _replayRecording = default!; [UISystemDependency] private readonly ExamineSystem? _examine = default; [UISystemDependency] private readonly GhostSystem? _ghost = default; diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs index 42dac1eb00c..abeb42a8fc8 100644 --- a/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs +++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs @@ -18,8 +18,8 @@ namespace Content.Client.UserInterface.Systems.Chat.Widgets; [Virtual] public partial class ChatBox : UIWidget { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private ILogManager _log = default!; private readonly ISawmill _sawmill; private readonly ChatUIController _controller; diff --git a/Content.Client/UserInterface/Systems/Chat/Widgets/ResizableChatBox.cs b/Content.Client/UserInterface/Systems/Chat/Widgets/ResizableChatBox.cs index 6decdddfabb..898d44f090d 100644 --- a/Content.Client/UserInterface/Systems/Chat/Widgets/ResizableChatBox.cs +++ b/Content.Client/UserInterface/Systems/Chat/Widgets/ResizableChatBox.cs @@ -7,7 +7,7 @@ namespace Content.Client.UserInterface.Systems.Chat.Widgets; -public sealed class ResizableChatBox : ChatBox +public sealed partial class ResizableChatBox : ChatBox { public ResizableChatBox() { @@ -21,7 +21,7 @@ public ResizableChatBox() // them to when the window is resized. We need it to be able to resize // within some bounds so that it doesn't overlap other UI elements, while still // being freely resizable within those bounds. - [Dependency] private readonly IClyde _clyde = default!; + [Dependency] private IClyde _clyde = default!; private const int DragMarginSize = 7; private const int MinDistanceFromBottom = 255; diff --git a/Content.Client/UserInterface/Systems/CloseWindow/CloseAllWindowsUIController.cs b/Content.Client/UserInterface/Systems/CloseWindow/CloseAllWindowsUIController.cs index a1daa55580d..b7ab0d43f04 100644 --- a/Content.Client/UserInterface/Systems/CloseWindow/CloseAllWindowsUIController.cs +++ b/Content.Client/UserInterface/Systems/CloseWindow/CloseAllWindowsUIController.cs @@ -9,10 +9,10 @@ namespace Content.Client.UserInterface.Systems.Info; -public sealed class CloseAllWindowsUIController : UIController +public sealed partial class CloseAllWindowsUIController : UIController { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; public override void Initialize() { diff --git a/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs b/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs index 45e313cf2e3..20a01921b40 100644 --- a/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs +++ b/Content.Client/UserInterface/Systems/CloseWindow/CloseRecentWindowUIController.cs @@ -9,10 +9,10 @@ namespace Content.Client.UserInterface.Systems.Info; -public sealed class CloseRecentWindowUIController : UIController +public sealed partial class CloseRecentWindowUIController : UIController { - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IUserInterfaceManager _uiManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IUserInterfaceManager _uiManager = default!; /// /// A list of windows that have been interacted with recently. Windows should only diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs index 54eee7e5050..fffc5112174 100644 --- a/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs +++ b/Content.Client/UserInterface/Systems/DamageOverlays/DamageOverlayUiController.cs @@ -16,10 +16,10 @@ namespace Content.Client.UserInterface.Systems.DamageOverlays; [UsedImplicitly] -public sealed class DamageOverlayUiController : UIController +public sealed partial class DamageOverlayUiController : UIController { - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; [UISystemDependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; [UISystemDependency] private readonly StatusEffectsSystem _statusEffects = default!; diff --git a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs index b05cebce409..0a9192ce31a 100644 --- a/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs +++ b/Content.Client/UserInterface/Systems/DamageOverlays/Overlays/DamageOverlay.cs @@ -8,14 +8,14 @@ namespace Content.Client.UserInterface.Systems.DamageOverlays.Overlays; -public sealed class DamageOverlay : Overlay +public sealed partial class DamageOverlay : Overlay { private static readonly ProtoId CircleMaskShader = "GradientCircleMask"; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override OverlaySpace Space => OverlaySpace.WorldSpace; diff --git a/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs b/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs index 27fa6f449ed..d1d6fd42ad5 100644 --- a/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs +++ b/Content.Client/UserInterface/Systems/DecalPlacer/DecalPlacerUIController.cs @@ -10,9 +10,9 @@ namespace Content.Client.UserInterface.Systems.DecalPlacer; -public sealed class DecalPlacerUIController : UIController, IOnStateExited, IOnSystemChanged +public sealed partial class DecalPlacerUIController : UIController, IOnStateExited, IOnSystemChanged { - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IPrototypeManager _prototypes = default!; [UISystemDependency] private readonly SandboxSystem _sandbox = default!; private DecalPlacerWindow? _window; diff --git a/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs b/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs index 781d0cad868..6417dfa5bcd 100644 --- a/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs +++ b/Content.Client/UserInterface/Systems/Emotes/EmotesUIController.cs @@ -16,10 +16,10 @@ namespace Content.Client.UserInterface.Systems.Emotes; [UsedImplicitly] -public sealed class EmotesUIController : UIController, IOnStateChanged +public sealed partial class EmotesUIController : UIController, IOnStateChanged { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; private MenuButton? EmotesButton => UIManager.GetActiveUIWidgetOrNull()?.EmotesButton; private SimpleRadialMenu? _menu; diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs index 199098410f1..0f090d553d5 100644 --- a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs +++ b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeContextUIController.cs @@ -10,12 +10,12 @@ namespace Content.Client.UserInterface.Systems.EscapeMenu; [UsedImplicitly] -public sealed class EscapeContextUIController : UIController +public sealed partial class EscapeContextUIController : UIController { - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IInputManager _inputManager = default!; - [Dependency] private readonly CloseRecentWindowUIController _closeRecentWindowUIController = default!; - [Dependency] private readonly EscapeUIController _escapeUIController = default!; + [Dependency] private CloseRecentWindowUIController _closeRecentWindowUIController = default!; + [Dependency] private EscapeUIController _escapeUIController = default!; public override void Initialize() { diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs index 54999dcd44d..dabc64b6356 100644 --- a/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs +++ b/Content.Client/UserInterface/Systems/EscapeMenu/EscapeUIController.cs @@ -17,16 +17,16 @@ namespace Content.Client.UserInterface.Systems.EscapeMenu; [UsedImplicitly] -public sealed class EscapeUIController : UIController, IOnStateEntered, IOnStateExited +public sealed partial class EscapeUIController : UIController, IOnStateEntered, IOnStateExited { - [Dependency] private readonly IClientConsoleHost _console = default!; - [Dependency] private readonly IUriOpener _uri = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ChangelogUIController _changelog = default!; - [Dependency] private readonly InfoUIController _info = default!; - [Dependency] private readonly OptionsUIController _options = default!; - [Dependency] private readonly GuidebookUIController _guidebook = default!; - [Dependency] private readonly FeedbackPopupUIController _feedback = null!; + [Dependency] private IClientConsoleHost _console = default!; + [Dependency] private IUriOpener _uri = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ChangelogUIController _changelog = default!; + [Dependency] private InfoUIController _info = default!; + [Dependency] private OptionsUIController _options = default!; + [Dependency] private GuidebookUIController _guidebook = default!; + [Dependency] private FeedbackPopupUIController _feedback = null!; private Options.UI.EscapeMenu? _escapeWindow; diff --git a/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs b/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs index 9f2179701ca..e579e03360b 100644 --- a/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs +++ b/Content.Client/UserInterface/Systems/EscapeMenu/OptionsUIController.cs @@ -6,9 +6,9 @@ namespace Content.Client.UserInterface.Systems.EscapeMenu; [UsedImplicitly] -public sealed class OptionsUIController : UIController +public sealed partial class OptionsUIController : UIController { - [Dependency] private readonly IConsoleHost _con = default!; + [Dependency] private IConsoleHost _con = default!; public override void Initialize() { diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs index aa93a95d393..fb7395587c4 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs @@ -9,7 +9,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles; [GenerateTypedNameReferences] public sealed partial class GhostRoleEntryButtons : BoxContainer { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; private readonly GhostRoleKind _ghostRoleKind; private readonly uint _playerCount; private readonly TimeSpan _raffleEndTime = TimeSpan.MinValue; diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs index fa4337accbb..b58bfa1755a 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles [GenerateTypedNameReferences] public sealed partial class GhostRoleRulesWindow : DefaultWindow { - [Dependency] private readonly IConfigurationManager _cfg = IoCManager.Resolve(); + [Dependency] private IConfigurationManager _cfg = IoCManager.Resolve(); private float _timer; public GhostRoleRulesWindow(string rules, Action requestAction) diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs index 5a9a3e49786..a0d7c0e9d97 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs @@ -10,11 +10,11 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles; [UsedImplicitly] -public sealed class MakeGhostRoleEui : BaseEui +public sealed partial class MakeGhostRoleEui : BaseEui { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; private readonly MakeGhostRoleWindow _window; diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs index 16e4cd97fef..2a6858ba45a 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs @@ -12,7 +12,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles [GenerateTypedNameReferences] public sealed partial class MakeGhostRoleWindow : DefaultWindow { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private readonly List _rafflePrototypes = []; private const int RaffleDontRaffleId = -1; diff --git a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs index 3e0a46f6f6f..47d1df4201a 100644 --- a/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs +++ b/Content.Client/UserInterface/Systems/Ghost/GhostUIController.cs @@ -9,9 +9,9 @@ namespace Content.Client.UserInterface.Systems.Ghost; // TODO hud refactor BEFORE MERGE fix ghost gui being too far up -public sealed class GhostUIController : UIController, IOnSystemChanged +public sealed partial class GhostUIController : UIController, IOnSystemChanged { - [Dependency] private readonly IEntityNetworkManager _net = default!; + [Dependency] private IEntityNetworkManager _net = default!; [UISystemDependency] private readonly GhostSystem? _system = default; diff --git a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs index fc79c6e9e92..0850de105b2 100644 --- a/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs +++ b/Content.Client/UserInterface/Systems/Guidebook/GuidebookUIController.cs @@ -19,12 +19,12 @@ namespace Content.Client.UserInterface.Systems.Guidebook; -public sealed class GuidebookUIController : UIController, IOnStateEntered, IOnStateEntered, IOnStateExited, IOnStateExited, IOnSystemChanged +public sealed partial class GuidebookUIController : UIController, IOnStateEntered, IOnStateEntered, IOnStateExited, IOnStateExited, IOnSystemChanged { [UISystemDependency] private readonly GuidebookSystem _guidebookSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly JobRequirementsManager _jobRequirements = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private JobRequirementsManager _jobRequirements = default!; private const int PlaytimeOpenGuidebook = 60; diff --git a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs index 122e0b2f088..8924d998fa4 100644 --- a/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs +++ b/Content.Client/UserInterface/Systems/Hands/HandsUIController.cs @@ -17,10 +17,10 @@ namespace Content.Client.UserInterface.Systems.Hands; -public sealed class HandsUIController : UIController, IOnStateEntered, IOnSystemChanged +public sealed partial class HandsUIController : UIController, IOnStateEntered, IOnSystemChanged { - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private IPlayerManager _player = default!; [UISystemDependency] private readonly HandsSystem _handsSystem = default!; [UISystemDependency] private readonly UseDelaySystem _useDelay = default!; diff --git a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs index e99de020cbb..5a8a804cb90 100644 --- a/Content.Client/UserInterface/Systems/Info/InfoUIController.cs +++ b/Content.Client/UserInterface/Systems/Info/InfoUIController.cs @@ -10,11 +10,11 @@ namespace Content.Client.UserInterface.Systems.Info; -public sealed class InfoUIController : UIController, IOnStateExited +public sealed partial class InfoUIController : UIController, IOnStateExited { - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; private RulesPopup? _rulesPopup; private RulesAndInfoWindow? _infoWindow; diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs b/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs index e3e367bccd9..3adf2da1597 100644 --- a/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs +++ b/Content.Client/UserInterface/Systems/Inventory/Controls/InventoryDisplay.cs @@ -8,6 +8,8 @@ namespace Content.Client.UserInterface.Systems.Inventory.Controls; public sealed class InventoryDisplay : LayoutContainer { private int Columns = 0; + + private ISawmill _sawmill = default!; private int Rows = 0; private const int MarginThickness = 10; private const int ButtonSpacing = 5; @@ -29,7 +31,7 @@ public SlotControl AddButton(SlotControl newButton, Vector2i buttonOffset) VerticalExpand = true; InheritChildMeasure = true; if (!_buttons.TryAdd(newButton.SlotName, (newButton, buttonOffset))) - Logger.Warning("Tried to add button without a slot!"); + _sawmill.Warning("Tried to add button without a slot!"); SetPosition(newButton, buttonOffset * ButtonSize + new Vector2(ButtonSpacing, ButtonSpacing)); UpdateSizeData(buttonOffset); return newButton; diff --git a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml.cs b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml.cs index 4f87fe77ed7..5798af29bcb 100644 --- a/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml.cs +++ b/Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml.cs @@ -14,7 +14,7 @@ namespace Content.Client.UserInterface.Systems.Inventory.Controls; [GenerateTypedNameReferences] public sealed partial class ItemStatusPanel : Control { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; [ViewVariables] private EntityUid? _entity; [ViewVariables] private Hand? _hand; diff --git a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs index 14b7422a318..cd7df0e24dc 100644 --- a/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs +++ b/Content.Client/UserInterface/Systems/Inventory/InventoryUIController.cs @@ -25,10 +25,10 @@ namespace Content.Client.UserInterface.Systems.Inventory; -public sealed class InventoryUIController : UIController, IOnStateEntered, IOnStateExited, +public sealed partial class InventoryUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged, IOnSystemChanged { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; [UISystemDependency] private readonly ClientInventorySystem _inventorySystem = default!; [UISystemDependency] private readonly HandsSystem _handsSystem = default!; diff --git a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs index e314310bc0c..2a78f87abf3 100644 --- a/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs +++ b/Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs @@ -13,17 +13,17 @@ namespace Content.Client.UserInterface.Systems.MenuBar; -public sealed class GameTopMenuBarUIController : UIController +public sealed partial class GameTopMenuBarUIController : UIController { - [Dependency] private readonly EscapeUIController _escape = default!; - [Dependency] private readonly AdminUIController _admin = default!; - [Dependency] private readonly CharacterUIController _character = default!; - [Dependency] private readonly CraftingUIController _crafting = default!; - [Dependency] private readonly AHelpUIController _ahelp = default!; - [Dependency] private readonly ActionUIController _action = default!; - [Dependency] private readonly SandboxUIController _sandbox = default!; - [Dependency] private readonly GuidebookUIController _guidebook = default!; - [Dependency] private readonly EmotesUIController _emotes = default!; + [Dependency] private EscapeUIController _escape = default!; + [Dependency] private AdminUIController _admin = default!; + [Dependency] private CharacterUIController _character = default!; + [Dependency] private CraftingUIController _crafting = default!; + [Dependency] private AHelpUIController _ahelp = default!; + [Dependency] private ActionUIController _action = default!; + [Dependency] private SandboxUIController _sandbox = default!; + [Dependency] private GuidebookUIController _guidebook = default!; + [Dependency] private EmotesUIController _emotes = default!; private GameTopMenuBar? GameTopMenuBar => UIManager.GetActiveUIWidgetOrNull(); diff --git a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs index e30bebee845..42a2976e257 100644 --- a/Content.Client/UserInterface/Systems/ProgressColorSystem.cs +++ b/Content.Client/UserInterface/Systems/ProgressColorSystem.cs @@ -7,9 +7,9 @@ namespace Content.Client.UserInterface.Systems; /// /// This system handles getting an interpolated color based on the value of a cvar. /// -public sealed class ProgressColorSystem : EntitySystem +public sealed partial class ProgressColorSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; + [Dependency] private IConfigurationManager _configuration = default!; private bool _colorBlindFriendly; diff --git a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs index 99510cf61b1..65fa7388ae3 100644 --- a/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs +++ b/Content.Client/UserInterface/Systems/Sandbox/SandboxUIController.cs @@ -22,12 +22,12 @@ namespace Content.Client.UserInterface.Systems.Sandbox; // TODO hud refactor should part of this be in engine? [UsedImplicitly] -public sealed class SandboxUIController : UIController, IOnStateChanged, IOnSystemChanged +public sealed partial class SandboxUIController : UIController, IOnStateChanged, IOnSystemChanged { - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IClientAdminManager _admin = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IClientAdminManager _admin = default!; + [Dependency] private IPlayerManager _player = default!; [UISystemDependency] private readonly SandboxSystem _sandbox = default!; diff --git a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs index b2ed74e3757..f69554bf0b5 100644 --- a/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs +++ b/Content.Client/UserInterface/Systems/Sandbox/Windows/SandboxWindow.xaml.cs @@ -14,10 +14,10 @@ namespace Content.Client.UserInterface.Systems.Sandbox.Windows; [GenerateTypedNameReferences] public sealed partial class SandboxWindow : DefaultWindow { - [Dependency] private readonly IEntityManager _entManager = null!; - [Dependency] private readonly IEyeManager _eyeManager = null!; - [Dependency] private readonly ILightManager _lightManager = null!; - [Dependency] private readonly IPlayerManager _playerManager = null!; + [Dependency] private IEntityManager _entManager = null!; + [Dependency] private IEyeManager _eyeManager = null!; + [Dependency] private ILightManager _lightManager = null!; + [Dependency] private IPlayerManager _playerManager = null!; private readonly DebugPhysicsSystem _debugPhysicsSystem; private readonly MarkerSystem _markerSystem; private readonly SubFloorHideSystem _subFloorSystem; diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs index 19789aba9a0..adcf6805d0e 100644 --- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs +++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs @@ -21,9 +21,9 @@ namespace Content.Client.UserInterface.Systems.Storage.Controls; -public sealed class StorageWindow : BaseWindow +public sealed partial class StorageWindow : BaseWindow { - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IEntityManager _entity = default!; private readonly StorageUIController _storageController; public EntityUid? StorageEntity; diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs index 792e5b9bc83..4be4456c25f 100644 --- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs +++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs @@ -25,7 +25,7 @@ namespace Content.Client.UserInterface.Systems.Storage; -public sealed class StorageUIController : UIController, IOnSystemChanged +public sealed partial class StorageUIController : UIController, IOnSystemChanged { /* * Things are a bit over the shop but essentially @@ -36,10 +36,10 @@ public sealed class StorageUIController : UIController, IOnSystemChanged UIManager.ActiveScreen?.GetWidget(); diff --git a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs index 52d0348b798..ab2c2663244 100644 --- a/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs +++ b/Content.Client/UserInterface/Systems/Vote/VoteUIController.cs @@ -7,9 +7,9 @@ namespace Content.Client.UserInterface.Systems.Vote; [UsedImplicitly] -public sealed class VoteUIController : UIController +public sealed partial class VoteUIController : UIController { - [Dependency] private readonly IVoteManager _votes = default!; + [Dependency] private IVoteManager _votes = default!; public override void Initialize() { diff --git a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs index 66b3a696bac..91e15fcc905 100644 --- a/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs +++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs @@ -16,8 +16,8 @@ namespace Content.Client.VendingMachines.UI [GenerateTypedNameReferences] public sealed partial class VendingMachineMenu : 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 Dictionary _dummies = []; private readonly Dictionary _listItems = new(); diff --git a/Content.Client/VendingMachines/VendingMachineSystem.cs b/Content.Client/VendingMachines/VendingMachineSystem.cs index 3e6ef0f8560..cdde7c72a19 100644 --- a/Content.Client/VendingMachines/VendingMachineSystem.cs +++ b/Content.Client/VendingMachines/VendingMachineSystem.cs @@ -6,11 +6,11 @@ namespace Content.Client.VendingMachines; -public sealed class VendingMachineSystem : SharedVendingMachineSystem +public sealed partial class VendingMachineSystem : SharedVendingMachineSystem { - [Dependency] private readonly AnimationPlayerSystem _animationPlayer = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _animationPlayer = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs index fd659a0f5da..d61f2fc79d9 100644 --- a/Content.Client/Verbs/UI/VerbMenuUIController.cs +++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs @@ -23,12 +23,12 @@ namespace Content.Client.Verbs.UI /// open a verb menu for a given entity, add verbs to it, and add server-verbs when the server response is /// received. /// - public sealed class VerbMenuUIController : UIController, + public sealed partial class VerbMenuUIController : UIController, IOnStateEntered, IOnStateExited, IOnStateEntered, IOnStateExited { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly ContextMenuUIController _context = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private ContextMenuUIController _context = default!; [UISystemDependency] private readonly CombatModeSystem _combatMode = default!; [UISystemDependency] private readonly VerbSystem _verbSystem = default!; diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index ee7fe1ac524..87b098e2496 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -22,18 +22,18 @@ namespace Content.Client.Verbs { [UsedImplicitly] - public sealed class VerbSystem : SharedVerbSystem + public sealed partial class VerbSystem : SharedVerbSystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly ExamineSystem _examine = default!; - [Dependency] private readonly SpriteTreeSystem _tree = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private ExamineSystem _examine = default!; + [Dependency] private SpriteTreeSystem _tree = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private EntityLookupSystem _lookup = default!; private float _lookupSize; diff --git a/Content.Client/Viewport/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs index 5c53d72d26e..ad2c572de20 100644 --- a/Content.Client/Viewport/ScalingViewport.cs +++ b/Content.Client/Viewport/ScalingViewport.cs @@ -19,11 +19,11 @@ namespace Content.Client.Viewport /// /// Viewport control that has a fixed viewport size and scales it appropriately. /// - public sealed class ScalingViewport : Control, IViewportControl + public sealed partial class ScalingViewport : Control, IViewportControl { - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IInputManager _inputManager = default!; // Internal viewport creation is deferred. private IClydeViewport? _viewport; diff --git a/Content.Client/Viewport/ViewportManager.cs b/Content.Client/Viewport/ViewportManager.cs index ef8132686b4..55c7a7c5203 100644 --- a/Content.Client/Viewport/ViewportManager.cs +++ b/Content.Client/Viewport/ViewportManager.cs @@ -8,9 +8,9 @@ namespace Content.Client.Viewport /// Event proxy for to listen to config events. /// // ReSharper disable once ClassNeverInstantiated.Global - public sealed class ViewportManager + public sealed partial class ViewportManager { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; private readonly List _viewports = new(); diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs index 8bf3e071a07..a2a6222e015 100644 --- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs +++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs @@ -4,9 +4,9 @@ namespace Content.Client.VoiceMask; -public sealed class VoiceMaskBoundUserInterface : BoundUserInterface +public sealed partial class VoiceMaskBoundUserInterface : BoundUserInterface { - [Dependency] private readonly IPrototypeManager _protomanager = default!; + [Dependency] private IPrototypeManager _protomanager = default!; [ViewVariables] private VoiceMaskNameChangeWindow? _window; diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs index 8a01600e5d0..fa457634814 100644 --- a/Content.Client/Voting/UI/VoteCallMenu.xaml.cs +++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs @@ -23,14 +23,14 @@ namespace Content.Client.Voting.UI [GenerateTypedNameReferences] public sealed partial class VoteCallMenu : BaseWindow { - [Dependency] private readonly IClientConsoleHost _consoleHost = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IClientNetManager _netManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntityNetworkManager _entNetManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IStateManager _state = default!; + [Dependency] private IClientConsoleHost _consoleHost = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IClientNetManager _netManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntityNetworkManager _entNetManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IStateManager _state = default!; private VotingSystem _votingSystem; diff --git a/Content.Client/Voting/UI/VoteCallMenuButton.cs b/Content.Client/Voting/UI/VoteCallMenuButton.cs index cf3f2c86f6b..466266eb4c7 100644 --- a/Content.Client/Voting/UI/VoteCallMenuButton.cs +++ b/Content.Client/Voting/UI/VoteCallMenuButton.cs @@ -8,9 +8,9 @@ namespace Content.Client.Voting.UI /// LITERALLY just a button that opens the vote call menu. /// Automatically disables itself if the client cannot call votes. /// - public sealed class VoteCallMenuButton : Button + public sealed partial class VoteCallMenuButton : Button { - [Dependency] private readonly IVoteManager _voteManager = default!; + [Dependency] private IVoteManager _voteManager = default!; private VoteCallMenu? _voteCallMenu; diff --git a/Content.Client/Voting/UI/VotePopup.xaml.cs b/Content.Client/Voting/UI/VotePopup.xaml.cs index 83e3ed9e55e..4cd454829d6 100644 --- a/Content.Client/Voting/UI/VotePopup.xaml.cs +++ b/Content.Client/Voting/UI/VotePopup.xaml.cs @@ -13,9 +13,9 @@ namespace Content.Client.Voting.UI [GenerateTypedNameReferences] public sealed partial class VotePopup : Control { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly IEntityNetworkManager _net = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private IEntityNetworkManager _net = default!; private readonly VoteManager.ActiveVote _vote; private readonly Button[] _voteButtons; diff --git a/Content.Client/Voting/VoteManager.cs b/Content.Client/Voting/VoteManager.cs index 09b3dcab1be..7c8c1c5ad3e 100644 --- a/Content.Client/Voting/VoteManager.cs +++ b/Content.Client/Voting/VoteManager.cs @@ -25,14 +25,14 @@ public interface IVoteManager event Action CanCallStandardVotesChanged; } - public sealed class VoteManager : IVoteManager + public sealed partial class VoteManager : IVoteManager { - [Dependency] private readonly IAudioManager _audio = default!; - [Dependency] private readonly IBaseClient _client = default!; - [Dependency] private readonly IClientConsoleHost _console = default!; - [Dependency] private readonly IClientNetManager _netManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IResourceCache _res = default!; + [Dependency] private IAudioManager _audio = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private IClientConsoleHost _console = default!; + [Dependency] private IClientNetManager _netManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IResourceCache _res = default!; private readonly Dictionary _standardVoteTimeouts = new(); private readonly Dictionary _votes = new(); diff --git a/Content.Client/Wall/WallmountDebugOverlay.cs b/Content.Client/Wall/WallmountDebugOverlay.cs index 02fd9ebeec8..71b1443ff44 100644 --- a/Content.Client/Wall/WallmountDebugOverlay.cs +++ b/Content.Client/Wall/WallmountDebugOverlay.cs @@ -9,9 +9,9 @@ namespace Content.Client.Wall; /// /// Shows the area in which entities with can be interacted from. /// -public sealed class WallmountDebugOverlay : Overlay +public sealed partial class WallmountDebugOverlay : Overlay { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private readonly SharedTransformSystem _transform; private readonly EntityLookupSystem _lookup; private readonly HashSet> _intersecting = []; diff --git a/Content.Client/Weapons/Marker/DamageMarkerSystem.cs b/Content.Client/Weapons/Marker/DamageMarkerSystem.cs index bdd95305deb..39aec8201db 100644 --- a/Content.Client/Weapons/Marker/DamageMarkerSystem.cs +++ b/Content.Client/Weapons/Marker/DamageMarkerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Client.Weapons.Marker; -public sealed class DamageMarkerSystem : SharedDamageMarkerSystem +public sealed partial class DamageMarkerSystem : SharedDamageMarkerSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs b/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs index 1eb82bde1cd..331f803f5d7 100644 --- a/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs +++ b/Content.Client/Weapons/Melee/MeleeSpreadCommand.cs @@ -6,15 +6,15 @@ namespace Content.Client.Weapons.Melee; -public sealed class MeleeSpreadCommand : LocalizedEntityCommands +public sealed partial class MeleeSpreadCommand : LocalizedEntityCommands { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly MeleeWeaponSystem _meleeSystem = default!; - [Dependency] private readonly SharedCombatModeSystem _combatSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private MeleeWeaponSystem _meleeSystem = default!; + [Dependency] private SharedCombatModeSystem _combatSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public override string Command => "showmeleespread"; diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs index 5eeddcb4e9c..4405f99a687 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs @@ -24,16 +24,16 @@ namespace Content.Client.Weapons.Melee; public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IStateManager _stateManager = default!; - [Dependency] private readonly AnimationPlayerSystem _animation = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; - [Dependency] private readonly MapSystem _map = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IStateManager _stateManager = default!; + [Dependency] private AnimationPlayerSystem _animation = default!; + [Dependency] private InputSystem _inputSystem = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] private SpriteSystem _sprite = default!; + [Dependency] private IConfigurationManager _cfg = default!; private EntityQuery _xformQuery; diff --git a/Content.Client/Weapons/Misc/GrapplingGunSystem.cs b/Content.Client/Weapons/Misc/GrapplingGunSystem.cs index 40b52b429f2..5e967f80de3 100644 --- a/Content.Client/Weapons/Misc/GrapplingGunSystem.cs +++ b/Content.Client/Weapons/Misc/GrapplingGunSystem.cs @@ -8,11 +8,11 @@ namespace Content.Client.Weapons.Misc; -public sealed class GrapplingGunSystem : SharedGrapplingGunSystem +public sealed partial class GrapplingGunSystem : SharedGrapplingGunSystem { - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly InputSystem _input = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private InputSystem _input = default!; + [Dependency] private IPlayerManager _player = default!; public override void Update(float frameTime) { diff --git a/Content.Client/Weapons/Misc/TetherGunSystem.cs b/Content.Client/Weapons/Misc/TetherGunSystem.cs index 80564d3fbe7..276ed5352c7 100644 --- a/Content.Client/Weapons/Misc/TetherGunSystem.cs +++ b/Content.Client/Weapons/Misc/TetherGunSystem.cs @@ -8,16 +8,16 @@ namespace Content.Client.Weapons.Misc; -public sealed class TetherGunSystem : SharedTetherGunSystem +public sealed partial class TetherGunSystem : SharedTetherGunSystem { - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IInputManager _input = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IOverlayManager _overlay = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IInputManager _input = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IOverlayManager _overlay = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs b/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs index 42456d232bf..aa4665a4855 100644 --- a/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs +++ b/Content.Client/Weapons/Ranged/Commands/ShowSpreadCommand.cs @@ -3,9 +3,9 @@ namespace Content.Client.Weapons.Ranged.Commands; -public sealed class ShowSpreadCommand : LocalizedEntityCommands +public sealed partial class ShowSpreadCommand : LocalizedEntityCommands { - [Dependency] private readonly GunSystem _gunSystem = default!; + [Dependency] private GunSystem _gunSystem = default!; public override string Command => "showgunspread"; diff --git a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs index 3a0aa255012..b140df865bf 100644 --- a/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/FlyBySoundSystem.cs @@ -8,11 +8,11 @@ namespace Content.Client.Weapons.Ranged.Systems; -public sealed class FlyBySoundSystem : SharedFlyBySoundSystem +public sealed partial class FlyBySoundSystem : SharedFlyBySoundSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs index e652bd03fe9..24979a9a91d 100644 --- a/Content.Client/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Client/Weapons/Ranged/Systems/GunSystem.cs @@ -33,18 +33,18 @@ namespace Content.Client.Weapons.Ranged.Systems; public sealed partial class GunSystem : SharedGunSystem { - [Dependency] private readonly AnimationPlayerSystem _animPlayer = default!; - [Dependency] private readonly IEyeManager _eyeManager = default!; - [Dependency] private readonly IInputManager _inputManager = default!; - [Dependency] private readonly InputSystem _inputSystem = default!; - [Dependency] private readonly IOverlayManager _overlayManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IStateManager _state = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private AnimationPlayerSystem _animPlayer = default!; + [Dependency] private IEyeManager _eyeManager = default!; + [Dependency] private IInputManager _inputManager = default!; + [Dependency] private InputSystem _inputSystem = default!; + [Dependency] private IOverlayManager _overlayManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IStateManager _state = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private SharedCameraRecoilSystem _recoil = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private SpriteSystem _sprite = default!; public static readonly EntProtoId HitscanProto = "HitscanEffect"; diff --git a/Content.Client/Weather/WeatherSystem.cs b/Content.Client/Weather/WeatherSystem.cs index 7e6db464dc2..2186422cbb8 100644 --- a/Content.Client/Weather/WeatherSystem.cs +++ b/Content.Client/Weather/WeatherSystem.cs @@ -13,12 +13,12 @@ namespace Content.Client.Weather; -public sealed class WeatherSystem : SharedWeatherSystem +public sealed partial class WeatherSystem : SharedWeatherSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; private EntityQuery _audioQuery; private EntityQuery _gridQuery; diff --git a/Content.Client/Wieldable/WieldableSystem.cs b/Content.Client/Wieldable/WieldableSystem.cs index 2d0812893c2..70d532c85c4 100644 --- a/Content.Client/Wieldable/WieldableSystem.cs +++ b/Content.Client/Wieldable/WieldableSystem.cs @@ -10,10 +10,10 @@ namespace Content.Client.Wieldable; -public sealed class WieldableSystem : SharedWieldableSystem +public sealed partial class WieldableSystem : SharedWieldableSystem { - [Dependency] private readonly EyeCursorOffsetSystem _eyeOffset = default!; - [Dependency] private readonly IClientGameTiming _gameTiming = default!; + [Dependency] private EyeCursorOffsetSystem _eyeOffset = default!; + [Dependency] private IClientGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Client/Wires/UI/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs index 44033c6d1dd..2c034a38fa8 100644 --- a/Content.Client/Wires/UI/WiresMenu.cs +++ b/Content.Client/Wires/UI/WiresMenu.cs @@ -15,9 +15,9 @@ namespace Content.Client.Wires.UI { - public sealed class WiresMenu : BaseWindow + public sealed partial class WiresMenu : BaseWindow { - [Dependency] private readonly IResourceCache _resourceCache = default!; + [Dependency] private IResourceCache _resourceCache = default!; private readonly Control _wiresHBox; private readonly Control _topContainer; diff --git a/Content.Client/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs b/Content.Client/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs index 557d46f46b6..0997f87c1ef 100644 --- a/Content.Client/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs +++ b/Content.Client/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs @@ -6,9 +6,9 @@ namespace Content.Client.Xenoarchaeology.Equipment; /// -public sealed class ArtifactAnalyzerSystem : SharedArtifactAnalyzerSystem +public sealed partial class ArtifactAnalyzerSystem : SharedArtifactAnalyzerSystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private UserInterfaceSystem _ui = default!; /// public override void Initialize() diff --git a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs index b5a208f941e..89592e6d115 100644 --- a/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/AnalysisConsoleMenu.xaml.cs @@ -23,9 +23,9 @@ public sealed partial class AnalysisConsoleMenu : FancyWindow { private static readonly TimeSpan ExtractInfoDisplayForDuration = TimeSpan.FromSeconds(3); - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly IResourceCache _resCache = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private IResourceCache _resCache = default!; + [Dependency] private IGameTiming _timing = default!; private readonly ArtifactAnalyzerSystem _artifactAnalyzer; private readonly XenoArtifactSystem _xenoArtifact; diff --git a/Content.Client/Xenoarchaeology/Ui/NodeScannerDisplay.xaml.cs b/Content.Client/Xenoarchaeology/Ui/NodeScannerDisplay.xaml.cs index f3663500eba..b744e380b4e 100644 --- a/Content.Client/Xenoarchaeology/Ui/NodeScannerDisplay.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/NodeScannerDisplay.xaml.cs @@ -13,8 +13,8 @@ namespace Content.Client.Xenoarchaeology.Ui; [GenerateTypedNameReferences] public sealed partial class NodeScannerDisplay : FancyWindow { - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private IGameTiming _timing = default!; private readonly SharedXenoArtifactSystem _artifact; private TimeSpan? _nextUpdate; diff --git a/Content.Client/Xenoarchaeology/Ui/XenoArtifactGraphControl.xaml.cs b/Content.Client/Xenoarchaeology/Ui/XenoArtifactGraphControl.xaml.cs index 53965ca032f..44b79dc64bb 100644 --- a/Content.Client/Xenoarchaeology/Ui/XenoArtifactGraphControl.xaml.cs +++ b/Content.Client/Xenoarchaeology/Ui/XenoArtifactGraphControl.xaml.cs @@ -15,7 +15,7 @@ namespace Content.Client.Xenoarchaeology.Ui; [GenerateTypedNameReferences] public sealed partial class XenoArtifactGraphControl : BoxContainer { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly XenoArtifactSystem _artifactSystem; diff --git a/Content.Client/Zombies/ZombieSystem.cs b/Content.Client/Zombies/ZombieSystem.cs index 11ec93162ab..be9cda66d84 100644 --- a/Content.Client/Zombies/ZombieSystem.cs +++ b/Content.Client/Zombies/ZombieSystem.cs @@ -7,10 +7,10 @@ namespace Content.Client.Zombies; -public sealed class ZombieSystem : SharedZombieSystem +public sealed partial class ZombieSystem : SharedZombieSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SpriteSystem _sprite = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SpriteSystem _sprite = default!; public override void Initialize() { diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs deleted file mode 100644 index 4dcab5e71f1..00000000000 --- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs +++ /dev/null @@ -1,98 +0,0 @@ -using Content.Shared.Administration.Systems; -using Content.Shared.Damage; -using Content.Shared.Damage.Components; -using Content.Shared.Damage.Prototypes; -using Content.Shared.Damage.Systems; -using Content.Shared.FixedPoint; -using Content.Shared.Mobs.Components; -using Content.Shared.Mobs.Systems; -using Robust.Shared.GameObjects; -using Robust.Shared.Map; -using Robust.Shared.Prototypes; - -namespace Content.IntegrationTests.Tests.Commands -{ - [TestFixture] - [TestOf(typeof(RejuvenateSystem))] - public sealed class RejuvenateTest - { - private static readonly ProtoId TestDamageGroup = "Toxin"; - - [TestPrototypes] - private const string Prototypes = @" -- type: entity - name: DamageableDummy - id: DamageableDummy - components: - - type: Damageable - damageContainer: Biological - - type: MobState - - type: MobThresholds - thresholds: - 0: Alive - 200: Dead -"; - - [Test] - public async Task RejuvenateDeadTest() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - var entManager = server.ResolveDependency(); - var prototypeManager = server.ResolveDependency(); - var mobStateSystem = entManager.System(); - var damSystem = entManager.System(); - var rejuvenateSystem = entManager.System(); - - await server.WaitAssertion(() => - { - var human = entManager.SpawnEntity("DamageableDummy", MapCoordinates.Nullspace); - DamageableComponent damageable = null; - MobStateComponent mobState = null; - - // Sanity check - Assert.Multiple(() => - { - Assert.That(entManager.TryGetComponent(human, out damageable)); - Assert.That(entManager.TryGetComponent(human, out mobState)); - }); - Assert.Multiple(() => - { - Assert.That(mobStateSystem.IsAlive(human, mobState), Is.True); - Assert.That(mobStateSystem.IsCritical(human, mobState), Is.False); - Assert.That(mobStateSystem.IsDead(human, mobState), Is.False); - Assert.That(mobStateSystem.IsIncapacitated(human, mobState), Is.False); - }); - - // Kill the entity - DamageSpecifier damage = new(prototypeManager.Index(TestDamageGroup), FixedPoint2.New(10000000)); - - damSystem.TryChangeDamage(human, damage, true); - - // Check that it is dead - Assert.Multiple(() => - { - Assert.That(mobStateSystem.IsAlive(human, mobState), Is.False); - Assert.That(mobStateSystem.IsCritical(human, mobState), Is.False); - Assert.That(mobStateSystem.IsDead(human, mobState), Is.True); - Assert.That(mobStateSystem.IsIncapacitated(human, mobState), Is.True); - }); - - // Rejuvenate them - rejuvenateSystem.PerformRejuvenate(human); - - // Check that it is alive and with no damage - Assert.Multiple(() => - { - Assert.That(mobStateSystem.IsAlive(human, mobState), Is.True); - Assert.That(mobStateSystem.IsCritical(human, mobState), Is.False); - Assert.That(mobStateSystem.IsDead(human, mobState), Is.False); - Assert.That(mobStateSystem.IsIncapacitated(human, mobState), Is.False); - - Assert.That(damSystem.GetTotalDamage((human, damageable)), Is.EqualTo(FixedPoint2.Zero)); - }); - }); - await pair.CleanReturnAsync(); - } - } -} diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs index 81229fb89ae..8748e966a91 100644 --- a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -163,7 +163,6 @@ await server.WaitAssertion(() => Assert.That(mobStateSystem.IsDead(player, mobStateComp)); Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && !ghostComp.CanReturnToBody); - Assert.That(damageableSystem.GetTotalDamage(player), Is.EqualTo(lethalDamageThreshold)); }); }); @@ -289,7 +288,6 @@ await server.WaitAssertion(() => Assert.That(mobStateSystem.IsDead(player, mobStateComp)); Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && !ghostComp.CanReturnToBody); - Assert.That(damageableSystem.GetAllDamage((player, damageableComp)).DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold)); }); }); @@ -364,7 +362,6 @@ await server.WaitAssertion(() => Assert.That(mobStateSystem.IsDead(player, mobStateComp)); Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && !ghostComp.CanReturnToBody); - Assert.That(damageableSystem.GetAllDamage((player, damageableComp)).DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold / 2)); }); }); diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs b/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs deleted file mode 100644 index 1651aa8eef5..00000000000 --- a/Content.IntegrationTests/Tests/Construction/Interaction/WindowRepair.cs +++ /dev/null @@ -1,44 +0,0 @@ -using Content.IntegrationTests.Tests.Interaction; -using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; -using Content.Shared.Damage.Systems; -using Content.Shared.FixedPoint; -using Robust.Shared.Prototypes; - -namespace Content.IntegrationTests.Tests.Construction.Interaction; - -public sealed class WindowRepair : InteractionTest -{ - private static readonly ProtoId BluntDamageType = "Blunt"; - - [Test] - public async Task RepairReinforcedWindow() - { - await SpawnTarget("ReinforcedWindow"); - - // Damage the entity. - var sys = SEntMan.System(); - var damageType = Server.ProtoMan.Index(BluntDamageType); - var damage = new DamageSpecifier(damageType, FixedPoint2.New(10)); - Assert.That(sys.GetTotalDamage(STarget.Value), Is.EqualTo(FixedPoint2.Zero)); - await Server.WaitPost(() => sys.TryChangeDamage(SEntMan.GetEntity(Target).Value, damage, ignoreResistances: true)); - await RunTicks(5); - Assert.That(sys.GetTotalDamage(STarget.Value), Is.GreaterThan(FixedPoint2.Zero)); - - // Repair the entity - await InteractUsing(Weld); - Assert.That(sys.GetTotalDamage(STarget.Value), Is.EqualTo(FixedPoint2.Zero)); - - // Validate that we can still deconstruct the entity (i.e., that welding deconstruction is not blocked). - await Interact( - Weld, - Screw, - Pry, - Weld, - Screw, - Wrench); - AssertDeleted(); - await AssertEntityLookup((RGlass, 2)); - } -} - diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index 9777054625f..e286c75e07f 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -91,170 +91,5 @@ public sealed class DamageableTest - type: Damageable damageContainer: testDamageContainer "; - - [Test] - public async Task TestDamageableComponents() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var sEntityManager = server.ResolveDependency(); - var sMapManager = server.ResolveDependency(); - var sPrototypeManager = server.ResolveDependency(); - var sEntitySystemManager = server.ResolveDependency(); - - EntityUid sDamageableEntity = default; - DamageableComponent sDamageableComponent = null; - DamageableSystem sDamageableSystem = null; - - DamageGroupPrototype group1 = default!; - DamageGroupPrototype group2 = default!; - DamageGroupPrototype group3 = default!; - - DamageTypePrototype type1 = default!; - DamageTypePrototype type2a = default!; - DamageTypePrototype type2b = default!; - DamageTypePrototype type3a = default!; - DamageTypePrototype type3b = default!; - DamageTypePrototype type3c = default!; - - FixedPoint2 typeDamage; - - var map = await pair.CreateTestMap(); - - await server.WaitPost(() => - { - var coordinates = map.MapCoords; - - sDamageableEntity = sEntityManager.SpawnEntity(TestDamageableEntityId, coordinates); - sDamageableComponent = sEntityManager.GetComponent(sDamageableEntity); - sDamageableSystem = sEntitySystemManager.GetEntitySystem(); - - group1 = sPrototypeManager.Index(TestGroup1); - group2 = sPrototypeManager.Index(TestGroup2); - group3 = sPrototypeManager.Index(TestGroup3); - - type1 = sPrototypeManager.Index(TestDamage1); - type2a = sPrototypeManager.Index(TestDamage2a); - type2b = sPrototypeManager.Index(TestDamage2b); - type3a = sPrototypeManager.Index(TestDamage3a); - type3b = sPrototypeManager.Index(TestDamage3b); - type3c = sPrototypeManager.Index(TestDamage3c); - }); - - await server.WaitRunTicks(5); - - await server.WaitAssertion(() => - { - var uid = sDamageableEntity; - var ent = new Entity(uid, sDamageableComponent); - - // Check that damage is evenly distributed over a group if its a nice multiple - var types = group3.DamageTypes; - var damageToDeal = FixedPoint2.New(types.Count * 5); - DamageSpecifier damage = new(group3, damageToDeal); - - sDamageableSystem.ChangeDamage(uid, damage, true); - - Assert.Multiple(() => - { - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(damageToDeal)); - Assert.That(sDamageableSystem.GetDamagePerGroup(ent)[group3.ID], Is.EqualTo(damageToDeal)); - foreach (var type in types) - { - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict.TryGetValue(type, out typeDamage)); - Assert.That(typeDamage, Is.EqualTo(damageToDeal / types.Count)); - } - }); - - // Heal - sDamageableSystem.ChangeDamage(uid, -damage); - - Assert.Multiple(() => - { - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - Assert.That(sDamageableSystem.GetDamagePerGroup(ent)[group3.ID], Is.EqualTo(FixedPoint2.Zero)); - foreach (var type in types) - { - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict.TryGetValue(type, out typeDamage)); - Assert.That(typeDamage, Is.EqualTo(FixedPoint2.Zero)); - } - }); - - // Check that damage works properly if it is NOT perfectly divisible among group members - types = group3.DamageTypes; - - Assert.That(types, Has.Count.EqualTo(3)); - - damage = new DamageSpecifier(group3, 14); - sDamageableSystem.ChangeDamage(uid, damage, true); - - Assert.Multiple(() => - { - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.New(14))); - Assert.That(sDamageableSystem.GetDamagePerGroup(ent)[group3.ID], Is.EqualTo(FixedPoint2.New(14))); - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(4.66f))); - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict[type3b.ID], Is.EqualTo(FixedPoint2.New(4.67f))); - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict[type3c.ID], Is.EqualTo(FixedPoint2.New(4.67f))); - }); - - // Heal - sDamageableSystem.ChangeDamage(uid, -damage); - - Assert.Multiple(() => - { - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - Assert.That(sDamageableSystem.GetDamagePerGroup(ent)[group3.ID], Is.EqualTo(FixedPoint2.Zero)); - foreach (var type in types) - { - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict.TryGetValue(type, out typeDamage)); - Assert.That(typeDamage, Is.EqualTo(FixedPoint2.Zero)); - } - - // Test that unsupported groups return false when setting/getting damage (and don't change damage) - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - }); - damage = new DamageSpecifier(group1, FixedPoint2.New(10)) + new DamageSpecifier(type2b, FixedPoint2.New(10)); - sDamageableSystem.ChangeDamage(uid, damage, true); - - Assert.Multiple(() => - { - Assert.That(sDamageableSystem.GetDamagePerGroup(ent).TryGetValue(group1.ID, out _), Is.False); - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict.TryGetValue(type1.ID, out typeDamage), Is.False); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - }); - - // Test SetAll and ClearAll function - sDamageableSystem.SetAllDamage((sDamageableEntity, sDamageableComponent), 10); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.New(10 * sDamageableSystem.GetAllDamage(uid).DamageDict.Count))); - sDamageableSystem.SetAllDamage((sDamageableEntity, sDamageableComponent), 0); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - sDamageableSystem.SetAllDamage((sDamageableEntity, sDamageableComponent), 10); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.New(10 * sDamageableSystem.GetAllDamage(uid).DamageDict.Count))); - sDamageableSystem.ClearAllDamage((sDamageableEntity, sDamageableComponent)); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - - // Test 'wasted' healing - sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3a, 5)); - sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(type3b, 7)); - sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -11)); - - Assert.Multiple(() => - { - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict[type3a.ID], Is.EqualTo(FixedPoint2.New(1.34))); - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict[type3b.ID], Is.EqualTo(FixedPoint2.New(3.33))); - Assert.That(sDamageableSystem.GetAllDamage(uid).DamageDict[type3c.ID], Is.EqualTo(FixedPoint2.New(0))); - }); - - // Test Over-Healing - sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, FixedPoint2.New(-100))); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - - // Test that if no health change occurred, returns false - sDamageableSystem.ChangeDamage(uid, new DamageSpecifier(group3, -100)); - Assert.That(sDamageableSystem.GetTotalDamage(ent), Is.EqualTo(FixedPoint2.Zero)); - }); - await pair.CleanReturnAsync(); - } } } diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs index f5010eefdc1..bf5f08a285c 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs @@ -54,27 +54,12 @@ await server.WaitAssertion(() => await server.WaitAssertion(() => { - var bruteDamageGroup = sPrototypeManager.Index(TestBruteDamageGroupId); - var burnDamageGroup = sPrototypeManager.Index(TestBurnDamageGroupId); - - DamageSpecifier bruteDamage = new(bruteDamageGroup, FixedPoint2.New(5)); - DamageSpecifier burnDamage = new(burnDamageGroup, FixedPoint2.New(5)); - - // Raise brute damage to 5 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage, true); - // No thresholds reached yet, the earliest one is at 10 damage Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise brute damage to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage, true); - // No threshold reached, burn needs to be 10 as well Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise burn damage to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, burnDamage * 2, true); - // One threshold reached, brute 10 + burn 10 Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); @@ -101,31 +86,19 @@ await server.WaitAssertion(() => sTestThresholdListenerSystem.ThresholdsReached.Clear(); - // Raise brute damage to 20 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage * 2, true); - // No new thresholds reached Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise burn damage to 20 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, burnDamage * 2, true); - // No new thresholds reached Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Lower brute damage to 0 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage * -10); Assert.Multiple(() => { - Assert.That(sDamageableSystem.GetTotalDamage(sDestructibleEntity), Is.EqualTo(FixedPoint2.New(20))); // No new thresholds reached, healing should not trigger it Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); }); - // Raise brute damage back up to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage * 2, true); - // 10 brute + 10 burn threshold reached, brute was healed and brought back to its threshold amount and slash stayed the same Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); @@ -137,15 +110,9 @@ await server.WaitAssertion(() => // No new thresholds reached, healing should not trigger it Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise brute damage to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage * 2, true); - // No new thresholds reached Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise burn damage to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, burnDamage * 2, true); - // Both classes of damage were healed and then raised again, the threshold should have been reached as triggers once is default false Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); @@ -181,15 +148,9 @@ await server.WaitAssertion(() => // No new thresholds reached from healing Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise brute damage to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bruteDamage * 2, true); - // No new thresholds reached Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - // Raise burn damage to 10 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, burnDamage * 2, true); - // No new thresholds reached as triggers once is set to true and it already triggered before Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); }); diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs index fc6cfae6a50..c18892e4afe 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs @@ -39,14 +39,6 @@ await server.WaitPost(() => await server.WaitAssertion(() => { var coordinates = sEntityManager.GetComponent(sDestructibleEntity).Coordinates; - var bruteDamageGroup = sPrototypeManager.Index(TestBruteDamageGroupId); - DamageSpecifier bruteDamage = new(bruteDamageGroup, 50); - -#pragma warning disable NUnit2045 // Interdependent assertions. - Assert.DoesNotThrow(() => - { - sEntityManager.System().TryChangeDamage(sDestructibleEntity, bruteDamage, true); - }); Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); #pragma warning restore NUnit2045 diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs deleted file mode 100644 index 3081c161c7d..00000000000 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs +++ /dev/null @@ -1,295 +0,0 @@ -using Content.Server.Destructible; -using Content.Server.Destructible.Thresholds; -using Content.Server.Destructible.Thresholds.Behaviors; -using Content.Shared.Damage; -using Content.Shared.Damage.Components; -using Content.Shared.Damage.Prototypes; -using Content.Shared.Damage.Systems; -using Content.Shared.Destructible; -using Content.Shared.Destructible.Thresholds.Triggers; -using Content.Shared.FixedPoint; -using Robust.Shared.Audio.Systems; -using Robust.Shared.GameObjects; -using Robust.Shared.Prototypes; -using System.Linq; -using static Content.IntegrationTests.Tests.Destructible.DestructibleTestPrototypes; - -namespace Content.IntegrationTests.Tests.Destructible -{ - [TestFixture] - [TestOf(typeof(DestructibleComponent))] - [TestOf(typeof(DamageThreshold))] - public sealed class DestructibleThresholdActivationTest - { - [Test] - public async Task Test() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var sEntityManager = server.ResolveDependency(); - var sPrototypeManager = server.ResolveDependency(); - var sEntitySystemManager = server.ResolveDependency(); - var audio = sEntitySystemManager.GetEntitySystem(); - - var testMap = await pair.CreateTestMap(); - - EntityUid sDestructibleEntity = default; - DamageableComponent sDamageableComponent = null; - DestructibleComponent sDestructibleComponent = null; - TestDestructibleListenerSystem sTestThresholdListenerSystem = null; - DamageableSystem sDamageableSystem = null; - - await server.WaitPost(() => - { - var coordinates = testMap.GridCoords; - - sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleEntityId, coordinates); - sDamageableComponent = sEntityManager.GetComponent(sDestructibleEntity); - sDestructibleComponent = sEntityManager.GetComponent(sDestructibleEntity); - - sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem(); - sTestThresholdListenerSystem.ThresholdsReached.Clear(); - - sDamageableSystem = sEntitySystemManager.GetEntitySystem(); - }); - - await server.WaitRunTicks(5); - - await server.WaitAssertion(() => - { - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - }); - - await server.WaitAssertion(() => - { - var bluntDamage = new DamageSpecifier(sPrototypeManager.Index(TestBluntDamageTypeId), 10); - - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true); - - // No thresholds reached yet, the earliest one is at 20 damage - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true); - - // Only one threshold reached, 20 - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); - - // Threshold 20 - var msg = sTestThresholdListenerSystem.ThresholdsReached[0]; - var threshold = msg.Threshold; - - // Check that it matches the YAML prototype - Assert.Multiple(() => - { - Assert.That(threshold.Behaviors, Is.Empty); - Assert.That(threshold.Trigger, Is.Not.Null); - Assert.That(threshold.Triggered, Is.True); - }); - - sTestThresholdListenerSystem.ThresholdsReached.Clear(); - - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 3, true); - - // One threshold reached, 50, since 20 already triggered before and it has not been healed below that amount - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); - - // Threshold 50 - msg = sTestThresholdListenerSystem.ThresholdsReached[0]; - threshold = msg.Threshold; - - // Check that it matches the YAML prototype - Assert.That(threshold.Behaviors, Has.Count.EqualTo(3)); - - var soundThreshold = (PlaySoundBehavior)threshold.Behaviors[0]; - var spawnThreshold = (SpawnEntitiesBehavior)threshold.Behaviors[1]; - var actsThreshold = (DoActsBehavior)threshold.Behaviors[2]; - - Assert.Multiple(() => - { - Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage)); - Assert.That(spawnThreshold.Spawn, Is.Not.Null); - Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1)); - Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId)); - Assert.That(spawnThreshold.Spawn.Single().Value.Min, Is.EqualTo(1)); - Assert.That(spawnThreshold.Spawn.Single().Value.Max, Is.EqualTo(1)); - Assert.That(threshold.Trigger, Is.Not.Null); - Assert.That(threshold.Triggered, Is.True); - }); - - sTestThresholdListenerSystem.ThresholdsReached.Clear(); - - // Damage for 50 again, up to 100 now - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 5, true); - - // No thresholds reached as they weren't healed below the trigger amount - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - - // Set damage to 0 - sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); - - // Damage for 100, up to 100 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 10, true); - - // Two thresholds reached as damage increased past the previous, 20 and 50 - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(2)); - - sTestThresholdListenerSystem.ThresholdsReached.Clear(); - - // Heal the entity for 40 damage, down to 60 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * -4, true); - - // ThresholdsLookup don't work backwards - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - - // Damage for 10, up to 70 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true); - - // Not enough healing to de-trigger a threshold - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - - // Heal by 30, down to 40 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * -3, true); - - // ThresholdsLookup don't work backwards - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - - // Damage up to 50 again - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage, true); - - // The 50 threshold should have triggered again, after being healed - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Count.EqualTo(1)); - - msg = sTestThresholdListenerSystem.ThresholdsReached[0]; - threshold = msg.Threshold; - - // Check that it matches the YAML prototype - Assert.That(threshold.Behaviors, Has.Count.EqualTo(3)); - - soundThreshold = (PlaySoundBehavior)threshold.Behaviors[0]; - spawnThreshold = (SpawnEntitiesBehavior)threshold.Behaviors[1]; - actsThreshold = (DoActsBehavior)threshold.Behaviors[2]; - - // Check that it matches the YAML prototype - Assert.Multiple(() => - { - Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage)); - Assert.That(spawnThreshold.Spawn, Is.Not.Null); - Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1)); - Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId)); - Assert.That(spawnThreshold.Spawn.Single().Value.Min, Is.EqualTo(1)); - Assert.That(spawnThreshold.Spawn.Single().Value.Max, Is.EqualTo(1)); - Assert.That(threshold.Trigger, Is.Not.Null); - Assert.That(threshold.Triggered, Is.True); - }); - - // Reset thresholds reached - sTestThresholdListenerSystem.ThresholdsReached.Clear(); - - // Heal all damage - sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); - - // Damage up to 50 - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 5, true); - - Assert.Multiple(() => - { - // Check that the total damage matches - Assert.That(sDamageableSystem.GetTotalDamage(sDestructibleEntity), Is.EqualTo(FixedPoint2.New(50))); - - // Both thresholds should have triggered - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Has.Exactly(2).Items); - }); - - // Verify the first one, should be the lowest one (20) - msg = sTestThresholdListenerSystem.ThresholdsReached[0]; - var trigger = (DamageTrigger)msg.Threshold.Trigger; - Assert.Multiple(() => - { - Assert.That(trigger, Is.Not.Null); - Assert.That(trigger.Damage, Is.EqualTo(FixedPoint2.New(20))); - }); - - threshold = msg.Threshold; - - // Check that it matches the YAML prototype - Assert.That(threshold.Behaviors, Is.Empty); - - // Verify the second one, should be the highest one (50) - msg = sTestThresholdListenerSystem.ThresholdsReached[1]; - trigger = (DamageTrigger)msg.Threshold.Trigger; - Assert.Multiple(() => - { - Assert.That(trigger, Is.Not.Null); - Assert.That(trigger.Damage, Is.EqualTo(FixedPoint2.New(50))); - }); - - threshold = msg.Threshold; - - Assert.That(threshold.Behaviors, Has.Count.EqualTo(3)); - - soundThreshold = (PlaySoundBehavior)threshold.Behaviors[0]; - spawnThreshold = (SpawnEntitiesBehavior)threshold.Behaviors[1]; - actsThreshold = (DoActsBehavior)threshold.Behaviors[2]; - - // Check that it matches the YAML prototype - Assert.Multiple(() => - { - Assert.That(actsThreshold.Acts, Is.EqualTo(ThresholdActs.Breakage)); - Assert.That(spawnThreshold.Spawn, Is.Not.Null); - Assert.That(spawnThreshold.Spawn, Has.Count.EqualTo(1)); - Assert.That(spawnThreshold.Spawn.Single().Key, Is.EqualTo(SpawnedEntityId)); - Assert.That(spawnThreshold.Spawn.Single().Value.Min, Is.EqualTo(1)); - Assert.That(spawnThreshold.Spawn.Single().Value.Max, Is.EqualTo(1)); - Assert.That(threshold.Trigger, Is.Not.Null); - Assert.That(threshold.Triggered, Is.True); - }); - - // Reset thresholds reached - sTestThresholdListenerSystem.ThresholdsReached.Clear(); - - // Heal the entity completely - sDamageableSystem.ClearAllDamage((sDestructibleEntity, sDamageableComponent)); - - // Check that the entity has 0 damage - Assert.That(sDamageableSystem.GetTotalDamage(sDestructibleEntity), Is.EqualTo(FixedPoint2.Zero)); - - // Set both thresholds to only trigger once - foreach (var destructibleThreshold in sDestructibleComponent.Thresholds) - { - Assert.That(destructibleThreshold.Trigger, Is.Not.Null); - destructibleThreshold.TriggersOnce = true; - } - - // Damage the entity up to 50 damage again - sDamageableSystem.TryChangeDamage(sDestructibleEntity, bluntDamage * 5, true); - - Assert.Multiple(() => - { - // Check that the total damage matches - Assert.That(sDamageableSystem.GetTotalDamage(sDestructibleEntity), Is.EqualTo(FixedPoint2.New(50))); - - // No thresholds should have triggered as they were already triggered before, and they are set to only trigger once - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - }); - - // Set both thresholds to trigger multiple times - foreach (var destructibleThreshold in sDestructibleComponent.Thresholds) - { - Assert.That(destructibleThreshold.Trigger, Is.Not.Null); - destructibleThreshold.TriggersOnce = false; - } - - Assert.Multiple(() => - { - // Check that the total damage matches - Assert.That(sDamageableSystem.GetTotalDamage(sDestructibleEntity), Is.EqualTo(FixedPoint2.New(50))); - - // They shouldn't have been triggered by changing TriggersOnce - Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); - }); - }); - await pair.CleanReturnAsync(); - } - } -} diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs deleted file mode 100644 index cfcd2ca8a4f..00000000000 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ /dev/null @@ -1,265 +0,0 @@ -#nullable enable -using System.Collections.Generic; -using System.Linq; -using Content.Server.Body.Components; -using Content.Server.GameTicking; -using Content.Server.GameTicking.Presets; -using Content.Server.GameTicking.Rules.Components; -using Content.Server.Mind; -using Content.Server.Roles; -using Content.Server.RoundEnd; -using Content.Server.Shuttles.Components; -using Content.Shared.CCVar; -using Content.Shared.Damage.Components; -using Content.Shared.Damage.Systems; -using Content.Shared.FixedPoint; -using Content.Shared.GameTicking; -using Content.Shared.Hands.Components; -using Content.Shared.Inventory; -using Content.Shared.NPC.Prototypes; -using Content.Shared.NPC.Systems; -using Content.Shared.NukeOps; -using Content.Shared.Pinpointer; -using Content.Shared.Roles.Components; -using Content.Shared.Station.Components; -using Robust.Server.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.Map.Components; -using Robust.Shared.Prototypes; - -namespace Content.IntegrationTests.Tests.GameRules; - -[TestFixture] -public sealed class NukeOpsTest -{ - private static readonly ProtoId SyndicateFaction = "Syndicate"; - private static readonly ProtoId NanotrasenFaction = "NanoTrasen"; - - /// - /// Check that a nuke ops game mode can start without issue. I.e., that the nuke station and such all get loaded. - /// - [Test] - public async Task TryStopNukeOpsFromConstantlyFailing() - { - await using var pair = await PoolManager.GetServerClient(new PoolSettings - { - Dirty = true, - DummyTicker = false, - Connected = true, - InLobby = true - }); - - var server = pair.Server; - var client = pair.Client; - var entMan = server.EntMan; - var mapSys = server.System(); - var ticker = server.System(); - var mindSys = server.System(); - var roleSys = server.System(); - var invSys = server.System(); - var factionSys = server.System(); - var roundEndSys = server.System(); - var damageSys = server.System(); - - server.CfgMan.SetCVar(CCVars.GridFill, true); - - // Initially in the lobby - Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby)); - Assert.That(client.AttachedEntity, Is.Null); - Assert.That(ticker.PlayerGameStatuses[client.User!.Value], Is.EqualTo(PlayerGameStatus.NotReadyToPlay)); - - // Add several dummy players - var dummies = await pair.Server.AddDummySessions(3); - await pair.RunTicksSync(5); - - // Opt into the nukies role. - await pair.SetAntagPreference("NukeopsCommander", true); - await pair.SetAntagPreference("NukeopsMedic", true, dummies[1].UserId); - - // Initially, the players have no attached entities - Assert.That(pair.Player?.AttachedEntity, Is.Null); - Assert.That(dummies.All(x => x.AttachedEntity == null)); - - // There are no grids or maps - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - - // And no nukie related components - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - Assert.That(entMan.Count(), Is.Zero); - - // Ready up and start nukeops - ticker.ToggleReadyAll(true); - Assert.That(ticker.PlayerGameStatuses.Values.All(x => x == PlayerGameStatus.ReadyToPlay)); - await pair.WaitCommand("forcepreset Nukeops"); - await pair.RunTicksSync(10); - - // Game should have started - Assert.That(ticker.RunLevel, Is.EqualTo(GameRunLevel.InRound)); - Assert.That(ticker.PlayerGameStatuses.Values.All(x => x == PlayerGameStatus.JoinedGame)); - Assert.That(client.EntMan.EntityExists(client.AttachedEntity)); - - var dummyEnts = dummies.Select(x => x.AttachedEntity ?? default).ToArray(); - var player = pair.Player!.AttachedEntity!.Value; - Assert.That(entMan.EntityExists(player)); - Assert.That(dummyEnts.All(e => entMan.EntityExists(e))); - - // Maps now exist - Assert.That(entMan.Count(), Is.GreaterThan(0)); - Assert.That(entMan.Count(), Is.GreaterThan(0)); - Assert.That(entMan.Count(), Is.EqualTo(1)); - - // And we now have nukie related components - Assert.That(entMan.Count(), Is.EqualTo(1)); - Assert.That(entMan.Count(), Is.EqualTo(2)); - Assert.That(entMan.Count(), Is.EqualTo(2)); - Assert.That(entMan.Count(), Is.EqualTo(1)); - - // The player entity should be the nukie commander - var mind = mindSys.GetMind(player)!.Value; - Assert.That(entMan.HasComponent(player)); - Assert.That(roleSys.MindIsAntagonist(mind)); - Assert.That(roleSys.MindHasRole(mind)); - Assert.That(factionSys.IsMember(player, SyndicateFaction), Is.True); - Assert.That(factionSys.IsMember(player, NanotrasenFaction), Is.False); - var roles = roleSys.MindGetAllRoleInfo(mind); - var cmdRoles = roles.Where(x => x.Prototype == "NukeopsCommander"); - Assert.That(cmdRoles.Count(), Is.EqualTo(1)); - - // The second dummy player should be a medic - var dummyMind = mindSys.GetMind(dummyEnts[1])!.Value; - Assert.That(entMan.HasComponent(dummyEnts[1])); - Assert.That(roleSys.MindIsAntagonist(dummyMind)); - Assert.That(roleSys.MindHasRole(dummyMind)); - Assert.That(factionSys.IsMember(dummyEnts[1], SyndicateFaction), Is.True); - Assert.That(factionSys.IsMember(dummyEnts[1], NanotrasenFaction), Is.False); - roles = roleSys.MindGetAllRoleInfo(dummyMind); - cmdRoles = roles.Where(x => x.Prototype == "NukeopsMedic"); - Assert.That(cmdRoles.Count(), Is.EqualTo(1)); - - // The other two players should have just spawned in as normal. - CheckDummy(0); - CheckDummy(2); - void CheckDummy(int i) - { - var ent = dummyEnts[i]; - var mindCrew = mindSys.GetMind(ent)!.Value; - Assert.That(entMan.HasComponent(ent), Is.False); - Assert.That(roleSys.MindIsAntagonist(mindCrew), Is.False); - Assert.That(roleSys.MindHasRole(mindCrew), Is.False); - Assert.That(factionSys.IsMember(ent, SyndicateFaction), Is.False); - Assert.That(factionSys.IsMember(ent, NanotrasenFaction), Is.True); - var nukeroles = new List() { "Nukeops", "NukeopsMedic", "NukeopsCommander" }; - Assert.That(roleSys.MindGetAllRoleInfo(mindCrew).Any(x => nukeroles.Contains(x.Prototype)), Is.False); - } - - // The game rule exists, and all the stations/shuttles/maps are properly initialized - var rule = entMan.AllComponents().Single(); - var ruleComp = rule.Component; - var gridsRule = entMan.GetComponent(rule.Uid); - foreach (var grid in gridsRule.MapGrids) - { - Assert.That(entMan.EntityExists(grid)); - Assert.That(entMan.HasComponent(grid)); - } - Assert.That(entMan.EntityExists(ruleComp.TargetStation)); - - Assert.That(entMan.HasComponent(ruleComp.TargetStation)); - - var nukieShuttle = entMan.AllComponents().Single(); - var nukieShuttlEnt = nukieShuttle.Uid; - Assert.That(entMan.EntityExists(nukieShuttlEnt)); - Assert.That(nukieShuttle.Component.AssociatedRule, Is.EqualTo(rule.Uid)); - - EntityUid? nukieStationEnt = null; - foreach (var grid in gridsRule.MapGrids) - { - if (entMan.HasComponent(grid)) - { - nukieStationEnt = grid; - break; - } - } - - Assert.That(!entMan.EntityExists(nukieStationEnt)); // its not supposed to be a station! - Assert.That(mapSys.MapExists(gridsRule.Map)); - var nukieMap = mapSys.GetMap(gridsRule.Map!.Value); - - var targetStation = entMan.GetComponent(ruleComp.TargetStation!.Value); - var targetGrid = targetStation.Grids.First(); - var targetMap = entMan.GetComponent(targetGrid).MapUid!.Value; - Assert.That(targetMap, Is.Not.EqualTo(nukieMap)); - - Assert.That(entMan.GetComponent(player).MapUid, Is.EqualTo(nukieMap)); - Assert.That(entMan.GetComponent(nukieShuttlEnt).MapUid, Is.EqualTo(nukieMap)); - - // The maps are all map-initialized, including the player - // Yes, this is necessary as this has repeatedly been broken somehow. - Assert.That(mapSys.IsInitialized(nukieMap)); - Assert.That(mapSys.IsInitialized(targetMap)); - Assert.That(mapSys.IsPaused(nukieMap), Is.False); - Assert.That(mapSys.IsPaused(targetMap), Is.False); - - EntityLifeStage LifeStage(EntityUid? uid) => entMan.GetComponent(uid!.Value).EntityLifeStage; - Assert.That(LifeStage(player), Is.GreaterThan(EntityLifeStage.Initialized)); - Assert.That(LifeStage(nukieMap), Is.GreaterThan(EntityLifeStage.Initialized)); - Assert.That(LifeStage(targetMap), Is.GreaterThan(EntityLifeStage.Initialized)); - Assert.That(LifeStage(nukieShuttlEnt), Is.GreaterThan(EntityLifeStage.Initialized)); - Assert.That(LifeStage(ruleComp.TargetStation), Is.GreaterThan(EntityLifeStage.Initialized)); - - // Make sure the player has hands. We've had fucking disarmed nukies before. - Assert.That(entMan.HasComponent(player)); - Assert.That(entMan.GetComponent(player).Hands.Count, Is.GreaterThan(0)); - - // While we're at it, lets make sure they aren't naked. I don't know how many inventory slots all mobs will be - // likely to have in the future. But nukies should probably have at least 3 slots with something in them. - var enumerator = invSys.GetSlotEnumerator(player); - var total = 0; - while (enumerator.NextItem(out _)) - { - total++; - } - Assert.That(total, Is.GreaterThan(3)); - - // Check the nukie commander passed basic training and figured out how to breathe. - if (entMan.TryGetComponent(player, out var resp)) - { - var totalSeconds = 30; - var totalTicks = (int)Math.Ceiling(totalSeconds / server.Timing.TickPeriod.TotalSeconds); - var increment = 5; - for (var tick = 0; tick < totalTicks; tick += increment) - { - await pair.RunTicksSync(increment); - Assert.That(resp.SuffocationCycles, Is.LessThanOrEqualTo(resp.SuffocationCycleThreshold)); - Assert.That(damageSys.GetTotalDamage(player), Is.EqualTo(FixedPoint2.Zero)); - } - } - - // Check that the round does not end prematurely when agents are deleted in the outpost - var nukies = dummyEnts.Where(entMan.HasComponent).Append(player).ToArray(); - await server.WaitAssertion(() => - { - for (var i = 0; i < nukies.Length - 1; i++) - { - entMan.DeleteEntity(nukies[i]); - Assert.That(roundEndSys.IsRoundEndRequested, - Is.False, - $"The round ended, but {nukies.Length - i - 1} nukies are still alive!"); - } - // Delete the last nukie and make sure the round ends. - entMan.DeleteEntity(nukies[^1]); - - Assert.That(roundEndSys.IsRoundEndRequested, - "All nukies were deleted, but the round didn't end!"); - }); - - ticker.SetGamePreset((GamePresetPrototype?)null); - await pair.CleanReturnAsync(); - } -} diff --git a/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs b/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs index 18361a9d901..92b2cec3454 100644 --- a/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs +++ b/Content.IntegrationTests/Tests/Medical/DefibrillatorTest.cs @@ -47,7 +47,6 @@ public async Task KillAndReviveTest() Assert.Multiple(() => { Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Alive), "Target mob was not alive when spawned."); - Assert.That(damageableSystem.GetTotalDamage(STarget!.Value), Is.EqualTo(FixedPoint2.Zero), "Target mob was damaged when spawned."); }); // Get the damage needed to kill or crit the target. @@ -64,7 +63,6 @@ public async Task KillAndReviveTest() Assert.Multiple(() => { Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Dead), "Target mob did not die from deadly damage amount."); - Assert.That(damageableSystem.GetTotalDamage(STarget!.Value), Is.EqualTo(deathThreshold), "Target mob had the wrong total damage amount after being killed."); }); // Spawn a defib and activate it. @@ -82,7 +80,6 @@ public async Task KillAndReviveTest() Assert.Multiple(() => { Assert.That(targetMobState.CurrentState, Is.EqualTo(MobState.Dead), "Target mob was revived despite being over the death damage threshold."); - Assert.That(damageableSystem.GetTotalDamage(STarget!.Value), Is.GreaterThan(deathThreshold), "Target mob did not take damage from being defibrillated."); }); // Set the damage halfway between the crit and death thresholds so that the target can be revived. diff --git a/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs b/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs index 88e2ac4404c..1b2e7698c8c 100644 --- a/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs +++ b/Content.IntegrationTests/Tests/Mousetrap/MousetrapTest.cs @@ -24,57 +24,6 @@ public sealed class MousetrapMouseMoveOverTest : MovementTest private static readonly EntProtoId MousetrapProtoId = "Mousetrap"; private static readonly EntProtoId MouseProtoId = "MobMouse"; protected override string PlayerPrototype => MouseProtoId.Id; // use a mouse as the player entity - - [Test] - public async Task MouseMoveOverTest() - { - // Make sure the mouse doesn't have any AI active - await Server.WaitPost(() => SEntMan.RemoveComponent(SPlayer)); - - // Spawn a mouse trap - await SpawnTarget(MousetrapProtoId); - Assert.That(Delta(), Is.GreaterThan(0.5), "Mouse and mousetrap not in expected positions."); - - Assert.That(HasComp(), - $"{MousetrapProtoId} does not have a MousetrapComponent. If you're refactoring, please update this test!"); - - Assert.That(TryComp(out var itemToggleComp), - $"{MousetrapProtoId} does not have a ItemToggleComponent. If you're refactoring, please update this test!"); - Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap started active."); - - // The mouse is spawned by the test before the atmosphere is added, so it has some barotrauma damage already - // TODO: fix this since it can have an impact on integration tests - var damageSystem = Server.System(); - var startingDamage = damageSystem.GetTotalDamage(SPlayer); - - Assert.That(SEntMan.TryGetComponent(SPlayer, out var mouseMobStateComp), - $"{MouseProtoId} does not have a MobStateComponent."); - Assert.That(mouseMobStateComp.CurrentState, Is.EqualTo(MobState.Alive), "Mouse was not alive when spawned."); - - // Move mouse over the trap - await Move(DirectionFlag.East, 1f); - - Assert.That(Delta(), Is.LessThan(0.5), "Mouse did not move over mousetrap."); - - // Walking over an inactive trap does not trigger it - Assert.That(damageSystem.GetTotalDamage(SPlayer), Is.LessThanOrEqualTo(startingDamage), "Mouse took damage from inactive trap!"); - Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap was activated."); - - // Activate the trap - var itemToggleSystem = Server.System(); - await Server.WaitAssertion(() => - { - Assert.That(itemToggleSystem.TrySetActive(STarget.Value, true), "Could not activate the mouse trap."); - }); - - await Move(DirectionFlag.West, 1f); - Assert.That(Delta(), Is.LessThan(0.1), "Mouse moved past active mousetrap."); - - // Walking over an active trap triggers it - Assert.That(damageSystem.GetTotalDamage(SPlayer), Is.GreaterThan(startingDamage), "Mouse did not take damage from active trap!"); - Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap was not deactivated after triggering."); - Assert.That(mouseMobStateComp.CurrentState, Is.EqualTo(MobState.Dead), "Mouse was not killed by trap."); - } } /// @@ -95,57 +44,4 @@ public sealed class MousetrapHumanMoveOverTest : MovementTest - type: Sprite sprite: Clothing/Shoes/Boots/workboots.rsi "; - - [Test] - public async Task HumanMoveOverTest() - { - await SpawnTarget(MousetrapProtoId); - - Assert.That(Delta(), Is.GreaterThan(0.5), "Player and mousetrap not in expected positions."); - - Assert.That(HasComp(), - $"{MousetrapProtoId} does not have a MousetrapComponent. If you're refactoring, please update this test!"); - - Assert.That(TryComp(out var itemToggleComp), - $"{MousetrapProtoId} does not have a ItemToggleComponent. If you're refactoring, please update this test!"); - - // Activate the trap - var itemToggleSystem = Server.System(); - await Server.WaitAssertion(() => - { - Assert.That(itemToggleSystem.TrySetActive(STarget.Value, true), "Could not activate the mouse trap."); - }); - - var damageSystem = Server.System(); - var startingDamage = damageSystem.GetTotalDamage(SPlayer); - - // Move player over the trap - await Move(DirectionFlag.East, 0.5f); - - Assert.That(Delta(), Is.LessThan(0.5), "Player did not move over mousetrap."); - - // Walking over the trap without shoes activates it - Assert.That(damageSystem.GetTotalDamage(SPlayer), Is.GreaterThan(startingDamage), "Player did not take damage."); - Assert.That(itemToggleComp.Activated, Is.False, "Mousetrap was not deactivated after triggering."); - - // Reactivate the trap - await Server.WaitAssertion(() => - { - Assert.That(itemToggleSystem.TrySetActive(STarget.Value, true), "Could not activate the mouse trap."); - }); - var afterStepDamage = damageSystem.GetTotalDamage(SPlayer); - - // Give the player some shoes - await PlaceInHands(ShoesProtoId); - // Thanks to quick-equip, using the shoes will wear them - await UseInHand(); - - // Move back over the trap - await Move(DirectionFlag.West, 1f); - Assert.That(Delta(), Is.GreaterThan(0.5), "Player did not move back over mousetrap."); - - // Walking over the trap with shoes on does not activate it - Assert.That(damageSystem.GetTotalDamage(SPlayer), Is.LessThanOrEqualTo(afterStepDamage), "Player took damage from trap!"); - Assert.That(itemToggleComp.Activated, "Mousetrap was deactivated despite the player being protected by shoes."); - } } diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index c36ad2de6d6..6b7f6f477cf 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -27,7 +27,7 @@ namespace Content.IntegrationTests.Tests.Networking // the tick where the server *should* have, but did not, acknowledge the state change. // Finally, we run two events inside the prediction area to ensure reconciling does for incremental stuff. [TestFixture] - public sealed class SimplePredictReconcileTest + public sealed partial class SimplePredictReconcileTest { [Test] public async Task Test() @@ -389,7 +389,7 @@ await client.WaitPost(() => await pair.CleanReturnAsync(); } - public sealed class PredictionTestEntitySystem : EntitySystem + public sealed partial class PredictionTestEntitySystem : EntitySystem { public bool Allow { get; set; } = true; @@ -397,7 +397,7 @@ public sealed class PredictionTestEntitySystem : EntitySystem public List<(GameTick tick, bool firstPredict, bool old, bool @new, bool value)> EventTriggerList { get; } = new(); - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.IntegrationTests/Tests/Storage/StorageTest.cs b/Content.IntegrationTests/Tests/Storage/StorageTest.cs deleted file mode 100644 index f6d83c26699..00000000000 --- a/Content.IntegrationTests/Tests/Storage/StorageTest.cs +++ /dev/null @@ -1,263 +0,0 @@ -#nullable enable -using Content.Shared.Containers; -using Content.Shared.Item; -using Content.Shared.Prototypes; -using Content.Shared.Storage; -using Content.Shared.Storage.Components; -using Content.Shared.Storage.EntitySystems; -using Robust.Shared.GameObjects; -using Robust.Shared.Prototypes; -using System.Collections.Generic; -using System.Linq; - -namespace Content.IntegrationTests.Tests.Storage; - -public sealed class StorageTest -{ - /// - /// Can an item store more than itself weighs. - /// In an ideal world this test wouldn't need to exist because sizes would be recursive. - /// - [Test] - public async Task StorageSizeArbitrageTest() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var protoManager = server.ResolveDependency(); - var entMan = server.ResolveDependency(); - - var itemSys = entMan.System(); - - await server.WaitAssertion(() => - { - foreach (var proto in protoManager.EnumeratePrototypes()) - { - if (!proto.TryGetComponent("Storage", out var storage) || - storage.Whitelist != null || - storage.MaxItemSize == null || - !proto.TryGetComponent("Item", out var item)) - continue; - - Assert.That(itemSys.GetSizePrototype(storage.MaxItemSize.Value).Weight, - Is.LessThanOrEqualTo(itemSys.GetSizePrototype(item.Size).Weight), - $"Found storage arbitrage on {proto.ID}"); - } - }); - await pair.CleanReturnAsync(); - } - - [Test] - public async Task TestStorageFillPrototypes() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var protoManager = server.ResolveDependency(); - - await server.WaitAssertion(() => - { - Assert.Multiple(() => - { - foreach (var proto in protoManager.EnumeratePrototypes()) - { - if (!proto.TryGetComponent("StorageFill", out var storage)) - continue; - - foreach (var entry in storage.Contents) - { - Assert.That(entry.Amount, Is.GreaterThan(0), $"Specified invalid amount of {entry.Amount} for prototype {proto.ID}"); - Assert.That(entry.SpawnProbability, Is.GreaterThan(0), $"Specified invalid probability of {entry.SpawnProbability} for prototype {proto.ID}"); - } - } - }); - }); - await pair.CleanReturnAsync(); - } - - [Test] - public async Task TestSufficientSpaceForFill() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var entMan = server.ResolveDependency(); - var protoMan = server.ResolveDependency(); - var compFact = server.ResolveDependency(); - var id = compFact.GetComponentName(); - - var itemSys = entMan.System(); - - var allSizes = protoMan.EnumeratePrototypes().ToList(); - allSizes.Sort(); - - await Assert.MultipleAsync(async () => - { - foreach (var (proto, fill) in pair.GetPrototypesWithComponent()) - { - if (proto.HasComponent(compFact)) - continue; - - StorageComponent? storage = null; - ItemComponent? item = null; - var size = 0; - await server.WaitAssertion(() => - { - if (!proto.TryGetComponent("Storage", out storage)) - { - Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!"); - return; - } - - proto.TryGetComponent("Item", out item); - size = GetFillSize(fill, false, protoMan, itemSys); - }); - - if (storage == null) - continue; - - var maxSize = storage.MaxItemSize; - if (storage.MaxItemSize == null) - { - if (item?.Size == null) - { - maxSize = SharedStorageSystem.DefaultStorageMaxItemSize; - } - else - { - var curIndex = allSizes.IndexOf(protoMan.Index(item.Size)); - var index = Math.Max(0, curIndex - 1); - maxSize = allSizes[index].ID; - } - } - - if (maxSize == null) - continue; - - Assert.That(size, Is.LessThanOrEqualTo(storage.Grid.GetArea()), $"{proto.ID} storage fill is too large."); - - foreach (var entry in fill.Contents) - { - if (entry.PrototypeId == null) - continue; - - if (!protoMan.TryIndex(entry.PrototypeId, out var fillItem)) - continue; - - ItemComponent? entryItem = null; - await server.WaitPost(() => - { - fillItem.TryGetComponent("Item", out entryItem); - }); - - if (entryItem == null) - continue; - - Assert.That(protoMan.Index(entryItem.Size).Weight, - Is.LessThanOrEqualTo(protoMan.Index(maxSize.Value).Weight), - $"Entity {proto.ID} has storage-fill item, {entry.PrototypeId}, that is too large"); - } - } - }); - - await pair.CleanReturnAsync(); - } - - [Test] - public async Task TestSufficientSpaceForEntityStorageFill() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - - var entMan = server.ResolveDependency(); - var protoMan = server.ResolveDependency(); - var compFact = server.ResolveDependency(); - var id = compFact.GetComponentName(); - - var itemSys = entMan.System(); - - foreach (var (proto, fill) in pair.GetPrototypesWithComponent()) - { - if (proto.HasComponent(compFact)) - continue; - - await server.WaitAssertion(() => - { - if (!proto.TryGetComponent("EntityStorage", out EntityStorageComponent? entStorage)) - Assert.Fail($"Entity {proto.ID} has storage-fill without a storage component!"); - - if (entStorage == null) - return; - - var size = GetFillSize(fill, true, protoMan, itemSys); - Assert.That(size, Is.LessThanOrEqualTo(entStorage.Capacity), - $"{proto.ID} storage fill is too large."); - }); - } - await pair.CleanReturnAsync(); - } - - private int GetEntrySize(EntitySpawnEntry entry, bool getCount, IPrototypeManager protoMan, SharedItemSystem itemSystem) - { - if (entry.PrototypeId == null) - return 0; - - if (!protoMan.TryIndex(entry.PrototypeId, out var proto)) - { - Assert.Fail($"Unknown prototype: {entry.PrototypeId}"); - return 0; - } - - if (getCount) - return entry.Amount; - - - if (proto.TryGetComponent("Item", out var item)) - return itemSystem.GetItemShape(item).GetArea() * entry.Amount; - - Assert.Fail($"Prototype is missing item comp: {entry.PrototypeId}"); - return 0; - } - - private int GetFillSize(StorageFillComponent fill, bool getCount, IPrototypeManager protoMan, SharedItemSystem itemSystem) - { - var totalSize = 0; - var groups = new Dictionary(); - foreach (var entry in fill.Contents) - { - var size = GetEntrySize(entry, getCount, protoMan, itemSystem); - - if (entry.GroupId == null) - totalSize += size; - else - groups[entry.GroupId] = Math.Max(size, groups.GetValueOrDefault(entry.GroupId)); - } - - return totalSize + groups.Values.Sum(); - } - - /// - /// Tests that prototypes are not using multiple container fill components at the same time. - /// - [Test] - public async Task NoMultipleContainerFillsTest() - { - await using var pair = await PoolManager.GetServerClient(); - var compFact = pair.Server.ResolveDependency(); - - Assert.Multiple(() => - { - foreach (var (proto, fill) in pair.GetPrototypesWithComponent()) - { - Assert.That(!proto.HasComponent(compFact), $"Prototype {proto.ID} has both {nameof(EntityTableContainerFillComponent)} and {nameof(StorageFillComponent)}."); - Assert.That(!proto.HasComponent(compFact), $"Prototype {proto.ID} has both {nameof(EntityTableContainerFillComponent)} and {nameof(ContainerFillComponent)}."); - } - - foreach (var (proto, fill) in pair.GetPrototypesWithComponent()) - { - Assert.That(!proto.HasComponent(compFact), $"Prototype {proto.ID} has both {nameof(ContainerFillComponent)} and {nameof(StorageFillComponent)}."); - } - }); - await pair.CleanReturnAsync(); - } -} diff --git a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs index ebbfc5e2352..75cf14b5dc0 100644 --- a/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs +++ b/Content.IntegrationTests/Tests/Vending/VendingInteractionTest.cs @@ -167,43 +167,4 @@ public async Task RestockTest() Assert.That(items.First().Amount, Is.EqualTo(10), "Restocking resulted in unexpected item count."); } - - [Test] - public async Task RepairTest() - { - await SpawnTarget(VendingMachineProtoId); - - // Power the vending machine - await SpawnEntity("APCBasic", SEntMan.GetCoordinates(TargetCoords)); - await RunTicks(1); - - // Break it - await BreakVendor(); - Assert.That(IsUiOpen(VendingMachineUiKey.Key), Is.False, "BUI did not close when vending machine broke."); - - // Make sure we can't open the BUI while it's broken - await Activate(); - Assert.That(IsUiOpen(VendingMachineUiKey.Key), Is.False, "Opened BUI of broken vending machine."); - - // Repair the vending machine - await InteractUsing(Weld); - - // Make sure the BUI can open now that the machine has been repaired - await Activate(); - Assert.That(IsUiOpen(VendingMachineUiKey.Key), "Failed to open BUI after repair."); - } - - private async Task BreakVendor() - { - var damageableSys = SEntMan.System(); - Assert.That(HasComp(), $"{VendingMachineProtoId} does not have DamageableComponent."); - Assert.That(damageableSys.GetAllDamage(STarget!.Value).GetTotal(), Is.EqualTo(FixedPoint2.Zero), $"{VendingMachineProtoId} started with unexpected damage."); - - // Damage the vending machine to the point that it breaks - var damageType = ProtoMan.Index(TestDamageType); - var damage = new DamageSpecifier(damageType, FixedPoint2.New(100)); - await Server.WaitPost(() => damageableSys.TryChangeDamage(SEntMan.GetEntity(Target).Value, damage, ignoreResistances: true)); - await RunTicks(5); - Assert.That(damageableSys.GetAllDamage(STarget!.Value).GetTotal(), Is.GreaterThan(FixedPoint2.Zero), $"{VendingMachineProtoId} did not take damage."); - } } diff --git a/Content.Replay/EntryPoint.cs b/Content.Replay/EntryPoint.cs index 6a6658f5eff..d5242c92774 100644 --- a/Content.Replay/EntryPoint.cs +++ b/Content.Replay/EntryPoint.cs @@ -9,12 +9,12 @@ namespace Content.Replay; [UsedImplicitly] -public sealed class EntryPoint : GameClient +public sealed partial class EntryPoint : GameClient { - [Dependency] private readonly IBaseClient _client = default!; - [Dependency] private readonly IStateManager _stateMan = default!; - [Dependency] private readonly ContentReplayPlaybackManager _contentReplayPlaybackMan = default!; - [Dependency] private readonly IClientConGroupController _conGrp = default!; + [Dependency] private IBaseClient _client = default!; + [Dependency] private IStateManager _stateMan = default!; + [Dependency] private ContentReplayPlaybackManager _contentReplayPlaybackMan = default!; + [Dependency] private IClientConGroupController _conGrp = default!; public override void Init() { diff --git a/Content.Replay/Menu/ReplayMainMenu.cs b/Content.Replay/Menu/ReplayMainMenu.cs index 6a80b137da8..f06c75a7765 100644 --- a/Content.Replay/Menu/ReplayMainMenu.cs +++ b/Content.Replay/Menu/ReplayMainMenu.cs @@ -22,17 +22,18 @@ namespace Content.Replay.Menu; /// /// Main menu screen for selecting and loading replays. /// -public sealed class ReplayMainScreen : State +public sealed partial class ReplayMainScreen : State { - [Dependency] private readonly IResourceManager _resMan = default!; - [Dependency] private readonly IComponentFactory _factory = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IReplayLoadManager _loadMan = default!; - [Dependency] private readonly IResourceCache _resourceCache = default!; - [Dependency] private readonly IGameController _controllerProxy = default!; - [Dependency] private readonly IClientRobustSerializer _serializer = default!; - [Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!; - [Dependency] private readonly ContentReplayPlaybackManager _replayMan = default!; + private ISawmill _sawmill = default!; + [Dependency] private IResourceManager _resMan = default!; + [Dependency] private IComponentFactory _factory = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IReplayLoadManager _loadMan = default!; + [Dependency] private IResourceCache _resourceCache = default!; + [Dependency] private IGameController _controllerProxy = default!; + [Dependency] private IClientRobustSerializer _serializer = default!; + [Dependency] private IUserInterfaceManager _userInterfaceManager = default!; + [Dependency] private ContentReplayPlaybackManager _replayMan = default!; private ReplayMainMenuControl _mainMenuControl = default!; private SelectReplayWindow? _selectWindow; @@ -263,7 +264,7 @@ public void SelectReplay(ResPath? replay) } catch (Exception ex) { - Logger.Error($"Failed to load replay info. Exception: {ex}"); + _sawmill.Error($"Failed to load replay info. Exception: {ex}"); SelectReplay(null); return; } diff --git a/Content.Server/Access/Systems/AccessOverriderSystem.cs b/Content.Server/Access/Systems/AccessOverriderSystem.cs index b13fe44a93f..4c908a0d4fe 100644 --- a/Content.Server/Access/Systems/AccessOverriderSystem.cs +++ b/Content.Server/Access/Systems/AccessOverriderSystem.cs @@ -22,16 +22,16 @@ namespace Content.Server.Access.Systems; [UsedImplicitly] -public sealed class AccessOverriderSystem : SharedAccessOverriderSystem +public sealed partial class AccessOverriderSystem : SharedAccessOverriderSystem { - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedStationSystem _station = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Access/Systems/AgentIDCardSystem.cs b/Content.Server/Access/Systems/AgentIDCardSystem.cs index def9b861bf8..15a91e8588d 100644 --- a/Content.Server/Access/Systems/AgentIDCardSystem.cs +++ b/Content.Server/Access/Systems/AgentIDCardSystem.cs @@ -19,16 +19,16 @@ namespace Content.Server.Access.Systems { - public sealed class AgentIDCardSystem : SharedAgentIdCardSystem + public sealed partial class AgentIDCardSystem : SharedAgentIdCardSystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IdCardSystem _cardSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChameleonClothingSystem _chameleon = default!; - [Dependency] private readonly ChameleonControllerSystem _chamController = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedJobStatusSystem _jobStatus = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IdCardSystem _cardSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ChameleonClothingSystem _chameleon = default!; + [Dependency] private ChameleonControllerSystem _chamController = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedJobStatusSystem _jobStatus = default!; public override void Initialize() { diff --git a/Content.Server/Access/Systems/IdBindSystem.cs b/Content.Server/Access/Systems/IdBindSystem.cs index aadd97676fd..a2b60eb433a 100644 --- a/Content.Server/Access/Systems/IdBindSystem.cs +++ b/Content.Server/Access/Systems/IdBindSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Access.Systems; -public sealed class IdBindSystem : EntitySystem +public sealed partial class IdBindSystem : EntitySystem { - [Dependency] private readonly IdCardSystem _cardSystem = default!; - [Dependency] private readonly PdaSystem _pdaSystem = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private IdCardSystem _cardSystem = default!; + [Dependency] private PdaSystem _pdaSystem = default!; + [Dependency] private InventorySystem _inventory = default!; public override void Initialize() { diff --git a/Content.Server/Access/Systems/IdCardConsoleSystem.cs b/Content.Server/Access/Systems/IdCardConsoleSystem.cs index 7477c03598b..58a781f9e79 100644 --- a/Content.Server/Access/Systems/IdCardConsoleSystem.cs +++ b/Content.Server/Access/Systems/IdCardConsoleSystem.cs @@ -32,23 +32,23 @@ namespace Content.Server.Access.Systems; [UsedImplicitly] -public sealed class IdCardConsoleSystem : SharedIdCardConsoleSystem +public sealed partial class IdCardConsoleSystem : SharedIdCardConsoleSystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly StationRecordsSystem _record = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly AccessSystem _access = default!; - [Dependency] private readonly IdCardSystem _idCard = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private StationRecordsSystem _record = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private AccessSystem _access = default!; + [Dependency] private IdCardSystem _idCard = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private MetaDataSystem _metaData = default!; public override void Initialize() { diff --git a/Content.Server/Access/Systems/IdCardSystem.cs b/Content.Server/Access/Systems/IdCardSystem.cs index 3b00a8bf6f8..fccb9ae1520 100644 --- a/Content.Server/Access/Systems/IdCardSystem.cs +++ b/Content.Server/Access/Systems/IdCardSystem.cs @@ -20,16 +20,16 @@ namespace Content.Server.Access.Systems; -public sealed class IdCardSystem : SharedIdCardSystem +public sealed partial class IdCardSystem : SharedIdCardSystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly MicrowaveSystem _microwave = default!; - [Dependency] private readonly CrewMetaRecordsSystem _crewMeta = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private MicrowaveSystem _microwave = default!; + [Dependency] private CrewMetaRecordsSystem _crewMeta = default!; + [Dependency] private StationSystem _station = default!; public override void Initialize() { diff --git a/Content.Server/Access/Systems/IdPrinterConsoleSystem.cs b/Content.Server/Access/Systems/IdPrinterConsoleSystem.cs index 97fa026a057..629c6acd66b 100644 --- a/Content.Server/Access/Systems/IdPrinterConsoleSystem.cs +++ b/Content.Server/Access/Systems/IdPrinterConsoleSystem.cs @@ -16,14 +16,14 @@ namespace Content.Server.Access.Systems; [UsedImplicitly] -public sealed class IdPrinterConsoleSystem : SharedIdPrinterConsoleSystem +public sealed partial class IdPrinterConsoleSystem : SharedIdPrinterConsoleSystem { - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly IdCardSystem _idCard = default!; - [Dependency] private readonly CrewMetaRecordsSystem _crewMeta = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly HandsSystem _hands = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private IdCardSystem _idCard = default!; + [Dependency] private CrewMetaRecordsSystem _crewMeta = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private HandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/Access/Systems/PresetIdCardSystem.cs b/Content.Server/Access/Systems/PresetIdCardSystem.cs index 171c0801929..51c643ac8e8 100644 --- a/Content.Server/Access/Systems/PresetIdCardSystem.cs +++ b/Content.Server/Access/Systems/PresetIdCardSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Access.Systems; -public sealed class PresetIdCardSystem : EntitySystem +public sealed partial class PresetIdCardSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IdCardSystem _cardSystem = default!; - [Dependency] private readonly SharedAccessSystem _accessSystem = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IdCardSystem _cardSystem = default!; + [Dependency] private SharedAccessSystem _accessSystem = default!; + [Dependency] private StationSystem _stationSystem = default!; public override void Initialize() { diff --git a/Content.Server/Actions/ActionOnInteractSystem.cs b/Content.Server/Actions/ActionOnInteractSystem.cs index 16560b461cc..4fc3bd8cf43 100644 --- a/Content.Server/Actions/ActionOnInteractSystem.cs +++ b/Content.Server/Actions/ActionOnInteractSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Actions; /// /// This System handled interactions for the . /// -public sealed class ActionOnInteractSystem : EntitySystem +public sealed partial class ActionOnInteractSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedChargesSystem _charges = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedChargesSystem _charges = default!; public override void Initialize() { diff --git a/Content.Server/Actions/Commands/AddActionCommand.cs b/Content.Server/Actions/Commands/AddActionCommand.cs index abd73793353..49830ec565f 100644 --- a/Content.Server/Actions/Commands/AddActionCommand.cs +++ b/Content.Server/Actions/Commands/AddActionCommand.cs @@ -10,10 +10,10 @@ namespace Content.Server.Actions.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class AddActionCommand : LocalizedEntityCommands +public sealed partial class AddActionCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override string Command => "addaction"; diff --git a/Content.Server/Actions/Commands/RemoveActionCommand.cs b/Content.Server/Actions/Commands/RemoveActionCommand.cs index 7affc0e4379..4745655de0b 100644 --- a/Content.Server/Actions/Commands/RemoveActionCommand.cs +++ b/Content.Server/Actions/Commands/RemoveActionCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Actions.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class RemoveActionCommand : LocalizedEntityCommands +public sealed partial class RemoveActionCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private SharedActionsSystem _actions = default!; public override string Command => "rmaction"; diff --git a/Content.Server/Administration/BanList/BanListEui.cs b/Content.Server/Administration/BanList/BanListEui.cs index 176b91ffe3b..01fff971f62 100644 --- a/Content.Server/Administration/BanList/BanListEui.cs +++ b/Content.Server/Administration/BanList/BanListEui.cs @@ -12,11 +12,11 @@ namespace Content.Server.Administration.BanList; -public sealed class BanListEui : BaseEui +public sealed partial class BanListEui : BaseEui { - [Dependency] private readonly IAdminManager _admins = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IAdminManager _admins = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IServerDbManager _db = default!; public BanListEui() { diff --git a/Content.Server/Administration/BanPanelEui.cs b/Content.Server/Administration/BanPanelEui.cs index 93abfbe1ffb..60a754cfb2f 100644 --- a/Content.Server/Administration/BanPanelEui.cs +++ b/Content.Server/Administration/BanPanelEui.cs @@ -11,14 +11,14 @@ namespace Content.Server.Administration; -public sealed class BanPanelEui : BaseEui +public sealed partial class BanPanelEui : BaseEui { - [Dependency] private readonly IBanManager _banManager = default!; - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IAdminManager _admins = default!; + [Dependency] private IBanManager _banManager = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IAdminManager _admins = default!; private readonly ISawmill _sawmill; diff --git a/Content.Server/Administration/Commands/AGhostCommand.cs b/Content.Server/Administration/Commands/AGhostCommand.cs index 5c5c0e32370..f0d9040fe5b 100644 --- a/Content.Server/Administration/Commands/AGhostCommand.cs +++ b/Content.Server/Administration/Commands/AGhostCommand.cs @@ -10,10 +10,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class AGhostCommand : LocalizedCommands +public sealed partial class AGhostCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; public override string Command => "aghost"; public override string Help => "aghost"; diff --git a/Content.Server/Administration/Commands/AddEntityStorageCommand.cs b/Content.Server/Administration/Commands/AddEntityStorageCommand.cs index 6c0574500c6..ed10147639d 100644 --- a/Content.Server/Administration/Commands/AddEntityStorageCommand.cs +++ b/Content.Server/Administration/Commands/AddEntityStorageCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class AddEntityStorageCommand : IConsoleCommand + public sealed partial class AddEntityStorageCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "addstorage"; public string Description => "Adds a given entity to a containing storage."; diff --git a/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs b/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs index f089268beae..3fda33d897a 100644 --- a/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs +++ b/Content.Server/Administration/Commands/AddPolymorphActionCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class AddPolymorphActionCommand : LocalizedEntityCommands +public sealed partial class AddPolymorphActionCommand : LocalizedEntityCommands { - [Dependency] private readonly PolymorphSystem _polySystem = default!; + [Dependency] private PolymorphSystem _polySystem = default!; public override string Command => "addpolymorphaction"; diff --git a/Content.Server/Administration/Commands/AddReagent.cs b/Content.Server/Administration/Commands/AddReagent.cs index 4648e7e82b5..8d2950465d2 100644 --- a/Content.Server/Administration/Commands/AddReagent.cs +++ b/Content.Server/Administration/Commands/AddReagent.cs @@ -13,10 +13,10 @@ namespace Content.Server.Administration.Commands /// Command that allows you to edit an existing solution by adding (or removing) reagents. /// [AdminCommand(AdminFlags.Admin)] - public sealed class AddReagent : IConsoleCommand + public sealed partial class AddReagent : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _protomanager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protomanager = default!; public string Command => "addreagent"; public string Description => "Add (or remove) some amount of reagent from some solution."; diff --git a/Content.Server/Administration/Commands/AdminWhoCommand.cs b/Content.Server/Administration/Commands/AdminWhoCommand.cs index 281c2efa58e..b78225cdb4e 100644 --- a/Content.Server/Administration/Commands/AdminWhoCommand.cs +++ b/Content.Server/Administration/Commands/AdminWhoCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.AdminWho)] -public sealed class AdminWhoCommand : LocalizedCommands +public sealed partial class AdminWhoCommand : LocalizedCommands { - [Dependency] private readonly IAfkManager _afkManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAfkManager _afkManager = default!; + [Dependency] private IAdminManager _adminManager = default!; public override string Command => "adminwho"; diff --git a/Content.Server/Administration/Commands/AnnounceUiCommand.cs b/Content.Server/Administration/Commands/AnnounceUiCommand.cs index 55a913b80e5..aea8ea7e62c 100644 --- a/Content.Server/Administration/Commands/AnnounceUiCommand.cs +++ b/Content.Server/Administration/Commands/AnnounceUiCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Moderator)] - public sealed class AnnounceUiCommand : LocalizedEntityCommands + public sealed partial class AnnounceUiCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "announceui"; diff --git a/Content.Server/Administration/Commands/BanCommand.cs b/Content.Server/Administration/Commands/BanCommand.cs index 52ae047ebdf..1868281c03b 100644 --- a/Content.Server/Administration/Commands/BanCommand.cs +++ b/Content.Server/Administration/Commands/BanCommand.cs @@ -11,14 +11,14 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class BanCommand : LocalizedCommands +public sealed partial class BanCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IBanManager _bans = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IBanManager _bans = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private ILogManager _logManager = default!; public override string Command => "ban"; diff --git a/Content.Server/Administration/Commands/BanExemptionCommands.cs b/Content.Server/Administration/Commands/BanExemptionCommands.cs index b566dcef804..d0015860ca0 100644 --- a/Content.Server/Administration/Commands/BanExemptionCommands.cs +++ b/Content.Server/Administration/Commands/BanExemptionCommands.cs @@ -6,10 +6,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class BanExemptionUpdateCommand : LocalizedCommands +public sealed partial class BanExemptionUpdateCommand : LocalizedCommands { - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; public override string Command => "ban_exemption_update"; @@ -61,10 +61,10 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Ban)] -public sealed class BanExemptionGetCommand : LocalizedCommands +public sealed partial class BanExemptionGetCommand : LocalizedCommands { - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; public override string Command => "ban_exemption_get"; diff --git a/Content.Server/Administration/Commands/BanListCommand.cs b/Content.Server/Administration/Commands/BanListCommand.cs index 1998809610a..230822be6c1 100644 --- a/Content.Server/Administration/Commands/BanListCommand.cs +++ b/Content.Server/Administration/Commands/BanListCommand.cs @@ -12,12 +12,12 @@ namespace Content.Server.Administration.Commands; /// Lists someones active Ban Ids or opens a window to see them. /// [AdminCommand(AdminFlags.Ban)] -public sealed class BanListCommand : LocalizedCommands +public sealed partial class BanListCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly EuiManager _eui = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private EuiManager _eui = default!; public override string Command => "banlist"; diff --git a/Content.Server/Administration/Commands/BanPanelCommand.cs b/Content.Server/Administration/Commands/BanPanelCommand.cs index 91f0ac354c2..093cf0b3f4f 100644 --- a/Content.Server/Administration/Commands/BanPanelCommand.cs +++ b/Content.Server/Administration/Commands/BanPanelCommand.cs @@ -5,11 +5,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class BanPanelCommand : LocalizedCommands +public sealed partial class BanPanelCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly EuiManager _euis = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private EuiManager _euis = default!; public override string Command => "banpanel"; diff --git a/Content.Server/Administration/Commands/CameraCommand.cs b/Content.Server/Administration/Commands/CameraCommand.cs index 1400eb17e88..52d4777566d 100644 --- a/Content.Server/Administration/Commands/CameraCommand.cs +++ b/Content.Server/Administration/Commands/CameraCommand.cs @@ -7,11 +7,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class CameraCommand : LocalizedCommands +public sealed partial class CameraCommand : LocalizedCommands { - [Dependency] private readonly EuiManager _eui = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private EuiManager _eui = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override string Command => "camera"; diff --git a/Content.Server/Administration/Commands/ChangeCvarCommand.cs b/Content.Server/Administration/Commands/ChangeCvarCommand.cs index 50c6eada54e..84fb4f12b5b 100644 --- a/Content.Server/Administration/Commands/ChangeCvarCommand.cs +++ b/Content.Server/Administration/Commands/ChangeCvarCommand.cs @@ -15,11 +15,11 @@ namespace Content.Server.Administration.Commands; /// Possible todo for future, store default values for cvars, and allow resetting to default. /// [AnyCommand] -public sealed class ChangeCvarCommand : IConsoleCommand +public sealed partial class ChangeCvarCommand : IConsoleCommand { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly CVarControlManager _cVarControlManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IAdminLogManager _adminLogManager = default!; + [Dependency] private CVarControlManager _cVarControlManager = default!; /// /// Searches the list of cvars for a cvar that matches the search string. diff --git a/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs b/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs index db7111f9307..e99832bf605 100644 --- a/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs +++ b/Content.Server/Administration/Commands/ClearBluespaceLockerLinks.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class ClearBluespaceLockerLinks : IConsoleCommand +public sealed partial class ClearBluespaceLockerLinks : IConsoleCommand { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public string Command => "clearbluespacelockerlinks"; public string Description => "Removes the bluespace links of the given uid. Does not remove links this uid is the target of."; diff --git a/Content.Server/Administration/Commands/CodexUiCommand.cs b/Content.Server/Administration/Commands/CodexUiCommand.cs index 9e472fb08c8..3b2abdbf91a 100644 --- a/Content.Server/Administration/Commands/CodexUiCommand.cs +++ b/Content.Server/Administration/Commands/CodexUiCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class CodexUiCommand : LocalizedEntityCommands +public sealed partial class CodexUiCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "codexui"; diff --git a/Content.Server/Administration/Commands/ControlMob.cs b/Content.Server/Administration/Commands/ControlMob.cs index 26cd83510b1..5e25f0a62c3 100644 --- a/Content.Server/Administration/Commands/ControlMob.cs +++ b/Content.Server/Administration/Commands/ControlMob.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class ControlMob : IConsoleCommand + public sealed partial class ControlMob : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "controlmob"; public string Description => Loc.GetString("control-mob-command-description"); diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs index 60f81fce5dc..040f77d1307 100644 --- a/Content.Server/Administration/Commands/DSay.cs +++ b/Content.Server/Administration/Commands/DSay.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Moderator)] -public sealed class DsayCommand : LocalizedEntityCommands +public sealed partial class DsayCommand : LocalizedEntityCommands { - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override string Command => "dsay"; diff --git a/Content.Server/Administration/Commands/DeAdminCommand.cs b/Content.Server/Administration/Commands/DeAdminCommand.cs index 3979c93bd70..56d13e6bdd2 100644 --- a/Content.Server/Administration/Commands/DeAdminCommand.cs +++ b/Content.Server/Administration/Commands/DeAdminCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.Commands { [UsedImplicitly] [AdminCommand(AdminFlags.None)] - public sealed class DeAdminCommand : LocalizedCommands + public sealed partial class DeAdminCommand : LocalizedCommands { - [Dependency] private readonly IAdminManager _admin = default!; + [Dependency] private IAdminManager _admin = default!; public override string Command => "deadmin"; diff --git a/Content.Server/Administration/Commands/DeleteComponentCommand.cs b/Content.Server/Administration/Commands/DeleteComponentCommand.cs index 7e971d65cd1..b5609c8e906 100644 --- a/Content.Server/Administration/Commands/DeleteComponentCommand.cs +++ b/Content.Server/Administration/Commands/DeleteComponentCommand.cs @@ -4,9 +4,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Spawn)] -public sealed class DeleteComponentCommand : LocalizedEntityCommands +public sealed partial class DeleteComponentCommand : LocalizedEntityCommands { - [Dependency] private readonly IComponentFactory _compFactory = default!; + [Dependency] private IComponentFactory _compFactory = default!; public override string Command => "deletecomponent"; diff --git a/Content.Server/Administration/Commands/DepartmentBanCommand.cs b/Content.Server/Administration/Commands/DepartmentBanCommand.cs index 40faeb74048..4511e68eb86 100644 --- a/Content.Server/Administration/Commands/DepartmentBanCommand.cs +++ b/Content.Server/Administration/Commands/DepartmentBanCommand.cs @@ -10,13 +10,13 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class DepartmentBanCommand : IConsoleCommand +public sealed partial class DepartmentBanCommand : IConsoleCommand { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IBanManager _banManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IBanManager _banManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILogManager _log = default!; private ISawmill? _sawmill; diff --git a/Content.Server/Administration/Commands/EraseCommand.cs b/Content.Server/Administration/Commands/EraseCommand.cs index ad4e48056c1..cced30960ff 100644 --- a/Content.Server/Administration/Commands/EraseCommand.cs +++ b/Content.Server/Administration/Commands/EraseCommand.cs @@ -7,11 +7,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class EraseCommand : LocalizedEntityCommands +public sealed partial class EraseCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly AdminSystem _admin = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private AdminSystem _admin = default!; public override string Command => "erase"; diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs index 7a5adaa073e..52cf645426c 100644 --- a/Content.Server/Administration/Commands/ExplosionCommand.cs +++ b/Content.Server/Administration/Commands/ExplosionCommand.cs @@ -13,9 +13,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class OpenExplosionEui : LocalizedEntityCommands +public sealed partial class OpenExplosionEui : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "explosionui"; @@ -34,11 +34,11 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Fun)] // for the admin. Not so much for anyone else. -public sealed class ExplosionCommand : LocalizedEntityCommands +public sealed partial class ExplosionCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ExplosionSystem _explosion = default!; + [Dependency] private TransformSystem _transform = default!; public override string Command => "explosion"; diff --git a/Content.Server/Administration/Commands/FaxUiCommand.cs b/Content.Server/Administration/Commands/FaxUiCommand.cs index 4b788375bda..4f7e79c7af0 100644 --- a/Content.Server/Administration/Commands/FaxUiCommand.cs +++ b/Content.Server/Administration/Commands/FaxUiCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class FaxUiCommand : LocalizedEntityCommands +public sealed partial class FaxUiCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "faxui"; diff --git a/Content.Server/Administration/Commands/FollowCommand.cs b/Content.Server/Administration/Commands/FollowCommand.cs index 27ecbb99cfb..c00849ca52a 100644 --- a/Content.Server/Administration/Commands/FollowCommand.cs +++ b/Content.Server/Administration/Commands/FollowCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class FollowCommand : LocalizedEntityCommands +public sealed partial class FollowCommand : LocalizedEntityCommands { - [Dependency] private readonly FollowerSystem _followerSystem = default!; + [Dependency] private FollowerSystem _followerSystem = default!; public override string Command => "follow"; diff --git a/Content.Server/Administration/Commands/ForceGhostCommand.cs b/Content.Server/Administration/Commands/ForceGhostCommand.cs index aed31028822..8a11a939176 100644 --- a/Content.Server/Administration/Commands/ForceGhostCommand.cs +++ b/Content.Server/Administration/Commands/ForceGhostCommand.cs @@ -9,12 +9,12 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class ForceGhostCommand : LocalizedEntityCommands +public sealed partial class ForceGhostCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly GhostSystem _ghost = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private GhostSystem _ghost = default!; public override string Command => "forceghost"; diff --git a/Content.Server/Administration/Commands/JobWhitelistCommands.cs b/Content.Server/Administration/Commands/JobWhitelistCommands.cs index 3da0a78ea51..d7bac952b59 100644 --- a/Content.Server/Administration/Commands/JobWhitelistCommands.cs +++ b/Content.Server/Administration/Commands/JobWhitelistCommands.cs @@ -10,13 +10,13 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class JobWhitelistAddCommand : LocalizedCommands +public sealed partial class JobWhitelistAddCommand : LocalizedCommands { - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly JobWhitelistManager _jobWhitelist = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private JobWhitelistManager _jobWhitelist = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IPrototypeManager _prototypes = default!; public override string Command => "jobwhitelistadd"; @@ -86,11 +86,11 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Ban)] -public sealed class GetJobWhitelistCommand : LocalizedCommands +public sealed partial class GetJobWhitelistCommand : LocalizedCommands { - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IPlayerManager _players = default!; public override string Command => "jobwhitelistget"; @@ -138,13 +138,13 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Ban)] -public sealed class RemoveJobWhitelistCommand : LocalizedCommands +public sealed partial class RemoveJobWhitelistCommand : LocalizedCommands { - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly JobWhitelistManager _jobWhitelist = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private JobWhitelistManager _jobWhitelist = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IPrototypeManager _prototypes = default!; public override string Command => "jobwhitelistremove"; diff --git a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs index acba13fc0bd..fe57a36f43b 100644 --- a/Content.Server/Administration/Commands/LinkBluespaceLocker.cs +++ b/Content.Server/Administration/Commands/LinkBluespaceLocker.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class LinkBluespaceLocker : IConsoleCommand +public sealed partial class LinkBluespaceLocker : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "linkbluespacelocker"; public string Description => "Links an entity, the target, to another as a bluespace locker target."; diff --git a/Content.Server/Administration/Commands/LoadGameMapCommand.cs b/Content.Server/Administration/Commands/LoadGameMapCommand.cs index 00be39cfc08..24ccb2d43f8 100644 --- a/Content.Server/Administration/Commands/LoadGameMapCommand.cs +++ b/Content.Server/Administration/Commands/LoadGameMapCommand.cs @@ -9,11 +9,11 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Round | AdminFlags.Spawn)] - public sealed class LoadGameMapCommand : LocalizedEntityCommands + public sealed partial class LoadGameMapCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; public override string Command => "loadgamemap"; @@ -73,9 +73,9 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Round | AdminFlags.Spawn)] - public sealed class ListGameMaps : LocalizedCommands + public sealed partial class ListGameMaps : LocalizedCommands { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override string Command => "listgamemaps"; diff --git a/Content.Server/Administration/Commands/OSay.cs b/Content.Server/Administration/Commands/OSay.cs index 7bdcf93aca3..6a986d0da46 100644 --- a/Content.Server/Administration/Commands/OSay.cs +++ b/Content.Server/Administration/Commands/OSay.cs @@ -9,10 +9,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class OSay : LocalizedCommands +public sealed partial class OSay : LocalizedCommands { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IEntityManager _entityManager = default!; public override string Command => "osay"; diff --git a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs index 9de0e35eb1b..f57a70cbfd8 100644 --- a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs +++ b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Logs)] -public sealed class OpenAdminLogsCommand : LocalizedEntityCommands +public sealed partial class OpenAdminLogsCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => Cmd; public const string Cmd = "adminlogs"; diff --git a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs index 13d365cc792..71c0259d5b3 100644 --- a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs +++ b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.ViewNotes)] -public sealed class OpenAdminNotesCommand : LocalizedCommands +public sealed partial class OpenAdminNotesCommand : LocalizedCommands { - [Dependency] private readonly IAdminNotesManager _adminNotes = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; + [Dependency] private IAdminNotesManager _adminNotes = default!; + [Dependency] private IPlayerLocator _locator = default!; public const string CommandName = "adminnotes"; diff --git a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs index 14167931e81..a3ce6acda64 100644 --- a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs +++ b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Permissions)] - public sealed class OpenPermissionsCommand : LocalizedEntityCommands + public sealed partial class OpenPermissionsCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "permissions"; diff --git a/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs b/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs index 53651a8a8e5..4511113a4d6 100644 --- a/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs +++ b/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs @@ -7,10 +7,10 @@ namespace Content.Server.Administration.Commands; [AnyCommand] -public sealed class OpenUserVisibleNotesCommand : IConsoleCommand +public sealed partial class OpenUserVisibleNotesCommand : IConsoleCommand { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IAdminNotesManager _notes = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IAdminNotesManager _notes = default!; public const string CommandName = "adminremarks"; diff --git a/Content.Server/Administration/Commands/OwoifyCommand.cs b/Content.Server/Administration/Commands/OwoifyCommand.cs index 16ceebeacfe..2d1ac7473d5 100644 --- a/Content.Server/Administration/Commands/OwoifyCommand.cs +++ b/Content.Server/Administration/Commands/OwoifyCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class OwoifyCommand : IConsoleCommand +public sealed partial class OwoifyCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "owoify"; diff --git a/Content.Server/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Administration/Commands/PanicBunkerCommand.cs index 3566bcb67de..36ed8a55801 100644 --- a/Content.Server/Administration/Commands/PanicBunkerCommand.cs +++ b/Content.Server/Administration/Commands/PanicBunkerCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerCommand : LocalizedCommands +public sealed partial class PanicBunkerCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker"; @@ -48,9 +48,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerDisableWithAdminsCommand : LocalizedCommands +public sealed partial class PanicBunkerDisableWithAdminsCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_disable_with_admins"; @@ -68,9 +68,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerEnableWithoutAdminsCommand : LocalizedCommands +public sealed partial class PanicBunkerEnableWithoutAdminsCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_enable_without_admins"; @@ -88,9 +88,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerCountDeadminnedCommand : LocalizedCommands +public sealed partial class PanicBunkerCountDeadminnedCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_count_deadminned_admins"; @@ -108,9 +108,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerShowReasonCommand : LocalizedCommands +public sealed partial class PanicBunkerShowReasonCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_show_reason"; @@ -128,9 +128,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerMinAccountAgeCommand : LocalizedCommands +public sealed partial class PanicBunkerMinAccountAgeCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_min_account_age"; @@ -160,9 +160,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerMinOverallMinutesCommand : LocalizedCommands +public sealed partial class PanicBunkerMinOverallMinutesCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_min_overall_minutes"; diff --git a/Content.Server/Administration/Commands/PardonCommand.cs b/Content.Server/Administration/Commands/PardonCommand.cs index d6f8f04e46a..b1c3cfdd832 100644 --- a/Content.Server/Administration/Commands/PardonCommand.cs +++ b/Content.Server/Administration/Commands/PardonCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Ban)] - public sealed class PardonCommand : LocalizedCommands + public sealed partial class PardonCommand : LocalizedCommands { - [Dependency] private readonly IServerDbManager _dbManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; public override string Command => "pardon"; diff --git a/Content.Server/Administration/Commands/PersistenceLoadCharCommand.cs b/Content.Server/Administration/Commands/PersistenceLoadCharCommand.cs index d9ea937a10d..c3b9326696f 100644 --- a/Content.Server/Administration/Commands/PersistenceLoadCharCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceLoadCharCommand.cs @@ -7,11 +7,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PersistenceLoadCharCommand : LocalizedEntityCommands +public sealed partial class PersistenceLoadCharCommand : LocalizedEntityCommands { - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override string Command => "persistenceloadchar"; diff --git a/Content.Server/Administration/Commands/PersistenceLoadCommand.cs b/Content.Server/Administration/Commands/PersistenceLoadCommand.cs index 038c6a9d9bf..1e52ba9b48f 100644 --- a/Content.Server/Administration/Commands/PersistenceLoadCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceLoadCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PersistenceLoadCommand : LocalizedEntityCommands +public sealed partial class PersistenceLoadCommand : LocalizedEntityCommands { - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; public override string Command => "persistenceload"; diff --git a/Content.Server/Administration/Commands/PersistenceLoadGridCommand.cs b/Content.Server/Administration/Commands/PersistenceLoadGridCommand.cs index e1210041c98..86159a12386 100644 --- a/Content.Server/Administration/Commands/PersistenceLoadGridCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceLoadGridCommand.cs @@ -9,10 +9,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PersistenceLoadGridCommand : LocalizedEntityCommands +public sealed partial class PersistenceLoadGridCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntitySystemManager _system = default!; - [Dependency] private readonly PersistenceSystem _persistence = default!; + [Dependency] private IEntitySystemManager _system = default!; + [Dependency] private PersistenceSystem _persistence = default!; public override string Command => "persistenceloadgrid"; diff --git a/Content.Server/Administration/Commands/PersistenceSaveCharCommand.cs b/Content.Server/Administration/Commands/PersistenceSaveCharCommand.cs index b0984b7659a..a39916f184b 100644 --- a/Content.Server/Administration/Commands/PersistenceSaveCharCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceSaveCharCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PersistenceSaveCharCommand : LocalizedEntityCommands +public sealed partial class PersistenceSaveCharCommand : LocalizedEntityCommands { - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; public override string Command => "persistencesavechar"; diff --git a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs index 1c9951bf3a1..953a6210ba6 100644 --- a/Content.Server/Administration/Commands/PersistenceSaveCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceSaveCommand.cs @@ -9,11 +9,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PersistenceSaveGrid : LocalizedEntityCommands +public sealed partial class PersistenceSaveGrid : LocalizedEntityCommands { - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; public override string Command => "persistencesave"; diff --git a/Content.Server/Administration/Commands/PersistenceSaveGridCommand.cs b/Content.Server/Administration/Commands/PersistenceSaveGridCommand.cs index 2060c809d90..07c424d4099 100644 --- a/Content.Server/Administration/Commands/PersistenceSaveGridCommand.cs +++ b/Content.Server/Administration/Commands/PersistenceSaveGridCommand.cs @@ -6,10 +6,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PersistenceSaveGridCommand : LocalizedEntityCommands +public sealed partial class PersistenceSaveGridCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly PersistenceSystem _persistence = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private PersistenceSystem _persistence = default!; public override string Command => "persistencesavegrid"; diff --git a/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs b/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs index 378326650e5..2b08ffc84d0 100644 --- a/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs +++ b/Content.Server/Administration/Commands/PlayGlobalSoundCommand.cs @@ -11,12 +11,12 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class PlayGlobalSoundCommand : IConsoleCommand +public sealed partial class PlayGlobalSoundCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IResourceManager _res = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IResourceManager _res = default!; public string Command => "playglobalsound"; public string Description => Loc.GetString("play-global-sound-command-description"); diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs index c1cdf2b3fb9..8c1145d979b 100644 --- a/Content.Server/Administration/Commands/PlayTimeCommands.cs +++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs @@ -7,10 +7,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Moderator)] -public sealed class PlayTimeAddOverallCommand : IConsoleCommand +public sealed partial class PlayTimeAddOverallCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; public string Command => "playtime_addoverall"; public string Description => Loc.GetString("cmd-playtime_addoverall-desc"); @@ -59,10 +59,10 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args) } [AdminCommand(AdminFlags.Moderator)] -public sealed class PlayTimeAddRoleCommand : IConsoleCommand +public sealed partial class PlayTimeAddRoleCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; public string Command => "playtime_addrole"; public string Description => Loc.GetString("cmd-playtime_addrole-desc"); @@ -124,10 +124,10 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args) } [AdminCommand(AdminFlags.Moderator)] -public sealed class PlayTimeGetOverallCommand : IConsoleCommand +public sealed partial class PlayTimeGetOverallCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; public string Command => "playtime_getoverall"; public string Description => Loc.GetString("cmd-playtime_getoverall-desc"); @@ -169,10 +169,10 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args) } [AdminCommand(AdminFlags.Moderator)] -public sealed class PlayTimeGetRoleCommand : IConsoleCommand +public sealed partial class PlayTimeGetRoleCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; public string Command => "playtime_getrole"; public string Description => Loc.GetString("cmd-playtime_getrole-desc"); @@ -248,10 +248,10 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args) /// Saves the timers for a particular player immediately /// [AdminCommand(AdminFlags.Moderator)] -public sealed class PlayTimeSaveCommand : IConsoleCommand +public sealed partial class PlayTimeSaveCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; public string Command => "playtime_save"; public string Description => Loc.GetString("cmd-playtime_save-desc"); @@ -290,10 +290,10 @@ public CompletionResult GetCompletion(IConsoleShell shell, string[] args) } [AdminCommand(AdminFlags.Debug)] -public sealed class PlayTimeFlushCommand : IConsoleCommand +public sealed partial class PlayTimeFlushCommand : IConsoleCommand { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; public string Command => "playtime_flush"; public string Description => Loc.GetString("cmd-playtime_flush-desc"); diff --git a/Content.Server/Administration/Commands/PlayerPanelCommand.cs b/Content.Server/Administration/Commands/PlayerPanelCommand.cs index 751660f2cd7..98d8dcd8704 100644 --- a/Content.Server/Administration/Commands/PlayerPanelCommand.cs +++ b/Content.Server/Administration/Commands/PlayerPanelCommand.cs @@ -7,11 +7,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class PlayerPanelCommand : LocalizedCommands +public sealed partial class PlayerPanelCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly EuiManager _euis = default!; - [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private EuiManager _euis = default!; + [Dependency] private IPlayerManager _players = default!; public override string Command => "playerpanel"; diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs index 446777256c1..c724b7652a4 100644 --- a/Content.Server/Administration/Commands/PromoteHostCommand.cs +++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs @@ -6,10 +6,10 @@ namespace Content.Server.Administration.Commands { [UsedImplicitly] - public sealed class PromoteHostCommand : LocalizedCommands + public sealed partial class PromoteHostCommand : LocalizedCommands { - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override string Command => "promotehost"; diff --git a/Content.Server/Administration/Commands/ReAdminCommand.cs b/Content.Server/Administration/Commands/ReAdminCommand.cs index 7d6c40cf3b5..764f2149168 100644 --- a/Content.Server/Administration/Commands/ReAdminCommand.cs +++ b/Content.Server/Administration/Commands/ReAdminCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands { [AnyCommand] - public sealed class ReAdminCommand : LocalizedCommands + public sealed partial class ReAdminCommand : LocalizedCommands { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; public override string Command => "readmin"; diff --git a/Content.Server/Administration/Commands/ReadyAllCommand.cs b/Content.Server/Administration/Commands/ReadyAllCommand.cs index 437f08730ce..af129f64643 100644 --- a/Content.Server/Administration/Commands/ReadyAllCommand.cs +++ b/Content.Server/Administration/Commands/ReadyAllCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Round)] -public sealed class ReadyAllCommand : LocalizedEntityCommands +public sealed partial class ReadyAllCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "readyall"; diff --git a/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs b/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs index 1b17fcc790b..2f3820fae38 100644 --- a/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs +++ b/Content.Server/Administration/Commands/RemoveBodyPartCommand.cs @@ -4,9 +4,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class RemoveBodyPartCommand : IConsoleCommand + public sealed partial class RemoveBodyPartCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "rmbodypart"; public string Description => "Removes a given entity from it's containing body, if any."; diff --git a/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs b/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs index 2fd8add66ab..13113fbd806 100644 --- a/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs +++ b/Content.Server/Administration/Commands/RemoveEntityStorageCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class RemoveEntityStorageCommand : IConsoleCommand + public sealed partial class RemoveEntityStorageCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "rmstorage"; public string Description => "Removes a given entity from it's containing storage, if any."; diff --git a/Content.Server/Administration/Commands/RemoveExtraComponents.cs b/Content.Server/Administration/Commands/RemoveExtraComponents.cs index 9304ce1844d..97b03a52237 100644 --- a/Content.Server/Administration/Commands/RemoveExtraComponents.cs +++ b/Content.Server/Administration/Commands/RemoveExtraComponents.cs @@ -5,10 +5,10 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Mapping)] - public sealed class RemoveExtraComponents : LocalizedEntityCommands + public sealed partial class RemoveExtraComponents : LocalizedEntityCommands { - [Dependency] private readonly IComponentFactory _compFactory = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IComponentFactory _compFactory = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override string Command => "removeextracomponents"; diff --git a/Content.Server/Administration/Commands/RemoveMechanismCommand.cs b/Content.Server/Administration/Commands/RemoveMechanismCommand.cs index f7946414429..bb40f438622 100644 --- a/Content.Server/Administration/Commands/RemoveMechanismCommand.cs +++ b/Content.Server/Administration/Commands/RemoveMechanismCommand.cs @@ -4,9 +4,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class RemoveMechanismCommand : IConsoleCommand + public sealed partial class RemoveMechanismCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "rmmechanism"; public string Description => "Removes a given entity from it's containing bodypart, if any."; diff --git a/Content.Server/Administration/Commands/RoleBanCommand.cs b/Content.Server/Administration/Commands/RoleBanCommand.cs index 530ec25c97f..b59f2f8714d 100644 --- a/Content.Server/Administration/Commands/RoleBanCommand.cs +++ b/Content.Server/Administration/Commands/RoleBanCommand.cs @@ -10,13 +10,13 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class RoleBanCommand : IConsoleCommand +public sealed partial class RoleBanCommand : IConsoleCommand { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IBanManager _bans = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IBanManager _bans = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private IPrototypeManager _proto = default!; private ISawmill? _sawmill; diff --git a/Content.Server/Administration/Commands/RoleBanListCommand.cs b/Content.Server/Administration/Commands/RoleBanListCommand.cs index eb786e1bb7e..c71b14f6c9d 100644 --- a/Content.Server/Administration/Commands/RoleBanListCommand.cs +++ b/Content.Server/Administration/Commands/RoleBanListCommand.cs @@ -8,13 +8,13 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class RoleBanListCommand : IConsoleCommand +public sealed partial class RoleBanListCommand : IConsoleCommand { - [Dependency] private readonly IServerDbManager _dbManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; - [Dependency] private readonly EuiManager _eui = default!; + [Dependency] private EuiManager _eui = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; + [Dependency] private IPlayerLocator _locator = default!; public string Command => "rolebanlist"; public string Description => Loc.GetString("cmd-rolebanlist-desc"); diff --git a/Content.Server/Administration/Commands/RoleUnbanCommand.cs b/Content.Server/Administration/Commands/RoleUnbanCommand.cs index e59a1a0bbfa..f7447eb9ec6 100644 --- a/Content.Server/Administration/Commands/RoleUnbanCommand.cs +++ b/Content.Server/Administration/Commands/RoleUnbanCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Ban)] -public sealed class RoleUnbanCommand : LocalizedCommands +public sealed partial class RoleUnbanCommand : LocalizedCommands { - [Dependency] private readonly IBanManager _banManager = default!; + [Dependency] private IBanManager _banManager = default!; public override string Command => "roleunban"; diff --git a/Content.Server/Administration/Commands/SectorWeatherCommand.cs b/Content.Server/Administration/Commands/SectorWeatherCommand.cs index fd57a131f2a..27c983431a8 100644 --- a/Content.Server/Administration/Commands/SectorWeatherCommand.cs +++ b/Content.Server/Administration/Commands/SectorWeatherCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class SectorWeatherCommand : LocalizedEntityCommands +public sealed partial class SectorWeatherCommand : LocalizedEntityCommands { - [Dependency] private readonly SectorWeatherSystem _sectorWeather = default!; - [Dependency] private readonly SectorWeatherSpawnSystem _sectorWeatherSpawns = default!; + [Dependency] private SectorWeatherSystem _sectorWeather = default!; + [Dependency] private SectorWeatherSpawnSystem _sectorWeatherSpawns = default!; public override string Command => "sectorweather"; diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs index 27c635feeb7..f889ddc15d7 100644 --- a/Content.Server/Administration/Commands/SetAdminOOC.cs +++ b/Content.Server/Administration/Commands/SetAdminOOC.cs @@ -6,10 +6,10 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.NameColor)] - internal sealed class SetAdminOOC : LocalizedCommands + internal sealed partial class SetAdminOOC : LocalizedCommands { - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly IServerPreferencesManager _preferenceManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private IServerPreferencesManager _preferenceManager = default!; public override string Command => "setadminooc"; diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs index 9407040e5d1..b1d09c3fcb1 100644 --- a/Content.Server/Administration/Commands/SetMindCommand.cs +++ b/Content.Server/Administration/Commands/SetMindCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class SetMindCommand : LocalizedEntityCommands + public sealed partial class SetMindCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; public override string Command => "setmind"; diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs index d4b1da7b178..71ac013e886 100644 --- a/Content.Server/Administration/Commands/SetOutfitCommand.cs +++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class SetOutfitCommand : LocalizedEntityCommands + public sealed partial class SetOutfitCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly OutfitSystem _outfitSystem = default!; + [Dependency] private EuiManager _euiManager = default!; + [Dependency] private OutfitSystem _outfitSystem = default!; public override string Command => "setoutfit"; public override string Description => Loc.GetString("cmd-setoutfit-desc", ("requiredComponent", nameof(InventoryComponent))); diff --git a/Content.Server/Administration/Commands/SetSolutionCapacity.cs b/Content.Server/Administration/Commands/SetSolutionCapacity.cs index c6799d86faa..0275d1c7b6b 100644 --- a/Content.Server/Administration/Commands/SetSolutionCapacity.cs +++ b/Content.Server/Administration/Commands/SetSolutionCapacity.cs @@ -8,9 +8,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class SetSolutionCapacity : IConsoleCommand + public sealed partial class SetSolutionCapacity : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "setsolutioncapacity"; public string Description => "Set the capacity (maximum volume) of some solution."; diff --git a/Content.Server/Administration/Commands/SetSolutionTemperature.cs b/Content.Server/Administration/Commands/SetSolutionTemperature.cs index 9b647d51888..d4f3575b45c 100644 --- a/Content.Server/Administration/Commands/SetSolutionTemperature.cs +++ b/Content.Server/Administration/Commands/SetSolutionTemperature.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class SetSolutionTemperature : IConsoleCommand + public sealed partial class SetSolutionTemperature : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "setsolutiontemperature"; public string Description => "Set the temperature of some solution."; diff --git a/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs b/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs index 0a69ea51d87..0d488d0bd3c 100644 --- a/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs +++ b/Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class SetSolutionThermalEnergy : IConsoleCommand + public sealed partial class SetSolutionThermalEnergy : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "setsolutionthermalenergy"; public string Description => "Set the thermal energy of some solution."; diff --git a/Content.Server/Administration/Commands/ShowGhostsCommand.cs b/Content.Server/Administration/Commands/ShowGhostsCommand.cs index 9d0b2872836..a20e7bc4698 100644 --- a/Content.Server/Administration/Commands/ShowGhostsCommand.cs +++ b/Content.Server/Administration/Commands/ShowGhostsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class ShowGhostsCommand : IConsoleCommand + public sealed partial class ShowGhostsCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "showghosts"; public string Description => "makes all of the currently present ghosts visible. Cannot be reversed."; diff --git a/Content.Server/Administration/Commands/ShuttleCommands.cs b/Content.Server/Administration/Commands/ShuttleCommands.cs index f8f8c201a5b..362e61fd9c7 100644 --- a/Content.Server/Administration/Commands/ShuttleCommands.cs +++ b/Content.Server/Administration/Commands/ShuttleCommands.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Round)] - public sealed class CallShuttleCommand : LocalizedEntityCommands + public sealed partial class CallShuttleCommand : LocalizedEntityCommands { - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; public override string Command => "callshuttle"; @@ -27,9 +27,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Round)] - public sealed class RecallShuttleCommand : LocalizedEntityCommands + public sealed partial class RecallShuttleCommand : LocalizedEntityCommands { - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; public override string Command => "recallshuttle"; diff --git a/Content.Server/Administration/Commands/StealthminCommand.cs b/Content.Server/Administration/Commands/StealthminCommand.cs index f28fd23f7e6..b1c68146f8d 100644 --- a/Content.Server/Administration/Commands/StealthminCommand.cs +++ b/Content.Server/Administration/Commands/StealthminCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Stealth)] -public sealed class StealthminCommand : LocalizedCommands +public sealed partial class StealthminCommand : LocalizedCommands { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; public override string Command => "stealthmin"; diff --git a/Content.Server/Administration/Commands/StripAllCommand.cs b/Content.Server/Administration/Commands/StripAllCommand.cs index 90fcde136d8..7137b62ccf4 100644 --- a/Content.Server/Administration/Commands/StripAllCommand.cs +++ b/Content.Server/Administration/Commands/StripAllCommand.cs @@ -7,10 +7,10 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class StripAllCommand : LocalizedEntityCommands +public sealed partial class StripAllCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; public override string Command => "stripall"; diff --git a/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs b/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs index 47a749e60b5..0452e672072 100644 --- a/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs +++ b/Content.Server/Administration/Commands/ThrowScoreboardCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.VarEdit)] -public sealed class ThrowScoreboardCommand : IConsoleCommand +public sealed partial class ThrowScoreboardCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "throwscoreboard"; diff --git a/Content.Server/Administration/Commands/TippyCommand.cs b/Content.Server/Administration/Commands/TippyCommand.cs index b79c1607066..fef20b6c7ae 100644 --- a/Content.Server/Administration/Commands/TippyCommand.cs +++ b/Content.Server/Administration/Commands/TippyCommand.cs @@ -8,11 +8,11 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class TippyCommand : LocalizedEntityCommands +public sealed partial class TippyCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedTipsSystem _tips = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private SharedTipsSystem _tips = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IPlayerManager _player = default!; public override string Command => "tippy"; @@ -89,9 +89,9 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Fun)] -public sealed class TipCommand : LocalizedEntityCommands +public sealed partial class TipCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedTipsSystem _tips = default!; + [Dependency] private SharedTipsSystem _tips = default!; public override string Command => "tip"; diff --git a/Content.Server/Administration/Commands/VariantizeCommand.cs b/Content.Server/Administration/Commands/VariantizeCommand.cs index 428207bde6d..5037cd4fced 100644 --- a/Content.Server/Administration/Commands/VariantizeCommand.cs +++ b/Content.Server/Administration/Commands/VariantizeCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Mapping)] -public sealed class VariantizeCommand : IConsoleCommand +public sealed partial class VariantizeCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "variantize"; diff --git a/Content.Server/Administration/Commands/WarpCommand.cs b/Content.Server/Administration/Commands/WarpCommand.cs index e82cf9f5d97..49e636769a8 100644 --- a/Content.Server/Administration/Commands/WarpCommand.cs +++ b/Content.Server/Administration/Commands/WarpCommand.cs @@ -13,9 +13,9 @@ namespace Content.Server.Administration.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class WarpCommand : IConsoleCommand + public sealed partial class WarpCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "warp"; public string Description => "Teleports you to predefined areas on the map."; diff --git a/Content.Server/Administration/Commands/WorldObjectivesUiCommand.cs b/Content.Server/Administration/Commands/WorldObjectivesUiCommand.cs index bbe4ec31423..9dd9599dcd9 100644 --- a/Content.Server/Administration/Commands/WorldObjectivesUiCommand.cs +++ b/Content.Server/Administration/Commands/WorldObjectivesUiCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class WorldObjectivesUiCommand : LocalizedEntityCommands +public sealed partial class WorldObjectivesUiCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "worldobjectivesui"; diff --git a/Content.Server/Administration/ContentNetworkResourceManager.cs b/Content.Server/Administration/ContentNetworkResourceManager.cs index dd95a2d8971..91178c0a32b 100644 --- a/Content.Server/Administration/ContentNetworkResourceManager.cs +++ b/Content.Server/Administration/ContentNetworkResourceManager.cs @@ -7,11 +7,11 @@ namespace Content.Server.Administration; -public sealed class ContentNetworkResourceManager +public sealed partial class ContentNetworkResourceManager { - [Dependency] private readonly IServerDbManager _serverDb = default!; - [Dependency] private readonly NetworkResourceManager _netRes = default!; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private IServerDbManager _serverDb = default!; + [Dependency] private NetworkResourceManager _netRes = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; [ViewVariables] public bool StoreUploaded { get; set; } = true; diff --git a/Content.Server/Administration/Logs/AdminLogManager.cs b/Content.Server/Administration/Logs/AdminLogManager.cs index b919f826e25..e861a34520c 100644 --- a/Content.Server/Administration/Logs/AdminLogManager.cs +++ b/Content.Server/Administration/Logs/AdminLogManager.cs @@ -27,17 +27,17 @@ namespace Content.Server.Administration.Logs; public sealed partial class AdminLogManager : SharedAdminLogManager, IAdminLogManager { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IDynamicTypeFactory _typeFactory = default!; - [Dependency] private readonly IReflectionManager _reflection = default!; - [Dependency] private readonly IDependencyCollection _dependencies = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly ISharedPlaytimeManager _playtime = default!; - [Dependency] private readonly ISharedChatManager _chat = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IDynamicTypeFactory _typeFactory = default!; + [Dependency] private IReflectionManager _reflection = default!; + [Dependency] private IDependencyCollection _dependencies = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private ISharedPlaytimeManager _playtime = default!; + [Dependency] private ISharedChatManager _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; public const string SawmillId = "admin.logs"; diff --git a/Content.Server/Administration/Logs/AdminLogSystem.cs b/Content.Server/Administration/Logs/AdminLogSystem.cs index b549e06248b..12d69ef7f61 100644 --- a/Content.Server/Administration/Logs/AdminLogSystem.cs +++ b/Content.Server/Administration/Logs/AdminLogSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.Logs; /// For system events that the manager needs to know about. /// for admin log usage. /// -public sealed class AdminLogSystem : EntitySystem +public sealed partial class AdminLogSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogs = default!; + [Dependency] private IAdminLogManager _adminLogs = default!; public override void Initialize() { diff --git a/Content.Server/Administration/Logs/AdminLogsEui.cs b/Content.Server/Administration/Logs/AdminLogsEui.cs index c6fb45f9c8e..e387c0c0fd8 100644 --- a/Content.Server/Administration/Logs/AdminLogsEui.cs +++ b/Content.Server/Administration/Logs/AdminLogsEui.cs @@ -17,13 +17,13 @@ namespace Content.Server.Administration.Logs; -public sealed class AdminLogsEui : BaseEui +public sealed partial class AdminLogsEui : BaseEui { - [Dependency] private readonly IAdminLogManager _adminLogs = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IAdminLogManager _adminLogs = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IEntityManager _e = default!; private readonly ISawmill _sawmill; diff --git a/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs b/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs index f84de350a6c..64908480dc4 100644 --- a/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs +++ b/Content.Server/Administration/Logs/Converters/EntityStringRepresentationConverter.cs @@ -4,9 +4,9 @@ namespace Content.Server.Administration.Logs.Converters; [AdminLogConverter] -public sealed class EntityStringRepresentationConverter : AdminLogConverter +public sealed partial class EntityStringRepresentationConverter : AdminLogConverter { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; public override void Write(Utf8JsonWriter writer, EntityStringRepresentation value, JsonSerializerOptions options) { diff --git a/Content.Server/Administration/Managers/AdminManager.Metrics.cs b/Content.Server/Administration/Managers/AdminManager.Metrics.cs index 51149499d18..2071a0fc38f 100644 --- a/Content.Server/Administration/Managers/AdminManager.Metrics.cs +++ b/Content.Server/Administration/Managers/AdminManager.Metrics.cs @@ -13,9 +13,9 @@ public sealed partial class AdminManager private const int SentinelRankId = -1; - [Dependency] private readonly IMetricsManager _metrics = default!; - [Dependency] private readonly IAfkManager _afkManager = default!; - [Dependency] private readonly IMeterFactory _meterFactory = default!; + [Dependency] private IMetricsManager _metrics = default!; + [Dependency] private IAfkManager _afkManager = default!; + [Dependency] private IMeterFactory _meterFactory = default!; private void InitializeMetrics() { diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 24f03e0c54a..381914ee9a1 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -24,16 +24,16 @@ namespace Content.Server.Administration.Managers { public sealed partial class AdminManager : IAdminManager, IPostInjectInit, IConGroupControllerImplementation { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IServerNetManager _netMgr = default!; - [Dependency] private readonly IConGroupController _conGroup = default!; - [Dependency] private readonly IResourceManager _res = default!; - [Dependency] private readonly IServerConsoleHost _consoleHost = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly ToolshedManager _toolshed = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IServerNetManager _netMgr = default!; + [Dependency] private IConGroupController _conGroup = default!; + [Dependency] private IResourceManager _res = default!; + [Dependency] private IServerConsoleHost _consoleHost = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private ToolshedManager _toolshed = default!; + [Dependency] private ILogManager _logManager = default!; private readonly Dictionary _admins = new(); private readonly HashSet _promotedPlayers = new(); diff --git a/Content.Server/Administration/Managers/BanManager.cs b/Content.Server/Administration/Managers/BanManager.cs index 3037402b788..baf45546700 100644 --- a/Content.Server/Administration/Managers/BanManager.cs +++ b/Content.Server/Administration/Managers/BanManager.cs @@ -26,18 +26,18 @@ namespace Content.Server.Administration.Managers; public sealed partial class BanManager : IBanManager, IPostInjectInit { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILocalizationManager _localizationManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntitySystemManager _systems = default!; - [Dependency] private readonly ITaskManager _taskManager = default!; - [Dependency] private readonly UserDbDataManager _userDbData = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ILocalizationManager _localizationManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntitySystemManager _systems = default!; + [Dependency] private ITaskManager _taskManager = default!; + [Dependency] private UserDbDataManager _userDbData = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Administration/Managers/CVarControlManager.cs b/Content.Server/Administration/Managers/CVarControlManager.cs index 3e639467434..6c8e7acdee6 100644 --- a/Content.Server/Administration/Managers/CVarControlManager.cs +++ b/Content.Server/Administration/Managers/CVarControlManager.cs @@ -11,12 +11,12 @@ namespace Content.Server.Administration.Managers; /// /// Manages the control of CVars via the attribute. /// -public sealed class CVarControlManager : IPostInjectInit +public sealed partial class CVarControlManager : IPostInjectInit { - [Dependency] private readonly IReflectionManager _reflectionManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly ILocalizationManager _localizationManager = default!; - [Dependency] private readonly ILogManager _logger = default!; + [Dependency] private IReflectionManager _reflectionManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private ILocalizationManager _localizationManager = default!; + [Dependency] private ILogManager _logger = default!; private readonly List _changableCvars = new(); private ISawmill _sawmill = default!; diff --git a/Content.Server/Administration/Managers/MultiServerKickManager.cs b/Content.Server/Administration/Managers/MultiServerKickManager.cs index b20578efc9c..d9d8f4f7f34 100644 --- a/Content.Server/Administration/Managers/MultiServerKickManager.cs +++ b/Content.Server/Administration/Managers/MultiServerKickManager.cs @@ -15,19 +15,19 @@ namespace Content.Server.Administration.Managers; /// Handles kicking people that connect to multiple servers on the same DB at once. /// /// -public sealed class MultiServerKickManager +public sealed partial class MultiServerKickManager { public const string NotificationChannel = "multi_server_kick"; - [Dependency] private readonly IPlayerManager _playerManager = null!; - [Dependency] private readonly IServerDbManager _dbManager = null!; - [Dependency] private readonly ILogManager _logManager = null!; - [Dependency] private readonly IConfigurationManager _cfg = null!; - [Dependency] private readonly IAdminManager _adminManager = null!; - [Dependency] private readonly ITaskManager _taskManager = null!; - [Dependency] private readonly IServerNetManager _netManager = null!; - [Dependency] private readonly ILocalizationManager _loc = null!; - [Dependency] private readonly ServerDbEntryManager _serverDbEntry = null!; + [Dependency] private IPlayerManager _playerManager = null!; + [Dependency] private IServerDbManager _dbManager = null!; + [Dependency] private ILogManager _logManager = null!; + [Dependency] private IConfigurationManager _cfg = null!; + [Dependency] private IAdminManager _adminManager = null!; + [Dependency] private ITaskManager _taskManager = null!; + [Dependency] private IServerNetManager _netManager = null!; + [Dependency] private ILocalizationManager _loc = null!; + [Dependency] private ServerDbEntryManager _serverDbEntry = null!; private ISawmill _sawmill = null!; private bool _allowed; diff --git a/Content.Server/Administration/Managers/WatchlistWebhookManager.cs b/Content.Server/Administration/Managers/WatchlistWebhookManager.cs index 7884b0a31b2..7f482e79a34 100644 --- a/Content.Server/Administration/Managers/WatchlistWebhookManager.cs +++ b/Content.Server/Administration/Managers/WatchlistWebhookManager.cs @@ -17,14 +17,14 @@ namespace Content.Server.Administration.Managers; /// This manager sends a Discord webhook notification whenever a player with an active /// watchlist joins the server. /// -public sealed class WatchlistWebhookManager : IWatchlistWebhookManager +public sealed partial class WatchlistWebhookManager : IWatchlistWebhookManager { - [Dependency] private readonly IAdminNotesManager _adminNotes = default!; - [Dependency] private readonly IBaseServer _baseServer = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly DiscordWebhook _discord = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IAdminNotesManager _adminNotes = default!; + [Dependency] private IBaseServer _baseServer = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private DiscordWebhook _discord = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPlayerManager _playerManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Administration/Notes/AdminMessageEui.cs b/Content.Server/Administration/Notes/AdminMessageEui.cs index 50dca2808a3..f2c9c320fb4 100644 --- a/Content.Server/Administration/Notes/AdminMessageEui.cs +++ b/Content.Server/Administration/Notes/AdminMessageEui.cs @@ -10,11 +10,11 @@ namespace Content.Server.Administration.Notes; -public sealed class AdminMessageEui : BaseEui +public sealed partial class AdminMessageEui : BaseEui { - [Dependency] private readonly IAdminNotesManager _notesMan = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IAdminNotesManager _notesMan = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _gameTiming = default!; private readonly TimeSpan _closeWait; private readonly TimeSpan _endTime; diff --git a/Content.Server/Administration/Notes/AdminNotesEui.cs b/Content.Server/Administration/Notes/AdminNotesEui.cs index 57a38f2b45a..41f91543f30 100644 --- a/Content.Server/Administration/Notes/AdminNotesEui.cs +++ b/Content.Server/Administration/Notes/AdminNotesEui.cs @@ -10,11 +10,11 @@ namespace Content.Server.Administration.Notes; -public sealed class AdminNotesEui : BaseEui +public sealed partial class AdminNotesEui : BaseEui { - [Dependency] private readonly IAdminManager _admins = default!; - [Dependency] private readonly IAdminNotesManager _notesMan = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; + [Dependency] private IAdminManager _admins = default!; + [Dependency] private IAdminNotesManager _notesMan = default!; + [Dependency] private IPlayerLocator _locator = default!; public AdminNotesEui() { diff --git a/Content.Server/Administration/Notes/AdminNotesManager.cs b/Content.Server/Administration/Notes/AdminNotesManager.cs index fb40d13dd4e..86a116d352f 100644 --- a/Content.Server/Administration/Notes/AdminNotesManager.cs +++ b/Content.Server/Administration/Notes/AdminNotesManager.cs @@ -15,14 +15,14 @@ namespace Content.Server.Administration.Notes; -public sealed class AdminNotesManager : IAdminNotesManager, IPostInjectInit +public sealed partial class AdminNotesManager : IAdminNotesManager, IPostInjectInit { - [Dependency] private readonly IAdminManager _admins = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly EuiManager _euis = default!; - [Dependency] private readonly IEntitySystemManager _systems = default!; - [Dependency] private readonly IConfigurationManager _config = default!; + [Dependency] private IAdminManager _admins = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private EuiManager _euis = default!; + [Dependency] private IEntitySystemManager _systems = default!; + [Dependency] private IConfigurationManager _config = default!; public const string SawmillId = "admin.notes"; diff --git a/Content.Server/Administration/Notes/AdminNotesSystem.cs b/Content.Server/Administration/Notes/AdminNotesSystem.cs index 8611241d27c..4a74f16dcca 100644 --- a/Content.Server/Administration/Notes/AdminNotesSystem.cs +++ b/Content.Server/Administration/Notes/AdminNotesSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Administration.Notes; -public sealed class AdminNotesSystem : EntitySystem +public sealed partial class AdminNotesSystem : EntitySystem { - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IAdminNotesManager _notes = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly EuiManager _euis = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IAdminNotesManager _notes = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private EuiManager _euis = default!; public override void Initialize() { diff --git a/Content.Server/Administration/Notes/UserNotesEui.cs b/Content.Server/Administration/Notes/UserNotesEui.cs index ae6e6bfb072..d783449e2e0 100644 --- a/Content.Server/Administration/Notes/UserNotesEui.cs +++ b/Content.Server/Administration/Notes/UserNotesEui.cs @@ -9,11 +9,11 @@ namespace Content.Server.Administration.Notes; -public sealed class UserNotesEui : BaseEui +public sealed partial class UserNotesEui : BaseEui { - [Dependency] private readonly IAdminNotesManager _notesMan = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private IAdminNotesManager _notesMan = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILogManager _log = default!; private readonly bool _seeOwnNotes; private readonly ISawmill _sawmill; diff --git a/Content.Server/Administration/PlayerLocator.cs b/Content.Server/Administration/PlayerLocator.cs index 8dcc4868755..4585a70ae37 100644 --- a/Content.Server/Administration/PlayerLocator.cs +++ b/Content.Server/Administration/PlayerLocator.cs @@ -70,12 +70,12 @@ public interface IPlayerLocator Task LookupIdAsync(NetUserId userId, CancellationToken cancel = default); } - internal sealed class PlayerLocator : IPlayerLocator, IDisposable, IPostInjectInit + internal sealed partial class PlayerLocator : IPlayerLocator, IDisposable, IPostInjectInit { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private ILogManager _logManager = default!; private readonly HttpClient _httpClient = new(); private ISawmill _sawmill = default!; diff --git a/Content.Server/Administration/PlayerPanelEui.cs b/Content.Server/Administration/PlayerPanelEui.cs index 4981f7a465c..2d1bc12416a 100644 --- a/Content.Server/Administration/PlayerPanelEui.cs +++ b/Content.Server/Administration/PlayerPanelEui.cs @@ -14,15 +14,15 @@ namespace Content.Server.Administration; -public sealed class PlayerPanelEui : BaseEui +public sealed partial class PlayerPanelEui : BaseEui { - [Dependency] private readonly IAdminManager _admins = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IAdminNotesManager _notesMan = default!; - [Dependency] private readonly IEntityManager _entity = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly EuiManager _eui = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private IAdminManager _admins = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IAdminNotesManager _notesMan = default!; + [Dependency] private IEntityManager _entity = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private EuiManager _eui = default!; + [Dependency] private IAdminLogManager _adminLog = default!; private readonly LocatedPlayerData _targetPlayer; private int? _notes; diff --git a/Content.Server/Administration/QuickDialogSystem.cs b/Content.Server/Administration/QuickDialogSystem.cs index 8e459a21d8d..6ae1d90af70 100644 --- a/Content.Server/Administration/QuickDialogSystem.cs +++ b/Content.Server/Administration/QuickDialogSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.Administration; /// public sealed partial class QuickDialogSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; /// /// Contains the success/cancel actions for a dialog. diff --git a/Content.Server/Administration/ServerApi.cs b/Content.Server/Administration/ServerApi.cs index 617b76b368a..402e1392152 100644 --- a/Content.Server/Administration/ServerApi.cs +++ b/Content.Server/Administration/ServerApi.cs @@ -47,22 +47,22 @@ public sealed partial class ServerApi : IPostInjectInit CCVars.PanicBunkerCustomReason.Name, ]; - [Dependency] private readonly IStatusHost _statusHost = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; - [Dependency] private readonly ISharedAdminManager _adminManager = default!; - [Dependency] private readonly IGameMapManager _gameMapManager = default!; - [Dependency] private readonly IServerNetManager _netManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IComponentFactory _componentFactory = default!; - [Dependency] private readonly ITaskManager _taskManager = default!; - [Dependency] private readonly EntityManager _entityManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IBanManager _bans = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IStatusHost _statusHost = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; + [Dependency] private ISharedAdminManager _adminManager = default!; + [Dependency] private IGameMapManager _gameMapManager = default!; + [Dependency] private IServerNetManager _netManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IComponentFactory _componentFactory = default!; + [Dependency] private ITaskManager _taskManager = default!; + [Dependency] private EntityManager _entityManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; + [Dependency] private ILocalizationManager _loc = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IBanManager _bans = default!; + [Dependency] private IServerDbManager _db = default!; private string _token = string.Empty; private ISawmill _sawmill = default!; diff --git a/Content.Server/Administration/Systems/AdminSystem.cs b/Content.Server/Administration/Systems/AdminSystem.cs index 955c8e58686..4d245dfd6ce 100644 --- a/Content.Server/Administration/Systems/AdminSystem.cs +++ b/Content.Server/Administration/Systems/AdminSystem.cs @@ -35,25 +35,25 @@ namespace Content.Server.Administration.Systems; -public sealed class AdminSystem : EntitySystem +public sealed partial class AdminSystem : EntitySystem { - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly SharedJobSystem _jobs = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly MindSystem _minds = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTime = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StationRecordsSystem _stationRecords = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private SharedJobSystem _jobs = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private MindSystem _minds = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private PlayTimeTrackingManager _playTime = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedRoleSystem _role = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StationRecordsSystem _stationRecords = default!; + [Dependency] private TransformSystem _transform = default!; private readonly Dictionary _playerList = new(); diff --git a/Content.Server/Administration/Systems/AdminTestArenaSystem.cs b/Content.Server/Administration/Systems/AdminTestArenaSystem.cs index f45af60f6d2..bfe9375e48f 100644 --- a/Content.Server/Administration/Systems/AdminTestArenaSystem.cs +++ b/Content.Server/Administration/Systems/AdminTestArenaSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Administration.Systems; /// /// This handles the administrative test arena maps, and loading them. /// -public sealed class AdminTestArenaSystem : EntitySystem +public sealed partial class AdminTestArenaSystem : EntitySystem { - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MetaDataSystem _metaDataSystem = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MetaDataSystem _metaDataSystem = default!; + [Dependency] private SharedMapSystem _maps = default!; public const string ArenaMapPath = "/Maps/Test/admin_test_arena.yml"; diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs index 16797971f56..31a58244513 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs @@ -18,10 +18,10 @@ namespace Content.Server.Administration.Systems; public sealed partial class AdminVerbSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly ZombieSystem _zombie = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly OutfitSystem _outfit = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private ZombieSystem _zombie = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private OutfitSystem _outfit = default!; private static readonly EntProtoId DefaultTraitorRule = "Traitor"; private static readonly EntProtoId DefaultInitialInfectedRule = "Zombie"; diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs index 8b5844380dc..7fea01c0ffc 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs @@ -67,34 +67,34 @@ public sealed partial class AdminVerbSystem private readonly ProtoId _lizardSmite = "AdminLizardSmite"; private readonly ProtoId _vulpkaninSmite = "AdminVulpSmite"; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; - [Dependency] private readonly BodySystem _bodySystem = default!; - [Dependency] private readonly CreamPieSystem _creamPieSystem = default!; - [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!; - [Dependency] private readonly EntityStorageSystem _entityStorageSystem = default!; - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly FlammableSystem _flammableSystem = default!; - [Dependency] private readonly GhostKickManager _ghostKickManager = default!; - [Dependency] private readonly SharedGodmodeSystem _sharedGodmodeSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; - [Dependency] private readonly PolymorphSystem _polymorphSystem = default!; - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly TabletopSystem _tabletopSystem = default!; - [Dependency] private readonly VomitSystem _vomitSystem = default!; - [Dependency] private readonly WeldableSystem _weldableSystem = default!; - [Dependency] private readonly SharedContentEyeSystem _eyeSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SuperBonkSystem _superBonkSystem = default!; - [Dependency] private readonly SlipperySystem _slipperySystem = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private BloodstreamSystem _bloodstreamSystem = default!; + [Dependency] private BodySystem _bodySystem = default!; + [Dependency] private CreamPieSystem _creamPieSystem = default!; + [Dependency] private ElectrocutionSystem _electrocutionSystem = default!; + [Dependency] private EntityStorageSystem _entityStorageSystem = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private FlammableSystem _flammableSystem = default!; + [Dependency] private GhostKickManager _ghostKickManager = default!; + [Dependency] private SharedGodmodeSystem _sharedGodmodeSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; + [Dependency] private PolymorphSystem _polymorphSystem = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private TabletopSystem _tabletopSystem = default!; + [Dependency] private VomitSystem _vomitSystem = default!; + [Dependency] private WeldableSystem _weldableSystem = default!; + [Dependency] private SharedContentEyeSystem _eyeSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SuperBonkSystem _superBonkSystem = default!; + [Dependency] private SlipperySystem _slipperySystem = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private DamageableSystem _damageable = default!; private readonly EntProtoId _actionViewLawsProtoId = "ActionViewLaws"; private readonly ProtoId _crewsimovLawset = "Crewsimov"; diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs index 02041a186ec..1f50781f339 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs @@ -40,18 +40,18 @@ namespace Content.Server.Administration.Systems; public sealed partial class AdminVerbSystem { - [Dependency] private readonly DoorSystem _door = default!; - [Dependency] private readonly AirlockSystem _airlockSystem = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly SharedAccessSystem _accessSystem = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; - [Dependency] private readonly AdminTestArenaSystem _adminTestArenaSystem = default!; - [Dependency] private readonly StationJobsSystem _stationJobsSystem = default!; - [Dependency] private readonly JointSystem _jointSystem = default!; - [Dependency] private readonly SharedBatterySystem _batterySystem = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly GunSystem _gun = default!; + [Dependency] private DoorSystem _door = default!; + [Dependency] private AirlockSystem _airlockSystem = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private SharedAccessSystem _accessSystem = default!; + [Dependency] private HandsSystem _handsSystem = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; + [Dependency] private AdminTestArenaSystem _adminTestArenaSystem = default!; + [Dependency] private StationJobsSystem _stationJobsSystem = default!; + [Dependency] private JointSystem _jointSystem = default!; + [Dependency] private SharedBatterySystem _batterySystem = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private GunSystem _gun = default!; private void AddTricksVerbs(GetVerbsEvent args) { diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index 5cb238746b2..fc11ee9d2ae 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -44,28 +44,28 @@ namespace Content.Server.Administration.Systems /// public sealed partial class AdminVerbSystem : EntitySystem { - [Dependency] private readonly IConGroupController _groupController = default!; - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly AdminSystem _adminSystem = default!; - [Dependency] private readonly DisposalTubeSystem _disposalTubes = default!; - [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly GhostRoleSystem _ghostRoleSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly PrayerSystem _prayerSystem = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly ToolshedManager _toolshed = default!; - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly StationSystem _stations = default!; - [Dependency] private readonly StationSpawningSystem _spawning = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly AdminFrozenSystem _freeze = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SiliconLawSystem _siliconLawSystem = default!; + [Dependency] private IConGroupController _groupController = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private AdminSystem _adminSystem = default!; + [Dependency] private DisposalTubeSystem _disposalTubes = default!; + [Dependency] private EuiManager _euiManager = default!; + [Dependency] private GhostRoleSystem _ghostRoleSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private PrayerSystem _prayerSystem = default!; + [Dependency] private MindSystem _mindSystem = default!; + [Dependency] private ToolshedManager _toolshed = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private StationSystem _stations = default!; + [Dependency] private StationSpawningSystem _spawning = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private AdminFrozenSystem _freeze = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SiliconLawSystem _siliconLawSystem = default!; private readonly Dictionary> _openSolutionUis = new(); diff --git a/Content.Server/Administration/Systems/BufferingSystem.cs b/Content.Server/Administration/Systems/BufferingSystem.cs index 4af89a7a398..557ffe89857 100644 --- a/Content.Server/Administration/Systems/BufferingSystem.cs +++ b/Content.Server/Administration/Systems/BufferingSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.Systems; -public sealed class BufferingSystem : SharedBufferingSystem +public sealed partial class BufferingSystem : SharedBufferingSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Update(float frameTime) { diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs index 153350fc338..8db48286821 100644 --- a/Content.Server/Administration/Systems/BwoinkSystem.cs +++ b/Content.Server/Administration/Systems/BwoinkSystem.cs @@ -33,16 +33,16 @@ public sealed partial class BwoinkSystem : SharedBwoinkSystem { private const string RateLimitKey = "AdminHelp"; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly SharedMindSystem _minds = default!; - [Dependency] private readonly IAfkManager _afkManager = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly PlayerRateLimitManager _rateLimit = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private SharedMindSystem _minds = default!; + [Dependency] private IAfkManager _afkManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private PlayerRateLimitManager _rateLimit = default!; [GeneratedRegex(@"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$")] private static partial Regex DiscordRegex(); diff --git a/Content.Server/Administration/Systems/SuperBonkSystem.cs b/Content.Server/Administration/Systems/SuperBonkSystem.cs index c4de0d0a41c..ad757bafb38 100644 --- a/Content.Server/Administration/Systems/SuperBonkSystem.cs +++ b/Content.Server/Administration/Systems/SuperBonkSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Administration.Systems; -public sealed class SuperBonkSystem : EntitySystem +public sealed partial class SuperBonkSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly ClumsySystem _clumsySystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private ClumsySystem _clumsySystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/Administration/Toolshed/AdminsCommand.cs b/Content.Server/Administration/Toolshed/AdminsCommand.cs index b1d26eff2e6..740b022ab49 100644 --- a/Content.Server/Administration/Toolshed/AdminsCommand.cs +++ b/Content.Server/Administration/Toolshed/AdminsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Administration.Toolshed; [ToolshedCommand, AdminCommand(AdminFlags.Admin)] -public sealed class AdminsCommand : ToolshedCommand +public sealed partial class AdminsCommand : ToolshedCommand { - [Dependency] private readonly IAdminManager _admin = default!; + [Dependency] private IAdminManager _admin = default!; [CommandImplementation("active")] public IEnumerable Active() diff --git a/Content.Server/Administration/UI/AdminAnnounceEui.cs b/Content.Server/Administration/UI/AdminAnnounceEui.cs index a7cf0333532..39475db2b57 100644 --- a/Content.Server/Administration/UI/AdminAnnounceEui.cs +++ b/Content.Server/Administration/UI/AdminAnnounceEui.cs @@ -7,10 +7,10 @@ namespace Content.Server.Administration.UI { - public sealed class AdminAnnounceEui : BaseEui + public sealed partial class AdminAnnounceEui : BaseEui { - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IChatManager _chatManager = default!; private readonly ChatSystem _chatSystem; public AdminAnnounceEui() diff --git a/Content.Server/Administration/UI/AdminCameraEui.cs b/Content.Server/Administration/UI/AdminCameraEui.cs index 2ff6feaf865..f297e427b41 100644 --- a/Content.Server/Administration/UI/AdminCameraEui.cs +++ b/Content.Server/Administration/UI/AdminCameraEui.cs @@ -19,9 +19,9 @@ namespace Content.Server.Administration.UI; [UsedImplicitly] public sealed partial class AdminCameraEui : BaseEui { - [Dependency] private readonly IAdminManager _admin = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IAdminManager _admin = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IGameTiming _timing = default!; private readonly FollowerSystem _follower = default!; private readonly PvsOverrideSystem _pvs = default!; diff --git a/Content.Server/Administration/UI/EditSolutionsEui.cs b/Content.Server/Administration/UI/EditSolutionsEui.cs index 13b7e233f3b..9f8c0ba38be 100644 --- a/Content.Server/Administration/UI/EditSolutionsEui.cs +++ b/Content.Server/Administration/UI/EditSolutionsEui.cs @@ -13,10 +13,10 @@ namespace Content.Server.Administration.UI /// Admin Eui for displaying and editing the reagents in a solution. /// [UsedImplicitly] - public sealed class EditSolutionsEui : BaseEui + public sealed partial class EditSolutionsEui : BaseEui { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; public readonly EntityUid Target; diff --git a/Content.Server/Administration/UI/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs index 9bf7b1d0336..8635b5168a2 100644 --- a/Content.Server/Administration/UI/PermissionsEui.cs +++ b/Content.Server/Administration/UI/PermissionsEui.cs @@ -13,12 +13,12 @@ namespace Content.Server.Administration.UI { - public sealed class PermissionsEui : BaseEui + public sealed partial class PermissionsEui : BaseEui { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private ILogManager _logManager = default!; private readonly ISawmill _sawmill; private bool _isLoading; diff --git a/Content.Server/Administration/UI/SetOutfitEui.cs b/Content.Server/Administration/UI/SetOutfitEui.cs index 2812975f4d7..22ce0871964 100644 --- a/Content.Server/Administration/UI/SetOutfitEui.cs +++ b/Content.Server/Administration/UI/SetOutfitEui.cs @@ -7,9 +7,9 @@ namespace Content.Server.Administration.UI { [UsedImplicitly] - public sealed class SetOutfitEui : BaseEui + public sealed partial class SetOutfitEui : BaseEui { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; private readonly NetEntity _target; public SetOutfitEui(NetEntity entity) diff --git a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs index 812a016b379..c5b01a7e0bb 100644 --- a/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs +++ b/Content.Server/Advertise/EntitySystems/SpeakOnUIClosedSystem.cs @@ -10,9 +10,9 @@ namespace Content.Server.Advertise.EntitySystems; public sealed partial class SpeakOnUIClosedSystem : SharedSpeakOnUIClosedSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/Afk/AFKSystem.cs b/Content.Server/Afk/AFKSystem.cs index 39d1e266d70..8e8f2d00353 100644 --- a/Content.Server/Afk/AFKSystem.cs +++ b/Content.Server/Afk/AFKSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Afk; /// /// Actively checks for AFK players regularly and issues an event whenever they go afk. /// -public sealed class AFKSystem : EntitySystem +public sealed partial class AFKSystem : EntitySystem { - [Dependency] private readonly IAfkManager _afkManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private IAfkManager _afkManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private GameTicker _ticker = default!; private float _checkDelay; private TimeSpan _checkTime; diff --git a/Content.Server/Afk/AfkManager.cs b/Content.Server/Afk/AfkManager.cs index 48b20ade01d..ad91c6746f4 100644 --- a/Content.Server/Afk/AfkManager.cs +++ b/Content.Server/Afk/AfkManager.cs @@ -33,13 +33,13 @@ public interface IAfkManager } [UsedImplicitly] - public sealed class AfkManager : IAfkManager + public sealed partial class AfkManager : IAfkManager { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IConsoleHost _consoleHost = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IConsoleHost _consoleHost = default!; + [Dependency] private IAdminManager _adminManager = default!; private readonly Dictionary _lastActionTimes = new(); diff --git a/Content.Server/Afk/IsAfkCommand.cs b/Content.Server/Afk/IsAfkCommand.cs index 3b1b3f60835..2359e9fdf82 100644 --- a/Content.Server/Afk/IsAfkCommand.cs +++ b/Content.Server/Afk/IsAfkCommand.cs @@ -6,10 +6,10 @@ namespace Content.Server.Afk { [AdminCommand(AdminFlags.Admin)] - public sealed class IsAfkCommand : LocalizedCommands + public sealed partial class IsAfkCommand : LocalizedCommands { - [Dependency] private readonly IAfkManager _afkManager = default!; - [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private IAfkManager _afkManager = default!; + [Dependency] private IPlayerManager _players = default!; public override string Command => "isafk"; diff --git a/Content.Server/Alert/Commands/ClearAlert.cs b/Content.Server/Alert/Commands/ClearAlert.cs index 2e317de7547..617d1fefa70 100644 --- a/Content.Server/Alert/Commands/ClearAlert.cs +++ b/Content.Server/Alert/Commands/ClearAlert.cs @@ -7,9 +7,9 @@ namespace Content.Server.Alert.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class ClearAlert : IConsoleCommand + public sealed partial class ClearAlert : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "clearalert"; public string Description => "Clears an alert for a player, defaulting to current player"; diff --git a/Content.Server/Alert/Commands/ShowAlert.cs b/Content.Server/Alert/Commands/ShowAlert.cs index cae24ff3360..bcdb5d28f16 100644 --- a/Content.Server/Alert/Commands/ShowAlert.cs +++ b/Content.Server/Alert/Commands/ShowAlert.cs @@ -7,9 +7,9 @@ namespace Content.Server.Alert.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class ShowAlert : IConsoleCommand + public sealed partial class ShowAlert : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "showalert"; public string Description => "Shows an alert for a player, defaulting to current player"; diff --git a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs index ed4a2e4f6fa..89648f3c224 100644 --- a/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs +++ b/Content.Server/AlertLevel/AlertLevelDisplaySystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.AlertLevel; -public sealed class AlertLevelDisplaySystem : EntitySystem +public sealed partial class AlertLevelDisplaySystem : EntitySystem { - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Server/AlertLevel/AlertLevelSystem.cs b/Content.Server/AlertLevel/AlertLevelSystem.cs index 8a4c2c68b04..08df39c051d 100644 --- a/Content.Server/AlertLevel/AlertLevelSystem.cs +++ b/Content.Server/AlertLevel/AlertLevelSystem.cs @@ -8,13 +8,13 @@ namespace Content.Server.AlertLevel; -public sealed class AlertLevelSystem : EntitySystem +public sealed partial class AlertLevelSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StationSystem _stationSystem = default!; // Until stations are a prototype, this is how it's going to have to be. public const string DefaultAlertLevelSet = "stationAlerts"; diff --git a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs index f6285e2fbc4..75b020678b0 100644 --- a/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs +++ b/Content.Server/AlertLevel/Commands/SetAlertLevelCommand.cs @@ -7,10 +7,10 @@ namespace Content.Server.AlertLevel.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class SetAlertLevelCommand : LocalizedEntityCommands + public sealed partial class SetAlertLevelCommand : LocalizedEntityCommands { - [Dependency] private readonly AlertLevelSystem _alertLevelSystem = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private AlertLevelSystem _alertLevelSystem = default!; + [Dependency] private StationSystem _stationSystem = default!; public override string Command => "setalertlevel"; diff --git a/Content.Server/Ame/AmeNodeGroup.cs b/Content.Server/Ame/AmeNodeGroup.cs index 79db6b0d407..6f0dfba7c3b 100644 --- a/Content.Server/Ame/AmeNodeGroup.cs +++ b/Content.Server/Ame/AmeNodeGroup.cs @@ -16,11 +16,11 @@ namespace Content.Server.Ame; /// Node group class for handling the Antimatter Engine's console and parts. /// [NodeGroup(NodeGroupID.AMEngine)] -public sealed class AmeNodeGroup : BaseNodeGroup +public sealed partial class AmeNodeGroup : BaseNodeGroup { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IRobustRandom _random = default!; /// /// The AME controller which is currently in control of this node group. diff --git a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs index 6cf50cfc144..50c8b44328f 100644 --- a/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs +++ b/Content.Server/Ame/EntitySystems/AmeControllerSystem.cs @@ -17,14 +17,14 @@ namespace Content.Server.Ame.EntitySystems; -public sealed class AmeControllerSystem : EntitySystem +public sealed partial class AmeControllerSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; public override void Initialize() { diff --git a/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs b/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs index 542ae8035e2..b1a627dafde 100644 --- a/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs +++ b/Content.Server/Ame/EntitySystems/AmeShieldingSystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.Ame.EntitySystems; -public sealed class AmeShieldingSystem : EntitySystem +public sealed partial class AmeShieldingSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly PointLightSystem _pointLightSystem = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private PointLightSystem _pointLightSystem = default!; public void SetCore(EntityUid uid, bool value, AmeShieldComponent? shield = null) { diff --git a/Content.Server/Animals/Systems/EggLayerSystem.cs b/Content.Server/Animals/Systems/EggLayerSystem.cs index 6dd0be80ad5..1c5ee6509eb 100644 --- a/Content.Server/Animals/Systems/EggLayerSystem.cs +++ b/Content.Server/Animals/Systems/EggLayerSystem.cs @@ -17,15 +17,15 @@ namespace Content.Server.Animals.Systems; /// Gives the ability to lay eggs/other things; /// produces endlessly if the owner does not have a HungerComponent. /// -public sealed class EggLayerSystem : EntitySystem +public sealed partial class EggLayerSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Server/Animals/Systems/ParrotMemorySystem.cs b/Content.Server/Animals/Systems/ParrotMemorySystem.cs index 2bfe15ab1df..de8ceaef60e 100644 --- a/Content.Server/Animals/Systems/ParrotMemorySystem.cs +++ b/Content.Server/Animals/Systems/ParrotMemorySystem.cs @@ -25,12 +25,12 @@ namespace Content.Server.Animals.Systems; /// public sealed partial class ParrotMemorySystem : SharedParrotMemorySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Server/Announcements/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs index 55a0498aa05..0edf27dd4e7 100644 --- a/Content.Server/Announcements/AnnounceCommand.cs +++ b/Content.Server/Announcements/AnnounceCommand.cs @@ -9,11 +9,11 @@ namespace Content.Server.Announcements; [AdminCommand(AdminFlags.Moderator)] -public sealed class AnnounceCommand : LocalizedEntityCommands +public sealed partial class AnnounceCommand : LocalizedEntityCommands { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IResourceManager _res = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IResourceManager _res = default!; public override string Command => "announce"; public override string Description => Loc.GetString("cmd-announce-desc"); diff --git a/Content.Server/Anomaly/AnomalyScannerSystem.cs b/Content.Server/Anomaly/AnomalyScannerSystem.cs index fb122206c38..8008b84d2aa 100644 --- a/Content.Server/Anomaly/AnomalyScannerSystem.cs +++ b/Content.Server/Anomaly/AnomalyScannerSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Anomaly; /// -public sealed class AnomalyScannerSystem : SharedAnomalyScannerSystem +public sealed partial class AnomalyScannerSystem : SharedAnomalyScannerSystem { - [Dependency] private readonly SecretDataAnomalySystem _secretData = default!; - [Dependency] private readonly AnomalySystem _anomaly = default!; + [Dependency] private SecretDataAnomalySystem _secretData = default!; + [Dependency] private AnomalySystem _anomaly = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/AnomalySystem.Commands.cs b/Content.Server/Anomaly/AnomalySystem.Commands.cs index 642e0945356..4e9d8863d61 100644 --- a/Content.Server/Anomaly/AnomalySystem.Commands.cs +++ b/Content.Server/Anomaly/AnomalySystem.Commands.cs @@ -7,7 +7,7 @@ namespace Content.Server.Anomaly; public sealed partial class AnomalySystem { - [Dependency] private readonly IConsoleHost _consoleHost = default!; + [Dependency] private IConsoleHost _consoleHost = default!; public void InitializeCommands() { diff --git a/Content.Server/Anomaly/AnomalySystem.Generator.cs b/Content.Server/Anomaly/AnomalySystem.Generator.cs index 2d6c923a0d9..079fe198781 100644 --- a/Content.Server/Anomaly/AnomalySystem.Generator.cs +++ b/Content.Server/Anomaly/AnomalySystem.Generator.cs @@ -20,8 +20,8 @@ namespace Content.Server.Anomaly; /// public sealed partial class AnomalySystem { - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; private void InitializeGenerator() { diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs index 5625b75a5be..3daf0bff6d4 100644 --- a/Content.Server/Anomaly/AnomalySystem.cs +++ b/Content.Server/Anomaly/AnomalySystem.cs @@ -26,19 +26,19 @@ namespace Content.Server.Anomaly; /// public sealed partial class AnomalySystem : SharedAnomalySystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly AmbientSoundSystem _ambient = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; - [Dependency] private readonly MaterialStorageSystem _material = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly RadiationSystem _radiation = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private AmbientSoundSystem _ambient = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private ExplosionSystem _explosion = default!; + [Dependency] private MaterialStorageSystem _material = default!; + [Dependency] private SharedPointLightSystem _pointLight = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private RadiationSystem _radiation = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public const float MinParticleVariation = 0.8f; public const float MaxParticleVariation = 1.2f; diff --git a/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs b/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs index bb19216cb1d..9c7db7b31f3 100644 --- a/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs +++ b/Content.Server/Anomaly/Effects/AnomalyCoreSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Anomaly.Effects; /// /// This component reduces the value of the entity during decay /// -public sealed class AnomalyCoreSystem : EntitySystem +public sealed partial class AnomalyCoreSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs b/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs index b080b84da0c..8cfa1bcca30 100644 --- a/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Anomaly.Effects; -public sealed class BluespaceAnomalySystem : EntitySystem +public sealed partial class BluespaceAnomalySystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedTransformSystem _xform = default!; /// public override void Initialize() diff --git a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs index 957850ff13f..f4fb944f335 100644 --- a/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ElectricityAnomalySystem.cs @@ -9,15 +9,15 @@ namespace Content.Server.Anomaly.Effects; -public sealed class ElectricityAnomalySystem : EntitySystem +public sealed partial class ElectricityAnomalySystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly LightningSystem _lightning = default!; - [Dependency] private readonly ElectrocutionSystem _electrocution = default!; - [Dependency] private readonly EmpSystem _emp = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private LightningSystem _lightning = default!; + [Dependency] private ElectrocutionSystem _electrocution = default!; + [Dependency] private EmpSystem _emp = default!; + [Dependency] private EntityLookupSystem _lookup = default!; /// public override void Initialize() diff --git a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs index 86d6937af5e..3e62ba8359d 100644 --- a/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/EntityAnomalySystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Anomaly.Effects; -public sealed class EntityAnomalySystem : SharedEntityAnomalySystem +public sealed partial class EntityAnomalySystem : SharedEntityAnomalySystem { - [Dependency] private readonly SharedAnomalySystem _anomaly = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private SharedAnomalySystem _anomaly = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; private EntityQuery _physicsQuery; diff --git a/Content.Server/Anomaly/Effects/ExplosionAnomalySystem.cs b/Content.Server/Anomaly/Effects/ExplosionAnomalySystem.cs index ae853fb2fb1..34ce13bddab 100644 --- a/Content.Server/Anomaly/Effects/ExplosionAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ExplosionAnomalySystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Anomaly.Effects; /// /// This handles /// -public sealed class ExplosionAnomalySystem : EntitySystem +public sealed partial class ExplosionAnomalySystem : EntitySystem { - [Dependency] private readonly ExplosionSystem _boom = default!; + [Dependency] private ExplosionSystem _boom = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs index c64caa037cd..62226a40233 100644 --- a/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/GasProducerAnomalySystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Anomaly.Effects; /// /// This handles and the events from /// -public sealed class GasProducerAnomalySystem : EntitySystem +public sealed partial class GasProducerAnomalySystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs index 8f4c105f0b5..ef11cc4391a 100644 --- a/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/InjectionAnomalySystem.cs @@ -13,11 +13,11 @@ namespace Content.Server.Anomaly.Effects; /// /// -public sealed class InjectionAnomalySystem : EntitySystem +public sealed partial class InjectionAnomalySystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private TransformSystem _transform = default!; private EntityQuery _injectableQuery; diff --git a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs index f498a7ad7b9..0afa4c2bb25 100644 --- a/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/InnerBodyAnomalySystem.cs @@ -19,20 +19,20 @@ namespace Content.Server.Anomaly.Effects; -public sealed class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem +public sealed partial class InnerBodyAnomalySystem : SharedInnerBodyAnomalySystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly AnomalySystem _anomaly = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly JitteringSystem _jitter = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly StunSystem _stun = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private AnomalySystem _anomaly = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private JitteringSystem _jitter = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private StunSystem _stun = default!; private readonly Color _messageColor = Color.FromSrgb(new Color(201, 22, 94)); diff --git a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs index ddbfd1b2256..f2bf16eaea7 100644 --- a/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ProjectileAnomalySystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.Anomaly.Effects; /// /// This handles and the events from /// -public sealed class ProjectileAnomalySystem : EntitySystem +public sealed partial class ProjectileAnomalySystem : EntitySystem { - [Dependency] private readonly TransformSystem _xform = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly GunSystem _gunSystem = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private TransformSystem _xform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private GunSystem _gunSystem = default!; + [Dependency] private SharedMapSystem _map = default!; private EntityQuery _xFormQuery; private EntityQuery _mobQuery; diff --git a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs index 8f20cca6138..72274618639 100644 --- a/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/PuddleCreateAnomalySystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Anomaly.Effects; /// /// This component allows the anomaly to create puddles from SolutionContainer. /// -public sealed class PuddleCreateAnomalySystem : EntitySystem +public sealed partial class PuddleCreateAnomalySystem : EntitySystem { - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs index 59aadd252ec..0e053cbcded 100644 --- a/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/PyroclasticAnomalySystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Anomaly.Effects; /// /// This handles and the events from /// -public sealed class PyroclasticAnomalySystem : EntitySystem +public sealed partial class PyroclasticAnomalySystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private FlammableSystem _flammable = default!; /// public override void Initialize() diff --git a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs index c9ac170bf61..05cae4363f8 100644 --- a/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ReagentProducerAnomalySystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.Anomaly.Effects; /// -public sealed class ReagentProducerAnomalySystem : EntitySystem +public sealed partial class ReagentProducerAnomalySystem : EntitySystem { //The idea is to divide substances into several categories. //The anomaly will choose one of the categories with a given chance based on severity. @@ -28,11 +28,11 @@ public sealed class ReagentProducerAnomalySystem : EntitySystem //Useful: //Those reagents that the players are hunting for. Very low percentage of loss. - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PointLightSystem _light = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private PointLightSystem _light = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedAudioSystem _audio = default!; public const string FallbackReagent = "Water"; diff --git a/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs b/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs index afd2e3ccdb8..6e530cdaa8a 100644 --- a/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/SecretDataAnomalySystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.Anomaly.Effects; -public sealed class SecretDataAnomalySystem : EntitySystem +public sealed partial class SecretDataAnomalySystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; private readonly List _deita = new(); diff --git a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs index 21399676915..104e363cb38 100644 --- a/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/ShuffleParticlesAnomalySystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.Anomaly.Effects; -public sealed class ShuffleParticlesAnomalySystem : EntitySystem +public sealed partial class ShuffleParticlesAnomalySystem : EntitySystem { - [Dependency] private readonly AnomalySystem _anomaly = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private AnomalySystem _anomaly = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/Effects/TechAnomalySystem.cs b/Content.Server/Anomaly/Effects/TechAnomalySystem.cs index a56506b9a48..5ed11b8239e 100644 --- a/Content.Server/Anomaly/Effects/TechAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/TechAnomalySystem.cs @@ -9,13 +9,13 @@ namespace Content.Server.Anomaly.Effects; -public sealed class TechAnomalySystem : EntitySystem +public sealed partial class TechAnomalySystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _signal = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly BeamSystem _beam = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private DeviceLinkSystem _signal = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private BeamSystem _beam = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/Anomaly/Effects/TempAffectingAnomalySystem.cs b/Content.Server/Anomaly/Effects/TempAffectingAnomalySystem.cs index dbdaf2994e9..4edb344f727 100644 --- a/Content.Server/Anomaly/Effects/TempAffectingAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/TempAffectingAnomalySystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Anomaly.Effects; /// /// This handles /// -public sealed class TempAffectingAnomalySystem : EntitySystem +public sealed partial class TempAffectingAnomalySystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly TransformSystem _xform = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private TransformSystem _xform = default!; public override void Update(float frameTime) { diff --git a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs index cc837d7ca6f..ac117c2f90d 100644 --- a/Content.Server/Anomaly/Effects/TileAnomalySystem.cs +++ b/Content.Server/Anomaly/Effects/TileAnomalySystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Anomaly.Effects; -public sealed class TileAnomalySystem : SharedTileAnomalySystem +public sealed partial class TileAnomalySystem : SharedTileAnomalySystem { - [Dependency] private readonly SharedAnomalySystem _anomaly = default!; - [Dependency] private readonly ITileDefinitionManager _tiledef = default!; - [Dependency] private readonly TileSystem _tile = default!; + [Dependency] private SharedAnomalySystem _anomaly = default!; + [Dependency] private ITileDefinitionManager _tiledef = default!; + [Dependency] private TileSystem _tile = default!; /// public override void Initialize() diff --git a/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs b/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs index d59fbc82b4b..b61e48931af 100644 --- a/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs +++ b/Content.Server/Antag/AntagMultipleRoleSpawnerSystem.cs @@ -3,10 +3,10 @@ namespace Content.Server.Antag; -public sealed class AntagMultipleRoleSpawnerSystem : EntitySystem +public sealed partial class AntagMultipleRoleSpawnerSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ILogManager _log = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Antag/AntagObjectivesSystem.cs b/Content.Server/Antag/AntagObjectivesSystem.cs index 4586b6e8ca8..8ce9c502c72 100644 --- a/Content.Server/Antag/AntagObjectivesSystem.cs +++ b/Content.Server/Antag/AntagObjectivesSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Antag; /// /// Adds fixed objectives to an antag made with AntagObjectivesComponent. /// -public sealed class AntagObjectivesSystem : EntitySystem +public sealed partial class AntagObjectivesSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Antag/AntagRandomObjectivesSystem.cs b/Content.Server/Antag/AntagRandomObjectivesSystem.cs index 9a31a905a0a..d1acea8b39b 100644 --- a/Content.Server/Antag/AntagRandomObjectivesSystem.cs +++ b/Content.Server/Antag/AntagRandomObjectivesSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Antag; /// /// Adds fixed objectives to an antag made with AntagRandomObjectivesComponent. /// -public sealed class AntagRandomObjectivesSystem : EntitySystem +public sealed partial class AntagRandomObjectivesSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private ObjectivesSystem _objectives = default!; public override void Initialize() { diff --git a/Content.Server/Antag/AntagRandomSpawnRule.cs b/Content.Server/Antag/AntagRandomSpawnRule.cs index cab337381e8..a1bc24f2d68 100644 --- a/Content.Server/Antag/AntagRandomSpawnRule.cs +++ b/Content.Server/Antag/AntagRandomSpawnRule.cs @@ -4,9 +4,9 @@ namespace Content.Server.Antag; -public sealed class AntagRandomSpawnSystem : GameRuleSystem +public sealed partial class AntagRandomSpawnSystem : GameRuleSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 8f4db0d77a9..34512abf755 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -40,21 +40,21 @@ namespace Content.Server.Antag; public sealed partial class AntagSelectionSystem : GameRuleSystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IBanManager _ban = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly GhostRoleSystem _ghostRole = default!; - [Dependency] private readonly JobSystem _jobs = default!; - [Dependency] private readonly LoadoutSystem _loadout = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly PlayTimeTrackingSystem _playTime = default!; - [Dependency] private readonly IServerPreferencesManager _pref = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ArrivalsSystem _arrivals = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IBanManager _ban = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private GhostRoleSystem _ghostRole = default!; + [Dependency] private JobSystem _jobs = default!; + [Dependency] private LoadoutSystem _loadout = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private PlayTimeTrackingSystem _playTime = default!; + [Dependency] private IServerPreferencesManager _pref = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ArrivalsSystem _arrivals = default!; // arbitrary random number to give late joining some mild interest. public const float LateJoinRandomChance = 0.5f; diff --git a/Content.Server/Antag/MobReplacementRuleSystem.cs b/Content.Server/Antag/MobReplacementRuleSystem.cs index d232bd274ed..faf5523b856 100644 --- a/Content.Server/Antag/MobReplacementRuleSystem.cs +++ b/Content.Server/Antag/MobReplacementRuleSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Antag; -public sealed class MobReplacementRuleSystem : GameRuleSystem +public sealed partial class MobReplacementRuleSystem : GameRuleSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Started(EntityUid uid, MobReplacementRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/Arcade/BlockGame/BlockGame.cs b/Content.Server/Arcade/BlockGame/BlockGame.cs index 428281cfc2a..90d9286b2a0 100644 --- a/Content.Server/Arcade/BlockGame/BlockGame.cs +++ b/Content.Server/Arcade/BlockGame/BlockGame.cs @@ -7,8 +7,8 @@ namespace Content.Server.Arcade.BlockGame; public sealed partial class BlockGame { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IRobustRandom _random = default!; private readonly ArcadeSystem _arcadeSystem; private readonly UserInterfaceSystem _uiSystem; diff --git a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs index 632dd378008..605f968a41c 100644 --- a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs +++ b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Arcade.BlockGame; -public sealed class BlockGameArcadeSystem : EntitySystem +public sealed partial class BlockGameArcadeSystem : EntitySystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SpeakOnUIClosedSystem _speakOnUIClosed = default!; public override void Initialize() { diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs index 990239140ef..dae169b7bda 100644 --- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs +++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs @@ -15,11 +15,11 @@ namespace Content.Server.Arcade.SpaceVillain; public sealed partial class SpaceVillainArcadeSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SpeakOnUIClosedSystem _speakOnUIClosed = default!; public override void Initialize() { diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs index 72a3aef1cfa..2bc39721b6c 100644 --- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs +++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainGame.cs @@ -12,8 +12,8 @@ namespace Content.Server.Arcade.SpaceVillain; /// public sealed partial class SpaceVillainGame { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IRobustRandom _random = default!; private readonly SharedAudioSystem _audioSystem = default!; private readonly UserInterfaceSystem _uiSystem = default!; private readonly SpaceVillainArcadeSystem _svArcade = default!; diff --git a/Content.Server/Armor/ArmorSystem.cs b/Content.Server/Armor/ArmorSystem.cs index 7eb6a6e808c..cf080766fc2 100644 --- a/Content.Server/Armor/ArmorSystem.cs +++ b/Content.Server/Armor/ArmorSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Armor; /// -public sealed class ArmorSystem : SharedArmorSystem +public sealed partial class ArmorSystem : SharedArmorSystem { - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Commands/AddAtmosCommand.cs b/Content.Server/Atmos/Commands/AddAtmosCommand.cs index 70911f4d746..66212da359b 100644 --- a/Content.Server/Atmos/Commands/AddAtmosCommand.cs +++ b/Content.Server/Atmos/Commands/AddAtmosCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class AddAtmosCommand : IConsoleCommand + public sealed partial class AddAtmosCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "addatmos"; public string Description => "Adds atmos support to a grid."; diff --git a/Content.Server/Atmos/Commands/AddGasCommand.cs b/Content.Server/Atmos/Commands/AddGasCommand.cs index 6f015ad2842..df99a6e184a 100644 --- a/Content.Server/Atmos/Commands/AddGasCommand.cs +++ b/Content.Server/Atmos/Commands/AddGasCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class AddGasCommand : IConsoleCommand + public sealed partial class AddGasCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "addgas"; public string Description => "Adds gas at a certain position."; diff --git a/Content.Server/Atmos/Commands/DeleteGasCommand.cs b/Content.Server/Atmos/Commands/DeleteGasCommand.cs index 448adb14279..4282bf594ab 100644 --- a/Content.Server/Atmos/Commands/DeleteGasCommand.cs +++ b/Content.Server/Atmos/Commands/DeleteGasCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class DeleteGasCommand : IConsoleCommand + public sealed partial class DeleteGasCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "deletegas"; public string Description => "Removes all gases from a grid, or just of one type if specified."; diff --git a/Content.Server/Atmos/Commands/FillGasCommand.cs b/Content.Server/Atmos/Commands/FillGasCommand.cs index 7eb34d90662..31749e46f22 100644 --- a/Content.Server/Atmos/Commands/FillGasCommand.cs +++ b/Content.Server/Atmos/Commands/FillGasCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class FillGas : IConsoleCommand + public sealed partial class FillGas : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "fillgas"; public string Description => "Adds gas to all tiles in a grid."; diff --git a/Content.Server/Atmos/Commands/ListGasesCommand.cs b/Content.Server/Atmos/Commands/ListGasesCommand.cs index fe6242cdcd0..33429e7b70c 100644 --- a/Content.Server/Atmos/Commands/ListGasesCommand.cs +++ b/Content.Server/Atmos/Commands/ListGasesCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class ListGasesCommand : IConsoleCommand + public sealed partial class ListGasesCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "listgases"; public string Description => "Prints a list of gases and their indices."; diff --git a/Content.Server/Atmos/Commands/PauseAtmosCommand.cs b/Content.Server/Atmos/Commands/PauseAtmosCommand.cs index 2893743d8b1..c635804cda0 100644 --- a/Content.Server/Atmos/Commands/PauseAtmosCommand.cs +++ b/Content.Server/Atmos/Commands/PauseAtmosCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Atmos.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class PauseAtmosCommand : LocalizedEntityCommands +public sealed partial class PauseAtmosCommand : LocalizedEntityCommands { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; public override string Command => "pauseatmos"; diff --git a/Content.Server/Atmos/Commands/RemoveGasCommand.cs b/Content.Server/Atmos/Commands/RemoveGasCommand.cs index a98bfb63e1b..e58e316cddc 100644 --- a/Content.Server/Atmos/Commands/RemoveGasCommand.cs +++ b/Content.Server/Atmos/Commands/RemoveGasCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class RemoveGasCommand : IConsoleCommand + public sealed partial class RemoveGasCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "removegas"; public string Description => "Removes an amount of gases."; diff --git a/Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs b/Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs index a3ec0f03fd3..452d9f220c4 100644 --- a/Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs +++ b/Content.Server/Atmos/Commands/SetAtmosTemperatureCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class SetAtmosTemperatureCommand : IConsoleCommand + public sealed partial class SetAtmosTemperatureCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "setatmostemp"; public string Description => "Sets a grid's temperature (in kelvin)."; diff --git a/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs b/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs index cf79b26c602..14d11365f91 100644 --- a/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs +++ b/Content.Server/Atmos/Commands/SetMapAtmosCommand.cs @@ -9,10 +9,10 @@ namespace Content.Server.Atmos.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class AddMapAtmosCommand : LocalizedEntityCommands +public sealed partial class AddMapAtmosCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private SharedMapSystem _map = default!; private const string Cmd = "cmd-set-map-atmos"; public override string Command => "setmapatmos"; diff --git a/Content.Server/Atmos/Commands/SetTemperatureCommand.cs b/Content.Server/Atmos/Commands/SetTemperatureCommand.cs index 75d358dfd6d..afb39d8fe27 100644 --- a/Content.Server/Atmos/Commands/SetTemperatureCommand.cs +++ b/Content.Server/Atmos/Commands/SetTemperatureCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class SetTemperatureCommand : IConsoleCommand + public sealed partial class SetTemperatureCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "settemp"; public string Description => "Sets a tile's temperature (in kelvin)."; diff --git a/Content.Server/Atmos/Commands/ShowAtmosCommand.cs b/Content.Server/Atmos/Commands/ShowAtmosCommand.cs index 89b9c846ece..dabcf256e22 100644 --- a/Content.Server/Atmos/Commands/ShowAtmosCommand.cs +++ b/Content.Server/Atmos/Commands/ShowAtmosCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Atmos.Commands { [AdminCommand(AdminFlags.Debug)] - public sealed class ShowAtmos : IConsoleCommand + public sealed partial class ShowAtmos : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "showatmos"; public string Description => "Toggles seeing atmos debug overlay."; diff --git a/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs b/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs index 3812b1686a9..eefad9f9b59 100644 --- a/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs +++ b/Content.Server/Atmos/Commands/SubstepAtmosCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Atmos.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class SubstepAtmosCommand : LocalizedEntityCommands +public sealed partial class SubstepAtmosCommand : LocalizedEntityCommands { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; public override string Command => "substepatmos"; diff --git a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs index 6b88def8ff2..2a95f04f69b 100644 --- a/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs +++ b/Content.Server/Atmos/Consoles/AtmosAlertsComputerSystem.cs @@ -16,16 +16,16 @@ namespace Content.Server.Atmos.Monitor.Systems; -public sealed class AtmosAlertsComputerSystem : SharedAtmosAlertsComputerSystem +public sealed partial class AtmosAlertsComputerSystem : SharedAtmosAlertsComputerSystem { - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly AirAlarmSystem _airAlarmSystem = default!; - [Dependency] private readonly AtmosDeviceNetworkSystem _atmosDevNet = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly NavMapSystem _navMapSystem = default!; - [Dependency] private readonly DeviceListSystem _deviceListSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private AirAlarmSystem _airAlarmSystem = default!; + [Dependency] private AtmosDeviceNetworkSystem _atmosDevNet = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private NavMapSystem _navMapSystem = default!; + [Dependency] private DeviceListSystem _deviceListSystem = default!; private const float UpdateTime = 1.0f; diff --git a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs index db62b2ec8a1..7e64c9dfbef 100644 --- a/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs +++ b/Content.Server/Atmos/Consoles/AtmosMonitoringConsoleSystem.cs @@ -20,11 +20,11 @@ namespace Content.Server.Atmos.Consoles; -public sealed class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleSystem +public sealed partial class AtmosMonitoringConsoleSystem : SharedAtmosMonitoringConsoleSystem { - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly SharedMapSystem _sharedMapSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private SharedMapSystem _sharedMapSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; // Private variables // Note: this data does not need to be saved diff --git a/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs b/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs index c737a985938..c638154fd19 100644 --- a/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AirFilterSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Atmos.EntitySystems; /// /// Handles gas filtering and intake for and . /// -public sealed class AirFilterSystem : EntitySystem +public sealed partial class AirFilterSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs index 111049e146b..81ffe9057e6 100644 --- a/Content.Server/Atmos/EntitySystems/AirtightSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AirtightSystem.cs @@ -9,13 +9,13 @@ namespace Content.Server.Atmos.EntitySystems { [UsedImplicitly] - public sealed class AirtightSystem : EntitySystem + public sealed partial class AirtightSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs index c1bc3cc7e48..716d51d7764 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.Atmos.EntitySystems { [UsedImplicitly] - public sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem + public sealed partial class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private MapSystem _mapSystem = default!; /// /// Players allowed to see the atmos debug overlay. diff --git a/Content.Server/Atmos/EntitySystems/AtmosPipeLayersSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosPipeLayersSystem.cs index 924a6695fc8..ae230481191 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosPipeLayersSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosPipeLayersSystem.cs @@ -15,10 +15,10 @@ namespace Content.Server.Atmos.EntitySystems; /// public sealed partial class AtmosPipeLayersSystem : SharedAtmosPipeLayersSystem { - [Dependency] private readonly NodeGroupSystem _nodeGroup = default!; - [Dependency] private readonly PipeRestrictOverlapSystem _pipeRestrictOverlap = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private NodeGroupSystem _nodeGroup = default!; + [Dependency] private PipeRestrictOverlapSystem _pipeRestrictOverlap = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _xform = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs index 11e7cde2548..4ec0d2ce7dd 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs @@ -5,7 +5,7 @@ namespace Content.Server.Atmos.EntitySystems { public sealed partial class AtmosphereSystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public bool SpaceWind { get; private set; } public float SpaceWindPressureForceDivisorThrow { get; private set; } diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs index 4ee85f95fa9..5a838a16f47 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs @@ -12,7 +12,7 @@ namespace Content.Server.Atmos.EntitySystems; public sealed partial class AtmosphereSystem { - [Dependency] private readonly IConsoleHost _consoleHost = default!; + [Dependency] private IConsoleHost _consoleHost = default!; private void InitializeCommands() { diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs index 3076651e954..ba05982f365 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Gases.cs @@ -11,7 +11,7 @@ namespace Content.Server.Atmos.EntitySystems { public sealed partial class AtmosphereSystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private GasReactionPrototype[] _gasReactions = []; diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs index 6ecd5f8e315..6adfebe55c4 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Hotspot.cs @@ -34,8 +34,8 @@ it starts spreading to adjacent tiles by radiating heat. /// private static readonly ProtoId DefaultHotspotSounds = "AtmosHotspot"; - [Dependency] private readonly DecalSystem _decalSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private DecalSystem _decalSystem = default!; + [Dependency] private IRobustRandom _random = default!; /// /// Number of cycles the hotspot system must process before it can play another sound diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs index 52eb63154e2..7137bfb21f8 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs @@ -13,7 +13,7 @@ namespace Content.Server.Atmos.EntitySystems { public sealed partial class AtmosphereSystem { - [Dependency] private readonly FirelockSystem _firelockSystem = default!; + [Dependency] private FirelockSystem _firelockSystem = default!; private readonly TileAtmosphereComparer _monstermosComparer = new(); diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs index a44264b755e..2e5d1b0f510 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Processing.cs @@ -14,7 +14,7 @@ namespace Content.Server.Atmos.EntitySystems { public sealed partial class AtmosphereSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; private readonly Stopwatch _simulationStopwatch = new(); diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs index 5c60e57a042..16c82d9949b 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs @@ -28,20 +28,20 @@ namespace Content.Server.Atmos.EntitySystems; [UsedImplicitly] public sealed partial class AtmosphereSystem : SharedAtmosphereSystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly IParallelManager _parallel = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly GasTileOverlaySystem _gasTileOverlaySystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly MapSystem _map = default!; - [Dependency] public readonly PuddleSystem Puddle = default!; - [Dependency] private readonly DamageableSystem _damage = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private IParallelManager _parallel = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private GasTileOverlaySystem _gasTileOverlaySystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] public PuddleSystem Puddle = default!; + [Dependency] private DamageableSystem _damage = default!; private const float ExposedUpdateDelay = 1f; private float _exposedTimer = 0f; diff --git a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs index bc5621118d4..203cabe16e3 100644 --- a/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs +++ b/Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Atmos.EntitySystems; /// Handles automatically adding a grid atmosphere to grids that become large enough, allowing players to build shuttles /// with a sealed atmosphere from scratch. /// -public sealed class AutomaticAtmosSystem : EntitySystem +public sealed partial class AutomaticAtmosSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs index e72ed8baf47..20c7c2c3358 100644 --- a/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs +++ b/Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Atmos.EntitySystems { - public sealed class BarotraumaSystem : EntitySystem + public sealed partial class BarotraumaSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private InventorySystem _inventorySystem = default!; private const float UpdateTimer = 1f; private float _timer; diff --git a/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs b/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs index 669735b90da..0e4e303de10 100644 --- a/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs +++ b/Content.Server/Atmos/EntitySystems/DeltaPressureSystem.cs @@ -16,7 +16,7 @@ namespace Content.Server.Atmos.EntitySystems; /// public sealed partial class DeltaPressureSystem : SharedDeltaPressureSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/FirestarterSystem.cs b/Content.Server/Atmos/EntitySystems/FirestarterSystem.cs index 544d5025809..ae8661edabf 100644 --- a/Content.Server/Atmos/EntitySystems/FirestarterSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FirestarterSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Atmos.EntitySystems; /// Adds an action ability that will cause all flammable targets in a radius to ignite, also heals the owner /// of the component when used. /// -public sealed class FirestarterSystem : SharedFirestarterSystem +public sealed partial class FirestarterSystem : SharedFirestarterSystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly FlammableSystem _flammable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private FlammableSystem _flammable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; private readonly HashSet> _flammables = new(); diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index 12e7ef1185d..742837c8d4a 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -35,25 +35,25 @@ namespace Content.Server.Atmos.EntitySystems { - public sealed class FlammableSystem : EntitySystem + public sealed partial class FlammableSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly StunSystem _stunSystem = default!; - [Dependency] private readonly TemperatureSystem _temperatureSystem = default!; - [Dependency] private readonly SharedIgnitionSourceSystem _ignitionSourceSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly FixtureSystem _fixture = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ContainerSystem _container = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private StunSystem _stunSystem = default!; + [Dependency] private TemperatureSystem _temperatureSystem = default!; + [Dependency] private SharedIgnitionSourceSystem _ignitionSourceSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private FixtureSystem _fixture = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ContainerSystem _container = default!; private EntityQuery _inventoryQuery; private EntityQuery _physicsQuery; diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs index d917f6e9b9b..505b36660ac 100644 --- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.Atmos.EntitySystems; [UsedImplicitly] -public sealed class GasAnalyzerSystem : EntitySystem +public sealed partial class GasAnalyzerSystem : EntitySystem { - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly AtmosphereSystem _atmo = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private AtmosphereSystem _atmo = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedTransformSystem _xform = default!; /// /// Minimum moles of a gas to be sent to the client. diff --git a/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs index b2debca666a..bb378e41616 100644 --- a/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Atmos.EntitySystems; [UsedImplicitly] -public sealed class GasMinerSystem : SharedGasMinerSystem +public sealed partial class GasMinerSystem : SharedGasMinerSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs index 7e42d74d213..0ffe3284fa5 100644 --- a/Content.Server/Atmos/EntitySystems/GasTankSystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasTankSystem.cs @@ -15,15 +15,15 @@ namespace Content.Server.Atmos.EntitySystems { [UsedImplicitly] - public sealed class GasTankSystem : SharedGasTankSystem + public sealed partial class GasTankSystem : SharedGasTankSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly ExplosionSystem _explosions = default!; - [Dependency] private readonly SharedAudioSystem _audioSys = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private ExplosionSystem _explosions = default!; + [Dependency] private SharedAudioSystem _audioSys = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private IConfigurationManager _cfg = default!; private const float TimerDelay = 0.5f; private float _timer = 0f; diff --git a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs index 578f5b3af7a..d054c8e3f30 100644 --- a/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs +++ b/Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs @@ -23,14 +23,14 @@ namespace Content.Server.Atmos.EntitySystems { [UsedImplicitly] - public sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem + public sealed partial class GasTileOverlaySystem : SharedGasTileOverlaySystem { - [Robust.Shared.IoC.Dependency] private readonly IGameTiming _gameTiming = default!; - [Robust.Shared.IoC.Dependency] private readonly IPlayerManager _playerManager = default!; - [Robust.Shared.IoC.Dependency] private readonly IMapManager _mapManager = default!; - [Robust.Shared.IoC.Dependency] private readonly IParallelManager _parMan = default!; - [Robust.Shared.IoC.Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Robust.Shared.IoC.Dependency] private readonly ChunkingSystem _chunkingSys = default!; + [Robust.Shared.IoC.Dependency] private IGameTiming _gameTiming = default!; + [Robust.Shared.IoC.Dependency] private IPlayerManager _playerManager = default!; + [Robust.Shared.IoC.Dependency] private IMapManager _mapManager = default!; + [Robust.Shared.IoC.Dependency] private IParallelManager _parMan = default!; + [Robust.Shared.IoC.Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Robust.Shared.IoC.Dependency] private ChunkingSystem _chunkingSys = default!; /// /// Per-tick cache of sessions. diff --git a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs index 1a55592d5bc..3bd647d12a3 100644 --- a/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs +++ b/Content.Server/Atmos/EntitySystems/HeatExchangerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Atmos.EntitySystems; -public sealed class HeatExchangerSystem : EntitySystem +public sealed partial class HeatExchangerSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedTransformSystem _transform = default!; float _tileLoss; diff --git a/Content.Server/Atmos/EntitySystems/PipeNetGasSnapshotSystem.cs b/Content.Server/Atmos/EntitySystems/PipeNetGasSnapshotSystem.cs index e01e1f5b1a4..bfd9d5424a3 100644 --- a/Content.Server/Atmos/EntitySystems/PipeNetGasSnapshotSystem.cs +++ b/Content.Server/Atmos/EntitySystems/PipeNetGasSnapshotSystem.cs @@ -15,9 +15,9 @@ namespace Content.Server.Atmos.EntitySystems; /// This intentionally allows for manual pipe deletions in the map editor to potentially wipe the contents of a pipenet /// to reduce save speed and storage size. /// -public sealed class PipeNetGasSnapshotSystem : EntitySystem +public sealed partial class PipeNetGasSnapshotSystem : EntitySystem { - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs index 6050f42196f..75ec5748a2c 100644 --- a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs +++ b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs @@ -15,11 +15,11 @@ namespace Content.Server.Atmos.EntitySystems; /// /// This handles restricting pipe-based entities from overlapping outlets/inlets with other entities. /// -public sealed class PipeRestrictOverlapSystem : EntitySystem +public sealed partial class PipeRestrictOverlapSystem : EntitySystem { - [Dependency] private readonly MapSystem _map = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly TransformSystem _xform = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private TransformSystem _xform = default!; private readonly List _anchoredEntities = new(); private EntityQuery _nodeContainerQuery; diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs index a5ea3c0e77e..f192b04113f 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmModes.cs @@ -77,9 +77,9 @@ public sealed class AirAlarmModeFactory } // like a tiny little EntitySystem -public abstract class AirAlarmModeExecutor : IAirAlarmMode +public abstract partial class AirAlarmModeExecutor : IAirAlarmMode { - [Dependency] public readonly IEntityManager EntityManager = default!; + [Dependency] public IEntityManager EntityManager = default!; public readonly DeviceNetworkSystem DeviceNetworkSystem; public readonly AirAlarmSystem AirAlarmSystem; diff --git a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs index 032ddbbcc65..29788a0bbdc 100644 --- a/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AirAlarmSystem.cs @@ -34,17 +34,17 @@ namespace Content.Server.Atmos.Monitor.Systems; // data key. In response, a packet will be transmitted // with the response type as its command, and the // response data in its data key. -public sealed class AirAlarmSystem : EntitySystem +public sealed partial class AirAlarmSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosAlarmableSystem _atmosAlarmable = default!; - [Dependency] private readonly AtmosDeviceNetworkSystem _atmosDevNet = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNet = default!; - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly DeviceListSystem _deviceList = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AtmosAlarmableSystem _atmosAlarmable = default!; + [Dependency] private AtmosDeviceNetworkSystem _atmosDevNet = default!; + [Dependency] private DeviceNetworkSystem _deviceNet = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; + [Dependency] private DeviceListSystem _deviceList = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private UserInterfaceSystem _ui = default!; #region Device Network API diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs index d9a772d72be..399106488fe 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosAlarmableSystem.cs @@ -15,12 +15,12 @@ namespace Content.Server.Atmos.Monitor.Systems; -public sealed class AtmosAlarmableSystem : EntitySystem +public sealed partial class AtmosAlarmableSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly AudioSystem _audioSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNet = default!; - [Dependency] private readonly AtmosDeviceNetworkSystem _atmosDevNetSystem = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private AudioSystem _audioSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNet = default!; + [Dependency] private AtmosDeviceNetworkSystem _atmosDevNetSystem = default!; /// /// An alarm. Has three valid states: Normal, Warning, Danger. diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs index 533f26b34d9..087b36b38da 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosDeviceNetwork.cs @@ -8,7 +8,7 @@ namespace Content.Server.Atmos.Monitor.Systems; /// Generic device network commands useful for atmos devices, /// as well as some helper commands. /// -public sealed class AtmosDeviceNetworkSystem : EntitySystem +public sealed partial class AtmosDeviceNetworkSystem : EntitySystem { /// /// Register a device's address on this device. @@ -25,7 +25,7 @@ public sealed class AtmosDeviceNetworkSystem : EntitySystem /// public const string SyncData = "atmos_sync_data"; - [Dependency] private readonly DeviceNetworkSystem _deviceNet = default!; + [Dependency] private DeviceNetworkSystem _deviceNet = default!; public void Register(EntityUid uid, string? address) { diff --git a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs index 03e5637831c..81abf091c2a 100644 --- a/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/AtmosMonitoringSystem.cs @@ -24,14 +24,14 @@ namespace Content.Server.Atmos.Monitor.Systems; // to it via local APC net, and starts sending updates of the // current atmosphere. Monitors fire (which always triggers as // a danger), and atmos (which triggers based on set thresholds). -public sealed class AtmosMonitorSystem : EntitySystem +public sealed partial class AtmosMonitorSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly AtmosDeviceSystem _atmosDeviceSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainerSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private AtmosDeviceSystem _atmosDeviceSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private NodeContainerSystem _nodeContainerSystem = default!; // Commands public const string AtmosMonitorSetThresholdCmd = "atmos_monitor_set_threshold"; diff --git a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs index 3f6bafa1630..f219ec3c736 100644 --- a/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs +++ b/Content.Server/Atmos/Monitor/Systems/FireAlarmSystem.cs @@ -11,14 +11,14 @@ namespace Content.Server.Atmos.Monitor.Systems; -public sealed class FireAlarmSystem : EntitySystem +public sealed partial class FireAlarmSystem : EntitySystem { - [Dependency] private readonly AtmosDeviceNetworkSystem _atmosDevNet = default!; - [Dependency] private readonly AtmosAlarmableSystem _atmosAlarmable = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private AtmosDeviceNetworkSystem _atmosDevNet = default!; + [Dependency] private AtmosAlarmableSystem _atmosAlarmable = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private IConfigurationManager _configManager = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs index a242a73a7af..c6bea261a10 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPassiveGateSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems { [UsedImplicitly] - public sealed class GasPassiveGateSystem : EntitySystem + public sealed partial class GasPassiveGateSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs index 0b442be1ca8..d822f820e98 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressurePumpSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems; [UsedImplicitly] -public sealed class GasPressurePumpSystem : SharedGasPressurePumpSystem +public sealed partial class GasPressurePumpSystem : SharedGasPressurePumpSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly PowerReceiverSystem _power = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private PowerReceiverSystem _power = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs index d3b5da9d754..537bc5afb00 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasPressureRegulatorSystem.cs @@ -18,13 +18,13 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems; /// See https://en.wikipedia.org/wiki/Pressure_regulator /// [UsedImplicitly] -public sealed class GasPressureRegulatorSystem : SharedGasPressureRegulatorSystem +public sealed partial class GasPressureRegulatorSystem : SharedGasPressureRegulatorSystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs index c6fab767948..5e3ae41b5a5 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs @@ -22,15 +22,15 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems { [UsedImplicitly] - public sealed class GasRecyclerSystem : EntitySystem + public sealed partial class GasRecyclerSystem : EntitySystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs index dc5e01b1c44..950b4b423e0 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasValveSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems; -public sealed class GasValveSystem : SharedGasValveSystem +public sealed partial class GasValveSystem : SharedGasValveSystem { - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Set(EntityUid uid, GasValveComponent component, bool value) { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs index 93c0415d0e0..ac0bb45661b 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/GasVolumePumpSystem.cs @@ -18,13 +18,13 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems { [UsedImplicitly] - public sealed class GasVolumePumpSystem : SharedGasVolumePumpSystem + public sealed partial class GasVolumePumpSystem : SharedGasVolumePumpSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs b/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs index 1f60ce1bbc5..95fbc43d099 100644 --- a/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs +++ b/Content.Server/Atmos/Piping/Binary/EntitySystems/SignalControlledValveSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems; -public sealed class SignalControlledValveSystem : EntitySystem +public sealed partial class SignalControlledValveSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _signal = default!; - [Dependency] private readonly GasValveSystem _valve = default!; + [Dependency] private DeviceLinkSystem _signal = default!; + [Dependency] private GasValveSystem _valve = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs index 1e94b4e0717..11caa95213d 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Atmos.Piping.EntitySystems { [UsedImplicitly] - public sealed class AtmosDeviceSystem : EntitySystem + public sealed partial class AtmosDeviceSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; private float _timer; diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs index 17f9d4652f3..159d5aa7d08 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeAppearanceSystem.cs @@ -10,8 +10,8 @@ namespace Content.Server.Atmos.Piping.EntitySystems; public sealed partial class AtmosPipeAppearanceSystem : SharedAtmosPipeAppearanceSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs index f0ecdda168f..e886eb0b6d8 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosPipeColorSystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.Atmos.Piping.EntitySystems { - public sealed class AtmosPipeColorSystem : EntitySystem + public sealed partial class AtmosPipeColorSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs index 08be29dcaa2..c3ecaab7e6f 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/AtmosUnsafeUnanchorSystem.cs @@ -13,11 +13,11 @@ namespace Content.Server.Atmos.Piping.EntitySystems { [UsedImplicitly] - public sealed class AtmosUnsafeUnanchorSystem : EntitySystem + public sealed partial class AtmosUnsafeUnanchorSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly NodeGroupSystem _group = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private NodeGroupSystem _group = default!; + [Dependency] private PopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs index 6dfb1afa866..081bf072f7a 100644 --- a/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs +++ b/Content.Server/Atmos/Piping/EntitySystems/GasPipeManifoldSystem.cs @@ -10,7 +10,7 @@ namespace Content.Server.Atmos.Piping.EntitySystems; public sealed partial class GasPipeManifoldSystem : EntitySystem { - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs index 2480ab6600d..78bdad5e456 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs @@ -19,15 +19,15 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems { [UsedImplicitly] - public sealed class GasFilterSystem : EntitySystem + public sealed partial class GasFilterSystem : EntitySystem { [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private IAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs index 271dbca27b5..ca414d9a24b 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/GasMixerSystem.cs @@ -19,15 +19,15 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems { [UsedImplicitly] - public sealed class GasMixerSystem : EntitySystem + public sealed partial class GasMixerSystem : EntitySystem { [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; [Dependency] private IAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs index 38f3ca8a470..fde632914e5 100644 --- a/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs +++ b/Content.Server/Atmos/Piping/Trinary/EntitySystems/PressureControlledValveSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems { [UsedImplicitly] - public sealed class PressureControlledValveSystem : EntitySystem + public sealed partial class PressureControlledValveSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs index d4b0d0012db..77f835de311 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCanisterSystem.cs @@ -13,11 +13,11 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems; -public sealed class GasCanisterSystem : SharedGasCanisterSystem +public sealed partial class GasCanisterSystem : SharedGasCanisterSystem { - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs index 7bec2136bed..5f3efb1bad9 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasCondenserSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems; [UsedImplicitly] -public sealed class GasCondenserSystem : EntitySystem +public sealed partial class GasCondenserSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly PowerReceiverSystem _power = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private PowerReceiverSystem _power = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs index 86738518e35..0de54f3d444 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasOutletInjectorSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems { [UsedImplicitly] - public sealed class GasOutletInjectorSystem : EntitySystem + public sealed partial class GasOutletInjectorSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs index 84bd25d0688..8b4ab9bb316 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPassiveVentSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems { [UsedImplicitly] - public sealed class GasPassiveVentSystem : EntitySystem + public sealed partial class GasPassiveVentSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs index f3d9b429ee7..faea04c6029 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasPortableSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems { [UsedImplicitly] - public sealed class GasPortableSystem : EntitySystem + public sealed partial class GasPortableSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs index cb2e04ab58f..d03c0ba33d9 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs @@ -17,12 +17,12 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems { [UsedImplicitly] - public sealed class GasThermoMachineSystem : SharedGasThermoMachineSystem + public sealed partial class GasThermoMachineSystem : SharedGasThermoMachineSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly PowerReceiverSystem _power = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private PowerReceiverSystem _power = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs index 19e51e5d3c6..138eb995109 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentPumpSystem.cs @@ -32,19 +32,19 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems { [UsedImplicitly] - public sealed class GasVentPumpSystem : EntitySystem + public sealed partial class GasVentPumpSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!; - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly WeldableSystem _weldable = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetSystem = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private WeldableSystem _weldable = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs index d51737a74b7..131120c41d2 100644 --- a/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs +++ b/Content.Server/Atmos/Piping/Unary/EntitySystems/GasVentScrubberSystem.cs @@ -25,17 +25,17 @@ namespace Content.Server.Atmos.Piping.Unary.EntitySystems { [UsedImplicitly] - public sealed class GasVentScrubberSystem : EntitySystem + public sealed partial class GasVentScrubberSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly WeldableSystem _weldable = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private WeldableSystem _weldable = default!; + [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs index a4e9062cd1d..ea7f18c9c5c 100644 --- a/Content.Server/Atmos/Portable/PortableScrubberSystem.cs +++ b/Content.Server/Atmos/Portable/PortableScrubberSystem.cs @@ -17,17 +17,17 @@ namespace Content.Server.Atmos.Portable { - public sealed class PortableScrubberSystem : EntitySystem + public sealed partial class PortableScrubberSystem : EntitySystem { - [Dependency] private readonly GasVentScrubberSystem _scrubberSystem = default!; - [Dependency] private readonly GasCanisterSystem _canisterSystem = default!; - [Dependency] private readonly GasPortableSystem _gasPortableSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly AmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private GasVentScrubberSystem _scrubberSystem = default!; + [Dependency] private GasCanisterSystem _canisterSystem = default!; + [Dependency] private GasPortableSystem _gasPortableSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private AmbientSoundSystem _ambientSound = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs index 9385613d945..fe9c76e8103 100644 --- a/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs +++ b/Content.Server/Atmos/Portable/SpaceHeaterSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Atmos.Portable; -public sealed class SpaceHeaterSystem : EntitySystem +public sealed partial class SpaceHeaterSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PowerReceiverSystem _power = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PowerReceiverSystem _power = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; public override void Initialize() { diff --git a/Content.Server/Atmos/Rotting/RottingSystem.cs b/Content.Server/Atmos/Rotting/RottingSystem.cs index 275012e5583..395c1006c0f 100644 --- a/Content.Server/Atmos/Rotting/RottingSystem.cs +++ b/Content.Server/Atmos/Rotting/RottingSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Atmos.Rotting; -public sealed class RottingSystem : SharedRottingSystem +public sealed partial class RottingSystem : SharedRottingSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Server/Audio/ContentAudioSystem.cs b/Content.Server/Audio/ContentAudioSystem.cs index 2f9b2c9e551..fd70b95d1bd 100644 --- a/Content.Server/Audio/ContentAudioSystem.cs +++ b/Content.Server/Audio/ContentAudioSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.Audio; -public sealed class ContentAudioSystem : SharedContentAudioSystem +public sealed partial class ContentAudioSystem : SharedContentAudioSystem { - [Dependency] private readonly AudioSystem _serverAudio = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private AudioSystem _serverAudio = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; private SoundCollectionPrototype? _lobbyMusicCollection = default!; private string[]? _lobbyPlaylist; diff --git a/Content.Server/Audio/Jukebox/JukeboxSystem.cs b/Content.Server/Audio/Jukebox/JukeboxSystem.cs index c8600a35536..5fcf35c8d5c 100644 --- a/Content.Server/Audio/Jukebox/JukeboxSystem.cs +++ b/Content.Server/Audio/Jukebox/JukeboxSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Audio.Jukebox; -public sealed class JukeboxSystem : SharedJukeboxSystem +public sealed partial class JukeboxSystem : SharedJukeboxSystem { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; public override void Initialize() { diff --git a/Content.Server/Audio/ServerGlobalSoundSystem.cs b/Content.Server/Audio/ServerGlobalSoundSystem.cs index 1c9d662945e..0d863afad51 100644 --- a/Content.Server/Audio/ServerGlobalSoundSystem.cs +++ b/Content.Server/Audio/ServerGlobalSoundSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Audio; -public sealed class ServerGlobalSoundSystem : SharedGlobalSoundSystem +public sealed partial class ServerGlobalSoundSystem : SharedGlobalSoundSystem { - [Dependency] private readonly IConsoleHost _conHost = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IConsoleHost _conHost = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Shutdown() { diff --git a/Content.Server/Beam/BeamSystem.cs b/Content.Server/Beam/BeamSystem.cs index 6be7dbf3113..1a89132b249 100644 --- a/Content.Server/Beam/BeamSystem.cs +++ b/Content.Server/Beam/BeamSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Beam; -public sealed class BeamSystem : SharedBeamSystem +public sealed partial class BeamSystem : SharedBeamSystem { - [Dependency] private readonly FixtureSystem _fixture = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private FixtureSystem _fixture = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedBroadphaseSystem _broadphase = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() { diff --git a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs index 726f66efef5..7521ee0325f 100644 --- a/Content.Server/Bed/Cryostorage/CryostorageSystem.cs +++ b/Content.Server/Bed/Cryostorage/CryostorageSystem.cs @@ -32,24 +32,24 @@ namespace Content.Server.Bed.Cryostorage; /// -public sealed class CryostorageSystem : SharedCryostorageSystem +public sealed partial class CryostorageSystem : SharedCryostorageSystem { - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly ServerInventorySystem _inventory = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StationRecordsSystem _stationRecords = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private ServerInventorySystem _inventory = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StationRecordsSystem _stationRecords = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private GameTicker _ticker = default!; /// public override void Initialize() { @@ -199,7 +199,7 @@ public void HandleEnterCryostorage(Entity ent, Ne var ev = new PersonalCryoEvent(true); RaiseLocalEvent(cryostorageEnt.Value, ref ev); } - + _audio.PlayPvs(cryostorageComponent.RemoveSound, ent); diff --git a/Content.Server/Bible/BibleSystem.cs b/Content.Server/Bible/BibleSystem.cs index 5ce37276b78..ce435bca2cf 100644 --- a/Content.Server/Bible/BibleSystem.cs +++ b/Content.Server/Bible/BibleSystem.cs @@ -21,18 +21,18 @@ namespace Content.Server.Bible { - public sealed class BibleSystem : EntitySystem + public sealed partial class BibleSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly InventorySystem _invSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private InventorySystem _invSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UseDelaySystem _delay = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Body/Commands/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs index ae8d6f69ebe..d6f6d04acd0 100644 --- a/Content.Server/Body/Commands/AddHandCommand.cs +++ b/Content.Server/Body/Commands/AddHandCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Body.Commands { [AdminCommand(AdminFlags.Fun)] - sealed class AddHandCommand : IConsoleCommand + sealed partial class AddHandCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private static int _handIdAccumulator; diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs index 2dd82446edc..8c9c26860c0 100644 --- a/Content.Server/Body/Systems/InternalsSystem.cs +++ b/Content.Server/Body/Systems/InternalsSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Body.Systems; -public sealed class InternalsSystem : SharedInternalsSystem +public sealed partial class InternalsSystem : SharedInternalsSystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly GasTankSystem _gasTank = default!; - [Dependency] private readonly RespiratorSystem _respirator = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private GasTankSystem _gasTank = default!; + [Dependency] private RespiratorSystem _respirator = default!; private EntityQuery _internalsQuery; diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index 857a81ff17e..d5c08963add 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -28,20 +28,20 @@ namespace Content.Server.Body.Systems; [UsedImplicitly] -public sealed class RespiratorSystem : EntitySystem +public sealed partial class RespiratorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmosSys = default!; - [Dependency] private readonly BodySystem _body = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damageableSys = default!; - [Dependency] private readonly LungSystem _lungSystem = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private AtmosphereSystem _atmosSys = default!; + [Dependency] private BodySystem _body = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DamageableSystem _damageableSys = default!; + [Dependency] private LungSystem _lungSystem = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedEntityConditionsSystem _entityConditions = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; private static readonly ProtoId RespirationStage = new("Respiration"); diff --git a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs index 81204bbe8ed..e0c03c836d7 100644 --- a/Content.Server/Body/Systems/ThermalRegulatorSystem.cs +++ b/Content.Server/Body/Systems/ThermalRegulatorSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Body.Systems; -public sealed class ThermalRegulatorSystem : EntitySystem +public sealed partial class ThermalRegulatorSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly TemperatureSystem _tempSys = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSys = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private TemperatureSystem _tempSys = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSys = default!; public override void Initialize() { diff --git a/Content.Server/Botany/Systems/BotanySwabSystem.cs b/Content.Server/Botany/Systems/BotanySwabSystem.cs index e8c7af92c27..21ab292aada 100644 --- a/Content.Server/Botany/Systems/BotanySwabSystem.cs +++ b/Content.Server/Botany/Systems/BotanySwabSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Botany.Systems; -public sealed class BotanySwabSystem : EntitySystem +public sealed partial class BotanySwabSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly MutationSystem _mutationSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private MutationSystem _mutationSystem = default!; public override void Initialize() { diff --git a/Content.Server/Botany/Systems/BotanySystem.Produce.cs b/Content.Server/Botany/Systems/BotanySystem.Produce.cs index bba3c48b867..c2169339ed3 100644 --- a/Content.Server/Botany/Systems/BotanySystem.Produce.cs +++ b/Content.Server/Botany/Systems/BotanySystem.Produce.cs @@ -7,7 +7,7 @@ namespace Content.Server.Botany.Systems; public sealed partial class BotanySystem { - [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!; + [Dependency] private SharedEntityEffectsSystem _entityEffects = default!; public void ProduceGrown(EntityUid uid, ProduceComponent produce) { diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs index 0af08dd8736..1aa08a3c272 100644 --- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs +++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs @@ -21,15 +21,15 @@ namespace Content.Server.Botany.Systems; public sealed partial class BotanySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly RandomHelperSystem _randomHelper = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private RandomHelperSystem _randomHelper = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Server/Botany/Systems/LogSystem.cs b/Content.Server/Botany/Systems/LogSystem.cs index 08190af7083..b6c8399ad96 100644 --- a/Content.Server/Botany/Systems/LogSystem.cs +++ b/Content.Server/Botany/Systems/LogSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Botany.Systems; -public sealed class LogSystem : EntitySystem +public sealed partial class LogSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly RandomHelperSystem _randomHelper = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private RandomHelperSystem _randomHelper = default!; public override void Initialize() { diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs index 834fd9e8efb..2b14f0c9509 100644 --- a/Content.Server/Botany/Systems/MutationSystem.cs +++ b/Content.Server/Botany/Systems/MutationSystem.cs @@ -7,13 +7,13 @@ namespace Content.Server.Botany; -public sealed class MutationSystem : EntitySystem +public sealed partial class MutationSystem : EntitySystem { private static ProtoId RandomPlantMutations = "RandomPlantMutations"; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedEntityEffectsSystem _entityEffects = default!; private RandomPlantMutationListPrototype _randomMutations = default!; public override void Initialize() diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 123833960bd..795f43f80f2 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -30,24 +30,24 @@ namespace Content.Server.Botany.Systems; -public sealed class PlantHolderSystem : EntitySystem +public sealed partial class PlantHolderSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly BotanySystem _botany = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly MutationSystem _mutation = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly RandomHelperSystem _randomHelper = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private BotanySystem _botany = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private MutationSystem _mutation = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private RandomHelperSystem _randomHelper = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedEntityEffectsSystem _entityEffects = default!; public const float HydroponicsSpeedMultiplier = 1f; public const float HydroponicsConsumptionMultiplier = 2f; diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs index c7e20983a7a..13781e5cfe9 100644 --- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs +++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Botany.Systems; -public sealed class SeedExtractorSystem : EntitySystem +public sealed partial class SeedExtractorSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly BotanySystem _botanySystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private BotanySystem _botanySystem = default!; public override void Initialize() { diff --git a/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs b/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs index e7d088df7ff..1fba0447d76 100644 --- a/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs +++ b/Content.Server/Buckle/Systems/IgniteOnBuckleSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.Buckle.Systems; -public sealed class IgniteOnBuckleSystem : EntitySystem +public sealed partial class IgniteOnBuckleSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private FlammableSystem _flammable = default!; public override void Initialize() { diff --git a/Content.Server/CardboardBox/CardboardBoxSystem.cs b/Content.Server/CardboardBox/CardboardBoxSystem.cs index 9fdd23e7804..05501915d0f 100644 --- a/Content.Server/CardboardBox/CardboardBoxSystem.cs +++ b/Content.Server/CardboardBox/CardboardBoxSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.CardboardBox; -public sealed class CardboardBoxSystem : SharedCardboardBoxSystem +public sealed partial class CardboardBoxSystem : SharedCardboardBoxSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedStealthSystem _stealth = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityStorageSystem _storage = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedStealthSystem _stealth = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityStorageSystem _storage = default!; public override void Initialize() { diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs index f75717ef576..1ea8ea20e25 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs @@ -33,11 +33,11 @@ namespace Content.Server.Cargo.Systems; public sealed partial class CargoSystem { - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSys = default!; - [Dependency] private readonly SharedSolutionContainerSystem _sharedSolutionContainer = default!; - [Dependency] private readonly JobNetSystem _jobNet = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private NameIdentifierSystem _nameIdentifier = default!; + [Dependency] private EntityWhitelistSystem _whitelistSys = default!; + [Dependency] private SharedSolutionContainerSystem _sharedSolutionContainer = default!; + [Dependency] private JobNetSystem _jobNet = default!; private static readonly ProtoId BountyNameIdentifierGroup = "Bounty"; private EntityQuery _stackQuery; @@ -283,7 +283,7 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component if (database.CheckedBounties.Contains(component.Id)) return; CargoBountyData? bounty; - if(component.DealerName != null) + if (component.DealerName != null) { var jobNet = _jobNet.GetJobNetByName(component.DealerName); if (jobNet == null) @@ -320,7 +320,7 @@ private void OnGetBountyPrice(EntityUid uid, CargoBountyLabelComponent component int totalSold = 0; foreach (var ent in bountyEnts) { - if(TryComp(ent, out var stack)) + if (TryComp(ent, out var stack)) { totalSold += stack.Count; } @@ -410,7 +410,7 @@ private void OnSold(ref EntitySoldEvent args) continue; CargoBountyData? bounty; - if(component.AssociatedStationId is not { } station) + if (component.AssociatedStationId is not { } station) { return; } @@ -486,7 +486,7 @@ private void OnSold(ref EntitySoldEvent args) var toSell = Math.Min(max, finalAmount); if (toSell >= max) { - CompleteBounty(station, bounty, args.Station, component.DealerName ); + CompleteBounty(station, bounty, args.Station, component.DealerName); } else { diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index 62f59a3d320..b8fd07ef13f 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -24,10 +24,10 @@ namespace Content.Server.Cargo.Systems { public sealed partial class CargoSystem { - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly BankSystem _bank = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private BankSystem _bank = default!; private void InitializeConsole() { @@ -475,8 +475,8 @@ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent com PlayDenySound(uid, component); return; } - - + + var amount = GetOutstandingOrderCount((station.Value, orderDatabase), order.Account); diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index df1e26c04df..d2d954f52b9 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -23,9 +23,9 @@ public sealed partial class CargoSystem * Handles cargo shuttle / trade mechanics. */ - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private IEntityManager _entityManager = default!; private static readonly SoundPathSpecifier ApproveSound = new("/Audio/Effects/Cargo/ping.ogg"); private bool _lockboxCutEnabled; diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs index a3671d0d6e8..24dfd700716 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.cs @@ -20,24 +20,24 @@ namespace Content.Server.Cargo.Systems; public sealed partial class CargoSystem : SharedCargoSystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly DeviceLinkSystem _linker = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PricingSystem _pricing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly RadioSystem _radio = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private DeviceLinkSystem _linker = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PricingSystem _pricing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private RadioSystem _radio = default!; private EntityQuery _xformQuery; private EntityQuery _blacklistQuery; diff --git a/Content.Server/Cargo/Systems/PriceGunSystem.cs b/Content.Server/Cargo/Systems/PriceGunSystem.cs index 0db1e41d8d4..89057a8c4b1 100644 --- a/Content.Server/Cargo/Systems/PriceGunSystem.cs +++ b/Content.Server/Cargo/Systems/PriceGunSystem.cs @@ -8,14 +8,14 @@ namespace Content.Server.Cargo.Systems; -public sealed class PriceGunSystem : SharedPriceGunSystem +public sealed partial class PriceGunSystem : SharedPriceGunSystem { - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly PricingSystem _pricingSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly CargoSystem _bountySystem = default!; - [Dependency] private readonly SalvageJobBoardSystem _salvageJobBoard = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private PricingSystem _pricingSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private CargoSystem _bountySystem = default!; + [Dependency] private SalvageJobBoardSystem _salvageJobBoard = default!; + [Dependency] private SharedAudioSystem _audio = default!; protected override bool GetPriceOrBounty(Entity entity, EntityUid target, EntityUid user) { diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 4c920856a03..90cd1a527df 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -24,13 +24,13 @@ namespace Content.Server.Cargo.Systems; /// /// This handles calculating the price of items, and implements two basic methods of pricing materials. /// -public sealed class PricingSystem : EntitySystem +public sealed partial class PricingSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IConsoleHost _consoleHost = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IConsoleHost _consoleHost = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; /// public override void Initialize() @@ -231,7 +231,7 @@ public double GetPrice(EntityUid uid, bool includeContents = true) { price += GetStaticPrice(uid); } - if(!TryComp(uid, out var cash)) + if (!TryComp(uid, out var cash)) { price *= _configurationManager.GetCVar(CCVars.PriceMult); diff --git a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs index a5822db6da2..96df8077fc6 100644 --- a/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs +++ b/Content.Server/CartridgeLoader/CartridgeLoaderSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.CartridgeLoader; -public sealed class CartridgeLoaderSystem : SharedCartridgeLoaderSystem +public sealed partial class CartridgeLoaderSystem : SharedCartridgeLoaderSystem { - [Dependency] private readonly ContainerSystem _containerSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly PdaSystem _pda = default!; + [Dependency] private ContainerSystem _containerSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private PdaSystem _pda = default!; public override void Initialize() { diff --git a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs index 0fd6e3cdc28..3529fb8e5fe 100644 --- a/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/AstroNavCartridgeSystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class AstroNavCartridgeSystem : EntitySystem +public sealed partial class AstroNavCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoaderSystem = default!; public override void Initialize() { diff --git a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs index b1b23b2732d..04320c1503b 100644 --- a/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/CrewManifestCartridgeSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class CrewManifestCartridgeSystem : EntitySystem +public sealed partial class CrewManifestCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly CrewManifestSystem _crewManifest = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoader = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private CrewManifestSystem _crewManifest = default!; + [Dependency] private StationSystem _stationSystem = default!; private static readonly EntProtoId CartridgePrototypeName = "CrewManifestCartridge"; diff --git a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs index 6391dd533bf..d7194dd82f0 100644 --- a/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.cs @@ -13,17 +13,17 @@ namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class LogProbeCartridgeSystem : EntitySystem +public sealed partial class LogProbeCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly LabelSystem _label = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly PaperSystem _paper = default!; + [Dependency] private CartridgeLoaderSystem _cartridge = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private LabelSystem _label = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private PaperSystem _paper = default!; public override void Initialize() { diff --git a/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs index 4d1b71dad04..533d9291496 100644 --- a/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/MedTekCartridgeSystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class MedTekCartridgeSystem : EntitySystem +public sealed partial class MedTekCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoaderSystem = default!; public override void Initialize() { diff --git a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs index ae028d01458..7a332c0f9be 100644 --- a/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/NanoTaskCartridgeSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.CartridgeLoader.Cartridges; /// /// Server-side class implementing the core UI logic of NanoTask /// -public sealed class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem +public sealed partial class NanoTaskCartridgeSystem : SharedNanoTaskCartridgeSystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PaperSystem _paper = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoader = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PaperSystem _paper = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs index aaeaf0325ea..24b584c1676 100644 --- a/Content.Server/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/NetProbeCartridgeSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class NetProbeCartridgeSystem : EntitySystem +public sealed partial class NetProbeCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; public override void Initialize() { diff --git a/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs index 1b77e63e5a9..9f417ac57ac 100644 --- a/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs +++ b/Content.Server/CartridgeLoader/Cartridges/NotekeeperCartridgeSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.CartridgeLoader.Cartridges; -public sealed class NotekeeperCartridgeSystem : EntitySystem +public sealed partial class NotekeeperCartridgeSystem : EntitySystem { - [Dependency] private readonly CartridgeLoaderSystem? _cartridgeLoaderSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Server/CharacterInfo/CharacterInfoSystem.cs b/Content.Server/CharacterInfo/CharacterInfoSystem.cs index 92f638aa239..3d61e1a9325 100644 --- a/Content.Server/CharacterInfo/CharacterInfoSystem.cs +++ b/Content.Server/CharacterInfo/CharacterInfoSystem.cs @@ -14,15 +14,15 @@ namespace Content.Server.CharacterInfo; -public sealed class CharacterInfoSystem : EntitySystem +public sealed partial class CharacterInfoSystem : EntitySystem { - [Dependency] private readonly JobSystem _jobs = default!; - [Dependency] private readonly MindSystem _minds = default!; - [Dependency] private readonly RoleSystem _roles = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; - [Dependency] private readonly BankSystem _bank = default!; - [Dependency] private readonly JobNetSystem _jobNet = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private JobSystem _jobs = default!; + [Dependency] private MindSystem _minds = default!; + [Dependency] private RoleSystem _roles = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; + [Dependency] private BankSystem _bank = default!; + [Dependency] private JobNetSystem _jobNet = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override void Initialize() { diff --git a/Content.Server/Chat/Commands/AdminChatCommand.cs b/Content.Server/Chat/Commands/AdminChatCommand.cs index 38eb977afc8..33ba3aa3262 100644 --- a/Content.Server/Chat/Commands/AdminChatCommand.cs +++ b/Content.Server/Chat/Commands/AdminChatCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Chat.Commands { [AdminCommand(AdminFlags.Adminchat)] - internal sealed class AdminChatCommand : LocalizedCommands + internal sealed partial class AdminChatCommand : LocalizedCommands { - [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private IChatManager _chatManager = default!; public override string Command => "asay"; diff --git a/Content.Server/Chat/Commands/LOOCCommand.cs b/Content.Server/Chat/Commands/LOOCCommand.cs index 3737b5d5185..6432b59e35d 100644 --- a/Content.Server/Chat/Commands/LOOCCommand.cs +++ b/Content.Server/Chat/Commands/LOOCCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class LOOCCommand : IConsoleCommand + internal sealed partial class LOOCCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "looc"; public string Description => "Send Local Out Of Character chat messages."; diff --git a/Content.Server/Chat/Commands/MeCommand.cs b/Content.Server/Chat/Commands/MeCommand.cs index ebdd37465b6..5a234a4b5de 100644 --- a/Content.Server/Chat/Commands/MeCommand.cs +++ b/Content.Server/Chat/Commands/MeCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class MeCommand : LocalizedEntityCommands + internal sealed partial class MeCommand : LocalizedEntityCommands { - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override string Command => "me"; diff --git a/Content.Server/Chat/Commands/OOCCommand.cs b/Content.Server/Chat/Commands/OOCCommand.cs index 1760d49ceac..44b6d531126 100644 --- a/Content.Server/Chat/Commands/OOCCommand.cs +++ b/Content.Server/Chat/Commands/OOCCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class OOCCommand : LocalizedCommands + internal sealed partial class OOCCommand : LocalizedCommands { - [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private IChatManager _chatManager = default!; public override string Command => "ooc"; diff --git a/Content.Server/Chat/Commands/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs index 1ad86717308..cfceb9ca521 100644 --- a/Content.Server/Chat/Commands/SayCommand.cs +++ b/Content.Server/Chat/Commands/SayCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class SayCommand : LocalizedEntityCommands + internal sealed partial class SayCommand : LocalizedEntityCommands { - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override string Command => "say"; public override void Execute(IConsoleShell shell, string argStr, string[] args) diff --git a/Content.Server/Chat/Commands/SetLOOCCommand.cs b/Content.Server/Chat/Commands/SetLOOCCommand.cs index c97c67c5690..0ced500c0c2 100644 --- a/Content.Server/Chat/Commands/SetLOOCCommand.cs +++ b/Content.Server/Chat/Commands/SetLOOCCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class SetLoocCommand : LocalizedCommands +public sealed partial class SetLoocCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; public override string Command => "setlooc"; diff --git a/Content.Server/Chat/Commands/SetOOCCommand.cs b/Content.Server/Chat/Commands/SetOOCCommand.cs index 46e7e84af4d..42f98c72d70 100644 --- a/Content.Server/Chat/Commands/SetOOCCommand.cs +++ b/Content.Server/Chat/Commands/SetOOCCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class SetOOCCommand : LocalizedCommands +public sealed partial class SetOOCCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; public override string Command => "setooc"; diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs index 972c194ff90..61f0690a5db 100644 --- a/Content.Server/Chat/Commands/SuicideCommand.cs +++ b/Content.Server/Chat/Commands/SuicideCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class SuicideCommand : IConsoleCommand + internal sealed partial class SuicideCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "suicide"; diff --git a/Content.Server/Chat/Commands/WhisperCommand.cs b/Content.Server/Chat/Commands/WhisperCommand.cs index 2131a18fdd6..a35ba6559ea 100644 --- a/Content.Server/Chat/Commands/WhisperCommand.cs +++ b/Content.Server/Chat/Commands/WhisperCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chat.Commands { [AnyCommand] - internal sealed class WhisperCommand : LocalizedEntityCommands + internal sealed partial class WhisperCommand : LocalizedEntityCommands { - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override string Command => "whisper"; public override void Execute(IConsoleShell shell, string argStr, string[] args) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index ee11a7cef93..ff7fc4ef730 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -34,18 +34,18 @@ internal sealed partial class ChatManager : IChatManager { "revolutionary", "#aa00ff" } }; - [Dependency] private readonly IReplayRecordingManager _replay = default!; - [Dependency] private readonly IServerNetManager _netManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly INetConfigurationManager _netConfigManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly DiscordChatLink _discordLink = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IReplayRecordingManager _replay = default!; + [Dependency] private IServerNetManager _netManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IServerPreferencesManager _preferencesManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private INetConfigurationManager _netConfigManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private PlayerRateLimitManager _rateLimitManager = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private DiscordChatLink _discordLink = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs index 8a0db547794..71ac78e1b6c 100644 --- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs +++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs @@ -10,7 +10,7 @@ namespace Content.Server.Chat.Managers; /// It currently ony removes the shorthands for emotes (like "lol" or "^-^") from a chat message and returns the last /// emote in their message /// -public sealed class ChatSanitizationManager : IChatSanitizationManager +public sealed partial class ChatSanitizationManager : IChatSanitizationManager { private static readonly (Regex regex, string emoteKey)[] ShorthandToEmote = [ @@ -93,8 +93,8 @@ private static readonly (Regex regex, string emoteKey)[] ShorthandToEmote = Entry("['=", "chatsan-tearfully-smiles"), ]; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private ILocalizationManager _loc = default!; private bool _doSanitize; diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index 9f901b2ad8f..2ceff597559 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -18,16 +18,16 @@ namespace Content.Server.Chat; -public sealed class SuicideSystem : EntitySystem +public sealed partial class SuicideSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly GhostSystem _ghostSystem = default!; - [Dependency] private readonly SharedSuicideSystem _suicide = default!; + [Dependency] private EntityLookupSystem _entityLookupSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private GhostSystem _ghostSystem = default!; + [Dependency] private SharedSuicideSystem _suicide = default!; private static readonly ProtoId CannotSuicideTag = "CannotSuicide"; diff --git a/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs b/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs index fee15700eb2..06fef2379a7 100644 --- a/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs +++ b/Content.Server/Chat/Systems/AnnounceOnSpawnSystem.cs @@ -1,8 +1,8 @@ namespace Content.Server.Chat.Systems; -public sealed class AnnounceOnSpawnSystem : EntitySystem +public sealed partial class AnnounceOnSpawnSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/Chat/Systems/AutoEmoteSystem.cs b/Content.Server/Chat/Systems/AutoEmoteSystem.cs index 19c388285f8..e39ec8427b8 100644 --- a/Content.Server/Chat/Systems/AutoEmoteSystem.cs +++ b/Content.Server/Chat/Systems/AutoEmoteSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Chat.Systems; -public sealed class AutoEmoteSystem : EntitySystem +public sealed partial class AutoEmoteSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override void Initialize() { diff --git a/Content.Server/Chat/Systems/ChatNotificationSystem.cs b/Content.Server/Chat/Systems/ChatNotificationSystem.cs index 8cd3d54e803..67263636404 100644 --- a/Content.Server/Chat/Systems/ChatNotificationSystem.cs +++ b/Content.Server/Chat/Systems/ChatNotificationSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.Chat.Systems; /// public sealed partial class ChatNotificationSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IChatManager _chats = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IChatManager _chats = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 744a36d5775..dc35ab90f83 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -42,21 +42,21 @@ namespace Content.Server.Chat.Systems; /// public sealed partial class ChatSystem : SharedChatSystem { - [Dependency] private readonly IReplayRecordingManager _replay = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IChatSanitizationManager _sanitizer = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!; - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; + [Dependency] private IReplayRecordingManager _replay = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IChatSanitizationManager _sanitizer = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ReplacementAccentSystem _wordreplacement = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; private bool _loocEnabled = true; private bool _deadLoocEnabled; diff --git a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs index 16e4551ae45..56e85af5f90 100644 --- a/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs +++ b/Content.Server/Chat/Systems/EmoteOnDamageSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.Chat.Systems; using Robust.Shared.Timing; using Robust.Shared.Utility; -public sealed class EmoteOnDamageSystem : EntitySystem +public sealed partial class EmoteOnDamageSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ChatSystem _chatSystem = default!; public override void Initialize() { diff --git a/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs b/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs index 4397ff056d0..9ad16c0fc79 100644 --- a/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs +++ b/Content.Server/Chat/V2/Commands/DeleteChatMessageCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Chat.V2.Commands; [ToolshedCommand, AdminCommand(AdminFlags.Admin)] -public sealed class DeleteChatMessageCommand : ToolshedCommand +public sealed partial class DeleteChatMessageCommand : ToolshedCommand { - [Dependency] private readonly IEntitySystemManager _manager = default!; + [Dependency] private IEntitySystemManager _manager = default!; [CommandImplementation("id")] public void DeleteChatMessage(IInvocationContext ctx, uint messageId) diff --git a/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs b/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs index 814a86c89e7..f669f237af6 100644 --- a/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs +++ b/Content.Server/Chat/V2/Commands/NukeChatMessagesCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Chat.V2.Commands; [ToolshedCommand, AdminCommand(AdminFlags.Admin)] -public sealed class NukeChatMessagesCommand : ToolshedCommand +public sealed partial class NukeChatMessagesCommand : ToolshedCommand { - [Dependency] private readonly IEntitySystemManager _manager = default!; + [Dependency] private IEntitySystemManager _manager = default!; [CommandImplementation("usernames")] public void Command(IInvocationContext ctx, string usernamesCsv) diff --git a/Content.Server/Chat/V2/Repository/ChatRepository.cs b/Content.Server/Chat/V2/Repository/ChatRepository.cs index 8a5b540b253..5a43dcaf8f2 100644 --- a/Content.Server/Chat/V2/Repository/ChatRepository.cs +++ b/Content.Server/Chat/V2/Repository/ChatRepository.cs @@ -12,10 +12,10 @@ namespace Content.Server.Chat.V2.Repository; /// Stores , gives them UIDs, and issues . /// Allows for deletion of messages. /// -public sealed class ChatRepositorySystem : EntitySystem +public sealed partial class ChatRepositorySystem : EntitySystem { - [Dependency] private readonly IReplayRecordingManager _replay = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IReplayRecordingManager _replay = default!; + [Dependency] private IPlayerManager _player = default!; // Clocks should start at 1, as 0 indicates "clock not set" or "clock forgotten to be set by bad programmer". private uint _nextMessageId = 1; diff --git a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs index 50097fbf539..9a21eab3d73 100644 --- a/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs +++ b/Content.Server/Chemistry/Commands/DumpReagentGuideText.cs @@ -7,9 +7,9 @@ namespace Content.Server.Chemistry.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class DumpReagentGuideText : LocalizedEntityCommands +public sealed partial class DumpReagentGuideText : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override string Command => "dumpreagentguidetext"; diff --git a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs index 97c057b0e04..ccf66900c1b 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs @@ -28,16 +28,16 @@ namespace Content.Server.Chemistry.EntitySystems /// /// [UsedImplicitly] - public sealed class ChemMasterSystem : EntitySystem + public sealed partial class ChemMasterSystem : EntitySystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly AudioSystem _audioSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly StorageSystem _storageSystem = default!; - [Dependency] private readonly LabelSystem _labelSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private AudioSystem _audioSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private StorageSystem _storageSystem = default!; + [Dependency] private LabelSystem _labelSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; private static readonly EntProtoId PillPrototypeId = "Pill"; diff --git a/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs index b35add95450..5844f65c334 100644 --- a/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ChemistryGuideDataSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Chemistry.EntitySystems; -public sealed class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem +public sealed partial class ChemistryGuideDataSystem : SharedChemistryGuideDataSystem { - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IPlayerManager _player = default!; /// public override void Initialize() diff --git a/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs b/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs index d4e03b09677..416d5d0bcd2 100644 --- a/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs +++ b/Content.Server/Chemistry/EntitySystems/DeleteOnSolutionEmptySystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.Chemistry.EntitySystems.DeleteOnSolutionEmptySystem { - public sealed class DeleteOnSolutionEmptySystem : EntitySystem + public sealed partial class DeleteOnSolutionEmptySystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public override void Initialize() { diff --git a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs index 8ca9754493e..a825a01ade0 100644 --- a/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs @@ -23,16 +23,16 @@ namespace Content.Server.Chemistry.EntitySystems /// /// [UsedImplicitly] - public sealed class ReagentDispenserSystem : EntitySystem + public sealed partial class ReagentDispenserSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audioSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly SolutionTransferSystem _solutionTransferSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; + [Dependency] private AudioSystem _audioSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SolutionTransferSystem _solutionTransferSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private HandsSystem _handsSystem = default!; public override void Initialize() { diff --git a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs index a47a8632974..ba9167aa7bc 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Chemistry.EntitySystems; -public sealed class SolutionHeaterSystem : EntitySystem +public sealed partial class SolutionHeaterSystem : EntitySystem { - [Dependency] private readonly PowerReceiverSystem _powerReceiver = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private PowerReceiverSystem _powerReceiver = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; /// public override void Initialize() diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs index 40cd21efa73..57e8bd5e301 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectOnEventSystem.cs @@ -17,13 +17,13 @@ namespace Content.Server.Chemistry.EntitySystems; /// System for handling the different inheritors of . /// Subscribes to relevent events and performs solution injections when they are raised. /// -public sealed class SolutionInjectOnCollideSystem : EntitySystem +public sealed partial class SolutionInjectOnCollideSystem : EntitySystem { - [Dependency] private readonly BloodstreamSystem _bloodstream = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private BloodstreamSystem _bloodstream = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private TagSystem _tag = default!; private static readonly ProtoId HardsuitTag = "Hardsuit"; diff --git a/Content.Server/Chemistry/EntitySystems/SolutionInjectWhileEmbeddedSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionInjectWhileEmbeddedSystem.cs index 3b552ccbb14..15058b9899c 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionInjectWhileEmbeddedSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionInjectWhileEmbeddedSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Chemistry.EntitySystems; /// /// System for handling injecting into an entity while a projectile is embedded. /// -public sealed class SolutionInjectWhileEmbeddedSystem : EntitySystem +public sealed partial class SolutionInjectWhileEmbeddedSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs index c77a46e9652..27f8ac848df 100644 --- a/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/SolutionRandomFillSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Chemistry.EntitySystems; -public sealed class SolutionRandomFillSystem : EntitySystem +public sealed partial class SolutionRandomFillSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionsSystem = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private SharedSolutionContainerSystem _solutionsSystem = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs index d5b220c3e83..877aa187313 100644 --- a/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs @@ -6,12 +6,12 @@ namespace Content.Server.Chemistry.EntitySystems; -public sealed class TransformableContainerSystem : EntitySystem +public sealed partial class TransformableContainerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionsSystem = default!; - [Dependency] private readonly MetaDataSystem _metadataSystem = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedSolutionContainerSystem _solutionsSystem = default!; + [Dependency] private MetaDataSystem _metadataSystem = default!; + [Dependency] private NameModifierSystem _nameMod = default!; public override void Initialize() { diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index 4c4007f0f37..7532f5a902b 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -20,15 +20,15 @@ namespace Content.Server.Chemistry.EntitySystems { [UsedImplicitly] - internal sealed class VaporSystem : EntitySystem + internal sealed partial class VaporSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly ReactiveSystem _reactive = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private ReactiveSystem _reactive = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public override void Initialize() { diff --git a/Content.Server/Chunking/ChunkingSystem.cs b/Content.Server/Chunking/ChunkingSystem.cs index a5bf5df7491..ec824268671 100644 --- a/Content.Server/Chunking/ChunkingSystem.cs +++ b/Content.Server/Chunking/ChunkingSystem.cs @@ -14,11 +14,11 @@ namespace Content.Shared.Chunking; /// This system just exists to provide some utility functions for other systems that chunk data that needs to be /// sent to players. In particular, see . /// -public sealed class ChunkingSystem : EntitySystem +public sealed partial class ChunkingSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; private EntityQuery _xformQuery; diff --git a/Content.Server/Clock/ClockSystem.cs b/Content.Server/Clock/ClockSystem.cs index 29400a59f7b..0c12a63ac44 100644 --- a/Content.Server/Clock/ClockSystem.cs +++ b/Content.Server/Clock/ClockSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Clock; -public sealed class ClockSystem : SharedClockSystem +public sealed partial class ClockSystem : SharedClockSystem { - [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; + [Dependency] private PvsOverrideSystem _pvsOverride = default!; + [Dependency] private IRobustRandom _robustRandom = default!; /// public override void Initialize() diff --git a/Content.Server/Cloning/CloningConsoleSystem.cs b/Content.Server/Cloning/CloningConsoleSystem.cs index 56e4a54e1d5..140f4ea954b 100644 --- a/Content.Server/Cloning/CloningConsoleSystem.cs +++ b/Content.Server/Cloning/CloningConsoleSystem.cs @@ -20,16 +20,16 @@ namespace Content.Server.Cloning { - public sealed class CloningConsoleSystem : EntitySystem + public sealed partial class CloningConsoleSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly CloningPodSystem _cloningPodSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private CloningPodSystem _cloningPodSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; public override void Initialize() { diff --git a/Content.Server/Cloning/CloningPodSystem.cs b/Content.Server/Cloning/CloningPodSystem.cs index 3018188f8d4..dc29f649f5a 100644 --- a/Content.Server/Cloning/CloningPodSystem.cs +++ b/Content.Server/Cloning/CloningPodSystem.cs @@ -34,29 +34,29 @@ namespace Content.Server.Cloning; -public sealed class CloningPodSystem : EntitySystem +public sealed partial class CloningPodSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly IPlayerManager _playerManager = null!; - [Dependency] private readonly EuiManager _euiManager = null!; - [Dependency] private readonly CloningConsoleSystem _cloningConsoleSystem = default!; - [Dependency] private readonly ContainerSystem _containerSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly PowerReceiverSystem _powerReceiverSystem = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly PuddleSystem _puddleSystem = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly MaterialStorageSystem _material = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly CloningSystem _cloning = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private IPlayerManager _playerManager = null!; + [Dependency] private EuiManager _euiManager = null!; + [Dependency] private CloningConsoleSystem _cloningConsoleSystem = default!; + [Dependency] private ContainerSystem _containerSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private PowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private PuddleSystem _puddleSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private MaterialStorageSystem _material = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private CloningSystem _cloning = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private DamageableSystem _damageable = default!; public readonly Dictionary ClonesWaitingForMind = new(); public readonly ProtoId SettingsId = "CloningPod"; diff --git a/Content.Server/Cloning/CloningSystem.Subscriptions.cs b/Content.Server/Cloning/CloningSystem.Subscriptions.cs index 6cfe4fc9664..3ff4efc354f 100644 --- a/Content.Server/Cloning/CloningSystem.Subscriptions.cs +++ b/Content.Server/Cloning/CloningSystem.Subscriptions.cs @@ -26,12 +26,12 @@ namespace Content.Server.Cloning; /// public sealed partial class CloningSystem { - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] private readonly LabelSystem _label = default!; - [Dependency] private readonly ForensicsSystem _forensics = default!; - [Dependency] private readonly PaperSystem _paper = default!; - [Dependency] private readonly VocalSystem _vocal = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] private LabelSystem _label = default!; + [Dependency] private ForensicsSystem _forensics = default!; + [Dependency] private PaperSystem _paper = default!; + [Dependency] private VocalSystem _vocal = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; public override void Initialize() { diff --git a/Content.Server/Cloning/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs index 09038c1bcb5..69744816a1c 100644 --- a/Content.Server/Cloning/CloningSystem.cs +++ b/Content.Server/Cloning/CloningSystem.cs @@ -27,17 +27,17 @@ namespace Content.Server.Cloning; /// public sealed partial class CloningSystem : SharedCloningSystem { - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly Shared.StatusEffectNew.StatusEffectsSystem _statusEffects = default!; //TODO: This system has to support both the old and new status effect systems, until the old is able to be fully removed. + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] private SharedSubdermalImplantSystem _subdermalImplant = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private NameModifierSystem _nameMod = default!; + [Dependency] private Shared.StatusEffectNew.StatusEffectsSystem _statusEffects = default!; //TODO: This system has to support both the old and new status effect systems, until the old is able to be fully removed. /// /// Spawns a clone of the given humanoid mob at the specified location or in nullspace. diff --git a/Content.Server/Cloning/RandomCloneSpawnerSystem.cs b/Content.Server/Cloning/RandomCloneSpawnerSystem.cs index b6b3a8ace7b..6173610f51b 100644 --- a/Content.Server/Cloning/RandomCloneSpawnerSystem.cs +++ b/Content.Server/Cloning/RandomCloneSpawnerSystem.cs @@ -8,13 +8,13 @@ namespace Content.Server.Cloning; /// /// This deals with spawning and setting up a clone of a random crew member. /// -public sealed class RandomCloneSpawnerSystem : EntitySystem +public sealed partial class RandomCloneSpawnerSystem : EntitySystem { - [Dependency] private readonly CloningSystem _cloning = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private CloningSystem _cloning = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs index 645b47d1802..75051c2caa6 100644 --- a/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs +++ b/Content.Server/Clothing/Systems/ChameleonClothingSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Clothing.Systems; -public sealed class ChameleonClothingSystem : SharedChameleonClothingSystem +public sealed partial class ChameleonClothingSystem : SharedChameleonClothingSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IdentitySystem _identity = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IdentitySystem _identity = default!; public override void Initialize() { diff --git a/Content.Server/Clothing/Systems/CursedMaskSystem.cs b/Content.Server/Clothing/Systems/CursedMaskSystem.cs index ef23df5f179..78f81fe1f13 100644 --- a/Content.Server/Clothing/Systems/CursedMaskSystem.cs +++ b/Content.Server/Clothing/Systems/CursedMaskSystem.cs @@ -18,15 +18,15 @@ namespace Content.Server.Clothing.Systems; /// -public sealed class CursedMaskSystem : SharedCursedMaskSystem +public sealed partial class CursedMaskSystem : SharedCursedMaskSystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly GhostSystem _ghostSystem = default!; - [Dependency] private readonly HTNSystem _htn = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private GhostSystem _ghostSystem = default!; + [Dependency] private HTNSystem _htn = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private PopupSystem _popup = default!; // We can't store this info on the component easily private static readonly ProtoId TakeoverRootTask = "SimpleHostileCompound"; diff --git a/Content.Server/Clothing/Systems/OutfitSystem.cs b/Content.Server/Clothing/Systems/OutfitSystem.cs index f363b1f8e31..e904381b36e 100644 --- a/Content.Server/Clothing/Systems/OutfitSystem.cs +++ b/Content.Server/Clothing/Systems/OutfitSystem.cs @@ -16,13 +16,13 @@ namespace Content.Server.Clothing.Systems; -public sealed class OutfitSystem : EntitySystem +public sealed partial class OutfitSystem : EntitySystem { - [Dependency] private readonly IServerPreferencesManager _preferenceManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly HandsSystem _handSystem = default!; - [Dependency] private readonly InventorySystem _invSystem = default!; - [Dependency] private readonly SharedStationSpawningSystem _spawningSystem = default!; + [Dependency] private IServerPreferencesManager _preferenceManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private HandsSystem _handSystem = default!; + [Dependency] private InventorySystem _invSystem = default!; + [Dependency] private SharedStationSpawningSystem _spawningSystem = default!; public bool SetOutfit(EntityUid target, string gear, Action? onEquipped = null, bool unremovable = false) { diff --git a/Content.Server/Cluwne/CluwneSystem.cs b/Content.Server/Cluwne/CluwneSystem.cs index 148312ba6f2..73826745d42 100644 --- a/Content.Server/Cluwne/CluwneSystem.cs +++ b/Content.Server/Cluwne/CluwneSystem.cs @@ -19,19 +19,19 @@ namespace Content.Server.Cluwne; -public sealed class CluwneSystem : EntitySystem +public sealed partial class CluwneSystem : EntitySystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly AutoEmoteSystem _autoEmote = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly OutfitSystem _outfitSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private SharedStunSystem _stunSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private AutoEmoteSystem _autoEmote = default!; + [Dependency] private NameModifierSystem _nameMod = default!; + [Dependency] private OutfitSystem _outfitSystem = default!; public override void Initialize() { diff --git a/Content.Server/Codewords/CodewordSystem.cs b/Content.Server/Codewords/CodewordSystem.cs index bf32494e5f3..f5df4ca5b07 100644 --- a/Content.Server/Codewords/CodewordSystem.cs +++ b/Content.Server/Codewords/CodewordSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.Codewords; /// /// Gamerule that provides codewords for other gamerules that rely on them. /// -public sealed class CodewordSystem : EntitySystem +public sealed partial class CodewordSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Commands/ActionCommands.cs b/Content.Server/Commands/ActionCommands.cs index 93de66c856c..45534797cc4 100644 --- a/Content.Server/Commands/ActionCommands.cs +++ b/Content.Server/Commands/ActionCommands.cs @@ -7,9 +7,9 @@ namespace Content.Server.Commands; [AdminCommand(AdminFlags.Fun)] -internal sealed class UpgradeActionCommand : IConsoleCommand +internal sealed partial class UpgradeActionCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; public string Command => "upgradeaction"; public string Description => Loc.GetString("upgradeaction-command-description"); diff --git a/Content.Server/Communications/CommsHackerSystem.cs b/Content.Server/Communications/CommsHackerSystem.cs index 7760eea5573..45fb26d4ccb 100644 --- a/Content.Server/Communications/CommsHackerSystem.cs +++ b/Content.Server/Communications/CommsHackerSystem.cs @@ -11,15 +11,15 @@ namespace Content.Server.Communications; -public sealed class CommsHackerSystem : SharedCommsHackerSystem +public sealed partial class CommsHackerSystem : SharedCommsHackerSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; // TODO: remove when generic check event is used - [Dependency] private readonly NinjaGlovesSystem _gloves = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private NinjaGlovesSystem _gloves = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; public override void Initialize() { diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index ef7ccc8bf0f..3fed807d208 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -22,19 +22,19 @@ namespace Content.Server.Communications { - public sealed class CommunicationsConsoleSystem : EntitySystem + public sealed partial class CommunicationsConsoleSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly AlertLevelSystem _alertLevelSystem = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly EmergencyShuttleSystem _emergency = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private AlertLevelSystem _alertLevelSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private EmergencyShuttleSystem _emergency = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; private const float UIUpdateInterval = 5.0f; diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs index 7adebcc7129..59eab1a7a7c 100644 --- a/Content.Server/Connection/ConnectionManager.cs +++ b/Content.Server/Connection/ConnectionManager.cs @@ -50,19 +50,19 @@ public interface IConnectionManager /// public sealed partial class ConnectionManager : IConnectionManager { - [Dependency] private readonly IPlayerManager _plyMgr = default!; - [Dependency] private readonly IServerNetManager _netMgr = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; - [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IHttpClientHolder _http = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IPlayerManager _plyMgr = default!; + [Dependency] private IServerNetManager _netMgr = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILocalizationManager _loc = default!; + [Dependency] private ServerDbEntryManager _serverDbEntry = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IHttpClientHolder _http = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private GameTicker? _ticker; diff --git a/Content.Server/Connection/GrantConnectBypassCommand.cs b/Content.Server/Connection/GrantConnectBypassCommand.cs index 8dcc7ec5bfa..94e55e250aa 100644 --- a/Content.Server/Connection/GrantConnectBypassCommand.cs +++ b/Content.Server/Connection/GrantConnectBypassCommand.cs @@ -5,12 +5,12 @@ namespace Content.Server.Connection; [AdminCommand(AdminFlags.Moderator)] -public sealed class GrantConnectBypassCommand : LocalizedCommands +public sealed partial class GrantConnectBypassCommand : LocalizedCommands { private static readonly TimeSpan DefaultDuration = TimeSpan.FromHours(1); - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IConnectionManager _connectionManager = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IConnectionManager _connectionManager = default!; public override string Command => "grant_connect_bypass"; diff --git a/Content.Server/Connection/Whitelist/BlacklistCommands.cs b/Content.Server/Connection/Whitelist/BlacklistCommands.cs index 906b9082432..00fbbba210b 100644 --- a/Content.Server/Connection/Whitelist/BlacklistCommands.cs +++ b/Content.Server/Connection/Whitelist/BlacklistCommands.cs @@ -6,10 +6,10 @@ namespace Content.Server.Connection.Whitelist; [AdminCommand(AdminFlags.Ban)] -public sealed class AddBlacklistCommand : LocalizedCommands +public sealed partial class AddBlacklistCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IServerDbManager _db = default!; public override string Command => "blacklistadd"; @@ -61,10 +61,10 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Ban)] -public sealed class RemoveBlacklistCommand : LocalizedCommands +public sealed partial class RemoveBlacklistCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _playerLocator = default!; - [Dependency] private readonly IServerDbManager _db = default!; + [Dependency] private IPlayerLocator _playerLocator = default!; + [Dependency] private IServerDbManager _db = default!; public override string Command => "blacklistremove"; diff --git a/Content.Server/Construction/Commands/FixRotationsCommand.cs b/Content.Server/Construction/Commands/FixRotationsCommand.cs index 807f81b4987..2aae39356cf 100644 --- a/Content.Server/Construction/Commands/FixRotationsCommand.cs +++ b/Content.Server/Construction/Commands/FixRotationsCommand.cs @@ -10,9 +10,9 @@ namespace Content.Server.Construction.Commands; [AdminCommand(AdminFlags.Mapping)] -public sealed class FixRotationsCommand : IConsoleCommand +public sealed partial class FixRotationsCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private static readonly ProtoId ForceFixRotationsTag = "ForceFixRotations"; private static readonly ProtoId ForceNoFixRotationsTag = "ForceNoFixRotations"; diff --git a/Content.Server/Construction/Commands/TileReplaceCommand.cs b/Content.Server/Construction/Commands/TileReplaceCommand.cs index e297099c3ad..26e4594d90b 100644 --- a/Content.Server/Construction/Commands/TileReplaceCommand.cs +++ b/Content.Server/Construction/Commands/TileReplaceCommand.cs @@ -7,10 +7,10 @@ namespace Content.Server.Construction.Commands; [AdminCommand(AdminFlags.Mapping)] -public sealed class TileReplaceCommand : IConsoleCommand +public sealed partial class TileReplaceCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDef = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private ITileDefinitionManager _tileDef = default!; // ReSharper disable once StringLiteralTypo public string Command => "tilereplace"; diff --git a/Content.Server/Construction/Commands/TileWallsCommand.cs b/Content.Server/Construction/Commands/TileWallsCommand.cs index 037e6fe68b8..35aec21eaca 100644 --- a/Content.Server/Construction/Commands/TileWallsCommand.cs +++ b/Content.Server/Construction/Commands/TileWallsCommand.cs @@ -11,10 +11,10 @@ namespace Content.Server.Construction.Commands; [AdminCommand(AdminFlags.Mapping)] -public sealed class TileWallsCommand : IConsoleCommand +public sealed partial class TileWallsCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; // ReSharper disable once StringLiteralTypo public string Command => "tilewalls"; diff --git a/Content.Server/Construction/Completions/BuildMech.cs b/Content.Server/Construction/Completions/BuildMech.cs index c0b5921db92..ddcbaab9db0 100644 --- a/Content.Server/Construction/Completions/BuildMech.cs +++ b/Content.Server/Construction/Completions/BuildMech.cs @@ -23,12 +23,14 @@ public sealed partial class BuildMech : IGraphAction [DataField("container")] public string Container = "battery-container"; + private ISawmill _sawmill = default!; + // TODO use or generalize ConstructionSystem.ChangeEntity(); public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager) { if (!entityManager.TryGetComponent(uid, out ContainerManagerComponent? containerManager)) { - Logger.Warning($"Mech construct entity {uid} did not have a container manager! Aborting build mech action."); + _sawmill.Warning($"Mech construct entity {uid} did not have a container manager! Aborting build mech action."); return; } @@ -37,20 +39,20 @@ public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager enti if (!containerSystem.TryGetContainer(uid, Container, out var container, containerManager)) { - Logger.Warning($"Mech construct entity {uid} did not have the specified '{Container}' container! Aborting build mech action."); + _sawmill.Warning($"Mech construct entity {uid} did not have the specified '{Container}' container! Aborting build mech action."); return; } if (container.ContainedEntities.Count != 1) { - Logger.Warning($"Mech construct entity {uid} did not have exactly one item in the specified '{Container}' container! Aborting build mech action."); + _sawmill.Warning($"Mech construct entity {uid} did not have exactly one item in the specified '{Container}' container! Aborting build mech action."); } var cell = container.ContainedEntities[0]; if (!entityManager.TryGetComponent(cell, out var batteryComponent)) { - Logger.Warning($"Mech construct entity {uid} had an invalid entity in container \"{Container}\"! Aborting build mech action."); + _sawmill.Warning($"Mech construct entity {uid} had an invalid entity in container \"{Container}\"! Aborting build mech action."); return; } diff --git a/Content.Server/Construction/ConstructionSystem.Computer.cs b/Content.Server/Construction/ConstructionSystem.Computer.cs index a35491ca106..be93e31405d 100644 --- a/Content.Server/Construction/ConstructionSystem.Computer.cs +++ b/Content.Server/Construction/ConstructionSystem.Computer.cs @@ -8,7 +8,7 @@ namespace Content.Server.Construction; public sealed partial class ConstructionSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; private void InitializeComputer() { diff --git a/Content.Server/Construction/ConstructionSystem.Guided.cs b/Content.Server/Construction/ConstructionSystem.Guided.cs index 489e6c74095..db738727d05 100644 --- a/Content.Server/Construction/ConstructionSystem.Guided.cs +++ b/Content.Server/Construction/ConstructionSystem.Guided.cs @@ -11,7 +11,7 @@ namespace Content.Server.Construction { public sealed partial class ConstructionSystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; private readonly Dictionary _guideCache = new(); diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs index 14df82e0c76..03f31c8d7c1 100644 --- a/Content.Server/Construction/ConstructionSystem.Initial.cs +++ b/Content.Server/Construction/ConstructionSystem.Initial.cs @@ -24,13 +24,13 @@ namespace Content.Server.Construction { public sealed partial class ConstructionSystem { - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private EntityLookupSystem _lookupSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; // --- WARNING! LEGACY CODE AHEAD! --- // This entire file contains the legacy code for initial construction. diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs index cc0b964fdc6..054c3a6535f 100644 --- a/Content.Server/Construction/ConstructionSystem.Interactions.cs +++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs @@ -25,9 +25,9 @@ namespace Content.Server.Construction { public sealed partial class ConstructionSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; #if EXCEPTION_TOLERANCE - [Dependency] private readonly IRuntimeLog _runtimeLog = default!; + [Dependency] private IRuntimeLog _runtimeLog = default!; #endif private readonly Queue _constructionUpdateQueue = new(); diff --git a/Content.Server/Construction/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs index 1b67c6ec859..4f25d0f7584 100644 --- a/Content.Server/Construction/ConstructionSystem.cs +++ b/Content.Server/Construction/ConstructionSystem.cs @@ -16,11 +16,11 @@ namespace Content.Server.Construction [UsedImplicitly] public sealed partial class ConstructionSystem : SharedConstructionSystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; public override void Initialize() { diff --git a/Content.Server/Construction/FlatpackSystem.cs b/Content.Server/Construction/FlatpackSystem.cs index baa123a9284..9e65535c1d7 100644 --- a/Content.Server/Construction/FlatpackSystem.cs +++ b/Content.Server/Construction/FlatpackSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Construction; /// -public sealed class FlatpackSystem : SharedFlatpackSystem +public sealed partial class FlatpackSystem : SharedFlatpackSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AmbientSoundSystem _ambientSound = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; /// public override void Initialize() diff --git a/Content.Server/Construction/MachineFrameSystem.cs b/Content.Server/Construction/MachineFrameSystem.cs index ef9d0093c70..27fff376a75 100644 --- a/Content.Server/Construction/MachineFrameSystem.cs +++ b/Content.Server/Construction/MachineFrameSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Construction; -public sealed class MachineFrameSystem : EntitySystem +public sealed partial class MachineFrameSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly ConstructionSystem _construction = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private ConstructionSystem _construction = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs b/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs index ed0350af573..10eb0994169 100644 --- a/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs +++ b/Content.Server/Containers/EmptyOnMachineDeconstructSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Containers /// Implements functionality of EmptyOnMachineDeconstructComponent. /// [UsedImplicitly] - public sealed class EmptyOnMachineDeconstructSystem : EntitySystem + public sealed partial class EmptyOnMachineDeconstructSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Server/Containers/ThrowInsertContainerSystem.cs b/Content.Server/Containers/ThrowInsertContainerSystem.cs index 8fa11abe67e..a704b1a21a6 100644 --- a/Content.Server/Containers/ThrowInsertContainerSystem.cs +++ b/Content.Server/Containers/ThrowInsertContainerSystem.cs @@ -9,13 +9,13 @@ namespace Content.Server.Containers; -public sealed class ThrowInsertContainerSystem : EntitySystem +public sealed partial class ThrowInsertContainerSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Coordinates/SpawnRandomOffsetSystem.cs b/Content.Server/Coordinates/SpawnRandomOffsetSystem.cs index 39d4d97fdb1..4b2f6b8a699 100644 --- a/Content.Server/Coordinates/SpawnRandomOffsetSystem.cs +++ b/Content.Server/Coordinates/SpawnRandomOffsetSystem.cs @@ -2,9 +2,9 @@ namespace Content.Server.Coordinates; -public sealed class SpawnRandomOffsetSystem : EntitySystem +public sealed partial class SpawnRandomOffsetSystem : EntitySystem { - [Dependency] private readonly RandomHelperSystem _randomHelper = default!; + [Dependency] private RandomHelperSystem _randomHelper = default!; public override void Initialize() { diff --git a/Content.Server/Crayon/CrayonSystem.cs b/Content.Server/Crayon/CrayonSystem.cs index 3226b89d8c2..641582c9dae 100644 --- a/Content.Server/Crayon/CrayonSystem.cs +++ b/Content.Server/Crayon/CrayonSystem.cs @@ -17,15 +17,15 @@ namespace Content.Server.Crayon; -public sealed class CrayonSystem : SharedCrayonSystem +public sealed partial class CrayonSystem : SharedCrayonSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly DecalSystem _decals = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedChargesSystem _charges = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private DecalSystem _decals = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedChargesSystem _charges = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; public override void Initialize() { diff --git a/Content.Server/CrewAssignments/AdminUI/CodexEui.cs b/Content.Server/CrewAssignments/AdminUI/CodexEui.cs index 88a13643e16..49aa777502a 100644 --- a/Content.Server/CrewAssignments/AdminUI/CodexEui.cs +++ b/Content.Server/CrewAssignments/AdminUI/CodexEui.cs @@ -10,12 +10,12 @@ namespace Content.Server.CrewAssignments.AdminUI; -public sealed class CodexEui : BaseEui +public sealed partial class CodexEui : BaseEui { - [Dependency] private readonly EntityManager _entityManager = default!; + [Dependency] private EntityManager _entityManager = default!; private readonly CrewMetaRecordsSystem _crewMeta; private readonly ChatSystem _chat; - [Dependency] private readonly IChatManager _chatInterface = default!; + [Dependency] private IChatManager _chatInterface = default!; public CodexEui() { IoCManager.InjectDependencies(this); @@ -58,7 +58,7 @@ public override void HandleMessage(EuiMessageBase msg) } case CodexEuiMsg.Save saveData: { - if(saveData.ID == -1) + if (saveData.ID == -1) { _crewMeta.MetaRecords.SectorStatus = saveData.Description; _chat.DispatchGlobalAnnouncement($"The Sector Status has changed!", "Sector Status"); diff --git a/Content.Server/CrewAssignments/Systems/CrewAssignmentsSystem.cs b/Content.Server/CrewAssignments/Systems/CrewAssignmentsSystem.cs index 5e933615754..c00e88394fd 100644 --- a/Content.Server/CrewAssignments/Systems/CrewAssignmentsSystem.cs +++ b/Content.Server/CrewAssignments/Systems/CrewAssignmentsSystem.cs @@ -25,12 +25,12 @@ namespace Content.Server.CrewAssignments.Systems; public sealed partial class CrewAssignmentSystem : SharedCrewAssignmentSystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedStationSystem _station = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly StationSystem _station2 = default!; - [Dependency] private readonly CargoSystem _cargo = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedStationSystem _station = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private StationSystem _station2 = default!; + [Dependency] private CargoSystem _cargo = default!; diff --git a/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs b/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs index 98c9034486a..45caabce246 100644 --- a/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs +++ b/Content.Server/CrewAssignments/Systems/JobNetSystem.Ui.cs @@ -23,11 +23,11 @@ namespace Content.Server.CrewAssignments.Systems; public sealed partial class JobNetSystem { - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly CrewMetaRecordsSystem _meta = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private CrewMetaRecordsSystem _meta = default!; private void InitializeUi() { @@ -194,9 +194,9 @@ public void UpdateUserInterface(EntityUid? user, EntityUid jobnet, JobNetCompone var balance = 0; _bank.TryGetBalance(user.Value, out balance); string? stationName = null; - if(component.DealerBounty != null) + if (component.DealerBounty != null) { - if(component.DealerBounty.TradeStationUID != 0) + if (component.DealerBounty.TradeStationUID != 0) { var ts = _cargo.GetTradeStationByID(component.DealerBounty.TradeStationUID); if (ts != null) diff --git a/Content.Server/CrewAssignments/Systems/JobNetSystem.cs b/Content.Server/CrewAssignments/Systems/JobNetSystem.cs index 8ff8c744fc6..5e06adc7f6d 100644 --- a/Content.Server/CrewAssignments/Systems/JobNetSystem.cs +++ b/Content.Server/CrewAssignments/Systems/JobNetSystem.cs @@ -50,21 +50,21 @@ namespace Content.Server.CrewAssignments.Systems; /// public sealed partial class JobNetSystem : SharedJobNetSystem { - [Dependency] private readonly BankSystem _bank = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly CargoSystem _cargo = default!; - [Dependency] private readonly CrewManifestSystem _crewManifest = default!; - [Dependency] private readonly IdCardSystem _card = default!; - [Dependency] private readonly CodewordSystem _codeword = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedCuffableSystem _cuffable = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly NameIdentifierSystem _nameIdentifier = default!; - [Dependency] private readonly IGameTiming _timing2 = default!; + [Dependency] private BankSystem _bank = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private CargoSystem _cargo = default!; + [Dependency] private CrewManifestSystem _crewManifest = default!; + [Dependency] private IdCardSystem _card = default!; + [Dependency] private CodewordSystem _codeword = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedCuffableSystem _cuffable = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private NameIdentifierSystem _nameIdentifier = default!; + [Dependency] private IGameTiming _timing2 = default!; public override void ReagentObjectiveComplete(JobNetComponent component, ProtoId objective) { if (_proto.TryIndex(objective, out PrecursorObjectivePrototype? proto) && proto != null) @@ -108,7 +108,7 @@ public override void Initialize() SubscribeLocalEvent(OnDealerLabel); SubscribeLocalEvent(AfterInteractOn); SubscribeLocalEvent(OnDoAfter); - + InitializeUi(); } @@ -178,9 +178,9 @@ private void OnDealerLabel(Entity ent, ref JobNetDealerLabelMes var newEntity = Spawn("PaperCargoBountyManifest", teleTransform.Coordinates); ent.Comp.NextPrintTime = _timing2.CurTime + TimeSpan.FromSeconds(10); _cargo.SetupBountyLabel(newEntity, ts.Value, ent.Comp.DealerBounty); - if(TryComp(newEntity, out var cbl)) + if (TryComp(newEntity, out var cbl)) { - if(cbl != null) + if (cbl != null) { cbl.DealerName = Name(player.Value); } @@ -250,9 +250,9 @@ private void OnSubmitHunted(Entity ent, ref JobNetSubmitHuntedM if (!TryComp(player, out var actor) || actor.PlayerSession == null) return; while (query.MoveNext(out var uid, out var comp)) { - if(comp.KillTarget == Name(player)) + if (comp.KillTarget == Name(player)) { - if(args.ID == comp.SecretPhrase) + if (args.ID == comp.SecretPhrase) { Compromise(uid, comp); HuntedCompleted(ent.Owner, ent.Comp); @@ -332,7 +332,7 @@ private void Compromise(EntityUid uid, JobNetComponent component) player = comp.ParentUid; if (player != null) { - if(TryComp(player, out var actor) && actor != null && actor.PlayerSession != null) + if (TryComp(player, out var actor) && actor != null && actor.PlayerSession != null) { var msg = $"You have been compromised. You must protect your secret phrase!"; _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications, @@ -348,7 +348,7 @@ private void Compromise(EntityUid uid, JobNetComponent component) component.NetworkType = RogueNetworkType.None; component.RogueLevel = "RogueLevel1"; component.XP = 0; - component.Precursor = Math.Max(0, component.Precursor-500); + component.Precursor = Math.Max(0, component.Precursor - 500); UpdateUserInterface(player, uid, component); } @@ -376,21 +376,21 @@ private void OnDoAfter(EntityUid uid, PrecursorExtractorComponent component, Pre { if (args.Handled || args.Cancelled) return; - if(!TryComp(args.User, out var actor) || actor.PlayerSession == null) + if (!TryComp(args.User, out var actor) || actor.PlayerSession == null) return; if (args.Args.Target != null) { var target = (EntityUid)args.Args.Target; bool vulnerable = false; - if(TryComp(target, out var cuffable) && cuffable != null) + if (TryComp(target, out var cuffable) && cuffable != null) { - if (_cuffable.IsCuffed((target,cuffable))) + if (_cuffable.IsCuffed((target, cuffable))) { vulnerable = true; } } - + if (TryComp(target, out var mobState)) { if (mobState.CurrentState == MobState.Dead) @@ -537,7 +537,7 @@ private void OnPurchasePrecursor(EntityUid uid, JobNetComponent component, JobNe if (prod.Group == "syndicatemarket3") requiredLevel = 3; if (prod.Group == "syndicatemarket4") requiredLevel = 4; var level = _proto.Index(component.RogueLevel); - if(level.ItemLevel < requiredLevel) + if (level.ItemLevel < requiredLevel) { _audio.PlayEntity(component.ErrorSound, player.Value, player.Value); var msg = $"You do not have the rogue level required to purchase this."; @@ -551,10 +551,10 @@ private void OnPurchasePrecursor(EntityUid uid, JobNetComponent component, JobNe ); return; } - if(prod.Cost > component.Precursor) + if (prod.Cost > component.Precursor) { _audio.PlayEntity(component.ErrorSound, player.Value, player.Value); - var msg = $"You have insufficent stored precursor. You need {prod.Cost-component.Precursor} more precursor."; + var msg = $"You have insufficent stored precursor. You need {prod.Cost - component.Precursor} more precursor."; if (msg != null) _chatManager.ChatMessageToOne(Shared.Chat.ChatChannel.Notifications, msg, @@ -573,7 +573,7 @@ private void OnPurchasePrecursor(EntityUid uid, JobNetComponent component, JobNe var targetMapPos = _transform.GetMapCoordinates(telepad); var calculatedDistance = targetMapPos.Position - userMapPos.Position; var total = calculatedDistance.Length(); - if(total <= 3) + if (total <= 3) { var teleTransform = Transform(telepad); var newEntity = Spawn(prod.Product, teleTransform.Coordinates); @@ -583,7 +583,7 @@ private void OnPurchasePrecursor(EntityUid uid, JobNetComponent component, JobNe break; } } - if(!found) + if (!found) { _audio.PlayEntity(component.ErrorSound, player.Value, player.Value); var msg = $"You must be next to a telepad to make purchases."; @@ -683,11 +683,10 @@ public void TryAssignRogueObjective(EntityUid user, JobNetComponent component) { List possible = new(); var query = EntityQueryEnumerator(); - int tradeStationUID = 0; List possibleTrade = new(); while (query.MoveNext(out var uid, out var comp)) { - if(TryComp(uid, out var sm)) + if (TryComp(uid, out var sm)) { possibleTrade.Add(comp); } @@ -696,7 +695,7 @@ public void TryAssignRogueObjective(EntityUid user, JobNetComponent component) var chosenUID = _random.Pick(possibleTrade).UID; foreach (var proto in _proto.EnumeratePrototypes()) { - if(proto.Group == "PrecursorBounty") + if (proto.Group == "PrecursorBounty") { possible.Add(proto); } diff --git a/Content.Server/CrewManifest/CrewManifestSystem.cs b/Content.Server/CrewManifest/CrewManifestSystem.cs index 7ee673024ec..ca73a815a2f 100644 --- a/Content.Server/CrewManifest/CrewManifestSystem.cs +++ b/Content.Server/CrewManifest/CrewManifestSystem.cs @@ -19,13 +19,13 @@ namespace Content.Server.CrewManifest; -public sealed class CrewManifestSystem : EntitySystem +public sealed partial class CrewManifestSystem : EntitySystem { private const string PassengerProtoID = "Passenger"; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private EuiManager _euiManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; /// /// Cached crew manifest entries. The alternative is to outright @@ -265,9 +265,9 @@ public void BuildCrewManifest(EntityUid station) } [AdminCommand(AdminFlags.Admin)] -public sealed class CrewManifestCommand : LocalizedEntityCommands +public sealed partial class CrewManifestCommand : LocalizedEntityCommands { - [Dependency] private readonly CrewManifestSystem _manifestSystem = default!; + [Dependency] private CrewManifestSystem _manifestSystem = default!; public override string Command => "crewmanifest"; diff --git a/Content.Server/CrewMetaRecords/Systems/CrewMetaRecordsSystem.cs b/Content.Server/CrewMetaRecords/Systems/CrewMetaRecordsSystem.cs index 13f9edeeb03..d589c44f870 100644 --- a/Content.Server/CrewMetaRecords/Systems/CrewMetaRecordsSystem.cs +++ b/Content.Server/CrewMetaRecords/Systems/CrewMetaRecordsSystem.cs @@ -8,8 +8,8 @@ namespace Content.Server.CrewRecords.Systems; public sealed partial class CrewMetaRecordsSystem : SharedCrewMetaRecordsSystem { - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IdCardSystem _idCard = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IdCardSystem _idCard = default!; public bool CharacterNameExists(string name) { diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs index 032534a7a6f..dcd24c8e77f 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs @@ -20,16 +20,16 @@ namespace Content.Server.CriminalRecords.Systems; /// /// Handles all UI for criminal records console /// -public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleSystem +public sealed partial class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleSystem { - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly CriminalRecordsSystem _criminalRecords = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly StationRecordsSystem _records = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private CriminalRecordsSystem _criminalRecords = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private StationRecordsSystem _records = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs index f8c5c9df0ba..2c5d2371661 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsHackerSystem.cs @@ -12,14 +12,14 @@ namespace Content.Server.CriminalRecords.Systems; -public sealed class CriminalRecordsHackerSystem : SharedCriminalRecordsHackerSystem +public sealed partial class CriminalRecordsHackerSystem : SharedCriminalRecordsHackerSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly CriminalRecordsSystem _criminalRecords = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StationRecordsSystem _records = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private CriminalRecordsSystem _criminalRecords = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StationRecordsSystem _records = default!; public override void Initialize() { diff --git a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs index 0abf60b7b4e..504b9d4b1fd 100644 --- a/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs +++ b/Content.Server/CriminalRecords/Systems/CriminalRecordsSystem.cs @@ -21,12 +21,12 @@ namespace Content.Server.CriminalRecords.Systems; /// - See security officers' actions in Criminal Records in the radio /// - See reasons for any action with no need to ask the officer personally /// -public sealed class CriminalRecordsSystem : SharedCriminalRecordsSystem +public sealed partial class CriminalRecordsSystem : SharedCriminalRecordsSystem { - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly StationRecordsSystem _records = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private StationRecordsSystem _records = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private CartridgeLoaderSystem _cartridge = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Commands/GodModeCommand.cs b/Content.Server/Damage/Commands/GodModeCommand.cs index 06a968b4733..0dc6c970a5f 100644 --- a/Content.Server/Damage/Commands/GodModeCommand.cs +++ b/Content.Server/Damage/Commands/GodModeCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Damage.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class GodModeCommand : IConsoleCommand + public sealed partial class GodModeCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "godmode"; public string Description => "Makes your entity or another invulnerable to almost anything. May have irreversible changes."; diff --git a/Content.Server/Damage/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs index 7b24550012a..506f35742d4 100644 --- a/Content.Server/Damage/Commands/HurtCommand.cs +++ b/Content.Server/Damage/Commands/HurtCommand.cs @@ -11,10 +11,10 @@ namespace Content.Server.Damage.Commands { [AdminCommand(AdminFlags.Fun)] - sealed class DamageCommand : IConsoleCommand + sealed partial class DamageCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public string Command => "damage"; public string Description => Loc.GetString("damage-command-description"); diff --git a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs index 6dd224c02f9..f2681f897dd 100644 --- a/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs +++ b/Content.Server/Damage/ForceSay/DamageForceSaySystem.cs @@ -14,11 +14,11 @@ namespace Content.Server.Damage.ForceSay; /// -public sealed class DamageForceSaySystem : EntitySystem +public sealed partial class DamageForceSaySystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/DamageOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOnHitSystem.cs index a96eacee487..55ea37819ff 100644 --- a/Content.Server/Damage/Systems/DamageOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnHitSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.Damage.Systems; -public sealed class DamageOnHitSystem : EntitySystem +public sealed partial class DamageOnHitSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/DamageOnLandSystem.cs b/Content.Server/Damage/Systems/DamageOnLandSystem.cs index 397d48bac4d..ef8f99784d4 100644 --- a/Content.Server/Damage/Systems/DamageOnLandSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnLandSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Damage.Systems /// /// Damages the thrown item when it lands. /// - public sealed class DamageOnLandSystem : EntitySystem + public sealed partial class DamageOnLandSystem : EntitySystem { - [Dependency] private readonly Shared.Damage.Systems.DamageableSystem _damageableSystem = default!; + [Dependency] private Shared.Damage.Systems.DamageableSystem _damageableSystem = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs index 939db002e79..1f1f4d78a0e 100644 --- a/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs +++ b/Content.Server/Damage/Systems/DamageOnToolInteractSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Damage.Systems { - public sealed class DamageOnToolInteractSystem : EntitySystem + public sealed partial class DamageOnToolInteractSystem : EntitySystem { - [Dependency] private readonly Shared.Damage.Systems.DamageableSystem _damageableSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private Shared.Damage.Systems.DamageableSystem _damageableSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs index c1b957c0c93..e132bf508ed 100644 --- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Damage.Systems; -public sealed class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem +public sealed partial class DamageOtherOnHitSystem : SharedDamageOtherOnHitSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly GunSystem _guns = default!; - [Dependency] private readonly Shared.Damage.Systems.DamageableSystem _damageable = default!; - [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!; - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private GunSystem _guns = default!; + [Dependency] private Shared.Damage.Systems.DamageableSystem _damageable = default!; + [Dependency] private SharedCameraRecoilSystem _sharedCameraRecoil = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs b/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs index 59f8afea92f..81786810996 100644 --- a/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs +++ b/Content.Server/Damage/Systems/DamageRandomPopupSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Damage.Systems; /// /// Outputs a random pop-up from the strings list when an object receives damage /// -public sealed class DamageRandomPopupSystem : EntitySystem +public sealed partial class DamageRandomPopupSystem : EntitySystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs index 608d8082457..e39d2a70cc1 100644 --- a/Content.Server/Damage/Systems/ExaminableDamageSystem.cs +++ b/Content.Server/Damage/Systems/ExaminableDamageSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Damage.Systems; -public sealed class ExaminableDamageSystem : EntitySystem +public sealed partial class ExaminableDamageSystem : EntitySystem { - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Server/Database/ServerDbEntryManager.cs b/Content.Server/Database/ServerDbEntryManager.cs index a627353ef14..03b70e18198 100644 --- a/Content.Server/Database/ServerDbEntryManager.cs +++ b/Content.Server/Database/ServerDbEntryManager.cs @@ -11,11 +11,11 @@ namespace Content.Server.Database; /// This allows the value to be cached, /// so it can be easily retrieved by later code that needs to log the server ID to the database. /// -public sealed class ServerDbEntryManager +public sealed partial class ServerDbEntryManager { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private ILogManager _logManager = default!; private Task? _serverEntityTask; diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs index 5ee39b01a93..d7c284f2cf7 100644 --- a/Content.Server/Database/ServerDbManager.cs +++ b/Content.Server/Database/ServerDbManager.cs @@ -356,7 +356,7 @@ public struct DatabaseNotification public string? Payload { get; set; } } - public sealed class ServerDbManager : IServerDbManager + public sealed partial class ServerDbManager : IServerDbManager { public static readonly Counter DbReadOpsMetric = Metrics.CreateCounter( "db_read_ops", @@ -370,10 +370,10 @@ public sealed class ServerDbManager : IServerDbManager "db_executing_ops", "Amount of active database operations. Note that some operations may be waiting for a database connection."); - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IResourceManager _res = default!; - [Dependency] private readonly ILogManager _logMgr = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IResourceManager _res = default!; + [Dependency] private ILogManager _logMgr = default!; + [Dependency] private ISerializationManager _serialization = default!; private ServerDbBase _db = default!; private LoggingProvider _msLogProvider = default!; diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs index 40f192bd0d8..fdbc6f59a09 100644 --- a/Content.Server/Database/UserDbDataManager.cs +++ b/Content.Server/Database/UserDbDataManager.cs @@ -15,9 +15,9 @@ namespace Content.Server.Database; /// Actual loading code is handled by separate managers such as . /// This manager is simply a centralized "is loading done" controller for other code to rely on. /// -public sealed class UserDbDataManager : IPostInjectInit +public sealed partial class UserDbDataManager : IPostInjectInit { - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private ILogManager _logManager = default!; private readonly Dictionary _users = new(); private readonly List _onLoadPlayer = []; diff --git a/Content.Server/Decals/Commands/AddDecalCommand.cs b/Content.Server/Decals/Commands/AddDecalCommand.cs index 2d9b642a8f9..5191b2b4f74 100644 --- a/Content.Server/Decals/Commands/AddDecalCommand.cs +++ b/Content.Server/Decals/Commands/AddDecalCommand.cs @@ -12,10 +12,10 @@ namespace Content.Server.Decals.Commands { [AdminCommand(AdminFlags.Mapping)] - public sealed class AddDecalCommand : IConsoleCommand + public sealed partial class AddDecalCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; public string Command => "adddecal"; public string Description => "Creates a decal on the map"; diff --git a/Content.Server/Decals/Commands/EditDecalCommand.cs b/Content.Server/Decals/Commands/EditDecalCommand.cs index 4338a14cf06..bc5ae042044 100644 --- a/Content.Server/Decals/Commands/EditDecalCommand.cs +++ b/Content.Server/Decals/Commands/EditDecalCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Decals; [AdminCommand(AdminFlags.Mapping)] -public sealed class EditDecalCommand : IConsoleCommand +public sealed partial class EditDecalCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "editdecal"; public string Description => "Edits a decal."; diff --git a/Content.Server/Decals/Commands/RemoveDecalCommand.cs b/Content.Server/Decals/Commands/RemoveDecalCommand.cs index fc6af4d009d..991b6cbba5f 100644 --- a/Content.Server/Decals/Commands/RemoveDecalCommand.cs +++ b/Content.Server/Decals/Commands/RemoveDecalCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Decals.Commands { [AdminCommand(AdminFlags.Mapping)] - public sealed class RemoveDecalCommand : IConsoleCommand + public sealed partial class RemoveDecalCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "rmdecal"; public string Description => "removes a decal"; diff --git a/Content.Server/Decals/DecalSystem.cs b/Content.Server/Decals/DecalSystem.cs index 8677315e0dd..00e045f970d 100644 --- a/Content.Server/Decals/DecalSystem.cs +++ b/Content.Server/Decals/DecalSystem.cs @@ -22,18 +22,18 @@ namespace Content.Server.Decals { - public sealed class DecalSystem : SharedDecalSystem + public sealed partial class DecalSystem : SharedDecalSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IParallelManager _parMan = default!; - [Dependency] private readonly ChunkingSystem _chunking = default!; - [Dependency] private readonly IConfigurationManager _conf = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IParallelManager _parMan = default!; + [Dependency] private ChunkingSystem _chunking = default!; + [Dependency] private IConfigurationManager _conf = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; private readonly Dictionary> _dirtyChunks = new(); private readonly Dictionary>> _previousSentChunks = new(); diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs index 5c589d21311..190307cdaa4 100644 --- a/Content.Server/Defusable/Systems/DefusableSystem.cs +++ b/Content.Server/Defusable/Systems/DefusableSystem.cs @@ -19,16 +19,16 @@ namespace Content.Server.Defusable.Systems; /// -public sealed class DefusableSystem : SharedDefusableSystem +public sealed partial class DefusableSystem : SharedDefusableSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly TriggerSystem _trigger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly WiresSystem _wiresSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private ExplosionSystem _explosion = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private TriggerSystem _trigger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private WiresSystem _wiresSystem = default!; /// public override void Initialize() diff --git a/Content.Server/Delivery/DeliverySystem.Spawning.cs b/Content.Server/Delivery/DeliverySystem.Spawning.cs index 364a96202dc..6d869379080 100644 --- a/Content.Server/Delivery/DeliverySystem.Spawning.cs +++ b/Content.Server/Delivery/DeliverySystem.Spawning.cs @@ -13,10 +13,10 @@ namespace Content.Server.Delivery; /// public sealed partial class DeliverySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; private void InitializeSpawning() { diff --git a/Content.Server/Delivery/DeliverySystem.cs b/Content.Server/Delivery/DeliverySystem.cs index 45644c89a66..bd7bb5b73e3 100644 --- a/Content.Server/Delivery/DeliverySystem.cs +++ b/Content.Server/Delivery/DeliverySystem.cs @@ -21,16 +21,16 @@ namespace Content.Server.Delivery; /// public sealed partial class DeliverySystem : SharedDeliverySystem { - [Dependency] private readonly CargoSystem _cargo = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StationRecordsSystem _records = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly FingerprintReaderSystem _fingerprintReader = default!; - [Dependency] private readonly LabelSystem _label = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private CargoSystem _cargo = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StationRecordsSystem _records = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private FingerprintReaderSystem _fingerprintReader = default!; + [Dependency] private LabelSystem _label = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _protoMan = default!; /// /// Default reason to use if the penalization is triggered diff --git a/Content.Server/DeltaV/TapeRecorder/TapeRecorderSystem.cs b/Content.Server/DeltaV/TapeRecorder/TapeRecorderSystem.cs index 222e393cc5b..8fa398dc4d5 100644 --- a/Content.Server/DeltaV/TapeRecorder/TapeRecorderSystem.cs +++ b/Content.Server/DeltaV/TapeRecorder/TapeRecorderSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.DeltaV.TapeRecorder; -public sealed class TapeRecorderSystem : SharedTapeRecorderSystem +public sealed partial class TapeRecorderSystem : SharedTapeRecorderSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly PaperSystem _paper = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private PaperSystem _paper = default!; public override void Initialize() { diff --git a/Content.Server/Destructible/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs index 343d08ed8ae..c7894975e42 100644 --- a/Content.Server/Destructible/DestructibleSystem.cs +++ b/Content.Server/Destructible/DestructibleSystem.cs @@ -28,21 +28,21 @@ namespace Content.Server.Destructible [UsedImplicitly] public sealed partial class DestructibleSystem : SharedDestructibleSystem { - [Dependency] public readonly IRobustRandom Random = default!; + [Dependency] public IRobustRandom Random = default!; public new IEntityManager EntityManager => base.EntityManager; - [Dependency] public readonly AtmosphereSystem AtmosphereSystem = default!; - [Dependency] public readonly AudioSystem AudioSystem = default!; - [Dependency] public readonly GibbingSystem Gibbing = default!; - [Dependency] public readonly ConstructionSystem ConstructionSystem = default!; - [Dependency] public readonly ExplosionSystem ExplosionSystem = default!; - [Dependency] public readonly StackSystem StackSystem = default!; - [Dependency] public readonly TriggerSystem TriggerSystem = default!; - [Dependency] public readonly SharedSolutionContainerSystem SolutionContainerSystem = default!; - [Dependency] public readonly PuddleSystem PuddleSystem = default!; - [Dependency] public readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] public readonly IPrototypeManager PrototypeManager = default!; - [Dependency] public readonly IAdminLogManager AdminLogger = default!; + [Dependency] public AtmosphereSystem AtmosphereSystem = default!; + [Dependency] public AudioSystem AudioSystem = default!; + [Dependency] public GibbingSystem Gibbing = default!; + [Dependency] public ConstructionSystem ConstructionSystem = default!; + [Dependency] public ExplosionSystem ExplosionSystem = default!; + [Dependency] public StackSystem StackSystem = default!; + [Dependency] public TriggerSystem TriggerSystem = default!; + [Dependency] public SharedSolutionContainerSystem SolutionContainerSystem = default!; + [Dependency] public PuddleSystem PuddleSystem = default!; + [Dependency] public SharedContainerSystem ContainerSystem = default!; + [Dependency] public IPrototypeManager PrototypeManager = default!; + [Dependency] public IAdminLogManager AdminLogger = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/AutoLinkSystem.cs b/Content.Server/DeviceLinking/Systems/AutoLinkSystem.cs index 875f29785d6..112c0aa73fa 100644 --- a/Content.Server/DeviceLinking/Systems/AutoLinkSystem.cs +++ b/Content.Server/DeviceLinking/Systems/AutoLinkSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.DeviceLinking.Systems; /// /// This handles automatically linking autolinked entities at round-start. /// -public sealed class AutoLinkSystem : EntitySystem +public sealed partial class AutoLinkSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLinkSystem = default!; + [Dependency] private DeviceLinkSystem _deviceLinkSystem = default!; /// public override void Initialize() diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs index df1cc3b02a5..13b84d2fe94 100644 --- a/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs +++ b/Content.Server/DeviceLinking/Systems/DeviceLinkOverloadSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class DeviceLinkOverloadSystem : EntitySystem +public sealed partial class DeviceLinkOverloadSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audioSystem = default!; + [Dependency] private AudioSystem _audioSystem = default!; public override void Initialize() { SubscribeLocalEvent(OnOverloadSound); diff --git a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs index 5ffa9cb82c1..11045863d41 100644 --- a/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs +++ b/Content.Server/DeviceLinking/Systems/DeviceLinkSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class DeviceLinkSystem : SharedDeviceLinkSystem +public sealed partial class DeviceLinkSystem : SharedDeviceLinkSystem { - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs index a7a8dd9c334..16c91e27123 100644 --- a/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs +++ b/Content.Server/DeviceLinking/Systems/DoorSignalControlSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.DeviceLinking.Systems { [UsedImplicitly] - public sealed class DoorSignalControlSystem : EntitySystem + public sealed partial class DoorSignalControlSystem : EntitySystem { - [Dependency] private readonly DoorSystem _doorSystem = default!; - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; + [Dependency] private DoorSystem _doorSystem = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs b/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs index 16fc98e07d5..6e6fc18d0fa 100644 --- a/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs +++ b/Content.Server/DeviceLinking/Systems/EdgeDetectorSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class EdgeDetectorSystem : EntitySystem +public sealed partial class EdgeDetectorSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs index cf78f5c1140..16bd669b00f 100644 --- a/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs +++ b/Content.Server/DeviceLinking/Systems/GunSignalControlSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.DeviceLinking.Systems; public sealed partial class GunSignalControlSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private SharedGunSystem _gun = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs index 102e0ce2a6d..00fd3a1b81a 100644 --- a/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs +++ b/Content.Server/DeviceLinking/Systems/LogicGateSystem.cs @@ -11,14 +11,14 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class LogicGateSystem : EntitySystem +public sealed partial class LogicGateSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private UseDelaySystem _useDelay = default!; private readonly int GateCount = Enum.GetValues(typeof(LogicGate)).Length; diff --git a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs index 7743a97d72d..394ae0dddf3 100644 --- a/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs +++ b/Content.Server/DeviceLinking/Systems/MemoryCellSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.DeviceLinking.Systems; /// /// Handles the control of output based on the input and enable ports. /// -public sealed class MemoryCellSystem : EntitySystem +public sealed partial class MemoryCellSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs b/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs index 6c23d476a58..4e584a35e46 100644 --- a/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs +++ b/Content.Server/DeviceLinking/Systems/PowerSensorSystem.cs @@ -15,15 +15,15 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class PowerSensorSystem : EntitySystem +public sealed partial class PowerSensorSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PowerNetSystem _powerNet = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PowerNetSystem _powerNet = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private UseDelaySystem _useDelay = default!; private EntityQuery _nodeQuery; private EntityQuery _xformQuery; diff --git a/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs b/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs index a9610399d12..e0828caa557 100644 --- a/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs +++ b/Content.Server/DeviceLinking/Systems/RandomGateSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class RandomGateSystem : SharedRandomGateSystem +public sealed partial class RandomGateSystem : SharedRandomGateSystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs index 83f00c53f8c..f6cba3ec5de 100644 --- a/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs +++ b/Content.Server/DeviceLinking/Systems/SignalSwitchSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class SignalSwitchSystem : EntitySystem +public sealed partial class SignalSwitchSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly LockSystem _lock = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private LockSystem _lock = default!; public override void Initialize() { diff --git a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs index 1d831ebceb0..9ee97b7310b 100644 --- a/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs +++ b/Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs @@ -10,14 +10,14 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class SignalTimerSystem : EntitySystem +public sealed partial class SignalTimerSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; /// /// Per-tick timer cache. diff --git a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs index 9af8446c7a3..660b9814c74 100644 --- a/Content.Server/DeviceLinking/Systems/SignallerSystem.cs +++ b/Content.Server/DeviceLinking/Systems/SignallerSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.DeviceLinking.Systems; -public sealed class SignallerSystem : EntitySystem +public sealed partial class SignallerSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _link = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private DeviceLinkSystem _link = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs index eb6419d1d9a..e21daa6f748 100644 --- a/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/ApcNetworkSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.DeviceNetwork.Systems { [UsedImplicitly] - public sealed class ApcNetworkSystem : EntitySystem + public sealed partial class ApcNetworkSystem : EntitySystem { - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs index e4936ad3768..66add571d0a 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceListSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.DeviceNetwork.Systems; [UsedImplicitly] -public sealed class DeviceListSystem : SharedDeviceListSystem +public sealed partial class DeviceListSystem : SharedDeviceListSystem { - [Dependency] private readonly NetworkConfiguratorSystem _configurator = default!; + [Dependency] private NetworkConfiguratorSystem _configurator = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs index 860ff886d44..e5b75ec8316 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.DeviceNetwork.Systems; /// -public sealed class DeviceNetworkJammerSystem : SharedDeviceNetworkJammerSystem +public sealed partial class DeviceNetworkJammerSystem : SharedDeviceNetworkJammerSystem { - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedDeviceNetworkJammerSystem _jammer = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedDeviceNetworkJammerSystem _jammer = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs index c6a9f940dda..fb8e9ddaaee 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs @@ -16,13 +16,13 @@ namespace Content.Server.DeviceNetwork.Systems /// Device networking allows machines and devices to communicate with each other while adhering to restrictions like range or being connected to the same powernet. /// [UsedImplicitly] - public sealed class DeviceNetworkSystem : SharedDeviceNetworkSystem + public sealed partial class DeviceNetworkSystem : SharedDeviceNetworkSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly DeviceListSystem _deviceLists = default!; - [Dependency] private readonly NetworkConfiguratorSystem _configurator = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private DeviceListSystem _deviceLists = default!; + [Dependency] private NetworkConfiguratorSystem _configurator = default!; private readonly Dictionary _networks = new(4); private readonly Queue _queueA = new(); diff --git a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs index d3481322414..c015560c2d9 100644 --- a/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/Devices/ApcNetSwitchSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.DeviceNetwork.Systems.Devices { - public sealed class ApcNetSwitchSystem : EntitySystem + public sealed partial class ApcNetSwitchSystem : EntitySystem { - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs index 5edd753c639..133a96b6274 100644 --- a/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/NetworkConfiguratorSystem.cs @@ -24,18 +24,18 @@ namespace Content.Server.DeviceNetwork.Systems; [UsedImplicitly] -public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem +public sealed partial class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem { - [Dependency] private readonly DeviceListSystem _deviceListSystem = default!; - [Dependency] private readonly DeviceLinkSystem _deviceLinkSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly AccessReaderSystem _accessSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly AudioSystem _audioSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private DeviceListSystem _deviceListSystem = default!; + [Dependency] private DeviceLinkSystem _deviceLinkSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private AccessReaderSystem _accessSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private AudioSystem _audioSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs index ca4cb8a46ba..f9038bd0230 100644 --- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.DeviceNetwork.Systems; /// Keeps one active server entity per station. Activates another available one if the currently active server becomes unavailable /// Server in this context means an entity that manages the devicenet packets like the /// -public sealed class SingletonDeviceNetServerSystem : EntitySystem +public sealed partial class SingletonDeviceNetServerSystem : EntitySystem { - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private StationSystem _stationSystem = default!; public override void Initialize() { diff --git a/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs index 64efe4b0278..2875dd59ed6 100644 --- a/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/StationLimitedNetworkSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.DeviceNetwork.Systems /// This system requires the StationLimitedNetworkComponent to be on the the sending entity as well as the receiving entity /// [UsedImplicitly] - public sealed class StationLimitedNetworkSystem : EntitySystem + public sealed partial class StationLimitedNetworkSystem : EntitySystem { - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private StationSystem _stationSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs index 8bca47e041f..0506f1cce67 100644 --- a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.DeviceNetwork.Systems { [UsedImplicitly] - public sealed class WirelessNetworkSystem : EntitySystem + public sealed partial class WirelessNetworkSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public override void Initialize() { diff --git a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs index 7230ae7315e..498445de48b 100644 --- a/Content.Server/Discord/DiscordLink/DiscordChatLink.cs +++ b/Content.Server/Discord/DiscordLink/DiscordChatLink.cs @@ -7,13 +7,13 @@ namespace Content.Server.Discord.DiscordLink; -public sealed class DiscordChatLink : IPostInjectInit +public sealed partial class DiscordChatLink : IPostInjectInit { - [Dependency] private readonly DiscordLink _discordLink = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly ITaskManager _taskManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private DiscordLink _discordLink = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private ITaskManager _taskManager = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Discord/DiscordLink/DiscordLink.cs b/Content.Server/Discord/DiscordLink/DiscordLink.cs index 08fda8564ae..926c8ae5f35 100644 --- a/Content.Server/Discord/DiscordLink/DiscordLink.cs +++ b/Content.Server/Discord/DiscordLink/DiscordLink.cs @@ -39,10 +39,10 @@ public sealed class CommandReceivedEventArgs /// /// Handles the connection to Discord and provides methods to interact with it. /// -public sealed class DiscordLink : IPostInjectInit +public sealed partial class DiscordLink : IPostInjectInit { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IConfigurationManager _configuration = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IConfigurationManager _configuration = default!; /// /// The Discord client. This is null if the bot is not connected. diff --git a/Content.Server/Discord/DiscordWebhook.cs b/Content.Server/Discord/DiscordWebhook.cs index 335910bee6b..21c3d870f4b 100644 --- a/Content.Server/Discord/DiscordWebhook.cs +++ b/Content.Server/Discord/DiscordWebhook.cs @@ -6,12 +6,12 @@ namespace Content.Server.Discord; -public sealed class DiscordWebhook : IPostInjectInit +public sealed partial class DiscordWebhook : IPostInjectInit { private static readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions { DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private ILogManager _log = default!; private const string BaseUrl = "https://discord.com/api/v10/webhooks"; private readonly HttpClient _http = new(); diff --git a/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs b/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs index 9e147fced2e..ba41aa46023 100644 --- a/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs +++ b/Content.Server/Discord/WebhookMessages/VoteWebhooks.cs @@ -7,11 +7,11 @@ namespace Content.Server.Discord.WebhookMessages; -public sealed class VoteWebhooks : IPostInjectInit +public sealed partial class VoteWebhooks : IPostInjectInit { - [Dependency] private readonly IEntitySystemManager _entSys = default!; - [Dependency] private readonly DiscordWebhook _discord = default!; - [Dependency] private readonly IBaseServer _baseServer = default!; + [Dependency] private IEntitySystemManager _entSys = default!; + [Dependency] private DiscordWebhook _discord = default!; + [Dependency] private IBaseServer _baseServer = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Disposal/Tube/DisposalSignalRouterSystem.cs b/Content.Server/Disposal/Tube/DisposalSignalRouterSystem.cs index 0d6c03b8c50..7a1fd53e19b 100644 --- a/Content.Server/Disposal/Tube/DisposalSignalRouterSystem.cs +++ b/Content.Server/Disposal/Tube/DisposalSignalRouterSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Disposal.Tube; /// /// Handles signals and the routing get next direction event. /// -public sealed class DisposalSignalRouterSystem : EntitySystem +public sealed partial class DisposalSignalRouterSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; public override void Initialize() { diff --git a/Content.Server/Disposal/Tube/DisposalSignallerSystem.cs b/Content.Server/Disposal/Tube/DisposalSignallerSystem.cs index 76c3c47ab4a..bd67e17a5e2 100644 --- a/Content.Server/Disposal/Tube/DisposalSignallerSystem.cs +++ b/Content.Server/Disposal/Tube/DisposalSignallerSystem.cs @@ -2,9 +2,9 @@ namespace Content.Server.Disposal.Tube; -public sealed class DisposalSignallerSystem : EntitySystem +public sealed partial class DisposalSignallerSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _link = default!; + [Dependency] private DeviceLinkSystem _link = default!; public override void Initialize() { diff --git a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs index a6f80a2fd3f..6b97be151e0 100644 --- a/Content.Server/Disposal/Tube/DisposalTubeSystem.cs +++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs @@ -19,18 +19,18 @@ namespace Content.Server.Disposal.Tube { - public sealed class DisposalTubeSystem : SharedDisposalTubeSystem + public sealed partial class DisposalTubeSystem : SharedDisposalTubeSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly PopupSystem _popups = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly DisposableSystem _disposableSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmosSystem = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private PopupSystem _popups = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private DisposableSystem _disposableSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private AtmosphereSystem _atmosSystem = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/Disposal/TubeConnectionsCommand.cs b/Content.Server/Disposal/TubeConnectionsCommand.cs index 29e732e67bf..bef42308c7f 100644 --- a/Content.Server/Disposal/TubeConnectionsCommand.cs +++ b/Content.Server/Disposal/TubeConnectionsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Disposal { [AdminCommand(AdminFlags.Debug)] - public sealed class TubeConnectionsCommand : IConsoleCommand + public sealed partial class TubeConnectionsCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "tubeconnections"; public string Description => Loc.GetString("tube-connections-command-description"); diff --git a/Content.Server/Disposal/Unit/DisposableSystem.cs b/Content.Server/Disposal/Unit/DisposableSystem.cs index 993545b9dca..f4cf3c10129 100644 --- a/Content.Server/Disposal/Unit/DisposableSystem.cs +++ b/Content.Server/Disposal/Unit/DisposableSystem.cs @@ -13,18 +13,18 @@ namespace Content.Server.Disposal.Unit { - public sealed class DisposableSystem : EntitySystem + public sealed partial class DisposableSystem : EntitySystem { - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!; - [Dependency] private readonly DisposalTubeSystem _disposalTubeSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private DisposalUnitSystem _disposalUnitSystem = default!; + [Dependency] private DisposalTubeSystem _disposalTubeSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedPhysicsSystem _physicsSystem = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; private EntityQuery _disposalTubeQuery; private EntityQuery _disposalUnitQuery; diff --git a/Content.Server/Disposal/Unit/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/DisposalUnitSystem.cs index 4c6436c6c9e..d764b49a058 100644 --- a/Content.Server/Disposal/Unit/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/DisposalUnitSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Disposal.Unit; -public sealed class DisposalUnitSystem : SharedDisposalUnitSystem +public sealed partial class DisposalUnitSystem : SharedDisposalUnitSystem { - [Dependency] private readonly AtmosphereSystem _atmosSystem = default!; + [Dependency] private AtmosphereSystem _atmosSystem = default!; public override void Initialize() { diff --git a/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs b/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs index 16514e49d6d..37f02a4234c 100644 --- a/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs +++ b/Content.Server/Doors/Electronics/Systems/DoorElectronicsSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Doors.Electronics; -public sealed class DoorElectronicsSystem : EntitySystem +public sealed partial class DoorElectronicsSystem : EntitySystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private SharedStationSystem _station = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Doors/Systems/AirlockSystem.cs b/Content.Server/Doors/Systems/AirlockSystem.cs index 15aa31b3fbb..838e769e368 100644 --- a/Content.Server/Doors/Systems/AirlockSystem.cs +++ b/Content.Server/Doors/Systems/AirlockSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Doors.Systems; -public sealed class AirlockSystem : SharedAirlockSystem +public sealed partial class AirlockSystem : SharedAirlockSystem { - [Dependency] private readonly WiresSystem _wiresSystem = default!; + [Dependency] private WiresSystem _wiresSystem = default!; public override void Initialize() { diff --git a/Content.Server/Doors/Systems/DoorSystem.cs b/Content.Server/Doors/Systems/DoorSystem.cs index 754818619ac..cd5732f9957 100644 --- a/Content.Server/Doors/Systems/DoorSystem.cs +++ b/Content.Server/Doors/Systems/DoorSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Doors.Systems; -public sealed class DoorSystem : SharedDoorSystem +public sealed partial class DoorSystem : SharedDoorSystem { - [Dependency] private readonly AirtightSystem _airtightSystem = default!; + [Dependency] private AirtightSystem _airtightSystem = default!; public override void Initialize() { diff --git a/Content.Server/Doors/Systems/FirelockSystem.cs b/Content.Server/Doors/Systems/FirelockSystem.cs index 842b7c306cd..6d90c668d4f 100644 --- a/Content.Server/Doors/Systems/FirelockSystem.cs +++ b/Content.Server/Doors/Systems/FirelockSystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.Doors.Systems { - public sealed class FirelockSystem : SharedFirelockSystem + public sealed partial class FirelockSystem : SharedFirelockSystem { - [Dependency] private readonly SharedDoorSystem _doorSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmosSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedMapSystem _mapping = default!; - [Dependency] private readonly PointLightSystem _pointLight = default!; + [Dependency] private SharedDoorSystem _doorSystem = default!; + [Dependency] private AtmosphereSystem _atmosSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedMapSystem _mapping = default!; + [Dependency] private PointLightSystem _pointLight = default!; private EntityQuery _atmosAlarmQuery; diff --git a/Content.Server/Dragon/DragonRiftSystem.cs b/Content.Server/Dragon/DragonRiftSystem.cs index 27eb832d6af..c6baf1c5cc2 100644 --- a/Content.Server/Dragon/DragonRiftSystem.cs +++ b/Content.Server/Dragon/DragonRiftSystem.cs @@ -19,14 +19,14 @@ namespace Content.Server.Dragon; /// /// Handles events for rift entities and rift updating. /// -public sealed class DragonRiftSystem : EntitySystem +public sealed partial class DragonRiftSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DragonSystem _dragon = default!; - [Dependency] private readonly ISerializationManager _serManager = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DragonSystem _dragon = default!; + [Dependency] private ISerializationManager _serManager = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index eaf7d555fe6..bcc71af68be 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -17,17 +17,17 @@ namespace Content.Server.Dragon; public sealed partial class DragonSystem : EntitySystem { - [Dependency] private readonly CarpRiftsConditionSystem _carpRifts = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; - [Dependency] private readonly NpcFactionSystem _faction = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private CarpRiftsConditionSystem _carpRifts = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private MovementSpeedModifierSystem _movement = default!; + [Dependency] private NpcFactionSystem _faction = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private TurfSystem _turf = default!; private EntityQuery _objQuery; diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs index 13fdc42e109..3f0ef823231 100644 --- a/Content.Server/Drowsiness/DrowsinessSystem.cs +++ b/Content.Server/Drowsiness/DrowsinessSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Drowsiness; -public sealed class DrowsinessSystem : SharedDrowsinessSystem +public sealed partial class DrowsinessSystem : SharedDrowsinessSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; /// public override void Initialize() diff --git a/Content.Server/EUI/EuiManager.cs b/Content.Server/EUI/EuiManager.cs index 71f84142949..e5e54dea517 100644 --- a/Content.Server/EUI/EuiManager.cs +++ b/Content.Server/EUI/EuiManager.cs @@ -7,11 +7,11 @@ namespace Content.Server.EUI { - public sealed class EuiManager : IPostInjectInit + public sealed partial class EuiManager : IPostInjectInit { - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IServerNetManager _net = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IServerNetManager _net = default!; private ISawmill? _sawmill; diff --git a/Content.Server/Electrocution/ElectrocuteCommand.cs b/Content.Server/Electrocution/ElectrocuteCommand.cs index 6bc3977544e..1ab7492ff24 100644 --- a/Content.Server/Electrocution/ElectrocuteCommand.cs +++ b/Content.Server/Electrocution/ElectrocuteCommand.cs @@ -7,10 +7,10 @@ namespace Content.Server.Electrocution; [AdminCommand(AdminFlags.Fun)] -public sealed class ElectrocuteCommand : LocalizedEntityCommands +public sealed partial class ElectrocuteCommand : LocalizedEntityCommands { - [Dependency] private readonly ElectrocutionSystem _electrocution = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + [Dependency] private ElectrocutionSystem _electrocution = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; public override string Command => "electrocute"; diff --git a/Content.Server/Electrocution/ElectrocutionSystem.cs b/Content.Server/Electrocution/ElectrocutionSystem.cs index bda23409a8f..b48e034bb95 100644 --- a/Content.Server/Electrocution/ElectrocutionSystem.cs +++ b/Content.Server/Electrocution/ElectrocutionSystem.cs @@ -34,26 +34,26 @@ namespace Content.Server.Electrocution; -public sealed class ElectrocutionSystem : SharedElectrocutionSystem +public sealed partial class ElectrocutionSystem : SharedElectrocutionSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly MeleeWeaponSystem _meleeWeapon = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly NodeGroupSystem _nodeGroup = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; - [Dependency] private readonly SharedJitteringSystem _jittering = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedStutteringSystem _stuttering = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private MeleeWeaponSystem _meleeWeapon = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private NodeGroupSystem _nodeGroup = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedStutteringSystem _stuttering = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private TurfSystem _turf = default!; private static readonly ProtoId StatusKeyIn = "Electrocution"; private static readonly ProtoId DamageType = "Shock"; diff --git a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs index 39217a81963..17d145aa79b 100644 --- a/Content.Server/Emoting/Systems/BodyEmotesSystem.cs +++ b/Content.Server/Emoting/Systems/BodyEmotesSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Emoting.Systems; -public sealed class BodyEmotesSystem : EntitySystem +public sealed partial class BodyEmotesSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs index 82e2d9c30d9..89b773282b2 100644 --- a/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs +++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Engineering.EntitySystems { [UsedImplicitly] - public sealed class SpawnAfterInteractSystem : EntitySystem + public sealed partial class SpawnAfterInteractSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly TurfSystem _turfSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private TurfSystem _turfSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _maps = default!; public override void Initialize() { diff --git a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs index c59129499de..d2ac8cc5df3 100644 --- a/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs +++ b/Content.Server/EntityConditions/Conditions/BreathingEntityConditionSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.EntityConditions.Conditions; /// public sealed partial class IsBreathingEntityConditionSystem : EntityConditionSystem { - [Dependency] private readonly RespiratorSystem _respirator = default!; + [Dependency] private RespiratorSystem _respirator = default!; protected override void Condition(Entity entity, ref EntityConditionEvent args) { args.Result = _respirator.IsBreathing(entity.AsNullable()); diff --git a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs index 14c27693b71..2dae14d2895 100644 --- a/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Atmos/CreateGasEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.EntityEffects.Effects.Atmos; /// public sealed partial class CreateGasEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs index b29475c0e57..c5664a4d01b 100644 --- a/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Atmos/FlammableEntityEffectSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.EntityEffects.Effects.Atmos; /// public sealed partial class FlammableEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private FlammableSystem _flammable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs index e769051832c..d2d5ad819d9 100644 --- a/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Atmos/IgniteEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.EntityEffects.Effects.Atmos; /// public sealed partial class IngiteEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private FlammableSystem _flammable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs index 8b254efbc05..5483217350f 100644 --- a/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs +++ b/Content.Server/EntityEffects/Effects/Body/OxygenateEntityEffectsSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.EntityEffects.Effects.Body; /// public sealed partial class OxygenateEntityEffectsSystem : EntityEffectSystem { - [Dependency] private readonly RespiratorSystem _respirator = default!; + [Dependency] private RespiratorSystem _respirator = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { _respirator.UpdateSaturation(entity, args.Scale * args.Effect.Factor, entity.Comp); diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs index ab656b8aa45..3a171e53750 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustHealthEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantAdjustHealthEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PlantHolderSystem _plantHolder = default!; + [Dependency] private PlantHolderSystem _plantHolder = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs index 4732465098c..76be1595b06 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustMutationLevelEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantAdjustMutationLevelEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PlantHolderSystem _plantHolder = default!; + [Dependency] private PlantHolderSystem _plantHolder = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs index 56c016700dd..fee82e62a5d 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustNutritionEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantAdjustNutritionEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PlantHolderSystem _plantHolder = default!; + [Dependency] private PlantHolderSystem _plantHolder = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs index 706eeb2ffe0..9b6d23bfb5b 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAdjustWaterEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantAdjustWaterEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PlantHolderSystem _plantHolder = default!; + [Dependency] private PlantHolderSystem _plantHolder = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs index b0faa6255e1..cc4869110f7 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantAffectGrowthEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantAffectGrowthEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PlantHolderSystem _plantHolder = default!; + [Dependency] private PlantHolderSystem _plantHolder = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs index 1f1589523d0..db8d4e1acfd 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantChangeStatEntityEffectSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantChangeStatEntityEffectSystem : EntityEffectSystem { // TODO: This is awful. I do not have the strength to refactor this. I want it gone. - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs index bc27f27b790..a017136cd06 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantCryoxadoneEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantCryoxadoneEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs index f15b578f231..2453aeef507 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeedsEntityEffectSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantDestroySeedsEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private PopupSystem _popup = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs index 88b493b1195..f476b47ee84 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantDiethylamineEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantDiethylamineEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs index 0a650c2b196..1097aadf582 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/PlantRestoreSeedsEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; public sealed partial class PlantRestoreSeedsEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private PopupSystem _popup = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs index 8d38acbb54b..1f98e4ccfef 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantAttributes/RobustHarvestEntityEffectSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.EntityEffects.Effects.Botany.PlantAttributes; /// public sealed partial class RobustHarvestEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs index 0288ea34182..cf95d101ffa 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateChemicalsEntityEffectSystem.cs @@ -11,8 +11,8 @@ namespace Content.Server.EntityEffects.Effects.Botany; public sealed partial class PlantMutateChemicalsEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs index 121bb7b2781..0be0b45382c 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateGasesEntityEffectSystem.cs @@ -9,7 +9,7 @@ namespace Content.Server.EntityEffects.Effects.Botany; public sealed partial class PlantMutateExudeGasesEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { @@ -31,7 +31,7 @@ protected override void Effect(Entity entity, ref EntityEf public sealed partial class PlantMutateConsumeGasesEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs index c26e1e08cf7..509e5c2cf78 100644 --- a/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Botany/PlantMutateSpeciesChangeEntityEffectSystem.cs @@ -9,8 +9,8 @@ namespace Content.Server.EntityEffects.Effects.Botany; public sealed partial class PlantMutateSpeciesChangeEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs index 7d358f2ef10..6057d30c042 100644 --- a/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/ExplodeEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.EntityEffects.Effects; /// public sealed partial class ExplodeEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly ExplosionSystem _explosion = default!; + [Dependency] private ExplosionSystem _explosion = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs index 56f758d5186..2fa3be093ef 100644 --- a/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/PolymorphEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Server.EntityEffects.Effects; /// public sealed partial class PolymorphEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly PolymorphSystem _polymorph = default!; + [Dependency] private PolymorphSystem _polymorph = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs index 670b83448e2..4049f759b4c 100644 --- a/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Solution/AreaReactionEntityEffectSystem.cs @@ -18,13 +18,13 @@ namespace Content.Server.EntityEffects.Effects.Solution; /// public sealed partial class AreaReactionEntityEffectsSystem : EntityEffectSystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly SmokeSystem _smoke = default!; - [Dependency] private readonly SpreaderSystem _spreader = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private SmokeSystem _smoke = default!; + [Dependency] private SpreaderSystem _spreader = default!; + [Dependency] private TurfSystem _turf = default!; // TODO: A sane way to make Smoke without a solution. protected override void Effect(Entity entity, ref EntityEffectEvent args) diff --git a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs index 0c1f775e7ff..9525bff88b3 100644 --- a/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs +++ b/Content.Server/EntityEffects/Effects/Transform/ExplosionEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.EntityEffects.Effects.Transform; /// public sealed partial class ExplosionEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly ExplosionSystem _explosion = default!; + [Dependency] private ExplosionSystem _explosion = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Server/EntityList/SpawnEntityListCommand.cs b/Content.Server/EntityList/SpawnEntityListCommand.cs index 371d7b4b6e7..e01d075bf93 100644 --- a/Content.Server/EntityList/SpawnEntityListCommand.cs +++ b/Content.Server/EntityList/SpawnEntityListCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.EntityList { [AdminCommand(AdminFlags.Spawn)] - public sealed class SpawnEntityListCommand : LocalizedEntityCommands + public sealed partial class SpawnEntityListCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override string Command => "spawnentitylist"; diff --git a/Content.Server/Entry/EntryPoint.cs b/Content.Server/Entry/EntryPoint.cs index ca7b0d03898..1bf7d0aad76 100644 --- a/Content.Server/Entry/EntryPoint.cs +++ b/Content.Server/Entry/EntryPoint.cs @@ -37,48 +37,48 @@ namespace Content.Server.Entry { - public sealed class EntryPoint : GameServer + public sealed partial class EntryPoint : GameServer { internal const string ConfigPresetsDir = "/ConfigPresets/"; private const string ConfigPresetsDirBuild = $"{ConfigPresetsDir}Build/"; - [Dependency] private readonly CVarControlManager _cvarCtrl = default!; - [Dependency] private readonly ContentLocalizationManager _loc = default!; - [Dependency] private readonly ContentNetworkResourceManager _netResMan = default!; - [Dependency] private readonly DiscordChatLink _discordChatLink = default!; - [Dependency] private readonly DiscordLink _discordLink = default!; - [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly GhostKickManager _ghostKick = default!; - [Dependency] private readonly IAdminManager _admin = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly IAfkManager _afk = default!; - [Dependency] private readonly IBanManager _ban = default!; - [Dependency] private readonly IChatManager _chatSan = default!; - [Dependency] private readonly IChatSanitizationManager _chat = default!; - [Dependency] private readonly IComponentFactory _factory = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IConnectionManager _connection = default!; - [Dependency] private readonly IEntitySystemManager _entSys = default!; - [Dependency] private readonly IGameMapManager _gameMap = default!; - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly INodeGroupFactory _nodeFactory = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IResourceManager _res = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly IServerPreferencesManager _preferences = default!; - [Dependency] private readonly IStatusHost _host = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly IWatchlistWebhookManager _watchlistWebhookManager = default!; - [Dependency] private readonly JobWhitelistManager _job = default!; - [Dependency] private readonly MultiServerKickManager _multiServerKick = default!; - [Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!; - [Dependency] private readonly PlayerRateLimitManager _rateLimit = default!; - [Dependency] private readonly RecipeManager _recipe = default!; - [Dependency] private readonly RulesManager _rules = default!; - [Dependency] private readonly ServerApi _serverApi = default!; - [Dependency] private readonly ServerInfoManager _serverInfo = default!; - [Dependency] private readonly ServerUpdateManager _updateManager = default!; - [Dependency] private readonly ServerFeedbackManager _feedbackManager = null!; + [Dependency] private CVarControlManager _cvarCtrl = default!; + [Dependency] private ContentLocalizationManager _loc = default!; + [Dependency] private ContentNetworkResourceManager _netResMan = default!; + [Dependency] private DiscordChatLink _discordChatLink = default!; + [Dependency] private DiscordLink _discordLink = default!; + [Dependency] private EuiManager _euiManager = default!; + [Dependency] private GhostKickManager _ghostKick = default!; + [Dependency] private IAdminManager _admin = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private IAfkManager _afk = default!; + [Dependency] private IBanManager _ban = default!; + [Dependency] private IChatManager _chatSan = default!; + [Dependency] private IChatSanitizationManager _chat = default!; + [Dependency] private IComponentFactory _factory = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IConnectionManager _connection = default!; + [Dependency] private IEntitySystemManager _entSys = default!; + [Dependency] private IGameMapManager _gameMap = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private INodeGroupFactory _nodeFactory = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IResourceManager _res = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private IServerPreferencesManager _preferences = default!; + [Dependency] private IStatusHost _host = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private IWatchlistWebhookManager _watchlistWebhookManager = default!; + [Dependency] private JobWhitelistManager _job = default!; + [Dependency] private MultiServerKickManager _multiServerKick = default!; + [Dependency] private PlayTimeTrackingManager _playTimeTracking = default!; + [Dependency] private PlayerRateLimitManager _rateLimit = default!; + [Dependency] private RecipeManager _recipe = default!; + [Dependency] private RulesManager _rules = default!; + [Dependency] private ServerApi _serverApi = default!; + [Dependency] private ServerInfoManager _serverInfo = default!; + [Dependency] private ServerUpdateManager _updateManager = default!; + [Dependency] private ServerFeedbackManager _feedbackManager = null!; public override void PreInit() { diff --git a/Content.Server/Examine/ExamineSystem.cs b/Content.Server/Examine/ExamineSystem.cs index eb85f3ed237..77791e9260f 100644 --- a/Content.Server/Examine/ExamineSystem.cs +++ b/Content.Server/Examine/ExamineSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Examine { [UsedImplicitly] - public sealed class ExamineSystem : ExamineSystemShared + public sealed partial class ExamineSystem : ExamineSystemShared { - [Dependency] private readonly VerbSystem _verbSystem = default!; + [Dependency] private VerbSystem _verbSystem = default!; private readonly FormattedMessage _entityNotFoundMessage = new(); private readonly FormattedMessage _entityOutOfRangeMessage = new(); diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 117ab223e2a..5b5753adc31 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -36,28 +36,28 @@ namespace Content.Server.Explosion.EntitySystems; public sealed partial class ExplosionSystem : SharedExplosionSystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!; - [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!; - [Dependency] private readonly SharedCameraRecoilSystem _recoilSystem = default!; - [Dependency] private readonly ThrowingSystem _throwingSystem = default!; - [Dependency] private readonly PvsOverrideSystem _pvsSys = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly FlammableSystem _flammableSystem = default!; - [Dependency] private readonly DestructibleSystem _destructibleSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _timing = default!; + + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private NodeGroupSystem _nodeGroupSystem = default!; + [Dependency] private PathfindingSystem _pathfindingSystem = default!; + [Dependency] private SharedCameraRecoilSystem _recoilSystem = default!; + [Dependency] private ThrowingSystem _throwingSystem = default!; + [Dependency] private PvsOverrideSystem _pvsSys = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private FlammableSystem _flammableSystem = default!; + [Dependency] private DestructibleSystem _destructibleSystem = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; private EntityQuery _flammableQuery; private EntityQuery _physicsQuery; diff --git a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs index 485ac48a5d9..82c34e8bbba 100644 --- a/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ProjectileGrenadeSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Explosion.EntitySystems; -public sealed class ProjectileGrenadeSystem : EntitySystem +public sealed partial class ProjectileGrenadeSystem : EntitySystem { - [Dependency] private readonly GunSystem _gun = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; + [Dependency] private GunSystem _gun = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private TransformSystem _transformSystem = default!; public override void Initialize() diff --git a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs index f2fbd4069f8..b7ed9551a39 100644 --- a/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ScatteringGrenadeSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Explosion.EntitySystems; -public sealed class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem +public sealed partial class ScatteringGrenadeSystem : SharedScatteringGrenadeSystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ThrowingSystem _throwingSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly TriggerSystem _trigger = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ThrowingSystem _throwingSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private TriggerSystem _trigger = default!; public override void Initialize() { diff --git a/Content.Server/Fax/AdminUI/AdminFaxEui.cs b/Content.Server/Fax/AdminUI/AdminFaxEui.cs index c5c1c55a282..b1585d4b11d 100644 --- a/Content.Server/Fax/AdminUI/AdminFaxEui.cs +++ b/Content.Server/Fax/AdminUI/AdminFaxEui.cs @@ -9,9 +9,9 @@ namespace Content.Server.Fax.AdminUI; -public sealed class AdminFaxEui : BaseEui +public sealed partial class AdminFaxEui : BaseEui { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private readonly FaxSystem _faxSystem; private readonly FollowerSystem _followerSystem; diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs index fdc3985b703..000fe14f994 100644 --- a/Content.Server/Fax/FaxSystem.cs +++ b/Content.Server/Fax/FaxSystem.cs @@ -34,25 +34,25 @@ namespace Content.Server.Fax; -public sealed class FaxSystem : EntitySystem +public sealed partial class FaxSystem : EntitySystem { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedGameTicker _gameTicker = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly LabelSystem _labelSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly ToolSystem _toolSystem = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly FaxecuteSystem _faxecute = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedGameTicker _gameTicker = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private LabelSystem _labelSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private ToolSystem _toolSystem = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private FaxecuteSystem _faxecute = default!; + [Dependency] private EmagSystem _emag = default!; private static readonly ProtoId ScrewingQuality = "Screwing"; diff --git a/Content.Server/FeedbackSystem/FeedbackCommand.cs b/Content.Server/FeedbackSystem/FeedbackCommand.cs index 07cab9b47a0..ca73ad83123 100644 --- a/Content.Server/FeedbackSystem/FeedbackCommand.cs +++ b/Content.Server/FeedbackSystem/FeedbackCommand.cs @@ -12,9 +12,9 @@ namespace Content.Server.FeedbackSystem; /// [ToolshedCommand] [AdminCommand(AdminFlags.Debug)] -public sealed class FeedbackCommand : ToolshedCommand +public sealed partial class FeedbackCommand : ToolshedCommand { - [Dependency] private readonly ISharedFeedbackManager _feedback = null!; + [Dependency] private ISharedFeedbackManager _feedback = null!; [CommandImplementation("show")] public void ExecuteShow([CommandArgument] ICommonSession session) diff --git a/Content.Server/FeedbackSystem/FeedbackSystem.cs b/Content.Server/FeedbackSystem/FeedbackSystem.cs index 86aa94ecd3e..4d267dce30c 100644 --- a/Content.Server/FeedbackSystem/FeedbackSystem.cs +++ b/Content.Server/FeedbackSystem/FeedbackSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.FeedbackSystem; public sealed partial class FeedbackSystem : EntitySystem { - [Dependency] private readonly ServerFeedbackManager _feedbackManager = null!; - [Dependency] private readonly GameTicker _gameTicker = null!; - [Dependency] private readonly IPrototypeManager _prototypeManager = null!; + [Dependency] private ServerFeedbackManager _feedbackManager = null!; + [Dependency] private GameTicker _gameTicker = null!; + [Dependency] private IPrototypeManager _prototypeManager = null!; public override void Initialize() { diff --git a/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs b/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs index 46689f1d6d7..30084b2219b 100644 --- a/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs +++ b/Content.Server/FeedbackSystem/OpenFeedbackPopupCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.FeedbackSystem; /// [AnyCommand] [ToolshedCommand] -public sealed class OpenFeedbackPopupCommand : ToolshedCommand +public sealed partial class OpenFeedbackPopupCommand : ToolshedCommand { - [Dependency] private readonly ISharedFeedbackManager _feedback = null!; + [Dependency] private ISharedFeedbackManager _feedback = null!; [CommandImplementation] public void Execute(IInvocationContext context) diff --git a/Content.Server/FeedbackSystem/ServerFeedbackManager.cs b/Content.Server/FeedbackSystem/ServerFeedbackManager.cs index 9ba069fc26e..c58372d032e 100644 --- a/Content.Server/FeedbackSystem/ServerFeedbackManager.cs +++ b/Content.Server/FeedbackSystem/ServerFeedbackManager.cs @@ -5,9 +5,9 @@ namespace Content.Server.FeedbackSystem; /// -public sealed class ServerFeedbackManager : SharedFeedbackManager +public sealed partial class ServerFeedbackManager : SharedFeedbackManager { - [Dependency] private readonly ISharedPlayerManager _player = null!; + [Dependency] private ISharedPlayerManager _player = null!; public override void Initialize() { diff --git a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs index 1a664741541..0fe4c803a87 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleDebugDebugOverlaySystem.cs @@ -8,13 +8,13 @@ namespace Content.Server.Fluids.EntitySystems; -public sealed class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOverlaySystem +public sealed partial class PuddleDebugDebugOverlaySystem : SharedPuddleDebugOverlaySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; private readonly HashSet _playerObservers = []; private List> _grids = []; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index aca8c5383d6..50a315d9f01 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -28,14 +28,14 @@ namespace Content.Server.Fluids.EntitySystems; /// public sealed partial class PuddleSystem : SharedPuddleSystem { - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; private EntityQuery _puddleQuery; diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs index 9360c395a16..cb0235e7433 100644 --- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs +++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs @@ -28,21 +28,21 @@ namespace Content.Server.Fluids.EntitySystems; /// /// Handles non-atmos solution entities similar to puddles. /// -public sealed class SmokeSystem : EntitySystem +public sealed partial class SmokeSystem : EntitySystem { // If I could do it all again this could probably use a lot more of puddles. - [Dependency] private readonly IAdminLogManager _logger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly BloodstreamSystem _blood = default!; - [Dependency] private readonly InternalsSystem _internals = default!; - [Dependency] private readonly ReactiveSystem _reactive = default!; - [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private IAdminLogManager _logger = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private BloodstreamSystem _blood = default!; + [Dependency] private InternalsSystem _internals = default!; + [Dependency] private ReactiveSystem _reactive = default!; + [Dependency] private SharedBroadphaseSystem _broadphase = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; private EntityQuery _smokeQuery; private EntityQuery _smokeAffectedQuery; diff --git a/Content.Server/Fluids/EntitySystems/SpraySystem.cs b/Content.Server/Fluids/EntitySystems/SpraySystem.cs index 9a4b32ca141..f0e7e08d56a 100644 --- a/Content.Server/Fluids/EntitySystems/SpraySystem.cs +++ b/Content.Server/Fluids/EntitySystems/SpraySystem.cs @@ -22,20 +22,20 @@ namespace Content.Server.Fluids.EntitySystems; -public sealed class SpraySystem : SharedSpraySystem +public sealed partial class SpraySystem : SharedSpraySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly GravitySystem _gravity = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly VaporSystem _vapor = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ContainerSystem _container = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private GravitySystem _gravity = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private VaporSystem _vapor = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ContainerSystem _container = default!; private float _gridImpulseMultiplier; diff --git a/Content.Server/Fluids/ShowFluidsCommand.cs b/Content.Server/Fluids/ShowFluidsCommand.cs index 4c3fc58cf40..e981321dc26 100644 --- a/Content.Server/Fluids/ShowFluidsCommand.cs +++ b/Content.Server/Fluids/ShowFluidsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Fluids; [AdminCommand(AdminFlags.Debug)] -public sealed class ShowFluidsCommand : IConsoleCommand +public sealed partial class ShowFluidsCommand : IConsoleCommand { - [Dependency] private readonly IEntitySystemManager _entitySystem = default!; + [Dependency] private IEntitySystemManager _entitySystem = default!; public string Command => "showfluids"; public string Description => "Toggles seeing puddle debug overlay."; public string Help => $"Usage: {Command}"; diff --git a/Content.Server/Forensics/Systems/ForensicPadSystem.cs b/Content.Server/Forensics/Systems/ForensicPadSystem.cs index 8d804719fc9..1451a2b29b1 100644 --- a/Content.Server/Forensics/Systems/ForensicPadSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicPadSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.Forensics /// /// Used to transfer fingerprints from entities to forensic pads. /// - public sealed class ForensicPadSystem : EntitySystem + public sealed partial class ForensicPadSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly ForensicsSystem _forensics = default!; - [Dependency] private readonly LabelSystem _label = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private ForensicsSystem _forensics = default!; + [Dependency] private LabelSystem _label = default!; public override void Initialize() { diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs index 72d289df0d6..50e31fa2d3c 100644 --- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs @@ -18,18 +18,18 @@ namespace Content.Server.Forensics { - public sealed class ForensicScannerSystem : EntitySystem + public sealed partial class ForensicScannerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly PaperSystem _paperSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly ForensicsSystem _forensicsSystem = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private PaperSystem _paperSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private ForensicsSystem _forensicsSystem = default!; + [Dependency] private TagSystem _tag = default!; private static readonly ProtoId DNASolutionScannableTag = "DNASolutionScannable"; diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs index 1f41277c416..07ea9cb773c 100644 --- a/Content.Server/Forensics/Systems/ForensicsSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs @@ -27,15 +27,15 @@ namespace Content.Server.Forensics { - public sealed class ForensicsSystem : SharedForensicsSystem + public sealed partial class ForensicsSystem : SharedForensicsSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private DoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Commands/DelayStartCommand.cs b/Content.Server/GameTicking/Commands/DelayStartCommand.cs index af5a097dbb5..9bfa8a677a9 100644 --- a/Content.Server/GameTicking/Commands/DelayStartCommand.cs +++ b/Content.Server/GameTicking/Commands/DelayStartCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.GameTicking.Commands; [AdminCommand(AdminFlags.Round)] -public sealed class DelayStartCommand : LocalizedEntityCommands +public sealed partial class DelayStartCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "delaystart"; diff --git a/Content.Server/GameTicking/Commands/EndRoundCommand.cs b/Content.Server/GameTicking/Commands/EndRoundCommand.cs index 543ce7e739e..aa2b4740058 100644 --- a/Content.Server/GameTicking/Commands/EndRoundCommand.cs +++ b/Content.Server/GameTicking/Commands/EndRoundCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.GameTicking.Commands; [AdminCommand(AdminFlags.Round)] -public sealed class EndRoundCommand : LocalizedEntityCommands +public sealed partial class EndRoundCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "endround"; diff --git a/Content.Server/GameTicking/Commands/ForceMapCommand.cs b/Content.Server/GameTicking/Commands/ForceMapCommand.cs index cd6f03fa152..305d74e3fb1 100644 --- a/Content.Server/GameTicking/Commands/ForceMapCommand.cs +++ b/Content.Server/GameTicking/Commands/ForceMapCommand.cs @@ -11,11 +11,11 @@ namespace Content.Server.GameTicking.Commands { [AdminCommand(AdminFlags.Round)] - public sealed class ForceMapCommand : LocalizedCommands + public sealed partial class ForceMapCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IGameMapManager _gameMapManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IGameMapManager _gameMapManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override string Command => "forcemap"; diff --git a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs index 85428eff591..da844b109ae 100644 --- a/Content.Server/GameTicking/Commands/ForcePresetCommand.cs +++ b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.GameTicking.Commands { [AdminCommand(AdminFlags.Round)] - public sealed class ForcePresetCommand : LocalizedEntityCommands + public sealed partial class ForcePresetCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private GameTicker _ticker = default!; public override string Command => "forcepreset"; diff --git a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs index 9dedd65714d..4258b2b25ff 100644 --- a/Content.Server/GameTicking/Commands/GoLobbyCommand.cs +++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs @@ -8,10 +8,10 @@ namespace Content.Server.GameTicking.Commands { [AdminCommand(AdminFlags.Round)] - public sealed class GoLobbyCommand : LocalizedEntityCommands + public sealed partial class GoLobbyCommand : LocalizedEntityCommands { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "golobby"; diff --git a/Content.Server/GameTicking/Commands/ObserveCommand.cs b/Content.Server/GameTicking/Commands/ObserveCommand.cs index e13d70b972d..45d911887d3 100644 --- a/Content.Server/GameTicking/Commands/ObserveCommand.cs +++ b/Content.Server/GameTicking/Commands/ObserveCommand.cs @@ -6,10 +6,10 @@ namespace Content.Server.GameTicking.Commands { [AnyCommand] - sealed class ObserveCommand : IConsoleCommand + sealed partial class ObserveCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IEntityManager _e = default!; + [Dependency] private IAdminManager _adminManager = default!; public string Command => "observe"; public string Description => ""; diff --git a/Content.Server/GameTicking/Commands/RespawnCommand.cs b/Content.Server/GameTicking/Commands/RespawnCommand.cs index d8734f7a059..72b7bfe50f1 100644 --- a/Content.Server/GameTicking/Commands/RespawnCommand.cs +++ b/Content.Server/GameTicking/Commands/RespawnCommand.cs @@ -8,12 +8,12 @@ namespace Content.Server.GameTicking.Commands { - sealed class RespawnCommand : LocalizedEntityCommands + sealed partial class RespawnCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly MindSystem _mind = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private MindSystem _mind = default!; public override string Command => "respawn"; diff --git a/Content.Server/GameTicking/Commands/RestartRoundCommand.cs b/Content.Server/GameTicking/Commands/RestartRoundCommand.cs index 6811df4e2e4..cd9c77ce0cb 100644 --- a/Content.Server/GameTicking/Commands/RestartRoundCommand.cs +++ b/Content.Server/GameTicking/Commands/RestartRoundCommand.cs @@ -6,10 +6,10 @@ namespace Content.Server.GameTicking.Commands; [AdminCommand(AdminFlags.Round)] -public sealed class RestartRoundCommand : LocalizedEntityCommands +public sealed partial class RestartRoundCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; public override string Command => "restartround"; @@ -26,9 +26,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Round)] -public sealed class RestartRoundNowCommand : LocalizedEntityCommands +public sealed partial class RestartRoundNowCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "restartroundnow"; diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs index a1b0d80ca94..cb32ce8a0f2 100644 --- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs +++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.GameTicking.Commands { [AdminCommand(AdminFlags.Round)] - public sealed class SetGamePresetCommand : IConsoleCommand + public sealed partial class SetGamePresetCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entity = default!; + [Dependency] private IEntityManager _entity = default!; public string Command => "setgamepreset"; public string Description => Loc.GetString("set-game-preset-command-description", ("command", Command)); diff --git a/Content.Server/GameTicking/Commands/StartRoundCommand.cs b/Content.Server/GameTicking/Commands/StartRoundCommand.cs index b23034be679..c9c52211806 100644 --- a/Content.Server/GameTicking/Commands/StartRoundCommand.cs +++ b/Content.Server/GameTicking/Commands/StartRoundCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.GameTicking.Commands; [AdminCommand(AdminFlags.Round)] -public sealed class StartRoundCommand : LocalizedEntityCommands +public sealed partial class StartRoundCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "startround"; diff --git a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs index 5eca38d65f0..1a8291882f6 100644 --- a/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs +++ b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.GameTicking.Commands { [AdminCommand(AdminFlags.Round)] - public sealed class ToggleDisallowLateJoinCommand : LocalizedCommands + public sealed partial class ToggleDisallowLateJoinCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; public override string Command => "toggledisallowlatejoin"; diff --git a/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs b/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs index 3debf377784..b990e92ca71 100644 --- a/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs +++ b/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs @@ -4,9 +4,9 @@ namespace Content.Server.GameTicking.Commands; [AnyCommand] -public sealed class ToggleReadyCommand : LocalizedEntityCommands +public sealed partial class ToggleReadyCommand : LocalizedEntityCommands { - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private GameTicker _gameTicker = default!; public override string Command => "toggleready"; diff --git a/Content.Server/GameTicking/GameTicker.GameRule.cs b/Content.Server/GameTicking/GameTicker.GameRule.cs index f0b22dc1e53..d586197cd4d 100644 --- a/Content.Server/GameTicking/GameTicker.GameRule.cs +++ b/Content.Server/GameTicking/GameTicker.GameRule.cs @@ -17,7 +17,7 @@ public sealed partial class GameTicker { [ViewVariables] private readonly List<(TimeSpan, string)> _allPreviousGameRules = new(); - [Dependency] private readonly EntityWhitelistSystem _whitelist = null!; + [Dependency] private EntityWhitelistSystem _whitelist = null!; /// /// A list storing the start times of all game rules that have been started this round. diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs index 80a0b9a5f69..4f35f13151e 100644 --- a/Content.Server/GameTicking/GameTicker.Player.cs +++ b/Content.Server/GameTicking/GameTicker.Player.cs @@ -19,7 +19,7 @@ namespace Content.Server.GameTicking [UsedImplicitly] public sealed partial class GameTicker { - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; private void InitializePlayer() { _playerManager.PlayerStatusChanged += PlayerStatusChanged; diff --git a/Content.Server/GameTicking/GameTicker.Replays.cs b/Content.Server/GameTicking/GameTicker.Replays.cs index 065b7368970..0bf7d93a068 100644 --- a/Content.Server/GameTicking/GameTicker.Replays.cs +++ b/Content.Server/GameTicking/GameTicker.Replays.cs @@ -11,9 +11,9 @@ namespace Content.Server.GameTicking; public sealed partial class GameTicker { - [Dependency] private readonly IReplayRecordingManager _replays = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly ISerializationManager _serialman = default!; + [Dependency] private IReplayRecordingManager _replays = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private ISerializationManager _serialman = default!; private ISawmill _sawmillReplays = default!; diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index f08905d2324..72ca3c50d37 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -35,9 +35,9 @@ namespace Content.Server.GameTicking { public sealed partial class GameTicker { - [Dependency] private readonly DiscordWebhook _discord = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly ITaskManager _taskManager = default!; + [Dependency] private DiscordWebhook _discord = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private ITaskManager _taskManager = default!; private static readonly Counter RoundNumberMetric = Metrics.CreateCounter( "ss14_round_number", @@ -440,100 +440,100 @@ public void StartRound(bool force = false) try { #endif - // If this game ticker is a dummy or the round is already being started, do nothing! - if (DummyTicker || _startingRound) - return; + // If this game ticker is a dummy or the round is already being started, do nothing! + if (DummyTicker || _startingRound) + return; - _startingRound = true; + _startingRound = true; - if (RoundId == 0) - IncrementRoundNumber(); + if (RoundId == 0) + IncrementRoundNumber(); - ReplayStartRound(); + ReplayStartRound(); - DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby); - _sawmill.Info("Starting round!"); + DebugTools.Assert(RunLevel == GameRunLevel.PreRoundLobby); + _sawmill.Info("Starting round!"); - SendServerMessage(Loc.GetString("game-ticker-start-round")); + SendServerMessage(Loc.GetString("game-ticker-start-round")); - var readyPlayers = new List(); - var readyPlayerProfiles = new Dictionary(); - var autoDeAdmin = _cfg.GetCVar(CCVars.AdminDeadminOnJoin); - foreach (var (userId, status) in _playerGameStatuses) - { - if (LobbyEnabled && status != PlayerGameStatus.ReadyToPlay) continue; - if (!_playerManager.TryGetSessionById(userId, out var session)) continue; + var readyPlayers = new List(); + var readyPlayerProfiles = new Dictionary(); + var autoDeAdmin = _cfg.GetCVar(CCVars.AdminDeadminOnJoin); + foreach (var (userId, status) in _playerGameStatuses) + { + if (LobbyEnabled && status != PlayerGameStatus.ReadyToPlay) continue; + if (!_playerManager.TryGetSessionById(userId, out var session)) continue; - if (autoDeAdmin && _adminManager.IsAdmin(session)) - { - _adminManager.DeAdmin(session); - } + if (autoDeAdmin && _adminManager.IsAdmin(session)) + { + _adminManager.DeAdmin(session); + } #if DEBUG DebugTools.Assert(_userDb.IsLoadComplete(session), $"Player was readied up but didn't have user DB data loaded yet??"); #endif - readyPlayers.Add(session); - HumanoidCharacterProfile? profile; - if (_prefsManager.TryGetCachedPreferences(userId, out var preferences)) - { - profile = preferences.SelectedCharacter as HumanoidCharacterProfile; - } - else - { - var speciesToBlacklist = - new HashSet(_cfg.GetCVar(CCVars.ICNewAccountSpeciesBlacklist).Split(",")); - profile = HumanoidCharacterProfile.Random(speciesToBlacklist); - } - readyPlayerProfiles.Add(userId, profile!); + readyPlayers.Add(session); + HumanoidCharacterProfile? profile; + if (_prefsManager.TryGetCachedPreferences(userId, out var preferences)) + { + profile = preferences.SelectedCharacter as HumanoidCharacterProfile; + } + else + { + var speciesToBlacklist = + new HashSet(_cfg.GetCVar(CCVars.ICNewAccountSpeciesBlacklist).Split(",")); + profile = HumanoidCharacterProfile.Random(speciesToBlacklist); } + readyPlayerProfiles.Add(userId, profile!); + } - DebugTools.AssertEqual(readyPlayers.Count, ReadyPlayerCount()); + DebugTools.AssertEqual(readyPlayers.Count, ReadyPlayerCount()); - // Just in case it hasn't been loaded previously we'll try loading it. - LoadMaps(); + // Just in case it hasn't been loaded previously we'll try loading it. + LoadMaps(); - // map has been selected so update the lobby info text - // applies to players who didn't ready up - UpdateInfoText(); + // map has been selected so update the lobby info text + // applies to players who didn't ready up + UpdateInfoText(); - StartGamePresetRules(); + StartGamePresetRules(); - RoundLengthMetric.Set(0); + RoundLengthMetric.Set(0); - var startingEvent = new RoundStartingEvent(RoundId); - RaiseLocalEvent(startingEvent); + var startingEvent = new RoundStartingEvent(RoundId); + RaiseLocalEvent(startingEvent); - var origReadyPlayers = readyPlayers.ToArray(); + var origReadyPlayers = readyPlayers.ToArray(); - if (!StartPreset(origReadyPlayers, force)) - { - _startingRound = false; - return; - } - var skipinit = false; - if (_ent.TryGetComponent(_map.GetMap(DefaultMap), out MapComponent? mc)) - { - if (mc.MapInitialized) skipinit = true; - } - if (!skipinit) - { - // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards... - _map.InitializeMap(DefaultMap); - } - _map.SetPaused(DefaultMap, false); + if (!StartPreset(origReadyPlayers, force)) + { + _startingRound = false; + return; + } + var skipinit = false; + if (_ent.TryGetComponent(_map.GetMap(DefaultMap), out MapComponent? mc)) + { + if (mc.MapInitialized) skipinit = true; + } + if (!skipinit) + { + // MapInitialize *before* spawning players, our codebase is too shit to do it afterwards... + _map.InitializeMap(DefaultMap); + } + _map.SetPaused(DefaultMap, false); - SpawnPlayers(readyPlayers, readyPlayerProfiles, force); + SpawnPlayers(readyPlayers, readyPlayerProfiles, force); - _roundStartDateTime = DateTime.UtcNow; - RunLevel = GameRunLevel.InRound; + _roundStartDateTime = DateTime.UtcNow; + RunLevel = GameRunLevel.InRound; - RoundStartTimeSpan = _gameTiming.CurTime; - SendStatusToAll(); - ReqWindowAttentionAll(); - UpdateLateJoinStatus(); - AnnounceRound(); - UpdateInfoText(); - SendRoundStartedDiscordMessage(); + RoundStartTimeSpan = _gameTiming.CurTime; + SendStatusToAll(); + ReqWindowAttentionAll(); + UpdateLateJoinStatus(); + AnnounceRound(); + UpdateInfoText(); + SendRoundStartedDiscordMessage(); #if EXCEPTION_TOLERANCE } @@ -856,7 +856,7 @@ public bool DelayStart(TimeSpan time) } private void UpdateRoundFlow(float frameTime) { - + if (_cfg.GetCVar(CCVars.AutoSaveEnabled) && RunLevel == GameRunLevel.InRound) { RoundLengthMetric.Inc(frameTime); diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index 23dc5405180..52c4b68da80 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -39,14 +39,14 @@ namespace Content.Server.GameTicking { public sealed partial class GameTicker { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly SharedJobSystem _jobs = default!; - [Dependency] private readonly AdminSystem _admin = default!; - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly BankSystem _bankSystem = default!; - [Dependency] private readonly CrewMetaRecordsSystem _crewMetaRecords = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private SharedJobSystem _jobs = default!; + [Dependency] private AdminSystem _admin = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private BankSystem _bankSystem = default!; + [Dependency] private CrewMetaRecordsSystem _crewMetaRecords = default!; + [Dependency] private StationSystem _stationSystem = default!; public static readonly EntProtoId ObserverPrototypeName = "MobObserver"; public static readonly EntProtoId AdminObserverPrototypeName = "AdminObserver"; diff --git a/Content.Server/GameTicking/GameTicker.StatusShell.cs b/Content.Server/GameTicking/GameTicker.StatusShell.cs index 64cd411c83a..3fe63307177 100644 --- a/Content.Server/GameTicking/GameTicker.StatusShell.cs +++ b/Content.Server/GameTicking/GameTicker.StatusShell.cs @@ -23,11 +23,11 @@ public sealed partial class GameTicker /// /// For access to CVars in status responses. /// - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; /// /// For access to the round ID in status responses. /// - [Dependency] private readonly SharedGameTicker _gameTicker = default!; + [Dependency] private SharedGameTicker _gameTicker = default!; private void InitializeStatusShell() { diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs index e21576b8809..f9a8c4438cd 100644 --- a/Content.Server/GameTicking/GameTicker.cs +++ b/Content.Server/GameTicking/GameTicker.cs @@ -32,38 +32,38 @@ namespace Content.Server.GameTicking { public sealed partial class GameTicker : SharedGameTicker { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IBanManager _banManager = default!; - [Dependency] private readonly IBaseServer _baseServer = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IConsoleHost _consoleHost = default!; - [Dependency] private readonly IGameMapManager _gameMapManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IBanManager _banManager = default!; + [Dependency] private IBaseServer _baseServer = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IConsoleHost _consoleHost = default!; + [Dependency] private IGameMapManager _gameMapManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _robustRandom = default!; #if EXCEPTION_TOLERANCE - [Dependency] private readonly IRuntimeLog _runtimeLog = default!; + [Dependency] private IRuntimeLog _runtimeLog = default!; #endif - [Dependency] private readonly IServerPreferencesManager _prefsManager = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly GhostSystem _ghost = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly PlayTimeTrackingSystem _playTimeTrackings = default!; - [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!; - [Dependency] private readonly ServerUpdateManager _serverUpdates = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StationJobsSystem _stationJobs = default!; - [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UserDbDataManager _userDb = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly ServerDbEntryManager _dbEntryManager = default!; + [Dependency] private IServerPreferencesManager _prefsManager = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private GhostSystem _ghost = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private PlayTimeTrackingSystem _playTimeTrackings = default!; + [Dependency] private PvsOverrideSystem _pvsOverride = default!; + [Dependency] private ServerUpdateManager _serverUpdates = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StationJobsSystem _stationJobs = default!; + [Dependency] private StationSpawningSystem _stationSpawning = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UserDbDataManager _userDb = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private ServerDbEntryManager _dbEntryManager = default!; [ViewVariables] private bool _initialized; [ViewVariables] private bool _postInitialized; diff --git a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs index a8e402758ec..52e49c31b86 100644 --- a/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/AntagLoadProfileRuleSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.GameTicking.Rules; -public sealed class AntagLoadProfileRuleSystem : GameRuleSystem +public sealed partial class AntagLoadProfileRuleSystem : GameRuleSystem { - [Dependency] private readonly HumanoidProfileSystem _humanoidProfile = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IServerPreferencesManager _prefs = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private HumanoidProfileSystem _humanoidProfile = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IServerPreferencesManager _prefs = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs index 941a6b6172d..513e3b0e4da 100644 --- a/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/DeathMatchRuleSystem.cs @@ -19,16 +19,16 @@ namespace Content.Server.GameTicking.Rules; /// /// Manages /// -public sealed class DeathMatchRuleSystem : GameRuleSystem +public sealed partial class DeathMatchRuleSystem : GameRuleSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly OutfitSystem _outfitSystem = default!; - [Dependency] private readonly PointSystem _point = default!; - [Dependency] private readonly RespawnRuleSystem _respawn = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; - [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private OutfitSystem _outfitSystem = default!; + [Dependency] private PointSystem _point = default!; + [Dependency] private RespawnRuleSystem _respawn = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; + [Dependency] private StationSpawningSystem _stationSpawning = default!; + [Dependency] private TransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/DragonRuleSystem.cs b/Content.Server/GameTicking/Rules/DragonRuleSystem.cs index af9f6cc9087..73d9a5424e7 100644 --- a/Content.Server/GameTicking/Rules/DragonRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/DragonRuleSystem.cs @@ -9,13 +9,13 @@ namespace Content.Server.GameTicking.Rules; -public sealed class DragonRuleSystem : GameRuleSystem +public sealed partial class DragonRuleSystem : GameRuleSystem { - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly RoleSystem _roleSystem = default!; - [Dependency] private readonly MindSystem _mind = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private RoleSystem _roleSystem = default!; + [Dependency] private MindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs b/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs index 07f02a570bb..b6a847cca64 100644 --- a/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/DynamicRuleSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.GameTicking.Rules; -public sealed class DynamicRuleSystem : GameRuleSystem +public sealed partial class DynamicRuleSystem : GameRuleSystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Added(EntityUid uid, DynamicRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/GameTicking/Rules/GameRuleSystem.cs b/Content.Server/GameTicking/Rules/GameRuleSystem.cs index 6b4240dd7ff..a02b50004ce 100644 --- a/Content.Server/GameTicking/Rules/GameRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/GameRuleSystem.cs @@ -9,14 +9,14 @@ namespace Content.Server.GameTicking.Rules; public abstract partial class GameRuleSystem : EntitySystem where T : IComponent { - [Dependency] protected readonly IRobustRandom RobustRandom = default!; - [Dependency] protected readonly IChatManager ChatManager = default!; - [Dependency] protected readonly GameTicker GameTicker = default!; - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IRobustRandom RobustRandom = default!; + [Dependency] protected IChatManager ChatManager = default!; + [Dependency] protected GameTicker GameTicker = default!; + [Dependency] protected IGameTiming Timing = default!; // Not protected, just to be used in utility methods - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly MapSystem _map = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private MapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs index 6b9a79be748..7f2e38d60bb 100644 --- a/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/InactivityTimeRestartRuleSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.GameTicking.Rules; -public sealed class InactivityTimeRestartRuleSystem : GameRuleSystem +public sealed partial class InactivityTimeRestartRuleSystem : GameRuleSystem { - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs index c22ddaef965..9e3a18d69f7 100644 --- a/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/KillCalloutRuleSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.GameTicking.Rules; /// /// This handles calling out kills from /// -public sealed class KillCalloutRuleSystem : GameRuleSystem +public sealed partial class KillCalloutRuleSystem : GameRuleSystem { - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IRobustRandom _random = default!; /// public override void Initialize() diff --git a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs index 5cc403fc977..ff4247bde61 100644 --- a/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/LoadMapRuleSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.GameTicking.Rules; -public sealed class LoadMapRuleSystem : StationEventSystem +public sealed partial class LoadMapRuleSystem : StationEventSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly MapSystem _map = default!; - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly GridPreloaderSystem _gridPreloader = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private GridPreloaderSystem _gridPreloader = default!; protected override void Added(EntityUid uid, LoadMapRuleComponent comp, GameRuleComponent rule, GameRuleAddedEvent args) { diff --git a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs index 16523c4d6a4..a79aa61a6fd 100644 --- a/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/MaxTimeRestartRuleSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.GameTicking.Rules; -public sealed class MaxTimeRestartRuleSystem : GameRuleSystem +public sealed partial class MaxTimeRestartRuleSystem : GameRuleSystem { - [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private IChatManager _chatManager = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index b6a9ea01e35..711ccd89366 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -31,15 +31,15 @@ namespace Content.Server.GameTicking.Rules; -public sealed class NukeopsRuleSystem : GameRuleSystem +public sealed partial class NukeopsRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly EmergencyShuttleSystem _emergency = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly RoundEndSystem _roundEndSystem = default!; - [Dependency] private readonly StoreSystem _store = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private EmergencyShuttleSystem _emergency = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private RoundEndSystem _roundEndSystem = default!; + [Dependency] private StoreSystem _store = default!; + [Dependency] private TagSystem _tag = default!; private static readonly ProtoId TelecrystalCurrencyPrototype = "Telecrystal"; private static readonly ProtoId NukeOpsUplinkTagPrototype = "NukeOpsUplink"; diff --git a/Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs b/Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs index ab8864caaa7..9714b02a049 100644 --- a/Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ParadoxCloneRuleSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.GameTicking.Rules; -public sealed class ParadoxCloneRuleSystem : GameRuleSystem +public sealed partial class ParadoxCloneRuleSystem : GameRuleSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly CloningSystem _cloning = default!; - [Dependency] private readonly SuitSensorSystem _sensor = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private CloningSystem _cloning = default!; + [Dependency] private SuitSensorSystem _sensor = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs index c0589b3f5a0..8c271b8560e 100644 --- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs @@ -18,12 +18,12 @@ namespace Content.Server.GameTicking.Rules; /// /// This handles logic and interactions related to /// -public sealed class RespawnRuleSystem : GameRuleSystem +public sealed partial class RespawnRuleSystem : GameRuleSystem { - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private StationSystem _station = default!; /// public override void Initialize() diff --git a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs index 4d494d2f45f..fb81fad04c9 100644 --- a/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs @@ -36,22 +36,22 @@ namespace Content.Server.GameTicking.Rules; /// /// Where all the main stuff for Revolutionaries happens (Assigning Head Revs, Command on station, and checking for the game to end.) /// -public sealed class RevolutionaryRuleSystem : GameRuleSystem +public sealed partial class RevolutionaryRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly EuiManager _euiMan = default!; - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private EuiManager _euiMan = default!; + [Dependency] private IAdminLogManager _adminLogManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private StationSystem _stationSystem = default!; //Used in OnPostFlash, no reference to the rule component is available public readonly ProtoId RevolutionaryNpcFaction = "Revolutionary"; diff --git a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs index e68510ea637..7e57cbc21c6 100644 --- a/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/RoundstartStationVariationRuleSystem.cs @@ -10,9 +10,9 @@ namespace Content.Server.GameTicking.Rules; /// -public sealed class RoundstartStationVariationRuleSystem : GameRuleSystem +public sealed partial class RoundstartStationVariationRuleSystem : GameRuleSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/RuleGridsSystem.cs b/Content.Server/GameTicking/Rules/RuleGridsSystem.cs index 365be94aaa9..bd50cc06fc5 100644 --- a/Content.Server/GameTicking/Rules/RuleGridsSystem.cs +++ b/Content.Server/GameTicking/Rules/RuleGridsSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.GameTicking.Rules; /// /// Handles storing grids from and antags spawning on their spawners. /// -public sealed class RuleGridsSystem : GameRuleSystem +public sealed partial class RuleGridsSystem : GameRuleSystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs index 23e9ee5a7d2..88e9686402e 100644 --- a/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/SandboxRuleSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.GameTicking.Rules; -public sealed class SandboxRuleSystem : GameRuleSystem +public sealed partial class SandboxRuleSystem : GameRuleSystem { - [Dependency] private readonly SandboxSystem _sandbox = default!; + [Dependency] private SandboxSystem _sandbox = default!; protected override void Started(EntityUid uid, SandboxRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs index 7192b5c9f92..d6e2a4a6c23 100644 --- a/Content.Server/GameTicking/Rules/SecretRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/SecretRuleSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.GameTicking.Rules; -public sealed class SecretRuleSystem : GameRuleSystem +public sealed partial class SecretRuleSystem : GameRuleSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; private string _ruleCompName = default!; diff --git a/Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs b/Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs index 046ecedad69..e86eef43f38 100644 --- a/Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/SurvivorRuleSystem.cs @@ -14,15 +14,15 @@ namespace Content.Server.GameTicking.Rules; -public sealed class SurvivorRuleSystem : GameRuleSystem +public sealed partial class SurvivorRuleSystem : GameRuleSystem { - [Dependency] private readonly RoleSystem _role = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly TransformSystem _xform = default!; - [Dependency] private readonly EmergencyShuttleSystem _eShuttle = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private RoleSystem _role = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private TransformSystem _xform = default!; + [Dependency] private EmergencyShuttleSystem _eShuttle = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private MobStateSystem _mobState = default!; private static readonly ProtoId InvalidForSurvivorAntagTag = "InvalidForSurvivorAntag"; diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs index 00ad6e8934d..d6239449a25 100644 --- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.GameTicking.Rules; -public sealed class ThiefRuleSystem : GameRuleSystem +public sealed partial class ThiefRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; + [Dependency] private AntagSelectionSystem _antag = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index 0b58f3c2067..4e1082b6cba 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -21,20 +21,20 @@ namespace Content.Server.GameTicking.Rules; -public sealed class TraitorRuleSystem : GameRuleSystem +public sealed partial class TraitorRuleSystem : GameRuleSystem { private static readonly Color TraitorCodewordColor = Color.FromHex("#cc3b3b"); - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly SharedJobSystem _jobs = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedRoleCodewordSystem _roleCodewordSystem = default!; - [Dependency] private readonly SharedRoleSystem _roleSystem = default!; - [Dependency] private readonly UplinkSystem _uplink = default!; - [Dependency] private readonly CodewordSystem _codewordSystem = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private SharedJobSystem _jobs = default!; + [Dependency] private MindSystem _mindSystem = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedRoleCodewordSystem _roleCodewordSystem = default!; + [Dependency] private SharedRoleSystem _roleSystem = default!; + [Dependency] private UplinkSystem _uplink = default!; + [Dependency] private CodewordSystem _codewordSystem = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs index c9712b65e20..62fd12a6e31 100644 --- a/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs +++ b/Content.Server/GameTicking/Rules/VariationPass/CutWireVariationPassSystem.cs @@ -10,9 +10,9 @@ namespace Content.Server.GameTicking.Rules.VariationPass; /// This system identifies target devices and adds to them. /// The actual wire cutting is handled by . /// -public sealed class CutWireVariationPassSystem : VariationPassSystem +public sealed partial class CutWireVariationPassSystem : VariationPassSystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; protected override void ApplyVariation(Entity ent, ref StationVariationPassEvent args) { diff --git a/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs index 98a355effdd..8d470606857 100644 --- a/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs +++ b/Content.Server/GameTicking/Rules/VariationPass/PoweredLightVariationPassSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.GameTicking.Rules.VariationPass; /// -public sealed class PoweredLightVariationPassSystem : VariationPassSystem +public sealed partial class PoweredLightVariationPassSystem : VariationPassSystem { - [Dependency] private readonly PoweredLightSystem _poweredLight = default!; + [Dependency] private PoweredLightSystem _poweredLight = default!; protected override void ApplyVariation(Entity ent, ref StationVariationPassEvent args) { diff --git a/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs index 898604312a5..2dbbae5e336 100644 --- a/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs +++ b/Content.Server/GameTicking/Rules/VariationPass/PuddleMessVariationPassSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.GameTicking.Rules.VariationPass; /// -public sealed class PuddleMessVariationPassSystem : VariationPassSystem +public sealed partial class PuddleMessVariationPassSystem : VariationPassSystem { - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private IPrototypeManager _proto = default!; protected override void ApplyVariation(Entity ent, ref StationVariationPassEvent args) { diff --git a/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs b/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs index d1c8088a765..04294f3418e 100644 --- a/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs +++ b/Content.Server/GameTicking/Rules/VariationPass/VariationPassSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.GameTicking.Rules.VariationPass; /// Base class for procedural variation rule passes, which apply some kind of variation to a station, /// so we simply reduce the boilerplate for the event handling a bit with this. /// -public abstract class VariationPassSystem : GameRuleSystem +public abstract partial class VariationPassSystem : GameRuleSystem where T : IComponent { - [Dependency] protected readonly StationSystem Stations = default!; - [Dependency] protected readonly IRobustRandom Random = default!; + [Dependency] protected StationSystem Stations = default!; + [Dependency] protected IRobustRandom Random = default!; public override void Initialize() { diff --git a/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs b/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs index cd8c193f510..db9c9f186a7 100644 --- a/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/XenoborgsRuleSystem.cs @@ -11,15 +11,15 @@ namespace Content.Server.GameTicking.Rules; -public sealed class XenoborgsRuleSystem : GameRuleSystem +public sealed partial class XenoborgsRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private IGameTiming _timing = default!; private static readonly Color AnnouncmentColor = Color.Gold; diff --git a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs index df78effa2e7..cfa19702996 100644 --- a/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ZombieRuleSystem.cs @@ -21,19 +21,19 @@ namespace Content.Server.GameTicking.Rules; -public sealed class ZombieRuleSystem : GameRuleSystem +public sealed partial class ZombieRuleSystem : GameRuleSystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly ZombieSystem _zombie = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private ZombieSystem _zombie = default!; public override void Initialize() { diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs index 3f0a3e3c380..d05a594f203 100644 --- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs +++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs @@ -21,20 +21,20 @@ namespace Content.Server.Gateway.Systems; /// /// Generates gateway destinations regularly and indefinitely that can be chosen from. /// -public sealed class GatewayGeneratorSystem : EntitySystem +public sealed partial class GatewayGeneratorSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - [Dependency] private readonly BiomeSystem _biome = default!; - [Dependency] private readonly DungeonSystem _dungeon = default!; - [Dependency] private readonly GatewaySystem _gateway = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedSalvageSystem _salvage = default!; - [Dependency] private readonly TileSystem _tile = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; + [Dependency] private BiomeSystem _biome = default!; + [Dependency] private DungeonSystem _dungeon = default!; + [Dependency] private GatewaySystem _gateway = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedSalvageSystem _salvage = default!; + [Dependency] private TileSystem _tile = default!; private static readonly ProtoId PlanetNames = "NamesBorer"; private static readonly ProtoId BiomeTemplate = "Continental"; diff --git a/Content.Server/Gateway/Systems/GatewaySystem.cs b/Content.Server/Gateway/Systems/GatewaySystem.cs index 1505175ae9a..6f453ad469d 100644 --- a/Content.Server/Gateway/Systems/GatewaySystem.cs +++ b/Content.Server/Gateway/Systems/GatewaySystem.cs @@ -13,17 +13,17 @@ namespace Content.Server.Gateway.Systems; -public sealed class GatewaySystem : EntitySystem +public sealed partial class GatewaySystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly LinkedEntitySystem _linkedEntity = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly StationSystem _stations = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private LinkedEntitySystem _linkedEntity = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private StationSystem _stations = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/Gatherable/GatherableSystem.cs b/Content.Server/Gatherable/GatherableSystem.cs index 7563abcc0d1..3ecfd1d45a1 100644 --- a/Content.Server/Gatherable/GatherableSystem.cs +++ b/Content.Server/Gatherable/GatherableSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Gatherable; public sealed partial class GatherableSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityTableSystem _entityTable = default!; public override void Initialize() { diff --git a/Content.Server/Ghost/GhostCommand.cs b/Content.Server/Ghost/GhostCommand.cs index f5aa58a4f24..4964aa1ca99 100644 --- a/Content.Server/Ghost/GhostCommand.cs +++ b/Content.Server/Ghost/GhostCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Ghost { [AnyCommand] - public sealed class GhostCommand : IConsoleCommand + public sealed partial class GhostCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "ghost"; public string Description => Loc.GetString("ghost-command-description"); diff --git a/Content.Server/Ghost/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs index e540521fea0..f6ad2b3a02f 100644 --- a/Content.Server/Ghost/GhostSystem.cs +++ b/Content.Server/Ghost/GhostSystem.cs @@ -42,34 +42,34 @@ namespace Content.Server.Ghost { - public sealed class GhostSystem : SharedGhostSystem + public sealed partial class GhostSystem : SharedGhostSystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; - [Dependency] private readonly FollowerSystem _followerSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly JobSystem _jobs = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly MindSystem _minds = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly GhostSpriteStateSystem _ghostState = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private SharedEyeSystem _eye = default!; + [Dependency] private FollowerSystem _followerSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private JobSystem _jobs = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private MindSystem _minds = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private VisibilitySystem _visibilitySystem = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private NameModifierSystem _nameMod = default!; + [Dependency] private GhostSpriteStateSystem _ghostState = default!; private EntityQuery _ghostQuery; private EntityQuery _physicsQuery; diff --git a/Content.Server/Ghost/Roles/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs index e8a7fda3323..c648247fa01 100644 --- a/Content.Server/Ghost/Roles/GhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs @@ -39,22 +39,22 @@ namespace Content.Server.Ghost.Roles; [UsedImplicitly] -public sealed class GhostRoleSystem : EntitySystem +public sealed partial class GhostRoleSystem : EntitySystem { - [Dependency] private readonly IBanManager _ban = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IEntityManager _ent = default!; - [Dependency] private readonly EuiManager _euiManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly FollowerSystem _followerSystem = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly SharedRoleSystem _roleSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IBanManager _ban = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IEntityManager _ent = default!; + [Dependency] private EuiManager _euiManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private FollowerSystem _followerSystem = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private SharedRoleSystem _roleSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IPrototypeManager _prototype = default!; private uint _nextRoleIdentifier; private bool _needsUpdateGhostRoleCount = true; @@ -919,9 +919,9 @@ public void OnGhostRoleRadioMessage(Entity entity, } [AnyCommand] -public sealed class GhostRoles : IConsoleCommand +public sealed partial class GhostRoles : IConsoleCommand { - [Dependency] private readonly IEntityManager _e = default!; + [Dependency] private IEntityManager _e = default!; public string Command => "ghostroles"; public string Description => "Opens the ghost role request window."; diff --git a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs index 96779f14394..0138f211e57 100644 --- a/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs +++ b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Ghost.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class MakeGhostRoleCommand : IConsoleCommand + public sealed partial class MakeGhostRoleCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "makeghostrole"; public string Description => "Turns an entity into a ghost role."; diff --git a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs index 11a6fab9bbe..0e6c3b92ce2 100644 --- a/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs +++ b/Content.Server/Ghost/Roles/MakeRaffledGhostRoleCommand.cs @@ -11,10 +11,10 @@ namespace Content.Server.Ghost.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class MakeRaffledGhostRoleCommand : IConsoleCommand + public sealed partial class MakeRaffledGhostRoleCommand : IConsoleCommand { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "makeghostroleraffled"; public string Description => "Turns an entity into a raffled ghost role."; diff --git a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs index 13f90d8bd1f..994d6c397dd 100644 --- a/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs +++ b/Content.Server/Ghost/Roles/ToggleableGhostRoleSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.Ghost.Roles; /// /// This handles logic and interaction related to /// -public sealed class ToggleableGhostRoleSystem : EntitySystem +public sealed partial class ToggleableGhostRoleSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedMindSystem _mind = default!; /// public override void Initialize() diff --git a/Content.Server/Ghost/SpookySpeakerSystem.cs b/Content.Server/Ghost/SpookySpeakerSystem.cs index e16c2cf9b39..e347e705bb6 100644 --- a/Content.Server/Ghost/SpookySpeakerSystem.cs +++ b/Content.Server/Ghost/SpookySpeakerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Ghost; -public sealed class SpookySpeakerSystem : EntitySystem +public sealed partial class SpookySpeakerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/GhostKick/GhostKickManager.cs b/Content.Server/GhostKick/GhostKickManager.cs index 61d8cf9b329..e91dad1dc94 100644 --- a/Content.Server/GhostKick/GhostKickManager.cs +++ b/Content.Server/GhostKick/GhostKickManager.cs @@ -12,9 +12,9 @@ namespace Content.Server.GhostKick; // Basically we boot the client off the server without telling them, so the game shits itself. // Hilarious, isn't it? -public sealed class GhostKickManager +public sealed partial class GhostKickManager { - [Dependency] private readonly IServerNetManager _netManager = default!; + [Dependency] private IServerNetManager _netManager = default!; public void Initialize() { @@ -45,10 +45,10 @@ public void DoDisconnect(INetChannel channel, string reason) } [AdminCommand(AdminFlags.Moderator)] -public sealed class GhostKickCommand : LocalizedEntityCommands +public sealed partial class GhostKickCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly GhostKickManager _ghostKick = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private GhostKickManager _ghostKick = default!; public override string Command => "ghostkick"; diff --git a/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs b/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs index f3990e4e1ba..92eaff06344 100644 --- a/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs +++ b/Content.Server/Gibbing/Systems/GibOnRoundEndSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Gibbing.Systems; -public sealed class GibOnRoundEndSystem : EntitySystem +public sealed partial class GibOnRoundEndSystem : EntitySystem { - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; public override void Initialize() { diff --git a/Content.Server/Gravity/GravityGeneratorSystem.cs b/Content.Server/Gravity/GravityGeneratorSystem.cs index 8e714cf8842..9c43aa71ae6 100644 --- a/Content.Server/Gravity/GravityGeneratorSystem.cs +++ b/Content.Server/Gravity/GravityGeneratorSystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.Gravity; -public sealed class GravityGeneratorSystem : SharedGravityGeneratorSystem +public sealed partial class GravityGeneratorSystem : SharedGravityGeneratorSystem { - [Dependency] private readonly GravitySystem _gravitySystem = default!; - [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private GravitySystem _gravitySystem = default!; + [Dependency] private SharedPointLightSystem _lights = default!; public override void Initialize() { diff --git a/Content.Server/GridControl/Systems/BluespaceParkingSystem.Lifecycle.cs b/Content.Server/GridControl/Systems/BluespaceParkingSystem.Lifecycle.cs index 0dfb92b5618..b9098e36b0d 100644 --- a/Content.Server/GridControl/Systems/BluespaceParkingSystem.Lifecycle.cs +++ b/Content.Server/GridControl/Systems/BluespaceParkingSystem.Lifecycle.cs @@ -27,16 +27,16 @@ namespace Content.Server.GridControl.Systems; public sealed partial class BluespaceParkingSystem : SharedBluespaceParkingSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly PersistenceSystem _persistence = default!; - [Dependency] private readonly IResourceManager _resMan = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DockingSystem _dock = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private PersistenceSystem _persistence = default!; + [Dependency] private IResourceManager _resMan = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DockingSystem _dock = default!; + [Dependency] private IAdminLogManager _adminLog = default!; [GeneratedRegex("[^a-zA-Z0-9 -]")] private static partial Regex SafeGridNameRgx(); diff --git a/Content.Server/GridControl/Systems/BluespaceParkingSystem.UI.cs b/Content.Server/GridControl/Systems/BluespaceParkingSystem.UI.cs index 8bebd9e013d..4cca20c4f11 100644 --- a/Content.Server/GridControl/Systems/BluespaceParkingSystem.UI.cs +++ b/Content.Server/GridControl/Systems/BluespaceParkingSystem.UI.cs @@ -15,13 +15,13 @@ namespace Content.Server.GridControl.Systems; public sealed partial class BluespaceParkingSystem : SharedBluespaceParkingSystem { - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly GridConfigSystem _gridConfigSystem = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private GridConfigSystem _gridConfigSystem = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private void InitializeUI() { Subs.BuiEvents(BSPAnchorKeyUiKey.Key, subs => diff --git a/Content.Server/GridControl/Systems/BluespaceParkingSystem.cs b/Content.Server/GridControl/Systems/BluespaceParkingSystem.cs index 767730c1d1d..ebf2dc2a4d6 100644 --- a/Content.Server/GridControl/Systems/BluespaceParkingSystem.cs +++ b/Content.Server/GridControl/Systems/BluespaceParkingSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.GridControl.Systems; [UsedImplicitly] public sealed partial class BluespaceParkingSystem : SharedBluespaceParkingSystem { - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private TransformSystem _transform = default!; public override void Initialize() diff --git a/Content.Server/GridControl/Systems/GridConfigSystem.cs b/Content.Server/GridControl/Systems/GridConfigSystem.cs index 7247a9b44ab..9493c5339fb 100644 --- a/Content.Server/GridControl/Systems/GridConfigSystem.cs +++ b/Content.Server/GridControl/Systems/GridConfigSystem.cs @@ -30,21 +30,21 @@ namespace Content.Server.GridControl.Systems; [UsedImplicitly] -public sealed class GridConfigSystem : SharedGridConfigSystem +public sealed partial class GridConfigSystem : SharedGridConfigSystem { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly CrewMetaRecordsSystem _crewMeta = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private CrewMetaRecordsSystem _crewMeta = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/GridControl/Systems/GridSpawnerSystem.cs b/Content.Server/GridControl/Systems/GridSpawnerSystem.cs index 5457426f12a..377c601868e 100644 --- a/Content.Server/GridControl/Systems/GridSpawnerSystem.cs +++ b/Content.Server/GridControl/Systems/GridSpawnerSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.GridControl.Systems; [UsedImplicitly] -public sealed class GridSpawnerSystem : EntitySystem +public sealed partial class GridSpawnerSystem : EntitySystem { - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private StationSystem _station = default!; public override void Initialize() { diff --git a/Content.Server/GridPreloader/GridPreloaderSystem.cs b/Content.Server/GridPreloader/GridPreloaderSystem.cs index fbe813f4201..9fb3899b519 100644 --- a/Content.Server/GridPreloader/GridPreloaderSystem.cs +++ b/Content.Server/GridPreloader/GridPreloaderSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.GridPreloader; -public sealed class GridPreloaderSystem : SharedGridPreloaderSystem +public sealed partial class GridPreloaderSystem : SharedGridPreloaderSystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly MapSystem _map = default!; - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// /// Whether the preloading CVar is set or not. diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs index 40a7c431023..8c8c86f4ba1 100644 --- a/Content.Server/Guardian/GuardianSystem.cs +++ b/Content.Server/Guardian/GuardianSystem.cs @@ -23,17 +23,17 @@ namespace Content.Server.Guardian /// /// A guardian has a host it's attached to that it fights for. A fighting spirit. /// - public sealed class GuardianSystem : EntitySystem + public sealed partial class GuardianSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly DamageableSystem _damageSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private DamageableSystem _damageSystem = default!; + [Dependency] private SharedActionsSystem _actionSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Guidebook/GuidebookDataSystem.cs b/Content.Server/Guidebook/GuidebookDataSystem.cs index 379a83e1efb..18d5a086c9e 100644 --- a/Content.Server/Guidebook/GuidebookDataSystem.cs +++ b/Content.Server/Guidebook/GuidebookDataSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Guidebook; /// Server system for identifying component fields/properties to extract values from entity prototypes. /// Extracted data is sent to clients when they connect or when prototypes are reloaded. /// -public sealed class GuidebookDataSystem : EntitySystem +public sealed partial class GuidebookDataSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private readonly Dictionary> _tagged = []; private GuidebookData _cachedData = new(); diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index 01674263958..d3df1b035c6 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -23,15 +23,15 @@ namespace Content.Server.Hands.Systems { - public sealed class HandsSystem : SharedHandsSystem + public sealed partial class HandsSystem : SharedHandsSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly PullingSystem _pullingSystem = default!; - [Dependency] private readonly ThrowingSystem _throwingSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private PullingSystem _pullingSystem = default!; + [Dependency] private ThrowingSystem _throwingSystem = default!; private EntityQuery _physicsQuery; diff --git a/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs b/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs index 186eb077a77..82b1f4fdfe0 100644 --- a/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs +++ b/Content.Server/Holiday/Christmas/LimitedItemGiverSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Holiday.Christmas; /// /// This handles handing out items from item givers. /// -public sealed class LimitedItemGiverSystem : EntitySystem +public sealed partial class LimitedItemGiverSystem : EntitySystem { - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly HolidaySystem _holiday = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private HolidaySystem _holiday = default!; + [Dependency] private PopupSystem _popup = default!; /// public override void Initialize() { diff --git a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs index 17a2d8ac2bc..5e288b41161 100644 --- a/Content.Server/Holiday/Christmas/RandomGiftSystem.cs +++ b/Content.Server/Holiday/Christmas/RandomGiftSystem.cs @@ -16,15 +16,15 @@ namespace Content.Server.Holiday.Christmas; /// /// This handles granting players their gift. /// -public sealed class RandomGiftSystem : EntitySystem +public sealed partial class RandomGiftSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; private readonly List _possibleGiftsSafe = new(); private readonly List _possibleGiftsUnsafe = new(); diff --git a/Content.Server/Holiday/HolidaySystem.cs b/Content.Server/Holiday/HolidaySystem.cs index b69e2675203..e81c657bf45 100644 --- a/Content.Server/Holiday/HolidaySystem.cs +++ b/Content.Server/Holiday/HolidaySystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Holiday { - public sealed class HolidaySystem : EntitySystem + public sealed partial class HolidaySystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; [ViewVariables] private readonly List _currentHolidays = new(); diff --git a/Content.Server/Holopad/HolopadSystem.cs b/Content.Server/Holopad/HolopadSystem.cs index 1996eb9ca96..a7c7e355dfd 100644 --- a/Content.Server/Holopad/HolopadSystem.cs +++ b/Content.Server/Holopad/HolopadSystem.cs @@ -27,21 +27,21 @@ namespace Content.Server.Holopad; -public sealed class HolopadSystem : SharedHolopadSystem +public sealed partial class HolopadSystem : SharedHolopadSystem { - [Dependency] private readonly TelephoneSystem _telephoneSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly TransformSystem _xformSystem = default!; - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedPointLightSystem _pointLightSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedStationAiSystem _stationAiSystem = default!; - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PvsOverrideSystem _pvs = default!; - [Dependency] private readonly SharedPowerStateSystem _powerState = default!; + [Dependency] private TelephoneSystem _telephoneSystem = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private TransformSystem _xformSystem = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedPointLightSystem _pointLightSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedStationAiSystem _stationAiSystem = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PvsOverrideSystem _pvs = default!; + [Dependency] private SharedPowerStateSystem _powerState = default!; private float _updateTimer = 1.0f; private const float UpdateTime = 1.0f; diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs index 537ae122765..1b2014d78bd 100644 --- a/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs +++ b/Content.Server/Humanoid/Systems/RandomHumanoidAppearanceSystem.cs @@ -5,11 +5,11 @@ namespace Content.Server.Humanoid.Systems; -public sealed class RandomHumanoidAppearanceSystem : EntitySystem +public sealed partial class RandomHumanoidAppearanceSystem : EntitySystem { - [Dependency] private readonly HumanoidProfileSystem _humanoidProfile = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private HumanoidProfileSystem _humanoidProfile = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public override void Initialize() { diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs index 992bc44f3dc..583f672fa0a 100644 --- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs +++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Humanoid.Systems; /// /// This deals with spawning and setting up random humanoids. /// -public sealed class RandomHumanoidSystem : EntitySystem +public sealed partial class RandomHumanoidSystem : EntitySystem { - [Dependency] private readonly HumanoidProfileSystem _humanoidProfile = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private HumanoidProfileSystem _humanoidProfile = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ISerializationManager _serialization = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; /// public override void Initialize() diff --git a/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs b/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs index 4ddfb17ac84..99c47b8ff6f 100644 --- a/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs +++ b/Content.Server/IconSmoothing/RandomIconSmoothSystem.cs @@ -5,8 +5,8 @@ namespace Content.Server.IconSmoothing; public sealed partial class RandomIconSmoothSystem : SharedRandomIconSmoothSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Server/IgnitionSource/IgnitionSourceSystem.cs b/Content.Server/IgnitionSource/IgnitionSourceSystem.cs index f39bb78a379..b6514ea1a71 100644 --- a/Content.Server/IgnitionSource/IgnitionSourceSystem.cs +++ b/Content.Server/IgnitionSource/IgnitionSourceSystem.cs @@ -5,8 +5,8 @@ namespace Content.Server.IgnitionSource; public sealed partial class IgnitionSourceSystem : SharedIgnitionSourceSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Update(float frameTime) { diff --git a/Content.Server/ImmovableRod/ImmovableRodSystem.cs b/Content.Server/ImmovableRod/ImmovableRodSystem.cs index 013f0294764..915dbc15828 100644 --- a/Content.Server/ImmovableRod/ImmovableRodSystem.cs +++ b/Content.Server/ImmovableRod/ImmovableRodSystem.cs @@ -18,19 +18,19 @@ namespace Content.Server.ImmovableRod; -public sealed class ImmovableRodSystem : EntitySystem +public sealed partial class ImmovableRodSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IRobustRandom _random = default!; + + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; public override void Update(float frameTime) { diff --git a/Content.Server/Implants/AutoImplantSystem.cs b/Content.Server/Implants/AutoImplantSystem.cs index b854e3ca3db..c6c130d2691 100644 --- a/Content.Server/Implants/AutoImplantSystem.cs +++ b/Content.Server/Implants/AutoImplantSystem.cs @@ -2,9 +2,9 @@ namespace Content.Server.Implants; -public sealed class AutoImplantSystem : EntitySystem +public sealed partial class AutoImplantSystem : EntitySystem { - [Dependency] private readonly SubdermalImplantSystem _subdermalImplant = default!; + [Dependency] private SubdermalImplantSystem _subdermalImplant = default!; public override void Initialize() { diff --git a/Content.Server/Implants/ChameleonControllerSystem.cs b/Content.Server/Implants/ChameleonControllerSystem.cs index 0202e10a80e..dc084e2e298 100644 --- a/Content.Server/Implants/ChameleonControllerSystem.cs +++ b/Content.Server/Implants/ChameleonControllerSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.Implants; -public sealed class ChameleonControllerSystem : SharedChameleonControllerSystem +public sealed partial class ChameleonControllerSystem : SharedChameleonControllerSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedStationSpawningSystem _stationSpawningSystem = default!; - [Dependency] private readonly ChameleonClothingSystem _chameleonClothingSystem = default!; - [Dependency] private readonly IServerPreferencesManager _preferences = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedStationSpawningSystem _stationSpawningSystem = default!; + [Dependency] private ChameleonClothingSystem _chameleonClothingSystem = default!; + [Dependency] private IServerPreferencesManager _preferences = default!; + [Dependency] private UseDelaySystem _delay = default!; public override void Initialize() { diff --git a/Content.Server/Implants/ImplanterSystem.cs b/Content.Server/Implants/ImplanterSystem.cs index 51f059e1329..e67117ba22a 100644 --- a/Content.Server/Implants/ImplanterSystem.cs +++ b/Content.Server/Implants/ImplanterSystem.cs @@ -11,9 +11,9 @@ namespace Content.Server.Implants; public sealed partial class ImplanterSystem : SharedImplanterSystem { - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 582b9cb2ac4..b4b3f4c3fc4 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Implants; -public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem +public sealed partial class SubdermalImplantSystem : SharedSubdermalImplantSystem { - [Dependency] private readonly StoreSystem _store = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private StoreSystem _store = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Info/RulesManager.cs b/Content.Server/Info/RulesManager.cs index 2f861876931..b701945bab0 100644 --- a/Content.Server/Info/RulesManager.cs +++ b/Content.Server/Info/RulesManager.cs @@ -10,13 +10,13 @@ namespace Content.Server.Info; -public sealed class RulesManager +public sealed partial class RulesManager { - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private IPlayerManager _player = default!; private static DateTime LastValidReadTime => DateTime.UtcNow - TimeSpan.FromDays(60); diff --git a/Content.Server/Info/ShowRulesCommand.cs b/Content.Server/Info/ShowRulesCommand.cs index 40e131fa232..390c3c343aa 100644 --- a/Content.Server/Info/ShowRulesCommand.cs +++ b/Content.Server/Info/ShowRulesCommand.cs @@ -10,11 +10,11 @@ namespace Content.Server.Info; [AdminCommand(AdminFlags.Admin)] -public sealed class ShowRulesCommand : LocalizedCommands +public sealed partial class ShowRulesCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IPlayerManager _player = default!; public override string Command => "showrules"; diff --git a/Content.Server/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs index ab1fd2ce046..ec4dc19c16f 100644 --- a/Content.Server/Instruments/InstrumentComponent.cs +++ b/Content.Server/Instruments/InstrumentComponent.cs @@ -7,7 +7,7 @@ namespace Content.Server.Instruments; [RegisterComponent] public sealed partial class InstrumentComponent : SharedInstrumentComponent { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [ViewVariables] public float Timer = 0f; [ViewVariables] public int BatchesDropped = 0; diff --git a/Content.Server/Instruments/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs index b5e116368ed..098f710050f 100644 --- a/Content.Server/Instruments/InstrumentSystem.cs +++ b/Content.Server/Instruments/InstrumentSystem.cs @@ -24,15 +24,15 @@ namespace Content.Server.Instruments; [UsedImplicitly] public sealed partial class InstrumentSystem : SharedInstrumentSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConsoleHost _conHost = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly StunSystem _stuns = default!; - [Dependency] private readonly UserInterfaceSystem _bui = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; - [Dependency] private readonly IAdminLogManager _admingLogSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IConsoleHost _conHost = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private StunSystem _stuns = default!; + [Dependency] private UserInterfaceSystem _bui = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; + [Dependency] private IAdminLogManager _admingLogSystem = default!; private const float MaxInstrumentBandRange = 10f; diff --git a/Content.Server/Instruments/SwappableInstrumentSystem.cs b/Content.Server/Instruments/SwappableInstrumentSystem.cs index f2c1a412e14..4ef124814ba 100644 --- a/Content.Server/Instruments/SwappableInstrumentSystem.cs +++ b/Content.Server/Instruments/SwappableInstrumentSystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.Instruments; -public sealed class SwappableInstrumentSystem : EntitySystem +public sealed partial class SwappableInstrumentSystem : EntitySystem { - [Dependency] private readonly SharedInstrumentSystem _sharedInstrument = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedInstrumentSystem _sharedInstrument = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/Interaction/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs index 1f25f8f1e0e..8a5d0f6b457 100644 --- a/Content.Server/Interaction/TilePryCommand.cs +++ b/Content.Server/Interaction/TilePryCommand.cs @@ -9,10 +9,10 @@ namespace Content.Server.Interaction; [AdminCommand(AdminFlags.Debug)] -public sealed class TilePryCommand : LocalizedEntityCommands +public sealed partial class TilePryCommand : LocalizedEntityCommands { - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; private readonly string _platingId = "Plating"; diff --git a/Content.Server/Invoices/Systems/InvoicePrinterConsoleSystem.cs b/Content.Server/Invoices/Systems/InvoicePrinterConsoleSystem.cs index 7179e17052f..e40a186e490 100644 --- a/Content.Server/Invoices/Systems/InvoicePrinterConsoleSystem.cs +++ b/Content.Server/Invoices/Systems/InvoicePrinterConsoleSystem.cs @@ -25,19 +25,19 @@ namespace Content.Server.Invoices.Systems; [UsedImplicitly] -public sealed class InvoicePrinterConsoleSystem : SharedInvoicePrinterConsoleSystem +public sealed partial class InvoicePrinterConsoleSystem : SharedInvoicePrinterConsoleSystem { - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly SharedCargoSystem _cargo = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly BankSystem _bank = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private SharedCargoSystem _cargo = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private BankSystem _bank = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 760329885e3..65a30bd6cb7 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -42,30 +42,30 @@ namespace Content.Server.Kitchen.EntitySystems { - public sealed class MicrowaveSystem : EntitySystem + public sealed partial class MicrowaveSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly PowerReceiverSystem _power = default!; - [Dependency] private readonly RecipeManager _recipeManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly LightningSystem _lightning = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly TemperatureSystem _temperature = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly HandsSystem _handsSystem = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedSuicideSystem _suicide = default!; - [Dependency] private readonly SharedPowerStateSystem _powerState = default!; + [Dependency] private DeviceLinkSystem _deviceLink = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private PowerReceiverSystem _power = default!; + [Dependency] private RecipeManager _recipeManager = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private LightningSystem _lightning = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ExplosionSystem _explosion = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private TemperatureSystem _temperature = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private HandsSystem _handsSystem = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedSuicideSystem _suicide = default!; + [Dependency] private SharedPowerStateSystem _powerState = default!; private static readonly EntProtoId MalfunctionSpark = "Spark"; diff --git a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs index 7966fee1637..f8c9c8b0e5b 100644 --- a/Content.Server/Kitchen/EntitySystems/SharpSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/SharpSystem.cs @@ -21,17 +21,17 @@ namespace Content.Server.Kitchen.EntitySystems; -public sealed class SharpSystem : EntitySystem +public sealed partial class SharpSystem : EntitySystem { - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly ContainerSystem _containerSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private SharedDestructibleSystem _destructibleSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private ContainerSystem _containerSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Server/LandMines/LandMineSystem.cs b/Content.Server/LandMines/LandMineSystem.cs index fdea8e9c652..197fe65d906 100644 --- a/Content.Server/LandMines/LandMineSystem.cs +++ b/Content.Server/LandMines/LandMineSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.LandMines; -public sealed class LandMineSystem : EntitySystem +public sealed partial class LandMineSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly TriggerSystem _trigger = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private TriggerSystem _trigger = default!; public override void Initialize() { diff --git a/Content.Server/Lathe/LatheProducingSystem.cs b/Content.Server/Lathe/LatheProducingSystem.cs index ce81ed66e04..e57701ece46 100644 --- a/Content.Server/Lathe/LatheProducingSystem.cs +++ b/Content.Server/Lathe/LatheProducingSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Lathe; /// The component is used more so as a marker for EntityQueryEnumerator, /// however it's also used to set the power state of the lathe when producing. /// -public sealed class LatheProducingSystem : EntitySystem +public sealed partial class LatheProducingSystem : EntitySystem { - [Dependency] private readonly SharedPowerStateSystem _powerState = default!; + [Dependency] private SharedPowerStateSystem _powerState = default!; public override void Initialize() { diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs index 4d7178e64e0..eb3d44e1d45 100644 --- a/Content.Server/Lathe/LatheSystem.cs +++ b/Content.Server/Lathe/LatheSystem.cs @@ -34,25 +34,25 @@ namespace Content.Server.Lathe { [UsedImplicitly] - public sealed class LatheSystem : SharedLatheSystem + public sealed partial class LatheSystem : SharedLatheSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly UserInterfaceSystem _uiSys = default!; - [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly RadioSystem _radio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private UserInterfaceSystem _uiSys = default!; + [Dependency] private MaterialStorageSystem _materialStorage = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private ReagentSpeedSystem _reagentSpeed = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private RadioSystem _radio = default!; /// /// Per-tick cache diff --git a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs index 437e2bcc99a..8b45dbed36a 100644 --- a/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs +++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.Light.EntitySystems; -public sealed class EmergencyLightSystem : SharedEmergencyLightSystem +public sealed partial class EmergencyLightSystem : SharedEmergencyLightSystem { - [Dependency] private readonly AmbientSoundSystem _ambient = default!; - [Dependency] private readonly BatterySystem _battery = default!; - [Dependency] private readonly PointLightSystem _pointLight = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private AmbientSoundSystem _ambient = default!; + [Dependency] private BatterySystem _battery = default!; + [Dependency] private PointLightSystem _pointLight = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private StationSystem _station = default!; public override void Initialize() { diff --git a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs index e334e38cfd9..53be4cfea6b 100644 --- a/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs @@ -20,15 +20,15 @@ namespace Content.Server.Light.EntitySystems { [UsedImplicitly] - public sealed class ExpendableLightSystem : EntitySystem + public sealed partial class ExpendableLightSystem : EntitySystem { - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly ClothingSystem _clothing = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly NameModifierSystem _nameModifier = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private ClothingSystem _clothing = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private NameModifierSystem _nameModifier = default!; private static readonly ProtoId TrashTag = "Trash"; diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs index 52937a58f11..7bcb89c174c 100644 --- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs +++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs @@ -15,16 +15,16 @@ namespace Content.Server.Light.EntitySystems { - public sealed class HandheldLightSystem : SharedHandheldLightSystem + public sealed partial class HandheldLightSystem : SharedHandheldLightSystem { - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPointLightSystem _lights = default!; // TODO: Ideally you'd be able to subscribe to power stuff to get events at certain percentages.. or something? // But for now this will be better anyway. diff --git a/Content.Server/Light/EntitySystems/LightCycleSystem.cs b/Content.Server/Light/EntitySystems/LightCycleSystem.cs index 9ac13cd9946..8b27b3cf9fd 100644 --- a/Content.Server/Light/EntitySystems/LightCycleSystem.cs +++ b/Content.Server/Light/EntitySystems/LightCycleSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.Light.EntitySystems; /// -public sealed class LightCycleSystem : SharedLightCycleSystem +public sealed partial class LightCycleSystem : SharedLightCycleSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; protected override void OnCycleMapInit(Entity ent, ref MapInitEvent args) { diff --git a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs index 0801c1d513b..035e492c7d5 100644 --- a/Content.Server/Light/EntitySystems/LightReplacerSystem.cs +++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.Light.EntitySystems; [UsedImplicitly] -public sealed class LightReplacerSystem : SharedLightReplacerSystem +public sealed partial class LightReplacerSystem : SharedLightReplacerSystem { - [Dependency] private readonly PoweredLightSystem _poweredLight = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private PoweredLightSystem _poweredLight = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs index fe03f5249cc..dd043afd5a3 100644 --- a/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs +++ b/Content.Server/Light/EntitySystems/LitOnPoweredSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.Light.EntitySystems { - public sealed class LitOnPoweredSystem : EntitySystem + public sealed partial class LitOnPoweredSystem : EntitySystem { - [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private SharedPointLightSystem _lights = default!; public override void Initialize() { diff --git a/Content.Server/Light/EntitySystems/RoofSystem.cs b/Content.Server/Light/EntitySystems/RoofSystem.cs index a3b8cb18361..b34d26f0767 100644 --- a/Content.Server/Light/EntitySystems/RoofSystem.cs +++ b/Content.Server/Light/EntitySystems/RoofSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.Light.EntitySystems; /// -public sealed class RoofSystem : SharedRoofSystem +public sealed partial class RoofSystem : SharedRoofSystem { - [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private SharedMapSystem _maps = default!; private EntityQuery _gridQuery; diff --git a/Content.Server/Lightning/LightningSystem.cs b/Content.Server/Lightning/LightningSystem.cs index f6322e9495e..8187c6b39c0 100644 --- a/Content.Server/Lightning/LightningSystem.cs +++ b/Content.Server/Lightning/LightningSystem.cs @@ -16,12 +16,12 @@ namespace Content.Server.Lightning; //I redesigned so that lightning branches can only be created from the point where the lightning struck, no more collide checks //and the number of these branches is explicitly controlled in the new function. -public sealed class LightningSystem : SharedLightningSystem +public sealed partial class LightningSystem : SharedLightningSystem { - [Dependency] private readonly BeamSystem _beam = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private BeamSystem _beam = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private TransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Lightning/LightningTargetSystem.cs b/Content.Server/Lightning/LightningTargetSystem.cs index eac23c30163..86905b95524 100644 --- a/Content.Server/Lightning/LightningTargetSystem.cs +++ b/Content.Server/Lightning/LightningTargetSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Tesla.EntitySystems; /// /// The component allows lightning to strike this target. And determining the behavior of the target when struck by lightning. /// -public sealed class LightningTargetSystem : EntitySystem +public sealed partial class LightningTargetSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; + [Dependency] private TransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Lube/LubeSystem.cs b/Content.Server/Lube/LubeSystem.cs index 5dcd5d64e41..19f63e057a3 100644 --- a/Content.Server/Lube/LubeSystem.cs +++ b/Content.Server/Lube/LubeSystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.Lube; -public sealed class LubeSystem : EntitySystem +public sealed partial class LubeSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly OpenableSystem _openable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private OpenableSystem _openable = default!; public override void Initialize() { diff --git a/Content.Server/Lube/LubedSystem.cs b/Content.Server/Lube/LubedSystem.cs index 01a2fa8dde5..fe017126b60 100644 --- a/Content.Server/Lube/LubedSystem.cs +++ b/Content.Server/Lube/LubedSystem.cs @@ -10,13 +10,13 @@ namespace Content.Server.Lube; -public sealed class LubedSystem : EntitySystem +public sealed partial class LubedSystem : EntitySystem { - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private NameModifierSystem _nameMod = default!; public override void Initialize() { diff --git a/Content.Server/MCTN/Systems/MCTNSystem.Plugs.cs b/Content.Server/MCTN/Systems/MCTNSystem.Plugs.cs index 15382bc55b7..616f6012196 100644 --- a/Content.Server/MCTN/Systems/MCTNSystem.Plugs.cs +++ b/Content.Server/MCTN/Systems/MCTNSystem.Plugs.cs @@ -8,8 +8,8 @@ namespace Content.Server.MCTN.Systems; public sealed partial class MCTNSystem : EntitySystem { - [Dependency] private readonly NodeGroupSystem _nodeGroup = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private NodeGroupSystem _nodeGroup = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; public Node? GetRemoteConnectionFor(EntityUid owner, MCTNComponent mctNode, Node thisNode) { diff --git a/Content.Server/MCTN/Systems/MCTNSystem.UI.cs b/Content.Server/MCTN/Systems/MCTNSystem.UI.cs index 886cdea2147..e5e59ca0c90 100644 --- a/Content.Server/MCTN/Systems/MCTNSystem.UI.cs +++ b/Content.Server/MCTN/Systems/MCTNSystem.UI.cs @@ -15,9 +15,9 @@ namespace Content.Server.MCTN.Systems; public sealed partial class MCTNSystem : EntitySystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private PopupSystem _popup = default!; private void InitializeUI() { diff --git a/Content.Server/MCTN/Systems/MCTNSystem.cs b/Content.Server/MCTN/Systems/MCTNSystem.cs index ee9fa4c80a9..d6df695c48f 100644 --- a/Content.Server/MCTN/Systems/MCTNSystem.cs +++ b/Content.Server/MCTN/Systems/MCTNSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.MCTN.Systems; public sealed partial class MCTNSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPhysicsSystem _physx = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPhysicsSystem _physx = default!; public override void Initialize() diff --git a/Content.Server/Machines/EntitySystems/MultipartMachineSystem.cs b/Content.Server/Machines/EntitySystems/MultipartMachineSystem.cs index 04903241e36..db825b8d919 100644 --- a/Content.Server/Machines/EntitySystems/MultipartMachineSystem.cs +++ b/Content.Server/Machines/EntitySystems/MultipartMachineSystem.cs @@ -13,11 +13,11 @@ namespace Content.Server.Machines.EntitySystems; /// When requested, performs scans of the map area around the specified entity /// to find and match parts of the machine. /// -public sealed class MultipartMachineSystem : SharedMultipartMachineSystem +public sealed partial class MultipartMachineSystem : SharedMultipartMachineSystem { - [Dependency] private readonly IComponentFactory _factory = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; + [Dependency] private IComponentFactory _factory = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private EntityLookupSystem _lookupSystem = default!; // The largest size ANY machine can theoretically have. // Used to aid search for machines in range of parts that have been anchored/constructed. diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs index 09f6fd143e4..3ff66595604 100644 --- a/Content.Server/Magic/MagicSystem.cs +++ b/Content.Server/Magic/MagicSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.Magic; -public sealed class MagicSystem : SharedMagicSystem +public sealed partial class MagicSystem : SharedMagicSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedMindSystem _mind = default!; private static readonly ProtoId InvalidForSurvivorAntagTag = "InvalidForSurvivorAntag"; diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs index 247c47fe783..d71ceb98cee 100644 --- a/Content.Server/Mapping/MappingCommand.cs +++ b/Content.Server/Mapping/MappingCommand.cs @@ -13,12 +13,12 @@ namespace Content.Server.Mapping { [AdminCommand(AdminFlags.Server | AdminFlags.Mapping)] - public sealed class MappingCommand : LocalizedEntityCommands + public sealed partial class MappingCommand : LocalizedEntityCommands { - [Dependency] private readonly IResourceManager _resourceMgr = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly MappingSystem _mappingSystem = default!; - [Dependency] private readonly MapLoaderSystem _mapLoader = default!; + [Dependency] private IResourceManager _resourceMgr = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private MappingSystem _mappingSystem = default!; + [Dependency] private MapLoaderSystem _mapLoader = default!; public override string Command => "mapping"; diff --git a/Content.Server/Mapping/MappingManager.cs b/Content.Server/Mapping/MappingManager.cs index 669804f13c7..52bbf8de5fa 100644 --- a/Content.Server/Mapping/MappingManager.cs +++ b/Content.Server/Mapping/MappingManager.cs @@ -12,15 +12,15 @@ namespace Content.Server.Mapping; -public sealed class MappingManager : IPostInjectInit +public sealed partial class MappingManager : IPostInjectInit { #if !FULL_RELEASE - [Dependency] private readonly IAdminManager _admin = default!; - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly IServerNetManager _net = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IEntitySystemManager _systems = default!; - [Dependency] private readonly IEntityManager _ent = default!; + [Dependency] private IAdminManager _admin = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private IServerNetManager _net = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IEntitySystemManager _systems = default!; + [Dependency] private IEntityManager _ent = default!; private ISawmill _sawmill = default!; private ZStdCompressionContext _zstd = default!; diff --git a/Content.Server/Mapping/MappingSystem.cs b/Content.Server/Mapping/MappingSystem.cs index d5282313c94..6decf5c86e3 100644 --- a/Content.Server/Mapping/MappingSystem.cs +++ b/Content.Server/Mapping/MappingSystem.cs @@ -16,14 +16,14 @@ namespace Content.Server.Mapping; /// /// Handles autosaving maps. /// -public sealed class MappingSystem : EntitySystem +public sealed partial class MappingSystem : EntitySystem { - [Dependency] private readonly IConsoleHost _conHost = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IResourceManager _resMan = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; + [Dependency] private IConsoleHost _conHost = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IResourceManager _resMan = default!; + [Dependency] private MapLoaderSystem _loader = default!; // Not a comp because I don't want to deal with this getting saved onto maps ever /// diff --git a/Content.Server/Maps/GameMapManager.cs b/Content.Server/Maps/GameMapManager.cs index afbeaeb4285..3072fbfe95c 100644 --- a/Content.Server/Maps/GameMapManager.cs +++ b/Content.Server/Maps/GameMapManager.cs @@ -13,14 +13,14 @@ namespace Content.Server.Maps; -public sealed class GameMapManager : IGameMapManager +public sealed partial class GameMapManager : IGameMapManager { - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IResourceManager _resMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IResourceManager _resMan = default!; + [Dependency] private IRobustRandom _random = default!; [ViewVariables(VVAccess.ReadOnly)] private readonly Queue _previousMaps = new(); diff --git a/Content.Server/Maps/GridDraggingCommand.cs b/Content.Server/Maps/GridDraggingCommand.cs index 8050a65ec56..57b40d6dc4e 100644 --- a/Content.Server/Maps/GridDraggingCommand.cs +++ b/Content.Server/Maps/GridDraggingCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Maps; /// Toggles GridDragging on the system. /// [AdminCommand(AdminFlags.Fun)] -public sealed class GridDraggingCommand : LocalizedEntityCommands +public sealed partial class GridDraggingCommand : LocalizedEntityCommands { - [Dependency] private readonly GridDraggingSystem _grid = default!; + [Dependency] private GridDraggingSystem _grid = default!; public override string Command => SharedGridDraggingSystem.CommandName; diff --git a/Content.Server/Maps/GridDraggingSystem.cs b/Content.Server/Maps/GridDraggingSystem.cs index a13c5aec25b..6c4a6db71a4 100644 --- a/Content.Server/Maps/GridDraggingSystem.cs +++ b/Content.Server/Maps/GridDraggingSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Maps; /// -public sealed class GridDraggingSystem : SharedGridDraggingSystem +public sealed partial class GridDraggingSystem : SharedGridDraggingSystem { - [Dependency] private readonly IConGroupController _admin = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IConGroupController _admin = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; private readonly HashSet _draggers = new(); diff --git a/Content.Server/Maps/MapMigrationSystem.cs b/Content.Server/Maps/MapMigrationSystem.cs index 25ef608dd60..a3bd462054c 100644 --- a/Content.Server/Maps/MapMigrationSystem.cs +++ b/Content.Server/Maps/MapMigrationSystem.cs @@ -15,12 +15,12 @@ namespace Content.Server.Maps; /// /// Performs basic map migration operations by listening for engine events. /// -public sealed class MapMigrationSystem : EntitySystem +public sealed partial class MapMigrationSystem : EntitySystem { #if DEBUG - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IPrototypeManager _protoMan = default!; #endif - [Dependency] private readonly IResourceManager _resMan = default!; + [Dependency] private IResourceManager _resMan = default!; private const string MigrationFile = "/migration.yml"; diff --git a/Content.Server/Maps/PlanetCommand.cs b/Content.Server/Maps/PlanetCommand.cs index 239833d748c..339f9c03808 100644 --- a/Content.Server/Maps/PlanetCommand.cs +++ b/Content.Server/Maps/PlanetCommand.cs @@ -13,11 +13,11 @@ namespace Content.Server.Maps; /// Converts the supplied map into a "planet" with defaults. /// [AdminCommand(AdminFlags.Mapping)] -public sealed class PlanetCommand : LocalizedEntityCommands +public sealed partial class PlanetCommand : LocalizedEntityCommands { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedMapSystem _map = default!; public override string Command => "planet"; public override string Description => Loc.GetString("cmd-planet-desc"); diff --git a/Content.Server/Maps/ResaveCommand.cs b/Content.Server/Maps/ResaveCommand.cs index b07399d1c08..b34a270ae1e 100644 --- a/Content.Server/Maps/ResaveCommand.cs +++ b/Content.Server/Maps/ResaveCommand.cs @@ -14,11 +14,11 @@ namespace Content.Server.Maps; /// Loads every map and resaves it into the data folder. /// [AdminCommand(AdminFlags.Host)] -public sealed class ResaveCommand : LocalizedCommands +public sealed partial class ResaveCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IResourceManager _res = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IResourceManager _res = default!; + [Dependency] private ILogManager _log = default!; public override string Command => "resave"; diff --git a/Content.Server/Maps/TileGridSplitSystem.cs b/Content.Server/Maps/TileGridSplitSystem.cs index fcf13559f0a..4397f619c06 100644 --- a/Content.Server/Maps/TileGridSplitSystem.cs +++ b/Content.Server/Maps/TileGridSplitSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Maps; /// /// This system handles transferring data when a grid is split. /// -public sealed class TileGridSplitSystem : EntitySystem +public sealed partial class TileGridSplitSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs index 8ab36591a18..86304b05b5a 100644 --- a/Content.Server/MassMedia/Systems/NewsSystem.cs +++ b/Content.Server/MassMedia/Systems/NewsSystem.cs @@ -30,21 +30,21 @@ namespace Content.Server.MassMedia.Systems; -public sealed class NewsSystem : SharedNewsSystem +public sealed partial class NewsSystem : SharedNewsSystem { - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly DiscordWebhook _discord = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IBaseServer _baseServer = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoaderSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private DiscordWebhook _discord = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IBaseServer _baseServer = default!; private WebhookIdentifier? _webhookId = null; private Color _webhookEmbedColor; diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs index 65d4777af97..65a3d0f2bc9 100644 --- a/Content.Server/Materials/MaterialReclaimerSystem.cs +++ b/Content.Server/Materials/MaterialReclaimerSystem.cs @@ -30,20 +30,20 @@ namespace Content.Server.Materials; /// -public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem +public sealed partial class MaterialReclaimerSystem : SharedMaterialReclaimerSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly GhostSystem _ghostSystem = default!; - [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private GhostSystem _ghostSystem = default!; + [Dependency] private MaterialStorageSystem _materialStorage = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; /// public override void Initialize() diff --git a/Content.Server/Materials/MaterialStorageSystem.cs b/Content.Server/Materials/MaterialStorageSystem.cs index 39284caed19..f1aec9b116c 100644 --- a/Content.Server/Materials/MaterialStorageSystem.cs +++ b/Content.Server/Materials/MaterialStorageSystem.cs @@ -18,15 +18,15 @@ namespace Content.Server.Materials; /// /// This handles /// -public sealed class MaterialStorageSystem : SharedMaterialStorageSystem +public sealed partial class MaterialStorageSystem : SharedMaterialStorageSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Server/Materials/OreSiloSystem.cs b/Content.Server/Materials/OreSiloSystem.cs index a0aab4fcae5..c80ce1bedf2 100644 --- a/Content.Server/Materials/OreSiloSystem.cs +++ b/Content.Server/Materials/OreSiloSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.Materials; /// -public sealed class OreSiloSystem : SharedOreSiloSystem +public sealed partial class OreSiloSystem : SharedOreSiloSystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private PvsOverrideSystem _pvsOverride = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; private const float OreSiloPreloadRangeSquared = 225f; // ~1 screen diff --git a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs index e405d7e17c6..81f85eee302 100644 --- a/Content.Server/Materials/ProduceMaterialExtractorSystem.cs +++ b/Content.Server/Materials/ProduceMaterialExtractorSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Materials; -public sealed class ProduceMaterialExtractorSystem : EntitySystem +public sealed partial class ProduceMaterialExtractorSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private MaterialStorageSystem _materialStorage = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedPopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs index dc4f7b40906..d3d72f40d36 100644 --- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs +++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs @@ -21,14 +21,14 @@ namespace Content.Server.Mech.Equipment.EntitySystems; /// /// Handles and all related UI logic /// -public sealed class MechGrabberSystem : EntitySystem +public sealed partial class MechGrabberSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly MechSystem _mech = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly InteractionSystem _interaction = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private MechSystem _mech = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private InteractionSystem _interaction = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private TransformSystem _transform = default!; /// public override void Initialize() diff --git a/Content.Server/Mech/Systems/MechEquipmentSystem.cs b/Content.Server/Mech/Systems/MechEquipmentSystem.cs index f9fe5e46413..a5dab7545b2 100644 --- a/Content.Server/Mech/Systems/MechEquipmentSystem.cs +++ b/Content.Server/Mech/Systems/MechEquipmentSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Mech.Systems; /// /// Handles the insertion of mech equipment into mechs. /// -public sealed class MechEquipmentSystem : EntitySystem +public sealed partial class MechEquipmentSystem : EntitySystem { - [Dependency] private readonly MechSystem _mech = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private MechSystem _mech = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; /// public override void Initialize() diff --git a/Content.Server/Mech/Systems/MechSystem.cs b/Content.Server/Mech/Systems/MechSystem.cs index 6bd85320576..14e8672ba31 100644 --- a/Content.Server/Mech/Systems/MechSystem.cs +++ b/Content.Server/Mech/Systems/MechSystem.cs @@ -33,16 +33,16 @@ namespace Content.Server.Mech.Systems; /// public sealed partial class MechSystem : SharedMechSystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; private static readonly ProtoId PryingQuality = "Prying"; diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs index 1c421f337ab..6e1c6877039 100644 --- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs +++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs @@ -35,25 +35,25 @@ namespace Content.Server.Medical.BiomassReclaimer { - public sealed class BiomassReclaimerSystem : EntitySystem + public sealed partial class BiomassReclaimerSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedJitteringSystem _jitteringSystem = default!; - [Dependency] private readonly SharedAudioSystem _sharedAudioSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PuddleSystem _puddleSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly MaterialStorageSystem _material = default!; - [Dependency] private readonly SharedMindSystem _minds = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedJitteringSystem _jitteringSystem = default!; + [Dependency] private SharedAudioSystem _sharedAudioSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PuddleSystem _puddleSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private MaterialStorageSystem _material = default!; + [Dependency] private SharedMindSystem _minds = default!; + [Dependency] private InventorySystem _inventory = default!; public static readonly ProtoId BiomassPrototype = "Biomass"; diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs index 67a63325346..387cdd5f6ac 100644 --- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs +++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringConsoleSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Medical.CrewMonitoring; -public sealed class CrewMonitoringConsoleSystem : EntitySystem +public sealed partial class CrewMonitoringConsoleSystem : EntitySystem { - [Dependency] private readonly PowerCellSystem _cell = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; + [Dependency] private PowerCellSystem _cell = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; public override void Initialize() { diff --git a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs index 51d763c1a8a..415a6074574 100644 --- a/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs +++ b/Content.Server/Medical/CrewMonitoring/CrewMonitoringServerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Medical.CrewMonitoring; -public sealed class CrewMonitoringServerSystem : EntitySystem +public sealed partial class CrewMonitoringServerSystem : EntitySystem { - [Dependency] private readonly SuitSensorSystem _sensors = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; + [Dependency] private SuitSensorSystem _sensors = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private SingletonDeviceNetServerSystem _singletonServerSystem = default!; private const float UpdateRate = 3f; private float _updateDiff; diff --git a/Content.Server/Medical/CryoPodSystem.cs b/Content.Server/Medical/CryoPodSystem.cs index 9668b0ab58b..9340b23516c 100644 --- a/Content.Server/Medical/CryoPodSystem.cs +++ b/Content.Server/Medical/CryoPodSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Medical; public sealed partial class CryoPodSystem : SharedCryoPodSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly GasCanisterSystem _gasCanisterSystem = default!; - [Dependency] private readonly GasAnalyzerSystem _gasAnalyzerSystem = default!; - [Dependency] private readonly HealthAnalyzerSystem _healthAnalyzerSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private GasCanisterSystem _gasCanisterSystem = default!; + [Dependency] private GasAnalyzerSystem _gasAnalyzerSystem = default!; + [Dependency] private HealthAnalyzerSystem _healthAnalyzerSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs index 34260fac431..b190cc4121c 100644 --- a/Content.Server/Medical/DefibrillatorSystem.cs +++ b/Content.Server/Medical/DefibrillatorSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Medical; -public sealed class DefibrillatorSystem : SharedDefibrillatorSystem +public sealed partial class DefibrillatorSystem : SharedDefibrillatorSystem { - [Dependency] private readonly EuiManager _eui = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private EuiManager _eui = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private SharedMindSystem _mind = default!; protected override void OpenReturnToBodyEui(Entity mind, ICommonSession session) { diff --git a/Content.Server/Medical/HealthAnalyzerSystem.cs b/Content.Server/Medical/HealthAnalyzerSystem.cs index f7fa7f238d6..c4da0b2ca81 100644 --- a/Content.Server/Medical/HealthAnalyzerSystem.cs +++ b/Content.Server/Medical/HealthAnalyzerSystem.cs @@ -22,18 +22,18 @@ namespace Content.Server.Medical; -public sealed class HealthAnalyzerSystem : EntitySystem +public sealed partial class HealthAnalyzerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private PowerCellSystem _cell = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private BloodstreamSystem _bloodstreamSystem = default!; public override void Initialize() { diff --git a/Content.Server/Medical/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs index 59947efbba5..f06fa74ff6a 100644 --- a/Content.Server/Medical/MedicalScannerSystem.cs +++ b/Content.Server/Medical/MedicalScannerSystem.cs @@ -19,15 +19,15 @@ namespace Content.Server.Medical { - public sealed class MedicalScannerSystem : EntitySystem + public sealed partial class MedicalScannerSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly ClimbSystem _climbSystem = default!; - [Dependency] private readonly CloningConsoleSystem _cloningConsoleSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly ContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private ClimbSystem _climbSystem = default!; + [Dependency] private CloningConsoleSystem _cloningConsoleSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private ContainerSystem _containerSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; private const float UpdateRate = 1f; private float _updateDif; diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index 5674b149e3e..2ae1ce7cca6 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Medical.SuitSensors; -public sealed class SuitSensorSystem : SharedSuitSensorSystem +public sealed partial class SuitSensorSystem : SharedSuitSensorSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private SingletonDeviceNetServerSystem _singletonServerSystem = default!; public override void Update(float frameTime) { diff --git a/Content.Server/MessageBoard/Systems/MessageBoardSystem.cs b/Content.Server/MessageBoard/Systems/MessageBoardSystem.cs index ea31406fca5..63643af4fa4 100644 --- a/Content.Server/MessageBoard/Systems/MessageBoardSystem.cs +++ b/Content.Server/MessageBoard/Systems/MessageBoardSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.MessageBoard.Systems; public sealed partial class MessageBoardSystem : SharedMessageBoardSystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly CrewMetaRecordsSystem _crewMetaRecordsSystem = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IChatManager _chatManager = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private CrewMetaRecordsSystem _crewMetaRecordsSystem = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IChatManager _chatManager = default!; public override void Initialize() { diff --git a/Content.Server/Mind/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs index dad5126a31e..3a02d19a1df 100644 --- a/Content.Server/Mind/Commands/MakeSentientCommand.cs +++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs @@ -5,9 +5,9 @@ namespace Content.Server.Mind.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class MakeSentientCommand : LocalizedEntityCommands +public sealed partial class MakeSentientCommand : LocalizedEntityCommands { - [Dependency] private readonly MindSystem _mindSystem = default!; + [Dependency] private MindSystem _mindSystem = default!; public override string Command => "makesentient"; diff --git a/Content.Server/Mind/Commands/MindInfoCommand.cs b/Content.Server/Mind/Commands/MindInfoCommand.cs index f1b987a8cbb..6e46b26e74c 100644 --- a/Content.Server/Mind/Commands/MindInfoCommand.cs +++ b/Content.Server/Mind/Commands/MindInfoCommand.cs @@ -9,11 +9,11 @@ namespace Content.Server.Mind.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class MindInfoCommand : LocalizedEntityCommands + public sealed partial class MindInfoCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly SharedMindSystem _minds = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private SharedMindSystem _minds = default!; public override string Command => "mindinfo"; diff --git a/Content.Server/Mind/Commands/RenameCommand.cs b/Content.Server/Mind/Commands/RenameCommand.cs index 8b49907b93a..0ebf1395c2f 100644 --- a/Content.Server/Mind/Commands/RenameCommand.cs +++ b/Content.Server/Mind/Commands/RenameCommand.cs @@ -9,12 +9,12 @@ namespace Content.Server.Mind.Commands; [AdminCommand(AdminFlags.VarEdit)] -public sealed class RenameCommand : LocalizedEntityCommands +public sealed partial class RenameCommand : LocalizedEntityCommands { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; public override string Command => "rename"; diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs index e9c18bd6114..2abe4ae05e6 100644 --- a/Content.Server/Mind/MindSystem.cs +++ b/Content.Server/Mind/MindSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.Mind; -public sealed class MindSystem : SharedMindSystem +public sealed partial class MindSystem : SharedMindSystem { - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly GhostSystem _ghosts = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private GhostSystem _ghosts = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private PvsOverrideSystem _pvsOverride = default!; public override void Initialize() { diff --git a/Content.Server/Mind/TransferMindOnGibSystem.cs b/Content.Server/Mind/TransferMindOnGibSystem.cs index 89910ba4f8b..598157e9bd9 100644 --- a/Content.Server/Mind/TransferMindOnGibSystem.cs +++ b/Content.Server/Mind/TransferMindOnGibSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Mind; /// to a different entity when they gib. /// used for skeletons. /// -public sealed class TransferMindOnGibSystem : EntitySystem +public sealed partial class TransferMindOnGibSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; /// public override void Initialize() diff --git a/Content.Server/Mindshield/MindShieldSystem.cs b/Content.Server/Mindshield/MindShieldSystem.cs index a97fdc7be48..01ccb1b19a3 100644 --- a/Content.Server/Mindshield/MindShieldSystem.cs +++ b/Content.Server/Mindshield/MindShieldSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.Mindshield; /// System used for adding or removing components with a mindshield implant /// as well as checking if the implanted is a Rev or Head Rev. /// -public sealed class MindShieldSystem : EntitySystem +public sealed partial class MindShieldSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly RoleSystem _roleSystem = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private IAdminLogManager _adminLogManager = default!; + [Dependency] private RoleSystem _roleSystem = default!; + [Dependency] private MindSystem _mindSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Server/Mining/MeteorSystem.cs b/Content.Server/Mining/MeteorSystem.cs index fa343c17a6f..b3f4ee39ca5 100644 --- a/Content.Server/Mining/MeteorSystem.cs +++ b/Content.Server/Mining/MeteorSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.Mining; -public sealed class MeteorSystem : EntitySystem +public sealed partial class MeteorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private MobThresholdSystem _mobThreshold = default!; /// public override void Initialize() diff --git a/Content.Server/Mining/MiningSystem.cs b/Content.Server/Mining/MiningSystem.cs index 4889677dc67..006cdf89422 100644 --- a/Content.Server/Mining/MiningSystem.cs +++ b/Content.Server/Mining/MiningSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Mining; /// /// This handles creating ores when the entity is destroyed. /// -public sealed class MiningSystem : EntitySystem +public sealed partial class MiningSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; /// public override void Initialize() diff --git a/Content.Server/MiningFluid/TrappedFluidExtractionSystem.cs b/Content.Server/MiningFluid/TrappedFluidExtractionSystem.cs index 33b07455729..d73c65e5f21 100644 --- a/Content.Server/MiningFluid/TrappedFluidExtractionSystem.cs +++ b/Content.Server/MiningFluid/TrappedFluidExtractionSystem.cs @@ -19,14 +19,14 @@ namespace Content.Server.MiningFluid; -public sealed class TrappedFluidExtractionSystem : EntitySystem +public sealed partial class TrappedFluidExtractionSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; private EntityQuery _trappedFluidQuery; diff --git a/Content.Server/MiningFluid/TrappedFluidSystem.cs b/Content.Server/MiningFluid/TrappedFluidSystem.cs index 0d01f8a7213..94bd553e071 100644 --- a/Content.Server/MiningFluid/TrappedFluidSystem.cs +++ b/Content.Server/MiningFluid/TrappedFluidSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.MiningFluid; -public sealed class TrappedFluidSystem : EntitySystem +public sealed partial class TrappedFluidSystem : EntitySystem { - [Dependency] private readonly MapSystem _mapSys = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private MapSystem _mapSys = default!; + [Dependency] private IRobustRandom _random = default!; private EntityQuery _gridQuery; private EntityQuery _floorPlanBuilderQuery; diff --git a/Content.Server/Mobs/CritMobActionsSystem.cs b/Content.Server/Mobs/CritMobActionsSystem.cs index c62c0dd5182..40171bbec07 100644 --- a/Content.Server/Mobs/CritMobActionsSystem.cs +++ b/Content.Server/Mobs/CritMobActionsSystem.cs @@ -25,21 +25,21 @@ namespace Content.Server.Mobs; /// /// Handles performing crit-specific actions. /// -public sealed class CritMobActionsSystem : EntitySystem +public sealed partial class CritMobActionsSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly DeathgaspSystem _deathgasp = default!; - [Dependency] private readonly IServerConsoleHost _host = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly IServerPreferencesManager _prefsManager = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private DeathgaspSystem _deathgasp = default!; + [Dependency] private IServerConsoleHost _host = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private IServerPreferencesManager _prefsManager = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; private const int MaxLastWordsLength = 30; public override void Initialize() diff --git a/Content.Server/Mobs/DeathgaspSystem.cs b/Content.Server/Mobs/DeathgaspSystem.cs index 56005617adb..4d6757c5db8 100644 --- a/Content.Server/Mobs/DeathgaspSystem.cs +++ b/Content.Server/Mobs/DeathgaspSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.Mobs; /// -public sealed class DeathgaspSystem : EntitySystem +public sealed partial class DeathgaspSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/Morgue/CrematoriumSystem.cs b/Content.Server/Morgue/CrematoriumSystem.cs index 77c75c9b17f..5ea5057a449 100644 --- a/Content.Server/Morgue/CrematoriumSystem.cs +++ b/Content.Server/Morgue/CrematoriumSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Morgue; -public sealed class CrematoriumSystem : SharedCrematoriumSystem +public sealed partial class CrematoriumSystem : SharedCrematoriumSystem { - [Dependency] private readonly GhostSystem _ghostSystem = default!; + [Dependency] private GhostSystem _ghostSystem = default!; public override void Initialize() { diff --git a/Content.Server/Morgue/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs index a97ccd04cd2..db764f6ecc7 100644 --- a/Content.Server/Morgue/MorgueSystem.cs +++ b/Content.Server/Morgue/MorgueSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Morgue; -public sealed class MorgueSystem : SharedMorgueSystem +public sealed partial class MorgueSystem : SharedMorgueSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/Motd/GetMOTDCommand.cs b/Content.Server/Motd/GetMOTDCommand.cs index 8cda9f3c31e..01770f9cfeb 100644 --- a/Content.Server/Motd/GetMOTDCommand.cs +++ b/Content.Server/Motd/GetMOTDCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Motd; /// A command that can be used by any player to print the Message of the Day. /// [AnyCommand] -public sealed class GetMotdCommand : LocalizedCommands +public sealed partial class GetMotdCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public override string Command => "get-motd"; diff --git a/Content.Server/Motd/MOTDCommand.cs b/Content.Server/Motd/MOTDCommand.cs index 9e59589b95b..c279f71f0a4 100644 --- a/Content.Server/Motd/MOTDCommand.cs +++ b/Content.Server/Motd/MOTDCommand.cs @@ -8,9 +8,9 @@ namespace Content.Server.Motd; /// A console command which acts as an alias for or depending on the number of arguments given. /// [AnyCommand] -internal sealed class MOTDCommand : LocalizedCommands +internal sealed partial class MOTDCommand : LocalizedCommands { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; public override string Command => "motd"; diff --git a/Content.Server/Motd/MOTDSystem.cs b/Content.Server/Motd/MOTDSystem.cs index a5bd369a172..f5d475d72db 100644 --- a/Content.Server/Motd/MOTDSystem.cs +++ b/Content.Server/Motd/MOTDSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Motd; /// /// The system that handles broadcasting the Message Of The Day to players when they join the lobby/the MOTD changes/they ask for it to be printed. /// -public sealed class MOTDSystem : EntitySystem +public sealed partial class MOTDSystem : EntitySystem { - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; /// /// The cached value of the Message of the Day. Used for fast access. diff --git a/Content.Server/Motd/SetMOTDCommand.cs b/Content.Server/Motd/SetMOTDCommand.cs index 1481f9663ad..fb80c781abb 100644 --- a/Content.Server/Motd/SetMOTDCommand.cs +++ b/Content.Server/Motd/SetMOTDCommand.cs @@ -13,11 +13,11 @@ namespace Content.Server.Motd; /// A console command usable by any user which prints or sets the Message of the Day. /// [AdminCommand(AdminFlags.Moderator)] -public sealed class SetMotdCommand : LocalizedCommands +public sealed partial class SetMotdCommand : LocalizedCommands { - [Dependency] private readonly IAdminLogManager _adminLogManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IAdminLogManager _adminLogManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; public override string Command => "set-motd"; diff --git a/Content.Server/Movement/LockEyesCommand.cs b/Content.Server/Movement/LockEyesCommand.cs index 006d8b4dce5..edf0875e763 100644 --- a/Content.Server/Movement/LockEyesCommand.cs +++ b/Content.Server/Movement/LockEyesCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Movement; [AdminCommand(AdminFlags.Fun)] -public sealed class LockEyesCommand : LocalizedEntityCommands +public sealed partial class LockEyesCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedMoverController _controller = default!; + [Dependency] private SharedMoverController _controller = default!; public override string Command => $"lockeyes"; diff --git a/Content.Server/Movement/Systems/BoundarySystem.cs b/Content.Server/Movement/Systems/BoundarySystem.cs index a82348926ed..1d3419e41bb 100644 --- a/Content.Server/Movement/Systems/BoundarySystem.cs +++ b/Content.Server/Movement/Systems/BoundarySystem.cs @@ -3,13 +3,13 @@ namespace Content.Server.Movement.Systems; -public sealed class BoundarySystem : EntitySystem +public sealed partial class BoundarySystem : EntitySystem { /* * The real reason this even exists is because with out mover controller it's really easy to clip out of bounds on chain shapes. */ - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private SharedTransformSystem _xform = default!; public override void Initialize() { diff --git a/Content.Server/Movement/Systems/JetpackSystem.cs b/Content.Server/Movement/Systems/JetpackSystem.cs index dbcd8a51376..4e3641ff0ed 100644 --- a/Content.Server/Movement/Systems/JetpackSystem.cs +++ b/Content.Server/Movement/Systems/JetpackSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Movement.Systems; -public sealed class JetpackSystem : SharedJetpackSystem +public sealed partial class JetpackSystem : SharedJetpackSystem { - [Dependency] private readonly GasTankSystem _gasTank = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private GasTankSystem _gasTank = default!; + [Dependency] private IGameTiming _timing = default!; protected override bool CanEnable(EntityUid uid, JetpackComponent component) { diff --git a/Content.Server/Movement/Systems/LagCompensationSystem.cs b/Content.Server/Movement/Systems/LagCompensationSystem.cs index fef07c7c0b3..6b7a5408623 100644 --- a/Content.Server/Movement/Systems/LagCompensationSystem.cs +++ b/Content.Server/Movement/Systems/LagCompensationSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Movement.Systems; /// Stores a buffer of previous positions of the relevant entity. /// Can be used to check the entity's position at a recent point in time. /// -public sealed class LagCompensationSystem : EntitySystem +public sealed partial class LagCompensationSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; // I figured 500 ping is max, so 1.5 is 750. // Max ping I've had is 350ms from aus to spain. diff --git a/Content.Server/Movement/Systems/MapBoundsSystem.cs b/Content.Server/Movement/Systems/MapBoundsSystem.cs index e3b951f0355..b4bedde60f1 100644 --- a/Content.Server/Movement/Systems/MapBoundsSystem.cs +++ b/Content.Server/Movement/Systems/MapBoundsSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Movement.Systems; -public sealed class MapBoundsSystem : EntitySystem +public sealed partial class MapBoundsSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() { diff --git a/Content.Server/Movement/Systems/PullController.cs b/Content.Server/Movement/Systems/PullController.cs index 2bfae24c8dd..7aa9091bd59 100644 --- a/Content.Server/Movement/Systems/PullController.cs +++ b/Content.Server/Movement/Systems/PullController.cs @@ -21,7 +21,7 @@ namespace Content.Server.Movement.Systems; -public sealed class PullController : VirtualController +public sealed partial class PullController : VirtualController { /* * This code is awful. If you try to tweak this without refactoring it I'm gonna revert it. @@ -53,11 +53,11 @@ public sealed class PullController : VirtualController // How much you must move for the puller movement check to actually hit. private const float MinimumMovementDistance = 0.005f; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; /// /// If distance between puller and pulled entity lower that this threshold, diff --git a/Content.Server/NPC/Commands/AddNPCCommand.cs b/Content.Server/NPC/Commands/AddNPCCommand.cs index 92425b8aa11..f208aef7f39 100644 --- a/Content.Server/NPC/Commands/AddNPCCommand.cs +++ b/Content.Server/NPC/Commands/AddNPCCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.NPC.Commands { [AdminCommand(AdminFlags.Fun)] - public sealed class AddNPCCommand : IConsoleCommand + public sealed partial class AddNPCCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private IEntityManager _entities = default!; public string Command => "addnpc"; public string Description => "Add a HTN NPC component with a given root task"; diff --git a/Content.Server/NPC/Commands/NPCCommand.cs b/Content.Server/NPC/Commands/NPCCommand.cs index 451d440f455..a75a3a8d38b 100644 --- a/Content.Server/NPC/Commands/NPCCommand.cs +++ b/Content.Server/NPC/Commands/NPCCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.NPC.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class NpcCommand : LocalizedEntityCommands +public sealed partial class NpcCommand : LocalizedEntityCommands { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; public override string Command => "npc"; diff --git a/Content.Server/NPC/Commands/NPCDomainCommand.cs b/Content.Server/NPC/Commands/NPCDomainCommand.cs index 836e5e90bb5..ecf5e017147 100644 --- a/Content.Server/NPC/Commands/NPCDomainCommand.cs +++ b/Content.Server/NPC/Commands/NPCDomainCommand.cs @@ -10,10 +10,10 @@ namespace Content.Server.NPC.Commands; /// Lists out the domain of a particular HTN compound task. /// [AdminCommand(AdminFlags.Debug)] -public sealed class NPCDomainCommand : IConsoleCommand +public sealed partial class NPCDomainCommand : IConsoleCommand { - [Dependency] private readonly IEntitySystemManager _sysManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; + [Dependency] private IEntitySystemManager _sysManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; public string Command => "npcdomain"; public string Description => "Lists the domain of a particular HTN compound task"; diff --git a/Content.Server/NPC/HTN/HTNSystem.cs b/Content.Server/NPC/HTN/HTNSystem.cs index 2856aa8ec61..c154a5f2303 100644 --- a/Content.Server/NPC/HTN/HTNSystem.cs +++ b/Content.Server/NPC/HTN/HTNSystem.cs @@ -16,12 +16,12 @@ namespace Content.Server.NPC.HTN; -public sealed class HTNSystem : EntitySystem +public sealed partial class HTNSystem : EntitySystem { - [Dependency] private readonly IAdminManager _admin = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly NPCUtilitySystem _utility = default!; + [Dependency] private IAdminManager _admin = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private NPCUtilitySystem _utility = default!; private readonly JobQueue _planQueue = new(0.004); diff --git a/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs index 93f7679766f..d8938cc96a7 100644 --- a/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/ActiveHandComponentPrecondition.cs @@ -8,7 +8,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class ActiveHandComponentPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("invert")] public bool Invert; diff --git a/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs index 049d81130a0..1a2c8122753 100644 --- a/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/ActiveHandEntityPrecondition.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class ActiveHandEntityPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public override bool IsMet(NPCBlackboard blackboard) { diff --git a/Content.Server/NPC/HTN/Preconditions/ActiveHandFreePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/ActiveHandFreePrecondition.cs index cfd1a85c2d5..4d948036107 100644 --- a/Content.Server/NPC/HTN/Preconditions/ActiveHandFreePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/ActiveHandFreePrecondition.cs @@ -5,7 +5,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class ActiveHandFreePrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public override bool IsMet(NPCBlackboard blackboard) { diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs index 452bf327f25..ca62d9251f2 100644 --- a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class CoordinatesInRangePrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private SharedTransformSystem _transformSystem = default!; [DataField("targetKey", required: true)] public string TargetKey = default!; diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs index 901831679e8..19128f15111 100644 --- a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class CoordinatesNotInRangePrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private SharedTransformSystem _transformSystem = default!; [DataField("targetKey", required: true)] public string TargetKey = default!; diff --git a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs index 961d3c39ab7..3f828a95b97 100644 --- a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs @@ -8,7 +8,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class GunAmmoPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField] public float MinPercent = 0f; diff --git a/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs index 4a56eeb9539..671e5b8ff5b 100644 --- a/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs @@ -5,7 +5,7 @@ namespace Content.Server.NPC.HTN.Preconditions; public sealed partial class HandcuffedPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField] public bool ReactOnlyWhenFullyCuffed = true; diff --git a/Content.Server/NPC/HTN/Preconditions/HasOrdersPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HasOrdersPrecondition.cs index d2976c98a68..dce76aa85ee 100644 --- a/Content.Server/NPC/HTN/Preconditions/HasOrdersPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/HasOrdersPrecondition.cs @@ -2,7 +2,7 @@ namespace Content.Server.NPC.HTN.Preconditions; public sealed partial class HasOrdersPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("orders", required: true)] public Enum Orders = default!; diff --git a/Content.Server/NPC/HTN/Preconditions/HungryPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HungryPrecondition.cs index b4851445188..8ab216b10fb 100644 --- a/Content.Server/NPC/HTN/Preconditions/HungryPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/HungryPrecondition.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class HungryPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true)] public HungerThreshold MinHungerState = HungerThreshold.Starving; diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs index dff2de45d6a..b367c0acf0b 100644 --- a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.Preconditions.Math; /// public sealed partial class KeyBoolEqualsPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true), ViewVariables] public string Key = string.Empty; diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs index 50530b3c54a..d8e363bc7f3 100644 --- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.Preconditions.Math; /// public sealed partial class KeyFloatEqualsPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true), ViewVariables] public string Key = string.Empty; diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs index b31aad577b0..02af5a151a5 100644 --- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.Preconditions.Math; /// public sealed partial class KeyFloatGreaterPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true), ViewVariables] public string Key = string.Empty; diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs index 542cae08278..a22209fa8a8 100644 --- a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.Preconditions.Math; /// public sealed partial class KeyFloatLessPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true), ViewVariables] public string Key = string.Empty; diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInLOSPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInLOSPrecondition.cs index bb27ae8868f..5c7c8870ab2 100644 --- a/Content.Server/NPC/HTN/Preconditions/TargetInLOSPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/TargetInLOSPrecondition.cs @@ -5,7 +5,7 @@ namespace Content.Server.NPC.HTN.Preconditions; public sealed partial class TargetInLOSPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private InteractionSystem _interaction = default!; [DataField("targetKey")] diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs index b88d17b13d9..de08c67396a 100644 --- a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class TargetInRangePrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private SharedTransformSystem _transformSystem = default!; [DataField("targetKey", required: true)] public string TargetKey = default!; diff --git a/Content.Server/NPC/HTN/Preconditions/ThirstyPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/ThirstyPrecondition.cs index 5ff66da38d2..7ca93e84b08 100644 --- a/Content.Server/NPC/HTN/Preconditions/ThirstyPrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/ThirstyPrecondition.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.Preconditions; /// public sealed partial class ThirstyPrecondition : HTNPrecondition { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true)] public ThirstThreshold MinThirstState = ThirstThreshold.Parched; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs index 775b89bd1a2..3ad0e4108f1 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/ContainerOperator.cs @@ -4,7 +4,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat; public sealed partial class ContainerOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private ContainerSystem _container = default!; private EntityQuery _transformQuery; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs index d023865a06d..cd8735226dc 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/EscapeOperator.cs @@ -9,7 +9,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Melee; public sealed partial class EscapeOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private ContainerSystem _container = default!; private EntityStorageSystem _entityStorage = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/JukeOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/JukeOperator.cs index 02a3b085104..7b7d7543b84 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/JukeOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/JukeOperator.cs @@ -4,7 +4,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat; public sealed partial class JukeOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("jukeType")] public JukeType JukeType = JukeType.AdjacentTile; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs index 9f6fd73bcdf..84cf8f04709 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeAttackOperator.cs @@ -11,7 +11,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Melee; /// public sealed partial class MeleeAttackOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private SharedMeleeWeaponSystem _melee; /// diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs index 6a5c4599206..0202a2f7f3b 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Melee/MeleeOperator.cs @@ -12,7 +12,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Melee; /// public sealed partial class MeleeOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; /// /// When to shut the task down. diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Ranged/GunOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Ranged/GunOperator.cs index f4f77553ec3..bd44c9b6624 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Ranged/GunOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/Ranged/GunOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat.Ranged; public sealed partial class GunOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("shutdownState")] public HTNPlanState ShutdownState { get; private set; } = HTNPlanState.TaskFinished; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs index 467ac0d4142..b4299b8a4a9 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat; public sealed partial class UnPullOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private PullingSystem _pulling = default!; private ActionBlockerSystem _actionBlocker = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/AltInteractOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/AltInteractOperator.cs index 7aa2a180375..ac69327558f 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/AltInteractOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/AltInteractOperator.cs @@ -8,7 +8,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; public sealed partial class AltInteractOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("targetKey")] public string Key = "Target"; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs index 374f342edd0..04c6199d6c0 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/DropOperator.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; /// public sealed partial class DropOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime) { diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/EquipOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/EquipOperator.cs index e64a7184e4b..7bd2f49571b 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/EquipOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/EquipOperator.cs @@ -4,7 +4,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; public sealed partial class EquipOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField("target")] public string Target = "Target"; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs index 111054c6970..7ea2f16e2c5 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs @@ -7,7 +7,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; public sealed partial class InteractWithOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private SharedDoAfterSystem _doAfterSystem = default!; public override void Initialize(IEntitySystemManager sysManager) diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/SwapToFreeHandOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/SwapToFreeHandOperator.cs index cf1c0d068a1..a9226e43555 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/SwapToFreeHandOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/SwapToFreeHandOperator.cs @@ -11,7 +11,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; /// public sealed partial class SwapToFreeHandOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public override async Task<(bool Valid, Dictionary? Effects)> Plan(NPCBlackboard blackboard, CancellationToken cancelToken) { diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs index e397539b1f8..c83936d127e 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs @@ -9,7 +9,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math; /// public sealed partial class AddFloatOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField(required: true), ViewVariables] public string TargetKey = string.Empty; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs index c57988df8be..8a61cbdce30 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs @@ -11,7 +11,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math; /// public sealed partial class SetRandomFloatOperator : HTNOperator { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; [DataField(required: true), ViewVariables] public string TargetKey = string.Empty; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs index 6398b3e8afa..dfa1408aa6e 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/MoveToOperator.cs @@ -15,7 +15,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; /// public sealed partial class MoveToOperator : HTNOperator, IHtnConditionalShutdown { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private NPCSteeringSystem _steering = default!; private PathfindingSystem _pathfind = default!; private SharedTransformSystem _transform = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleComponentOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleComponentOperator.cs index 979e7c145c2..57b1e500906 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleComponentOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleComponentOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; /// public sealed partial class PickAccessibleComponentOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private PathfindingSystem _pathfinding = default!; private EntityLookupSystem _lookup = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleOperator.cs index 3ecebe07806..6bc363220cb 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickAccessibleOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; /// public sealed partial class PickAccessibleOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private PathfindingSystem _pathfinding = default!; [DataField("rangeKey", required: true)] diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickRandomRotationOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickRandomRotationOperator.cs index 441c4edea1d..536badb9de2 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickRandomRotationOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PickRandomRotationOperator.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class PickRandomRotationOperator : HTNOperator { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; [DataField("targetKey")] public string TargetKey = "RotateTarget"; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RandomOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RandomOperator.cs index 1adcf09be17..74a48647465 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RandomOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RandomOperator.cs @@ -6,8 +6,8 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class RandomOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IRobustRandom _random = default!; /// /// Target blackboard key to set the value to. Doesn't need to exist beforehand. diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RotateToTargetOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RotateToTargetOperator.cs index 71a25bc5486..a6ce7fe3f92 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RotateToTargetOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/RotateToTargetOperator.cs @@ -4,7 +4,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class RotateToTargetOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; private RotateToFaceSystem _rotate = default!; [DataField("targetKey")] diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs index 430d82b16ff..9f398969b6e 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs @@ -5,7 +5,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SayKeyOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private ChatSystem _chat = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs index 9ca00172b86..0aeb4026d64 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SpeakOperator.cs @@ -12,11 +12,11 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; public sealed partial class SpeakOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entMan = default!; + [Dependency] private IGameTiming _gameTiming = default!; private ChatSystem _chat = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; [DataField(required: true)] public SpeakOperatorSpeech Speech; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/EnsureComponentOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/EnsureComponentOperator.cs index 317b7aacf2e..1a206eccd15 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/EnsureComponentOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/EnsureComponentOperator.cs @@ -4,7 +4,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific; public sealed partial class EnsureComponentOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; /// /// Target entity to inject. diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs index 20e3daec538..9b70f7cdc4b 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/MedibotInjectOperator.cs @@ -10,7 +10,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific; public sealed partial class MedibotInjectOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; private ChatSystem _chat = default!; private MedibotSystem _medibot = default!; private SharedAudioSystem _audio = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs index b3535dea07c..2b2a31abffc 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/PickNearbyInjectableOperator.cs @@ -15,7 +15,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific; public sealed partial class PickNearbyInjectableOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; private MedibotSystem _medibot = default!; private PathfindingSystem _pathfinding = default!; private DamageableSystem _damageable = default!; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs index a9bf9e4cb39..a634778cd20 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Specific/RaiseEventForOwnerOperator.cs @@ -6,7 +6,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Specific; /// public sealed partial class RaiseEventForOwnerOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; /// /// The conceptual "target" of this event. Note that this is NOT the entity for which the event is raised. If null, diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Test/PickPathfindPointOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Test/PickPathfindPointOperator.cs index 3011f2c3b13..31ae54546f3 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Test/PickPathfindPointOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Test/PickPathfindPointOperator.cs @@ -7,8 +7,8 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Test; public sealed partial class PickPathfindPointOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IRobustRandom _random = default!; public override async Task<(bool Valid, Dictionary? Effects)> Plan(NPCBlackboard blackboard, CancellationToken cancelToken) diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/UtilityOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/UtilityOperator.cs index a3c34128371..3996ecbd5f7 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/UtilityOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/UtilityOperator.cs @@ -13,7 +13,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; /// public sealed partial class UtilityOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; [DataField] public string Key = "Target"; diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/WaitOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/WaitOperator.cs index 26fea76d700..d7f5924d7e0 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/WaitOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/WaitOperator.cs @@ -5,7 +5,7 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators; /// public sealed partial class WaitOperator : HTNOperator { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; /// /// Blackboard key for the time we'll wait for. diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs index 5193a4f522d..c8bfa6bee27 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs @@ -40,18 +40,18 @@ public sealed partial class PathfindingSystem : SharedPathfindingSystem * See PathfindingSystem.Grid for a description of the grid implementation. */ - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IParallelManager _parallel = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IParallelManager _parallel = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; private readonly Dictionary _subscribedSessions = new(); diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs index 34a1fe533d7..43d240ce1b6 100644 --- a/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs +++ b/Content.Server/NPC/Systems/NPCCombatSystem.Ranged.cs @@ -11,8 +11,8 @@ namespace Content.Server.NPC.Systems; public sealed partial class NPCCombatSystem { - [Dependency] private readonly SharedCombatModeSystem _combat = default!; - [Dependency] private readonly RotateToFaceSystem _rotate = default!; + [Dependency] private SharedCombatModeSystem _combat = default!; + [Dependency] private RotateToFaceSystem _rotate = default!; private EntityQuery _combatQuery; private EntityQuery _steeringQuery; diff --git a/Content.Server/NPC/Systems/NPCCombatSystem.cs b/Content.Server/NPC/Systems/NPCCombatSystem.cs index 644af8f4aa5..f4a08d23fe8 100644 --- a/Content.Server/NPC/Systems/NPCCombatSystem.cs +++ b/Content.Server/NPC/Systems/NPCCombatSystem.cs @@ -13,16 +13,16 @@ namespace Content.Server.NPC.Systems; /// public sealed partial class NPCCombatSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly GunSystem _gun = default!; - [Dependency] private readonly InteractionSystem _interaction = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly NPCSteeringSystem _steering = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private GunSystem _gun = default!; + [Dependency] private InteractionSystem _interaction = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private NPCSteeringSystem _steering = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedMeleeWeaponSystem _melee = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// /// If disabled we'll move into range but not attack. diff --git a/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs b/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs index bc81a90bd0b..b0c2cb71b4a 100644 --- a/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs +++ b/Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.NPC.Systems; public sealed partial class NPCImprintingOnSpawnBehaviourSystem : SharedNPCImprintingOnSpawnBehaviourSystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Server/NPC/Systems/NPCJukeSystem.cs b/Content.Server/NPC/Systems/NPCJukeSystem.cs index 6b19f32e74b..c96a057898a 100644 --- a/Content.Server/NPC/Systems/NPCJukeSystem.cs +++ b/Content.Server/NPC/Systems/NPCJukeSystem.cs @@ -10,14 +10,14 @@ namespace Content.Server.NPC.Systems; -public sealed class NPCJukeSystem : EntitySystem +public sealed partial class NPCJukeSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly MeleeWeaponSystem _melee = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private MeleeWeaponSystem _melee = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; private EntityQuery _npcMeleeQuery; private EntityQuery _npcRangedQuery; diff --git a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs index 7ccc2cfd256..c4d94f32a59 100644 --- a/Content.Server/NPC/Systems/NPCRetaliationSystem.cs +++ b/Content.Server/NPC/Systems/NPCRetaliationSystem.cs @@ -12,10 +12,10 @@ namespace Content.Server.NPC.Systems; /// /// Handles NPC which become aggressive after being attacked. /// -public sealed class NPCRetaliationSystem : EntitySystem +public sealed partial class NPCRetaliationSystem : EntitySystem { - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private IGameTiming _timing = default!; /// public override void Initialize() diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs index a1ff3ac7104..04c0ae7bf31 100644 --- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs +++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs @@ -50,24 +50,24 @@ public sealed partial class NPCSteeringSystem : SharedNPCSteeringSystem * (though in their case it was for an F1 game so used context steering across the width of the road). */ - [Dependency] private readonly IAdminManager _admin = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] private readonly DoAfterSystem _doAfter = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly PathfindingSystem _pathfindingSystem = default!; - [Dependency] private readonly PryingSystem _pryingSystem = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedCombatModeSystem _combat = default!; + [Dependency] private IAdminManager _admin = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] private DoAfterSystem _doAfter = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private PathfindingSystem _pathfindingSystem = default!; + [Dependency] private PryingSystem _pryingSystem = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedMeleeWeaponSystem _melee = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedCombatModeSystem _combat = default!; private EntityQuery _fixturesQuery; private EntityQuery _modifierQuery; diff --git a/Content.Server/NPC/Systems/NPCSystem.cs b/Content.Server/NPC/Systems/NPCSystem.cs index 695d254dc88..1feee3df635 100644 --- a/Content.Server/NPC/Systems/NPCSystem.cs +++ b/Content.Server/NPC/Systems/NPCSystem.cs @@ -23,10 +23,10 @@ public sealed partial class NPCSystem : SharedNPCSystem "npc_active_count", "Amount of NPCs that are actively processing"); - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly HTNSystem _htn = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private HTNSystem _htn = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedMindSystem _mind = default!; /// /// Whether any NPCs are allowed to run at all. diff --git a/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs b/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs index acd71b0d4c6..2b7dcb0546b 100644 --- a/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs +++ b/Content.Server/NPC/Systems/NPCUseActionOnTargetSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.NPC.Systems; -public sealed class NPCUseActionOnTargetSystem : EntitySystem +public sealed partial class NPCUseActionOnTargetSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private SharedActionsSystem _actions = default!; /// public override void Initialize() diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs index aa6a639c39b..7c9239b89ca 100644 --- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs +++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs @@ -37,25 +37,25 @@ namespace Content.Server.NPC.Systems; /// /// Handles utility queries for NPCs. /// -public sealed class NPCUtilitySystem : EntitySystem +public sealed partial class NPCUtilitySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly IngestionSystem _ingestion = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!; - [Dependency] private readonly WeldableSystem _weldable = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly MobThresholdSystem _thresholdSystem = default!; - [Dependency] private readonly TurretTargetSettingsSystem _turretTargetSettings = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private IngestionSystem _ingestion = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedSolutionContainerSystem _solutions = default!; + [Dependency] private WeldableSystem _weldable = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private MobThresholdSystem _thresholdSystem = default!; + [Dependency] private TurretTargetSettingsSystem _turretTargetSettings = default!; + [Dependency] private DamageableSystem _damageable = default!; private EntityQuery _puddleQuery; private EntityQuery _xformQuery; diff --git a/Content.Server/NameIdentifier/NameIdentifierSystem.cs b/Content.Server/NameIdentifier/NameIdentifierSystem.cs index e5d667daafa..9f68b3e326f 100644 --- a/Content.Server/NameIdentifier/NameIdentifierSystem.cs +++ b/Content.Server/NameIdentifier/NameIdentifierSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.NameIdentifier; -public sealed class NameIdentifierSystem : SharedNameIdentifierSystem +public sealed partial class NameIdentifierSystem : SharedNameIdentifierSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly NameModifierSystem _nameModifier = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private NameModifierSystem _nameModifier = default!; /// /// Free IDs available per . diff --git a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs index 98fae3ae131..f1de18ff766 100644 --- a/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs +++ b/Content.Server/Ninja/Systems/BatteryDrainerSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.Ninja.Systems; /// /// Handles the doafter and power transfer when draining. /// -public sealed class BatteryDrainerSystem : SharedBatteryDrainerSystem +public sealed partial class BatteryDrainerSystem : SharedBatteryDrainerSystem { - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/Ninja/Systems/ItemCreatorSystem.cs b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs index cca80f2e42b..c81524f787a 100644 --- a/Content.Server/Ninja/Systems/ItemCreatorSystem.cs +++ b/Content.Server/Ninja/Systems/ItemCreatorSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Ninja.Systems; -public sealed class ItemCreatorSystem : SharedItemCreatorSystem +public sealed partial class ItemCreatorSystem : SharedItemCreatorSystem { - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs index 29e3848c854..e99499766ff 100644 --- a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs +++ b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Ninja.Systems; /// /// Handles the toggle gloves action. /// -public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem +public sealed partial class NinjaGlovesSystem : SharedNinjaGlovesSystem { - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; - [Dependency] private readonly SpaceNinjaSystem _ninja = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; + [Dependency] private SpaceNinjaSystem _ninja = default!; protected override void EnableGloves(Entity ent, Entity user) { diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs index f6c4643cad4..91bf220f1be 100644 --- a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs +++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs @@ -14,13 +14,13 @@ namespace Content.Server.Ninja.Systems; /// Handles power cell upgrading and actions. /// TODO: Move all of this to shared and predict it /// -public sealed class NinjaSuitSystem : SharedNinjaSuitSystem +public sealed partial class NinjaSuitSystem : SharedNinjaSuitSystem { - [Dependency] private readonly SharedEmpSystem _emp = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SpaceNinjaSystem _ninja = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedEmpSystem _emp = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SpaceNinjaSystem _ninja = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private SharedTransformSystem _transform = default!; // How much the cell score should be increased per 1 AutoRechargeRate. private const int AutoRechargeValue = 100; diff --git a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs index 93bc778876c..b046e5068df 100644 --- a/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs +++ b/Content.Server/Ninja/Systems/SpaceNinjaSystem.cs @@ -21,13 +21,13 @@ namespace Content.Server.Ninja.Systems; /// /// Main ninja system that handles ninja setup, provides helper methods for the rest of the code to use. /// -public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem +public sealed partial class SpaceNinjaSystem : SharedSpaceNinjaSystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly CodeConditionSystem _codeCondition = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private CodeConditionSystem _codeCondition = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs index c2d9fb3f683..0314c257c20 100644 --- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs +++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Ninja.Systems; /// /// Prevents planting a spider charge outside of its location and handles greentext. /// -public sealed class SpiderChargeSystem : SharedSpiderChargeSystem +public sealed partial class SpiderChargeSystem : SharedSpiderChargeSystem { - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SpaceNinjaSystem _ninja = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedRoleSystem _role = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SpaceNinjaSystem _ninja = default!; public override void Initialize() { diff --git a/Content.Server/Ninja/Systems/StunProviderSystem.cs b/Content.Server/Ninja/Systems/StunProviderSystem.cs index 387844b6b1a..225028a2539 100644 --- a/Content.Server/Ninja/Systems/StunProviderSystem.cs +++ b/Content.Server/Ninja/Systems/StunProviderSystem.cs @@ -15,16 +15,16 @@ namespace Content.Server.Ninja.Systems; /// /// Shocks clicked mobs using battery charge. /// -public sealed class StunProviderSystem : SharedStunProviderSystem +public sealed partial class StunProviderSystem : SharedStunProviderSystem { - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs index 9d20a61ba0a..9e1c3e31933 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs @@ -12,9 +12,9 @@ namespace Content.Server.NodeContainer.EntitySystems /// /// [UsedImplicitly] - public sealed class NodeContainerSystem : SharedNodeContainerSystem + public sealed partial class NodeContainerSystem : SharedNodeContainerSystem { - [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!; + [Dependency] private NodeGroupSystem _nodeGroupSystem = default!; private EntityQuery _query; public override void Initialize() diff --git a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs index f288a3c697e..a6b2f345e18 100644 --- a/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs +++ b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs @@ -19,12 +19,12 @@ namespace Content.Server.NodeContainer.EntitySystems /// /// [UsedImplicitly] - public sealed class NodeGroupSystem : EntitySystem + public sealed partial class NodeGroupSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly INodeGroupFactory _nodeGroupFactory = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private INodeGroupFactory _nodeGroupFactory = default!; + [Dependency] private ILogManager _logManager = default!; private readonly List _visDeletes = new(); private readonly List _visSends = new(); diff --git a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs index 06e25cf4e9f..5197d4796c5 100644 --- a/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs +++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs @@ -18,10 +18,10 @@ public interface INodeGroupFactory INodeGroup MakeNodeGroup(NodeGroupID id); } - public sealed class NodeGroupFactory : INodeGroupFactory + public sealed partial class NodeGroupFactory : INodeGroupFactory { - [Dependency] private readonly IReflectionManager _reflectionManager = default!; - [Dependency] private readonly IDynamicTypeFactory _typeFactory = default!; + [Dependency] private IReflectionManager _reflectionManager = default!; + [Dependency] private IDynamicTypeFactory _typeFactory = default!; private readonly Dictionary _groupTypes = new(); diff --git a/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs b/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs index 199ea154c1f..8d08e031384 100644 --- a/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs +++ b/Content.Server/Nuke/Commands/SendNukeCodesCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Nuke.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class SendNukeCodesCommand : LocalizedEntityCommands +public sealed partial class SendNukeCodesCommand : LocalizedEntityCommands { - [Dependency] private readonly NukeCodePaperSystem _nukeCodeSystem = default!; + [Dependency] private NukeCodePaperSystem _nukeCodeSystem = default!; public override string Command => "nukecodes"; diff --git a/Content.Server/Nuke/Commands/ToggleNukeCommand.cs b/Content.Server/Nuke/Commands/ToggleNukeCommand.cs index d6f196ae340..ae13bc231c8 100644 --- a/Content.Server/Nuke/Commands/ToggleNukeCommand.cs +++ b/Content.Server/Nuke/Commands/ToggleNukeCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Nuke.Commands; [UsedImplicitly] [AdminCommand(AdminFlags.Fun)] -public sealed class ToggleNukeCommand : LocalizedCommands +public sealed partial class ToggleNukeCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public override string Command => "nukearm"; diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs index c95fc7071cf..253aa7ce3e5 100644 --- a/Content.Server/Nuke/NukeCodePaperSystem.cs +++ b/Content.Server/Nuke/NukeCodePaperSystem.cs @@ -10,13 +10,13 @@ namespace Content.Server.Nuke { - public sealed class NukeCodePaperSystem : EntitySystem + public sealed partial class NukeCodePaperSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly PaperSystem _paper = default!; - [Dependency] private readonly FaxSystem _faxSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private PaperSystem _paper = default!; + [Dependency] private FaxSystem _faxSystem = default!; public override void Initialize() { diff --git a/Content.Server/Nuke/NukeLabelSystem.cs b/Content.Server/Nuke/NukeLabelSystem.cs index 39f0b1ca770..4baec34e038 100644 --- a/Content.Server/Nuke/NukeLabelSystem.cs +++ b/Content.Server/Nuke/NukeLabelSystem.cs @@ -3,10 +3,10 @@ namespace Content.Server.Nuke; /// /// This handles labelling an entity with a nuclear bomb label. /// -public sealed class NukeLabelSystem : EntitySystem +public sealed partial class NukeLabelSystem : EntitySystem { - [Dependency] private readonly NukeSystem _nuke = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private NukeSystem _nuke = default!; + [Dependency] private MetaDataSystem _metaData = default!; /// public override void Initialize() diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs index 4bae2192a1e..a2f531366cd 100644 --- a/Content.Server/Nuke/NukeSystem.cs +++ b/Content.Server/Nuke/NukeSystem.cs @@ -25,26 +25,26 @@ namespace Content.Server.Nuke; -public sealed class NukeSystem : EntitySystem +public sealed partial class NukeSystem : EntitySystem { - [Dependency] private readonly AlertLevelSystem _alertLevel = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly ExplosionSystem _explosions = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly PointLightSystem _pointLight = default!; - [Dependency] private readonly PopupSystem _popups = default!; - [Dependency] private readonly ServerGlobalSoundSystem _sound = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private AlertLevelSystem _alertLevel = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private ExplosionSystem _explosions = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private PointLightSystem _pointLight = default!; + [Dependency] private PopupSystem _popups = default!; + [Dependency] private ServerGlobalSoundSystem _sound = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private IGameTiming _timing = default!; /// /// Used to calculate when the nuke song should start playing for maximum kino with the nuke sfx diff --git a/Content.Server/NukeOps/WarDeclaratorSystem.cs b/Content.Server/NukeOps/WarDeclaratorSystem.cs index 71e4431d735..0cfa91469c7 100644 --- a/Content.Server/NukeOps/WarDeclaratorSystem.cs +++ b/Content.Server/NukeOps/WarDeclaratorSystem.cs @@ -16,15 +16,15 @@ namespace Content.Server.NukeOps; /// /// This handles nukeops special war mode declaration device and directly using nukeops game rule /// -public sealed class WarDeclaratorSystem : EntitySystem +public sealed partial class WarDeclaratorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; public override void Initialize() { diff --git a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs index e5f590a3626..463211f0f01 100644 --- a/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs +++ b/Content.Server/Nutrition/EntitySystems/AnimalHusbandrySystem.cs @@ -21,19 +21,19 @@ namespace Content.Server.Nutrition.EntitySystems; /// /// This handles logic and interactions related to /// -public sealed class AnimalHusbandrySystem : EntitySystem +public sealed partial class AnimalHusbandrySystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private NameModifierSystem _nameMod = default!; private readonly HashSet _failedAttempts = new(); private readonly HashSet _birthQueue = new(); diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs index 99b55be0955..7c5e63eb849 100644 --- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs @@ -18,15 +18,15 @@ namespace Content.Server.Nutrition.EntitySystems { [UsedImplicitly] - public sealed class CreamPieSystem : SharedCreamPieSystem + public sealed partial class CreamPieSystem : SharedCreamPieSystem { - [Dependency] private readonly IngestionSystem _ingestion = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!; - [Dependency] private readonly TriggerSystem _trigger = default!; + [Dependency] private IngestionSystem _ingestion = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedSolutionContainerSystem _solutions = default!; + [Dependency] private TriggerSystem _trigger = default!; public override void Initialize() { diff --git a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs index bbef1fd2d31..33fd881774a 100644 --- a/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FatExtractorSystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.Nutrition.EntitySystems; /// /// This handles logic and interactions relating to /// -public sealed class FatExtractorSystem : EntitySystem +public sealed partial class FatExtractorSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; /// public override void Initialize() diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs index 65ad6afa363..2f24a6f9128 100644 --- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs @@ -18,16 +18,16 @@ namespace Content.Server.Nutrition.EntitySystems; -public sealed class SliceableFoodSystem : EntitySystem +public sealed partial class SliceableFoodSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDestructibleSystem _destroy = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly DoAfterSystem _doAfter = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDestructibleSystem _destroy = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private DoAfterSystem _doAfter = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs index 9a1d64b2eb1..9b8bb4a1847 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.SmokingPipe.cs @@ -10,7 +10,7 @@ namespace Content.Server.Nutrition.EntitySystems { public sealed partial class SmokingSystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; private void InitializePipes() { diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs index 37b5c4e842a..48e2daf67a0 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.Vape.cs @@ -19,12 +19,12 @@ namespace Content.Server.Nutrition.EntitySystems { public sealed partial class SmokingSystem { - [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly IngestionSystem _ingestion = default!; - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private DoAfterSystem _doAfterSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private IngestionSystem _ingestion = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; private void InitializeVapes() { diff --git a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs index c4df0363a64..4b761175134 100644 --- a/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SmokingSystem.cs @@ -22,18 +22,18 @@ namespace Content.Server.Nutrition.EntitySystems { public sealed partial class SmokingSystem : EntitySystem { - [Dependency] private readonly ReactiveSystem _reactiveSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly ClothingSystem _clothing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedItemSystem _items = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ForensicsSystem _forensics = default!; + [Dependency] private ReactiveSystem _reactiveSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private BloodstreamSystem _bloodstreamSystem = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private ClothingSystem _clothing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedItemSystem _items = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private ForensicsSystem _forensics = default!; private const float UpdateTimer = 3f; diff --git a/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs b/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs index 08ff0c1d41b..66a78205ece 100644 --- a/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs +++ b/Content.Server/Nutrition/EntitySystems/TrashOnSolutionEmptySystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Nutrition.EntitySystems { - public sealed class TrashOnSolutionEmptySystem : EntitySystem + public sealed partial class TrashOnSolutionEmptySystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; private static readonly ProtoId TrashTag = "Trash"; diff --git a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs index 7327ee1ffd9..39a7b87cd8b 100644 --- a/Content.Server/Objectives/Commands/AddObjectiveCommand.cs +++ b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs @@ -11,12 +11,12 @@ namespace Content.Server.Objectives.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class AddObjectiveCommand : LocalizedEntityCommands +public sealed partial class AddObjectiveCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly ObjectivesSystem _objectives = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private ObjectivesSystem _objectives = default!; public override string Command => "addobjective"; diff --git a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs index fda0c483583..bf2089ab03d 100644 --- a/Content.Server/Objectives/Commands/ListObjectivesCommand.cs +++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs @@ -10,10 +10,10 @@ namespace Content.Server.Objectives.Commands { [AdminCommand(AdminFlags.Logs)] - public sealed class ListObjectivesCommand : LocalizedCommands + public sealed partial class ListObjectivesCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly IPlayerManager _players = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private IPlayerManager _players = default!; public override string Command => "lsobjectives"; diff --git a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs index dbdcd54b485..5dd1dc58ab2 100644 --- a/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs +++ b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs @@ -8,11 +8,11 @@ namespace Content.Server.Objectives.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class RemoveObjectiveCommand : LocalizedEntityCommands + public sealed partial class RemoveObjectiveCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; public override string Command => "rmobjective"; public override void Execute(IConsoleShell shell, string argStr, string[] args) diff --git a/Content.Server/Objectives/ObjectivesSystem.cs b/Content.Server/Objectives/ObjectivesSystem.cs index 459afa43153..08c37c10681 100644 --- a/Content.Server/Objectives/ObjectivesSystem.cs +++ b/Content.Server/Objectives/ObjectivesSystem.cs @@ -21,15 +21,15 @@ namespace Content.Server.Objectives; -public sealed class ObjectivesSystem : SharedObjectivesSystem +public sealed partial class ObjectivesSystem : SharedObjectivesSystem { - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly SharedJobSystem _job = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private SharedJobSystem _job = default!; + [Dependency] private IConfigurationManager _cfg = default!; private IEnumerable? _objectives; diff --git a/Content.Server/Objectives/Systems/CarpRiftsConditionSystem.cs b/Content.Server/Objectives/Systems/CarpRiftsConditionSystem.cs index a1890d0e13f..296ac5d9e60 100644 --- a/Content.Server/Objectives/Systems/CarpRiftsConditionSystem.cs +++ b/Content.Server/Objectives/Systems/CarpRiftsConditionSystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.Objectives.Systems; -public sealed class CarpRiftsConditionSystem : EntitySystem +public sealed partial class CarpRiftsConditionSystem : EntitySystem { - [Dependency] private readonly NumberObjectiveSystem _number = default!; + [Dependency] private NumberObjectiveSystem _number = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/CodeConditionSystem.cs b/Content.Server/Objectives/Systems/CodeConditionSystem.cs index af1df41fbae..b278a4a9782 100644 --- a/Content.Server/Objectives/Systems/CodeConditionSystem.cs +++ b/Content.Server/Objectives/Systems/CodeConditionSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Objectives.Systems; /// /// Handles progress and provides API for systems to use. /// -public sealed class CodeConditionSystem : EntitySystem +public sealed partial class CodeConditionSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/DieConditionSystem.cs b/Content.Server/Objectives/Systems/DieConditionSystem.cs index 8bc384646df..c1ab3bcf608 100644 --- a/Content.Server/Objectives/Systems/DieConditionSystem.cs +++ b/Content.Server/Objectives/Systems/DieConditionSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.Objectives.Systems; -public sealed class DieConditionSystem : EntitySystem +public sealed partial class DieConditionSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/EscapeShuttleConditionSystem.cs b/Content.Server/Objectives/Systems/EscapeShuttleConditionSystem.cs index 125e15e6159..6357ce63670 100644 --- a/Content.Server/Objectives/Systems/EscapeShuttleConditionSystem.cs +++ b/Content.Server/Objectives/Systems/EscapeShuttleConditionSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Objectives.Systems; -public sealed class EscapeShuttleConditionSystem : EntitySystem +public sealed partial class EscapeShuttleConditionSystem : EntitySystem { - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs index 0e07830092e..b7996afee0c 100644 --- a/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs +++ b/Content.Server/Objectives/Systems/HelpProgressConditionSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Objectives.Systems; /// /// Handles help progress condition logic. /// -public sealed class HelpProgressConditionSystem : EntitySystem +public sealed partial class HelpProgressConditionSystem : EntitySystem { - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; + [Dependency] private TargetObjectiveSystem _target = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs b/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs index 564fb79af52..fa89711ef2f 100644 --- a/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs +++ b/Content.Server/Objectives/Systems/HijackShuttleConditionSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.Objectives.Systems; -public sealed class HijackShuttleConditionSystem : EntitySystem +public sealed partial class HijackShuttleConditionSystem : EntitySystem { - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedRoleSystem _role = default!; + [Dependency] private MobStateSystem _mobState = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/KeepAliveCondition.cs b/Content.Server/Objectives/Systems/KeepAliveCondition.cs index f68227e861a..9d60295bd74 100644 --- a/Content.Server/Objectives/Systems/KeepAliveCondition.cs +++ b/Content.Server/Objectives/Systems/KeepAliveCondition.cs @@ -7,10 +7,10 @@ namespace Content.Server.Objectives.Systems; /// /// Handles keep alive condition logic. /// -public sealed class KeepAliveConditionSystem : EntitySystem +public sealed partial class KeepAliveConditionSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private TargetObjectiveSystem _target = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs index 9c8fa0b3350..192ab0951f8 100644 --- a/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs +++ b/Content.Server/Objectives/Systems/KillPersonConditionSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Objectives.Systems; /// /// Handles kill person condition logic and picking random kill targets. /// -public sealed class KillPersonConditionSystem : EntitySystem +public sealed partial class KillPersonConditionSystem : EntitySystem { - [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly TargetObjectiveSystem _target = default!; + [Dependency] private EmergencyShuttleSystem _emergencyShuttle = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private TargetObjectiveSystem _target = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs b/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs index 75811194fb0..f5fbe9cd4b7 100644 --- a/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs +++ b/Content.Server/Objectives/Systems/MultipleTraitorsRequirementSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Objectives.Systems; /// /// Handles requiring multiple traitors being alive for the objective to be given. /// -public sealed class MultipleTraitorsRequirementSystem : EntitySystem +public sealed partial class MultipleTraitorsRequirementSystem : EntitySystem { - [Dependency] private readonly TraitorRuleSystem _traitorRule = default!; + [Dependency] private TraitorRuleSystem _traitorRule = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs index 1b24d403221..22fcba388e9 100644 --- a/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs +++ b/Content.Server/Objectives/Systems/NinjaConditionsSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Objectives.Systems; /// Handles the objective conditions that hard depend on ninja. /// Survive is handled by since it works without being a ninja. /// -public sealed class NinjaConditionsSystem : EntitySystem +public sealed partial class NinjaConditionsSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly NumberObjectiveSystem _number = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private NumberObjectiveSystem _number = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedRoleSystem _roles = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs b/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs index 4c88bf03f38..ee610bc7ac7 100644 --- a/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs +++ b/Content.Server/Objectives/Systems/NotJobRequirementSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Objectives.Systems; /// /// Handles checking the job blacklist for this objective. /// -public sealed class NotJobRequirementSystem : EntitySystem +public sealed partial class NotJobRequirementSystem : EntitySystem { - [Dependency] private readonly SharedJobSystem _jobs = default!; + [Dependency] private SharedJobSystem _jobs = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/NumberObjectiveSystem.cs b/Content.Server/Objectives/Systems/NumberObjectiveSystem.cs index baac47a7ba9..d4c9d5af456 100644 --- a/Content.Server/Objectives/Systems/NumberObjectiveSystem.cs +++ b/Content.Server/Objectives/Systems/NumberObjectiveSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Objectives.Systems; /// /// Provides API for other components, handles picking the count and setting the title and description. /// -public sealed class NumberObjectiveSystem : EntitySystem +public sealed partial class NumberObjectiveSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs index e92943a65e5..429513e2fb5 100644 --- a/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs +++ b/Content.Server/Objectives/Systems/ObjectiveBlacklistRequirementSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Objectives.Systems; /// /// Handles applying the objective component blacklist to the objective entity. /// -public sealed class ObjectiveBlacklistRequirementSystem : EntitySystem +public sealed partial class ObjectiveBlacklistRequirementSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs b/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs index 02265d08997..5bef9d0487a 100644 --- a/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs +++ b/Content.Server/Objectives/Systems/PickObjectiveTargetSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Objectives.Systems; /// Handles assinging a target to an objective entity with using different components. /// These can be combined with condition components for objective completions in order to create a variety of objectives. /// -public sealed class PickObjectiveTargetSystem : EntitySystem +public sealed partial class PickObjectiveTargetSystem : EntitySystem { - [Dependency] private readonly TargetObjectiveSystem _target = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private TargetObjectiveSystem _target = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/RoleRequirementSystem.cs b/Content.Server/Objectives/Systems/RoleRequirementSystem.cs index a86d6bf23ad..762e7c0b6fe 100644 --- a/Content.Server/Objectives/Systems/RoleRequirementSystem.cs +++ b/Content.Server/Objectives/Systems/RoleRequirementSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Objectives.Systems; /// /// Handles role requirement for objectives that require a certain (probably antagonist) role(s). /// -public sealed class RoleRequirementSystem : EntitySystem +public sealed partial class RoleRequirementSystem : EntitySystem { - [Dependency] private readonly SharedRoleSystem _roles = default!; + [Dependency] private SharedRoleSystem _roles = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Objectives/Systems/StealConditionSystem.cs b/Content.Server/Objectives/Systems/StealConditionSystem.cs index e9d5bce6f08..e663f8943be 100644 --- a/Content.Server/Objectives/Systems/StealConditionSystem.cs +++ b/Content.Server/Objectives/Systems/StealConditionSystem.cs @@ -15,15 +15,15 @@ namespace Content.Server.Objectives.Systems; -public sealed class StealConditionSystem : EntitySystem +public sealed partial class StealConditionSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; + [Dependency] private EntityLookupSystem _lookup = default!; private EntityQuery _containerQuery; diff --git a/Content.Server/Objectives/Systems/SurviveConditionSystem.cs b/Content.Server/Objectives/Systems/SurviveConditionSystem.cs index 39a164f1c48..f52e396f4a2 100644 --- a/Content.Server/Objectives/Systems/SurviveConditionSystem.cs +++ b/Content.Server/Objectives/Systems/SurviveConditionSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Objectives.Systems; /// /// Handles progress for the survive objective condition. /// -public sealed class SurviveConditionSystem : EntitySystem +public sealed partial class SurviveConditionSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedMindSystem _mind = default!; public override void Initialize() { diff --git a/Content.Server/Objectives/Systems/TargetObjectiveSystem.cs b/Content.Server/Objectives/Systems/TargetObjectiveSystem.cs index 7ffdf9f82da..2d2478ea595 100644 --- a/Content.Server/Objectives/Systems/TargetObjectiveSystem.cs +++ b/Content.Server/Objectives/Systems/TargetObjectiveSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Objectives.Systems; /// /// Provides API for other components and handles setting the title. /// -public sealed class TargetObjectiveSystem : EntitySystem +public sealed partial class TargetObjectiveSystem : EntitySystem { - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedJobSystem _job = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedJobSystem _job = default!; public override void Initialize() { diff --git a/Content.Server/PAI/PAISystem.cs b/Content.Server/PAI/PAISystem.cs index d1ba560caf9..a27d68432db 100644 --- a/Content.Server/PAI/PAISystem.cs +++ b/Content.Server/PAI/PAISystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.PAI; -public sealed class PAISystem : EntitySystem +public sealed partial class PAISystem : EntitySystem { - [Dependency] private readonly InstrumentSystem _instrumentSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ToggleableGhostRoleSystem _toggleableGhostRole = default!; + [Dependency] private InstrumentSystem _instrumentSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ToggleableGhostRoleSystem _toggleableGhostRole = default!; /// /// Possible symbols that can be part of a scrambled pai's name. diff --git a/Content.Server/PDA/PdaSystem.cs b/Content.Server/PDA/PdaSystem.cs index 570997aabeb..e4353f9aadc 100644 --- a/Content.Server/PDA/PdaSystem.cs +++ b/Content.Server/PDA/PdaSystem.cs @@ -26,18 +26,18 @@ namespace Content.Server.PDA { - public sealed class PdaSystem : SharedPdaSystem + public sealed partial class PdaSystem : SharedPdaSystem { - [Dependency] private readonly CartridgeLoaderSystem _cartridgeLoader = default!; - [Dependency] private readonly InstrumentSystem _instrument = default!; - [Dependency] private readonly RingerSystem _ringer = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StoreSystem _store = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly UnpoweredFlashlightSystem _unpoweredFlashlight = default!; - [Dependency] private readonly ContainerSystem _containerSystem = default!; - [Dependency] private readonly IdCardSystem _idCard = default!; + [Dependency] private CartridgeLoaderSystem _cartridgeLoader = default!; + [Dependency] private InstrumentSystem _instrument = default!; + [Dependency] private RingerSystem _ringer = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StoreSystem _store = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private UnpoweredFlashlightSystem _unpoweredFlashlight = default!; + [Dependency] private ContainerSystem _containerSystem = default!; + [Dependency] private IdCardSystem _idCard = default!; public override void Initialize() { diff --git a/Content.Server/PDA/Ringer/RingerSystem.cs b/Content.Server/PDA/Ringer/RingerSystem.cs index 00b0e730546..cec1fcb0c07 100644 --- a/Content.Server/PDA/Ringer/RingerSystem.cs +++ b/Content.Server/PDA/Ringer/RingerSystem.cs @@ -10,9 +10,9 @@ namespace Content.Server.PDA.Ringer; /// /// Handles the server-side logic for . /// -public sealed class RingerSystem : SharedRingerSystem +public sealed partial class RingerSystem : SharedRingerSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; /// public override void Initialize() diff --git a/Content.Server/Paper/PaperRandomStorySystem.cs b/Content.Server/Paper/PaperRandomStorySystem.cs index 2e43058197b..388ffd3194d 100644 --- a/Content.Server/Paper/PaperRandomStorySystem.cs +++ b/Content.Server/Paper/PaperRandomStorySystem.cs @@ -3,10 +3,10 @@ namespace Content.Server.Paper; -public sealed class PaperRandomStorySystem : EntitySystem +public sealed partial class PaperRandomStorySystem : EntitySystem { - [Dependency] private readonly StoryGeneratorSystem _storyGen = default!; - [Dependency] private readonly PaperSystem _paper = default!; + [Dependency] private StoryGeneratorSystem _storyGen = default!; + [Dependency] private PaperSystem _paper = default!; public override void Initialize() { diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs index 11daec56945..c4a2cd177f0 100644 --- a/Content.Server/Parallax/BiomeSystem.cs +++ b/Content.Server/Parallax/BiomeSystem.cs @@ -34,20 +34,20 @@ namespace Content.Server.Parallax; public sealed partial class BiomeSystem : SharedBiomeSystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IParallelManager _parallel = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly DecalSystem _decals = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ShuttleSystem _shuttles = default!; - [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IParallelManager _parallel = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private DecalSystem _decals = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ShuttleSystem _shuttles = default!; + [Dependency] private TagSystem _tags = default!; private EntityQuery _biomeQuery; private EntityQuery _fixturesQuery; diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs index f324bc50e3b..8b4a61c8d8b 100644 --- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.ControlBox.cs @@ -18,8 +18,8 @@ namespace Content.Server.ParticleAccelerator.EntitySystems; public sealed partial class ParticleAcceleratorSystem { - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private SharedAudioSystem _audio = default!; private void InitializeControlBoxSystem() { diff --git a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs index a127d072999..acf3cefbb8f 100644 --- a/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs +++ b/Content.Server/ParticleAccelerator/EntitySystems/ParticleAcceleratorSystem.cs @@ -11,16 +11,16 @@ namespace Content.Server.ParticleAccelerator.EntitySystems; public sealed partial class ParticleAcceleratorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly ProjectileSystem _projectileSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly MultipartMachineSystem _multipartMachine = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private ProjectileSystem _projectileSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedPhysicsSystem _physicsSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private MultipartMachineSystem _multipartMachine = default!; public override void Initialize() { diff --git a/Content.Server/Payload/EntitySystems/PayloadSystem.cs b/Content.Server/Payload/EntitySystems/PayloadSystem.cs index 3c104ffc2c3..0e16791f619 100644 --- a/Content.Server/Payload/EntitySystems/PayloadSystem.cs +++ b/Content.Server/Payload/EntitySystems/PayloadSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.Payload.EntitySystems; -public sealed class PayloadSystem : EntitySystem +public sealed partial class PayloadSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ISerializationManager _serializationManager = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ISerializationManager _serializationManager = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private TransformSystem _transform = default!; private static readonly ProtoId PayloadTag = "Payload"; diff --git a/Content.Server/Persistence/Systems/PersistenceSystem.cs b/Content.Server/Persistence/Systems/PersistenceSystem.cs index 33f7bc0990c..58e3fc50f36 100644 --- a/Content.Server/Persistence/Systems/PersistenceSystem.cs +++ b/Content.Server/Persistence/Systems/PersistenceSystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Persistence.Systems; -public sealed class PersistenceSystem : EntitySystem +public sealed partial class PersistenceSystem : EntitySystem { - [Dependency] private readonly MapLoaderSystem _mapLoaderSys = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ActorSystem _actor = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private MapLoaderSystem _mapLoaderSys = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ActorSystem _actor = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IRobustRandom _random = default!; public bool LoadGrid( ResPath path, MapId mapId, Vector2 offset, Angle rot, diff --git a/Content.Server/Physics/Controllers/ChaoticJumpSystem.cs b/Content.Server/Physics/Controllers/ChaoticJumpSystem.cs index 9612f093f11..8707b825a3c 100644 --- a/Content.Server/Physics/Controllers/ChaoticJumpSystem.cs +++ b/Content.Server/Physics/Controllers/ChaoticJumpSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.Physics.Controllers; /// /// A component which makes its entity periodically chaotic jumps arounds /// -public sealed class ChaoticJumpSystem : VirtualController +public sealed partial class ChaoticJumpSystem : VirtualController { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() { diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs index 750266a6252..79c0ca551fb 100644 --- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs +++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Physics.Controllers; /// /// A system which makes its entity chasing another entity with selected component. /// -public sealed class ChasingWalkSystem : VirtualController +public sealed partial class ChasingWalkSystem : VirtualController { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; private readonly HashSet> _potentialChaseTargets = new(); diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs index b1ebd2fab93..d49ef0b0397 100644 --- a/Content.Server/Physics/Controllers/ConveyorController.cs +++ b/Content.Server/Physics/Controllers/ConveyorController.cs @@ -13,13 +13,13 @@ namespace Content.Server.Physics.Controllers; -public sealed class ConveyorController : SharedConveyorController +public sealed partial class ConveyorController : SharedConveyorController { - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly MaterialReclaimerSystem _materialReclaimer = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private DeviceLinkSystem _signalSystem = default!; + [Dependency] private MaterialReclaimerSystem _materialReclaimer = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private TurfSystem _turf = default!; public override void Initialize() { diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs index bd40f3415f1..a003cca9742 100644 --- a/Content.Server/Physics/Controllers/MoverController.cs +++ b/Content.Server/Physics/Controllers/MoverController.cs @@ -14,13 +14,13 @@ namespace Content.Server.Physics.Controllers; -public sealed class MoverController : SharedMoverController +public sealed partial class MoverController : SharedMoverController { private static readonly Gauge ActiveMoverGauge = Metrics.CreateGauge( "physics_active_mover_count", "Amount of ActiveInputMovers being processed by MoverController"); - [Dependency] private readonly ThrusterSystem _thruster = default!; + [Dependency] private ThrusterSystem _thruster = default!; private Dictionary)> _shuttlePilots = new(); diff --git a/Content.Server/Physics/Controllers/RandomWalkController.cs b/Content.Server/Physics/Controllers/RandomWalkController.cs index 496b211572a..d8964252dd4 100644 --- a/Content.Server/Physics/Controllers/RandomWalkController.cs +++ b/Content.Server/Physics/Controllers/RandomWalkController.cs @@ -14,12 +14,12 @@ namespace Content.Server.Physics.Controllers; /// The entity system responsible for managing s. /// Handles updating the direction they move in when their cooldown elapses. /// -internal sealed class RandomWalkController : VirtualController +internal sealed partial class RandomWalkController : VirtualController { #region Dependencies - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private PhysicsSystem _physics = default!; #endregion Dependencies public override void Initialize() diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs index eee785d57cb..4a4af7ba084 100644 --- a/Content.Server/Pinpointer/NavMapSystem.cs +++ b/Content.Server/Pinpointer/NavMapSystem.cs @@ -20,13 +20,13 @@ namespace Content.Server.Pinpointer; /// public sealed partial class NavMapSystem : SharedNavMapSystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly TurfSystem _turfSystem = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private TurfSystem _turfSystem = default!; public const float CloseDistance = 15f; public const float FarDistance = 30f; diff --git a/Content.Server/Pinpointer/PinpointerSystem.cs b/Content.Server/Pinpointer/PinpointerSystem.cs index db03389e45e..573e20259a9 100644 --- a/Content.Server/Pinpointer/PinpointerSystem.cs +++ b/Content.Server/Pinpointer/PinpointerSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Pinpointer; -public sealed class PinpointerSystem : SharedPinpointerSystem +public sealed partial class PinpointerSystem : SharedPinpointerSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; private EntityQuery _xformQuery; diff --git a/Content.Server/Pinpointer/StationMapSystem.cs b/Content.Server/Pinpointer/StationMapSystem.cs index 096430788b9..1deb2a428cc 100644 --- a/Content.Server/Pinpointer/StationMapSystem.cs +++ b/Content.Server/Pinpointer/StationMapSystem.cs @@ -8,13 +8,13 @@ namespace Content.Server.Pinpointer; -public sealed class StationMapSystem : EntitySystem +public sealed partial class StationMapSystem : EntitySystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; - [Dependency] private readonly SharedStationSystem _station = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private PowerCellSystem _cell = default!; + [Dependency] private SharedStationSystem _station = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private GameTicker _gameTicker = default!; public override void Initialize() { diff --git a/Content.Server/Placement/PlacementLoggerSystem.cs b/Content.Server/Placement/PlacementLoggerSystem.cs index e928c569e1f..635c70763a5 100644 --- a/Content.Server/Placement/PlacementLoggerSystem.cs +++ b/Content.Server/Placement/PlacementLoggerSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Placement; -public sealed class PlacementLoggerSystem : EntitySystem +public sealed partial class PlacementLoggerSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private ISharedPlayerManager _player = default!; public override void Initialize() { diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs index 09e7773d573..bad63ddf1f1 100644 --- a/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs +++ b/Content.Server/Players/JobWhitelist/JobWhitelistManager.cs @@ -13,15 +13,15 @@ namespace Content.Server.Players.JobWhitelist; -public sealed class JobWhitelistManager : IPostInjectInit +public sealed partial class JobWhitelistManager : IPostInjectInit { - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly UserDbDataManager _userDb = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private UserDbDataManager _userDb = default!; + [Dependency] private ILogManager _logManager = default!; private readonly Dictionary> _whitelists = new(); private ISawmill _sawmill = default!; diff --git a/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs index 0a3f026ba9e..6266edd741f 100644 --- a/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs +++ b/Content.Server/Players/JobWhitelist/JobWhitelistSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Players.JobWhitelist; -public sealed class JobWhitelistSystem : EntitySystem +public sealed partial class JobWhitelistSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly JobWhitelistManager _manager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private JobWhitelistManager _manager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private ImmutableArray> _whitelistedJobs = []; diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs index 90224e2eabe..c05fcddb4f7 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs @@ -54,15 +54,15 @@ namespace Content.Server.Players.PlayTimeTracking; /// Operations like refreshing and sending play time info to clients are deferred until the next frame (note: not tick). /// /// -public sealed class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjectInit +public sealed partial class PlayTimeTrackingManager : ISharedPlaytimeManager, IPostInjectInit { - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IServerNetManager _net = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ITaskManager _task = default!; - [Dependency] private readonly IRuntimeLog _runtimeLog = default!; - [Dependency] private readonly UserDbDataManager _userDb = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IServerNetManager _net = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ITaskManager _task = default!; + [Dependency] private IRuntimeLog _runtimeLog = default!; + [Dependency] private UserDbDataManager _userDb = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index 07bead94079..812f33843f0 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs @@ -27,16 +27,16 @@ namespace Content.Server.Players.PlayTimeTracking; /// /// Connects to the simulation state. Reports trackers and such. /// -public sealed class PlayTimeTrackingSystem : EntitySystem +public sealed partial class PlayTimeTrackingSystem : EntitySystem { - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IAfkManager _afk = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly PlayTimeTrackingManager _tracking = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IAfkManager _afk = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerPreferencesManager _preferencesManager = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private PlayTimeTrackingManager _tracking = default!; public override void Initialize() { diff --git a/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs b/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs index cd7f9bbbfa9..c030cd1c8cf 100644 --- a/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs +++ b/Content.Server/Players/RateLimiting/PlayerRateLimitManager.cs @@ -11,12 +11,12 @@ namespace Content.Server.Players.RateLimiting; -public sealed class PlayerRateLimitManager : SharedPlayerRateLimitManager +public sealed partial class PlayerRateLimitManager : SharedPlayerRateLimitManager { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPlayerManager _playerManager = default!; private readonly Dictionary _registrations = new(); private readonly Dictionary> _rateLimitData = new(); diff --git a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs index 8e2b1f0116e..cf648b218b7 100644 --- a/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs +++ b/Content.Server/PneumaticCannon/PneumaticCannonSystem.cs @@ -14,14 +14,14 @@ namespace Content.Server.PneumaticCannon; -public sealed class PneumaticCannonSystem : SharedPneumaticCannonSystem +public sealed partial class PneumaticCannonSystem : SharedPneumaticCannonSystem { - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly GasTankSystem _gasTank = default!; - [Dependency] private readonly GunSystem _gun = default!; - [Dependency] private readonly StunSystem _stun = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private GasTankSystem _gasTank = default!; + [Dependency] private GunSystem _gun = default!; + [Dependency] private StunSystem _stun = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; public override void Initialize() { diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index 2fe0db97fe1..5b13e99ef73 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -29,23 +29,23 @@ namespace Content.Server.Pointing.EntitySystems { [UsedImplicitly] - internal sealed class PointingSystem : SharedPointingSystem + internal sealed partial class PointingSystem : SharedPointingSystem { - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly IReplayRecordingManager _replay = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; - [Dependency] private readonly SharedMindSystem _minds = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private IReplayRecordingManager _replay = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private RotateToFaceSystem _rotateToFaceSystem = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private VisibilitySystem _visibilitySystem = default!; + [Dependency] private SharedMindSystem _minds = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ExamineSystemShared _examine = default!; private TimeSpan _pointDelay = TimeSpan.FromSeconds(0.5f); diff --git a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs index c36e1741729..14ed8816eab 100644 --- a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.Pointing.EntitySystems { [UsedImplicitly] - internal sealed class RoguePointingSystem : EntitySystem + internal sealed partial class RoguePointingSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ExplosionSystem _explosion = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ExplosionSystem _explosion = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; private EntityUid? RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null) { diff --git a/Content.Server/Points/PointSystem.cs b/Content.Server/Points/PointSystem.cs index 27f9d5f0857..f55ecaedeb6 100644 --- a/Content.Server/Points/PointSystem.cs +++ b/Content.Server/Points/PointSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Points; /// -public sealed class PointSystem : SharedPointSystem +public sealed partial class PointSystem : SharedPointSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private PvsOverrideSystem _pvsOverride = default!; /// public override void Initialize() diff --git a/Content.Server/Polymorph/Systems/PolymorphSystem.cs b/Content.Server/Polymorph/Systems/PolymorphSystem.cs index 6b769e4e5fc..e7b00f6d323 100644 --- a/Content.Server/Polymorph/Systems/PolymorphSystem.cs +++ b/Content.Server/Polymorph/Systems/PolymorphSystem.cs @@ -26,23 +26,23 @@ namespace Content.Server.Polymorph.Systems; public sealed partial class PolymorphSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly SharedBuckleSystem _buckle = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly ServerInventorySystem _inventory = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private SharedBuckleSystem _buckle = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MobThresholdSystem _mobThreshold = default!; + [Dependency] private ServerInventorySystem _inventory = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private MetaDataSystem _metaData = default!; private const string RevertPolymorphId = "ActionRevertPolymorph"; diff --git a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs index 5b6baa57f01..f5a59089fce 100644 --- a/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs +++ b/Content.Server/Polymorph/Toolshed/PolymorphCommand.cs @@ -12,7 +12,7 @@ namespace Content.Server.Polymorph.Toolshed; /// Polymorphs the given entity(s) into the target morph. /// [ToolshedCommand, AdminCommand(AdminFlags.Fun)] -public sealed class PolymorphCommand : ToolshedCommand +public sealed partial class PolymorphCommand : ToolshedCommand { private PolymorphSystem? _system; [Dependency] private IPrototypeManager _proto = default!; diff --git a/Content.Server/Popups/PopupSystem.cs b/Content.Server/Popups/PopupSystem.cs index ee9a81cd8c3..35e7e1e52dd 100644 --- a/Content.Server/Popups/PopupSystem.cs +++ b/Content.Server/Popups/PopupSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.Popups { - public sealed class PopupSystem : SharedPopupSystem + public sealed partial class PopupSystem : SharedPopupSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void PopupCursor(string? message, PopupType type = PopupType.Small) { diff --git a/Content.Server/Power/Commands/PowerStatCommand.cs b/Content.Server/Power/Commands/PowerStatCommand.cs index 89e2bc3f210..8843bbcc71a 100644 --- a/Content.Server/Power/Commands/PowerStatCommand.cs +++ b/Content.Server/Power/Commands/PowerStatCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Power.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class PowerStatCommand : LocalizedEntityCommands +public sealed partial class PowerStatCommand : LocalizedEntityCommands { - [Dependency] private readonly PowerNetSystem _powerNet = default!; + [Dependency] private PowerNetSystem _powerNet = default!; public override string Command => "powerstat"; diff --git a/Content.Server/Power/Commands/PowerValidateCommand.cs b/Content.Server/Power/Commands/PowerValidateCommand.cs index 9f365a73e8e..e449b936075 100644 --- a/Content.Server/Power/Commands/PowerValidateCommand.cs +++ b/Content.Server/Power/Commands/PowerValidateCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Power.Commands; [AdminCommand(AdminFlags.Debug)] -public sealed class PowerValidateCommand : LocalizedEntityCommands +public sealed partial class PowerValidateCommand : LocalizedEntityCommands { - [Dependency] private readonly PowerNetSystem _powerNet = null!; + [Dependency] private PowerNetSystem _powerNet = null!; public override string Command => "power_validate"; diff --git a/Content.Server/Power/Components/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs index dda2eff4ef0..d172b139007 100644 --- a/Content.Server/Power/Components/BaseNetConnectorComponent.cs +++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs @@ -19,7 +19,7 @@ public interface IBaseNetConnectorComponent public abstract partial class BaseNetConnectorComponent : Component, IBaseNetConnectorComponent where TNetType : class { - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IEntityManager _entMan = default!; [ViewVariables(VVAccess.ReadWrite)] public Voltage Voltage { get => _voltage; set => SetVoltage(value); } diff --git a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs index a33bddcaa34..72fa6a8701b 100644 --- a/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs +++ b/Content.Server/Power/EntitySystems/ActivatableUIRequiresPowerSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Power.EntitySystems; -public sealed class ActivatableUIRequiresPowerSystem : SharedActivatableUIRequiresPowerSystem +public sealed partial class ActivatableUIRequiresPowerSystem : SharedActivatableUIRequiresPowerSystem { - [Dependency] private readonly ActivatableUISystem _activatableUI = default!; + [Dependency] private ActivatableUISystem _activatableUI = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/ApcSystem.cs b/Content.Server/Power/EntitySystems/ApcSystem.cs index 425a349b30d..02d9918d25b 100644 --- a/Content.Server/Power/EntitySystems/ApcSystem.cs +++ b/Content.Server/Power/EntitySystems/ApcSystem.cs @@ -17,16 +17,16 @@ namespace Content.Server.Power.EntitySystems; -public sealed class ApcSystem : EntitySystem +public sealed partial class ApcSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs index b68edec3bfa..5d7560fd472 100644 --- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs +++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs @@ -21,11 +21,11 @@ namespace Content.Server.Power.EntitySystems; /// it merely reconfigures parameters on from the UI. /// /// -public sealed class BatteryInterfaceSystem : EntitySystem +public sealed partial class BatteryInterfaceSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = null!; - [Dependency] private readonly SharedBatterySystem _battery = null!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private UserInterfaceSystem _uiSystem = null!; + [Dependency] private SharedBatterySystem _battery = null!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs index 0d130e05edd..c3ddd9d8ce3 100644 --- a/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs +++ b/Content.Server/Power/EntitySystems/CableMultitoolSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Power.EntitySystems { [UsedImplicitly] - public sealed class CableMultitoolSystem : EntitySystem + public sealed partial class CableMultitoolSystem : EntitySystem { - [Dependency] private readonly ToolSystem _toolSystem = default!; - [Dependency] private readonly PowerNetSystem _pnSystem = default!; - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; + [Dependency] private ToolSystem _toolSystem = default!; + [Dependency] private PowerNetSystem _pnSystem = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs index ffe2998c744..48e558ed530 100644 --- a/Content.Server/Power/EntitySystems/CableSystem.Placer.cs +++ b/Content.Server/Power/EntitySystems/CableSystem.Placer.cs @@ -11,10 +11,10 @@ namespace Content.Server.Power.EntitySystems; public sealed partial class CableSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; private void InitializeCablePlacer() { diff --git a/Content.Server/Power/EntitySystems/CableSystem.cs b/Content.Server/Power/EntitySystems/CableSystem.cs index 4eaab665371..c6decadc4d1 100644 --- a/Content.Server/Power/EntitySystems/CableSystem.cs +++ b/Content.Server/Power/EntitySystems/CableSystem.cs @@ -12,10 +12,10 @@ namespace Content.Server.Power.EntitySystems; public sealed partial class CableSystem : EntitySystem { - [Dependency] private readonly ITileDefinitionManager _tileManager = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!; + [Dependency] private ITileDefinitionManager _tileManager = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private ElectrocutionSystem _electrocutionSystem = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/CableVisSystem.cs b/Content.Server/Power/EntitySystems/CableVisSystem.cs index fa0c9e87fc7..06eb2e8d82f 100644 --- a/Content.Server/Power/EntitySystems/CableVisSystem.cs +++ b/Content.Server/Power/EntitySystems/CableVisSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Power.EntitySystems { [UsedImplicitly] - public sealed class CableVisSystem : EntitySystem + public sealed partial class CableVisSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs index 0a61751aa10..78d50f2f751 100644 --- a/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs +++ b/Content.Server/Power/EntitySystems/ExtensionCableSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Power.EntitySystems { - public sealed class ExtensionCableSystem : EntitySystem + public sealed partial class ExtensionCableSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs index 201ae325ba5..b4110fd7066 100644 --- a/Content.Server/Power/EntitySystems/PowerChargeSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerChargeSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Power.EntitySystems; -public sealed class PowerChargeSystem : EntitySystem +public sealed partial class PowerChargeSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly AmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private AmbientSoundSystem _ambientSoundSystem = default!; public override void Initialize() { diff --git a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs index 75291b56308..84f9bbaf3bb 100644 --- a/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerMonitoringConsoleSystem.cs @@ -21,9 +21,9 @@ namespace Content.Server.Power.EntitySystems; [UsedImplicitly] internal sealed partial class PowerMonitoringConsoleSystem : SharedPowerMonitoringConsoleSystem { - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly SharedMapSystem _sharedMapSystem = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private SharedMapSystem _sharedMapSystem = default!; + [Dependency] private SharedBatterySystem _battery = default!; // Note: this data does not need to be saved private Dictionary> _gridPowerCableChunks = new(); diff --git a/Content.Server/Power/EntitySystems/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs index d8f68ffbbb1..9a7dbe3dbe4 100644 --- a/Content.Server/Power/EntitySystems/PowerNetSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs @@ -18,13 +18,13 @@ namespace Content.Server.Power.EntitySystems /// Manages power networks, power state, and all power components. /// [UsedImplicitly] - public sealed class PowerNetSystem : SharedPowerNetSystem + public sealed partial class PowerNetSystem : SharedPowerNetSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly PowerNetConnectorSystem _powerNetConnector = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IParallelManager _parMan = default!; - [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private PowerNetConnectorSystem _powerNetConnector = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IParallelManager _parMan = default!; + [Dependency] private BatterySystem _battery = default!; private readonly PowerState _powerState = new(); private readonly HashSet _powerNetReconnectQueue = new(); diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index c76995973b7..a51a0c6661e 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -12,9 +12,9 @@ namespace Content.Server.Power.EntitySystems { - public sealed class PowerReceiverSystem : SharedPowerReceiverSystem + public sealed partial class PowerReceiverSystem : SharedPowerReceiverSystem { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; private EntityQuery _recQuery; private EntityQuery _provQuery; diff --git a/Content.Server/Power/EntitySystems/RiggableSystem.cs b/Content.Server/Power/EntitySystems/RiggableSystem.cs index 0bff0f4ba81..5569de33cd5 100644 --- a/Content.Server/Power/EntitySystems/RiggableSystem.cs +++ b/Content.Server/Power/EntitySystems/RiggableSystem.cs @@ -14,11 +14,11 @@ namespace Content.Server.Power.EntitySystems; /// /// Handles sabotaged/rigged objects /// -public sealed class RiggableSystem : EntitySystem +public sealed partial class RiggableSystem : EntitySystem { - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedBatterySystem _battery = default!; public override void Initialize() { diff --git a/Content.Server/Power/Generation/GasGenerator/GasGeneratorSystem.cs b/Content.Server/Power/Generation/GasGenerator/GasGeneratorSystem.cs index dac03798889..9d33faa81d9 100644 --- a/Content.Server/Power/Generation/GasGenerator/GasGeneratorSystem.cs +++ b/Content.Server/Power/Generation/GasGenerator/GasGeneratorSystem.cs @@ -26,11 +26,11 @@ namespace Content.Server.Power.Generation.GasGenerator; /// and it will consume more or less fuel depending on current efficiency. /// /// -public sealed class GasGeneratorSystem : EntitySystem +public sealed partial class GasGeneratorSystem : EntitySystem { - [Dependency] private readonly AmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private AmbientSoundSystem _ambientSound = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; private EntityQuery _nodeContainerQuery; diff --git a/Content.Server/Power/Generation/Teg/TegSystem.cs b/Content.Server/Power/Generation/Teg/TegSystem.cs index 72a3de25ae1..62225c8836f 100644 --- a/Content.Server/Power/Generation/Teg/TegSystem.cs +++ b/Content.Server/Power/Generation/Teg/TegSystem.cs @@ -44,7 +44,7 @@ namespace Content.Server.Power.Generation.Teg; /// /// /// -public sealed class TegSystem : EntitySystem +public sealed partial class TegSystem : EntitySystem { /// /// Node name for the TEG part connection nodes (). @@ -66,12 +66,12 @@ public sealed class TegSystem : EntitySystem /// public const string DeviceNetworkCommandSyncData = "teg_sync_data"; - [Dependency] private readonly AmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly PointLightSystem _pointLight = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + [Dependency] private AmbientSoundSystem _ambientSound = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private PointLightSystem _pointLight = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; private EntityQuery _nodeContainerQuery; diff --git a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs index f181b6424c8..ff4bb572518 100644 --- a/Content.Server/Power/Generator/GasPowerReceiverSystem.cs +++ b/Content.Server/Power/Generator/GasPowerReceiverSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Power.Generator; /// /// This handles gas power receivers, allowing devices to accept power in the form of a gas. /// -public sealed class GasPowerReceiverSystem : EntitySystem +public sealed partial class GasPowerReceiverSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; /// public override void Initialize() diff --git a/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs b/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs index c61509725b9..4304f97f38d 100644 --- a/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs +++ b/Content.Server/Power/Generator/GeneratorExhaustGasSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Power.Generator; /// /// -public sealed class GeneratorExhaustGasSystem : EntitySystem +public sealed partial class GeneratorExhaustGasSystem : EntitySystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; public override void Initialize() { diff --git a/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs b/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs index f05a3a429a1..88043b60181 100644 --- a/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSignalControlSystem.cs @@ -3,10 +3,10 @@ namespace Content.Server.Power.Generator; -public sealed class GeneratorSignalControlSystem : EntitySystem +public sealed partial class GeneratorSignalControlSystem : EntitySystem { - [Dependency] private readonly GeneratorSystem _generator = default!; - [Dependency] private readonly ActiveGeneratorRevvingSystem _revving = default!; + [Dependency] private GeneratorSystem _generator = default!; + [Dependency] private ActiveGeneratorRevvingSystem _revving = default!; public override void Initialize() { diff --git a/Content.Server/Power/Generator/GeneratorSystem.cs b/Content.Server/Power/Generator/GeneratorSystem.cs index 1c098163e8b..a41c407e2aa 100644 --- a/Content.Server/Power/Generator/GeneratorSystem.cs +++ b/Content.Server/Power/Generator/GeneratorSystem.cs @@ -16,14 +16,14 @@ namespace Content.Server.Power.Generator; /// /// /// -public sealed class GeneratorSystem : SharedGeneratorSystem +public sealed partial class GeneratorSystem : SharedGeneratorSystem { - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly AmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly MaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private AmbientSoundSystem _ambientSound = default!; + [Dependency] private MaterialStorageSystem _materialStorage = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private PuddleSystem _puddle = default!; public override void Initialize() { diff --git a/Content.Server/Power/Generator/PortableGeneratorSystem.cs b/Content.Server/Power/Generator/PortableGeneratorSystem.cs index 57bcb85c301..bc2af904ed6 100644 --- a/Content.Server/Power/Generator/PortableGeneratorSystem.cs +++ b/Content.Server/Power/Generator/PortableGeneratorSystem.cs @@ -16,16 +16,16 @@ namespace Content.Server.Power.Generator; /// Implements logic for portable generators (the PACMAN). Primarily UI & power switching behavior. /// /// -public sealed class PortableGeneratorSystem : SharedPortableGeneratorSystem +public sealed partial class PortableGeneratorSystem : SharedPortableGeneratorSystem { - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly DoAfterSystem _doAfter = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly GeneratorSystem _generator = default!; - [Dependency] private readonly PowerSwitchableSystem _switchable = default!; - [Dependency] private readonly ActiveGeneratorRevvingSystem _revving = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private DoAfterSystem _doAfter = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private GeneratorSystem _generator = default!; + [Dependency] private PowerSwitchableSystem _switchable = default!; + [Dependency] private ActiveGeneratorRevvingSystem _revving = default!; public override void Initialize() { diff --git a/Content.Server/Power/Generator/PowerSwitchableSystem.cs b/Content.Server/Power/Generator/PowerSwitchableSystem.cs index 5281940eaef..5dbe6f5905a 100644 --- a/Content.Server/Power/Generator/PowerSwitchableSystem.cs +++ b/Content.Server/Power/Generator/PowerSwitchableSystem.cs @@ -16,12 +16,12 @@ namespace Content.Server.Power.Generator; /// /// /// -public sealed class PowerSwitchableSystem : SharedPowerSwitchableSystem +public sealed partial class PowerSwitchableSystem : SharedPowerSwitchableSystem { - [Dependency] private readonly NodeGroupSystem _nodeGroup = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private NodeGroupSystem _nodeGroup = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UseDelaySystem _useDelay = default!; // TODO: Prediction /// diff --git a/Content.Server/Power/SMES/SmesSystem.cs b/Content.Server/Power/SMES/SmesSystem.cs index 5a8169e1c92..85881ef32ae 100644 --- a/Content.Server/Power/SMES/SmesSystem.cs +++ b/Content.Server/Power/SMES/SmesSystem.cs @@ -11,11 +11,11 @@ namespace Content.Server.Power.SMES; [UsedImplicitly] -internal sealed class SmesSystem : EntitySystem +internal sealed partial class SmesSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedBatterySystem _battery = default!; public override void Initialize() { diff --git a/Content.Server/Power/SetBatteryPercentCommand.cs b/Content.Server/Power/SetBatteryPercentCommand.cs index f13a1b820e4..62da97d19d3 100644 --- a/Content.Server/Power/SetBatteryPercentCommand.cs +++ b/Content.Server/Power/SetBatteryPercentCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Power { [AdminCommand(AdminFlags.Debug)] - public sealed class SetBatteryPercentCommand : LocalizedEntityCommands + public sealed partial class SetBatteryPercentCommand : LocalizedEntityCommands { - [Dependency] private readonly SharedBatterySystem _batterySystem = default!; + [Dependency] private SharedBatterySystem _batterySystem = default!; public override string Command => "setbatterypercent"; diff --git a/Content.Server/PowerSink/PowerSinkSystem.cs b/Content.Server/PowerSink/PowerSinkSystem.cs index a700be2d196..698c76ed9dc 100644 --- a/Content.Server/PowerSink/PowerSinkSystem.cs +++ b/Content.Server/PowerSink/PowerSinkSystem.cs @@ -11,7 +11,7 @@ namespace Content.Server.PowerSink { - public sealed class PowerSinkSystem : EntitySystem + public sealed partial class PowerSinkSystem : EntitySystem { /// /// Percentage of battery full to trigger the announcement warning at. @@ -27,12 +27,12 @@ public sealed class PowerSinkSystem : EntitySystem /// private readonly TimeSpan _explosionDelayTime = TimeSpan.FromSeconds(1.465); - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private BatterySystem _battery = default!; public override void Initialize() { diff --git a/Content.Server/Prayer/PrayerSystem.cs b/Content.Server/Prayer/PrayerSystem.cs index 7b599c02da5..68ec5642991 100644 --- a/Content.Server/Prayer/PrayerSystem.cs +++ b/Content.Server/Prayer/PrayerSystem.cs @@ -17,12 +17,12 @@ namespace Content.Server.Prayer; /// /// Rain is a professional developer and this did not take 2 PRs to fix subtle messages /// -public sealed class PrayerSystem : EntitySystem +public sealed partial class PrayerSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; public override void Initialize() { diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index c28a0183742..e26c3e14a7e 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -31,19 +31,19 @@ namespace Content.Server.Preferences.Managers /// Sends before the client joins the lobby. /// Receives and at any time. /// - public sealed class ServerPreferencesManager : IServerPreferencesManager, IPostInjectInit + public sealed partial class ServerPreferencesManager : IServerPreferencesManager, IPostInjectInit { - [Dependency] private readonly IServerNetManager _netManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IServerDbManager _db = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IDependencyCollection _dependencies = default!; - [Dependency] private readonly ILogManager _log = default!; - [Dependency] private readonly UserDbDataManager _userDb = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly MarkingManager _marking = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; + [Dependency] private IServerNetManager _netManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IServerDbManager _db = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IDependencyCollection _dependencies = default!; + [Dependency] private ILogManager _log = default!; + [Dependency] private UserDbDataManager _userDb = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private MarkingManager _marking = default!; + [Dependency] private ISerializationManager _serialization = default!; // Cache player prefs on the server so we don't need as much async hell related to them. private readonly Dictionary _cachedPlayerPrefs = new(); diff --git a/Content.Server/Procedural/DungeonSystem.cs b/Content.Server/Procedural/DungeonSystem.cs index 83d6c9290d8..7cf2a9e572e 100644 --- a/Content.Server/Procedural/DungeonSystem.cs +++ b/Content.Server/Procedural/DungeonSystem.cs @@ -23,19 +23,19 @@ namespace Content.Server.Procedural; public sealed partial class DungeonSystem : SharedDungeonSystem { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - [Dependency] private readonly AnchorableSystem _anchorable = default!; - [Dependency] private readonly DecalSystem _decals = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; + [Dependency] private AnchorableSystem _anchorable = default!; + [Dependency] private DecalSystem _decals = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedTransformSystem _transform = default!; private readonly List<(Vector2i, Tile)> _tiles = new(); diff --git a/Content.Server/Procedural/RoomFillSystem.cs b/Content.Server/Procedural/RoomFillSystem.cs index 9ebde1a79f2..d3fe7623b4a 100644 --- a/Content.Server/Procedural/RoomFillSystem.cs +++ b/Content.Server/Procedural/RoomFillSystem.cs @@ -2,10 +2,10 @@ namespace Content.Server.Procedural; -public sealed class RoomFillSystem : EntitySystem +public sealed partial class RoomFillSystem : EntitySystem { - [Dependency] private readonly DungeonSystem _dungeon = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private DungeonSystem _dungeon = default!; + [Dependency] private SharedMapSystem _maps = default!; public override void Initialize() { diff --git a/Content.Server/Projectiles/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs index b5eef17b6a2..40888bc24df 100644 --- a/Content.Server/Projectiles/ProjectileSystem.cs +++ b/Content.Server/Projectiles/ProjectileSystem.cs @@ -14,14 +14,14 @@ namespace Content.Server.Projectiles; -public sealed class ProjectileSystem : SharedProjectileSystem +public sealed partial class ProjectileSystem : SharedProjectileSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ColorFlashEffectSystem _color = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly DestructibleSystem _destructibleSystem = default!; - [Dependency] private readonly GunSystem _guns = default!; - [Dependency] private readonly SharedCameraRecoilSystem _sharedCameraRecoil = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ColorFlashEffectSystem _color = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private DestructibleSystem _destructibleSystem = default!; + [Dependency] private GunSystem _guns = default!; + [Dependency] private SharedCameraRecoilSystem _sharedCameraRecoil = default!; public override void Initialize() { diff --git a/Content.Server/Puppet/VentriloquistPuppetSystem.cs b/Content.Server/Puppet/VentriloquistPuppetSystem.cs index 05bb3007f75..1a12c5f20fe 100644 --- a/Content.Server/Puppet/VentriloquistPuppetSystem.cs +++ b/Content.Server/Puppet/VentriloquistPuppetSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Puppet { - public sealed class VentriloquistPuppetSystem : SharedVentriloquistPuppetSystem + public sealed partial class VentriloquistPuppetSystem : SharedVentriloquistPuppetSystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Server/Radiation/Systems/GeigerSystem.cs b/Content.Server/Radiation/Systems/GeigerSystem.cs index f7c2b71bbc1..3cb3575e096 100644 --- a/Content.Server/Radiation/Systems/GeigerSystem.cs +++ b/Content.Server/Radiation/Systems/GeigerSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Radiation.Systems; -public sealed class GeigerSystem : SharedGeigerSystem +public sealed partial class GeigerSystem : SharedGeigerSystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly RadiationSystem _radiation = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private RadiationSystem _radiation = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IPlayerManager _player = default!; private static readonly float ApproxEqual = 0.01f; diff --git a/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs index b42a05a056f..84115e95fe6 100644 --- a/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs +++ b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.Radiation.EntitySystems; -public sealed class RadiationProtectionSystem : EntitySystem +public sealed partial class RadiationProtectionSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override void Initialize() { diff --git a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs index 7e1775e3591..e5c7a85845f 100644 --- a/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs +++ b/Content.Server/Radiation/Systems/RadiationSystem.Debug.cs @@ -87,9 +87,9 @@ private void UpdateGridcastDebugOverlay( /// Toggle visibility of radiation rays coming from rad sources. /// [AdminCommand(AdminFlags.Admin)] -public sealed class RadiationViewCommand : LocalizedEntityCommands +public sealed partial class RadiationViewCommand : LocalizedEntityCommands { - [Dependency] private readonly RadiationSystem _radiation = default!; + [Dependency] private RadiationSystem _radiation = default!; public override string Command => "showradiation"; diff --git a/Content.Server/Radiation/Systems/RadiationSystem.cs b/Content.Server/Radiation/Systems/RadiationSystem.cs index 34ae65a35cc..ac8e0ec1c20 100644 --- a/Content.Server/Radiation/Systems/RadiationSystem.cs +++ b/Content.Server/Radiation/Systems/RadiationSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Radiation.Systems; public sealed partial class RadiationSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private IGameTiming _timing = default!; private EntityQuery _blockerQuery; private EntityQuery _resistanceQuery; diff --git a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs index 502f4e82372..21001c9d23f 100644 --- a/Content.Server/Radio/EntitySystems/HeadsetSystem.cs +++ b/Content.Server/Radio/EntitySystems/HeadsetSystem.cs @@ -14,13 +14,13 @@ namespace Content.Server.Radio.EntitySystems; -public sealed class HeadsetSystem : SharedHeadsetSystem +public sealed partial class HeadsetSystem : SharedHeadsetSystem { - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; public override void Initialize() { diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs index 04c60a59f39..1143e9d02f3 100644 --- a/Content.Server/Radio/EntitySystems/JammerSystem.cs +++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.Radio.EntitySystems; -public sealed class JammerSystem : SharedJammerSystem +public sealed partial class JammerSystem : SharedJammerSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs index e014860310b..e111903f402 100644 --- a/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs @@ -19,14 +19,14 @@ namespace Content.Server.Radio.EntitySystems; /// /// This system handles radio speakers and microphones (which together form a hand-held radio). /// -public sealed class RadioDeviceSystem : SharedRadioDeviceSystem +public sealed partial class RadioDeviceSystem : SharedRadioDeviceSystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly InteractionSystem _interaction = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private InteractionSystem _interaction = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; // Used to prevent a shitter from using a bunch of radios to spam chat. private HashSet<(string, EntityUid, RadioChannelPrototype)> _recentlySent = new(); diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs index e9977e918b4..c9f51abb1ed 100644 --- a/Content.Server/Radio/EntitySystems/RadioSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs @@ -25,18 +25,18 @@ namespace Content.Server.Radio.EntitySystems; /// /// This system handles intrinsic radios and the general process of converting radio messages into chat messages. /// -public sealed class RadioSystem : EntitySystem +public sealed partial class RadioSystem : EntitySystem { - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IReplayRecordingManager _replay = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly HeadsetSystem _headset = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IReplayRecordingManager _replay = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private HeadsetSystem _headset = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private SharedTransformSystem _xform = default!; // set used to prevent radio feedback loops. private readonly HashSet _messages = new(); diff --git a/Content.Server/RandomAppearance/RandomAppearanceSystem.cs b/Content.Server/RandomAppearance/RandomAppearanceSystem.cs index 4eca0a21aab..ddd75814337 100644 --- a/Content.Server/RandomAppearance/RandomAppearanceSystem.cs +++ b/Content.Server/RandomAppearance/RandomAppearanceSystem.cs @@ -2,10 +2,10 @@ namespace Content.Server.RandomAppearance; -public sealed class RandomAppearanceSystem : EntitySystem +public sealed partial class RandomAppearanceSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Server/RandomMetadata/RandomMetadataSystem.cs b/Content.Server/RandomMetadata/RandomMetadataSystem.cs index c60c942a7e4..148437a219e 100644 --- a/Content.Server/RandomMetadata/RandomMetadataSystem.cs +++ b/Content.Server/RandomMetadata/RandomMetadataSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.RandomMetadata; -public sealed class RandomMetadataSystem : EntitySystem +public sealed partial class RandomMetadataSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; private readonly List<(string, object)> _outputSegments = new(); diff --git a/Content.Server/RatKing/RatKingSystem.cs b/Content.Server/RatKing/RatKingSystem.cs index 52026618c29..d7be1fcfbc4 100644 --- a/Content.Server/RatKing/RatKingSystem.cs +++ b/Content.Server/RatKing/RatKingSystem.cs @@ -18,14 +18,14 @@ namespace Content.Server.RatKing { /// - public sealed class RatKingSystem : SharedRatKingSystem + public sealed partial class RatKingSystem : SharedRatKingSystem { - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly HTNSystem _htn = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private HTNSystem _htn = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private PopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Server/RequiresGrid/RequiresGridSystem.cs b/Content.Server/RequiresGrid/RequiresGridSystem.cs index 99b8794f67d..c07924509d8 100644 --- a/Content.Server/RequiresGrid/RequiresGridSystem.cs +++ b/Content.Server/RequiresGrid/RequiresGridSystem.cs @@ -2,9 +2,9 @@ namespace Content.Server.RequiresGrid; -public sealed class RequiresGridSystem : EntitySystem +public sealed partial class RequiresGridSystem : EntitySystem { - [Dependency] private readonly DestructibleSystem _destructible = default!; + [Dependency] private DestructibleSystem _destructible = default!; public override void Initialize() { diff --git a/Content.Server/Research/Disk/ResearchDiskSystem.cs b/Content.Server/Research/Disk/ResearchDiskSystem.cs index c1ccc154494..a398ccde67b 100644 --- a/Content.Server/Research/Disk/ResearchDiskSystem.cs +++ b/Content.Server/Research/Disk/ResearchDiskSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Research.Disk { - public sealed class ResearchDiskSystem : EntitySystem + public sealed partial class ResearchDiskSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly ResearchSystem _research = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private ResearchSystem _research = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Research/Systems/ResearchStealerSystem.cs b/Content.Server/Research/Systems/ResearchStealerSystem.cs index d40134f1e9f..360f4e90a9c 100644 --- a/Content.Server/Research/Systems/ResearchStealerSystem.cs +++ b/Content.Server/Research/Systems/ResearchStealerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.Research.Systems; -public sealed class ResearchStealerSystem : SharedResearchStealerSystem +public sealed partial class ResearchStealerSystem : SharedResearchStealerSystem { - [Dependency] private readonly SharedResearchSystem _research = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private SharedResearchSystem _research = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Research/Systems/ResearchSystem.Console.cs b/Content.Server/Research/Systems/ResearchSystem.Console.cs index 7339803fd01..fe6ef2406e6 100644 --- a/Content.Server/Research/Systems/ResearchSystem.Console.cs +++ b/Content.Server/Research/Systems/ResearchSystem.Console.cs @@ -11,7 +11,7 @@ namespace Content.Server.Research.Systems; public sealed partial class ResearchSystem { - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private EmagSystem _emag = default!; private void InitializeConsole() { diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs index 5618f8c8f96..d7d4ea61b25 100644 --- a/Content.Server/Research/Systems/ResearchSystem.cs +++ b/Content.Server/Research/Systems/ResearchSystem.cs @@ -16,14 +16,14 @@ namespace Content.Server.Research.Systems [UsedImplicitly] public sealed partial class ResearchSystem : SharedResearchSystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private StationSystem _station = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Research/TechnologyDisk/Systems/DiskConsoleSystem.cs b/Content.Server/Research/TechnologyDisk/Systems/DiskConsoleSystem.cs index ba9885a3463..9b3492dd5af 100644 --- a/Content.Server/Research/TechnologyDisk/Systems/DiskConsoleSystem.cs +++ b/Content.Server/Research/TechnologyDisk/Systems/DiskConsoleSystem.cs @@ -9,12 +9,12 @@ namespace Content.Server.Research.TechnologyDisk.Systems; -public sealed class DiskConsoleSystem : EntitySystem +public sealed partial class DiskConsoleSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly ResearchSystem _research = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private ResearchSystem _research = default!; + [Dependency] private UserInterfaceSystem _ui = default!; /// public override void Initialize() diff --git a/Content.Server/Resist/EscapeInventorySystem.cs b/Content.Server/Resist/EscapeInventorySystem.cs index 3641fbb6681..51668cb82fd 100644 --- a/Content.Server/Resist/EscapeInventorySystem.cs +++ b/Content.Server/Resist/EscapeInventorySystem.cs @@ -12,13 +12,13 @@ namespace Content.Server.Resist; -public sealed class EscapeInventorySystem : EntitySystem +public sealed partial class EscapeInventorySystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; public override void Initialize() { diff --git a/Content.Server/Resist/ResistLockerSystem.cs b/Content.Server/Resist/ResistLockerSystem.cs index cdc37210ff5..5db2019c910 100644 --- a/Content.Server/Resist/ResistLockerSystem.cs +++ b/Content.Server/Resist/ResistLockerSystem.cs @@ -12,14 +12,14 @@ namespace Content.Server.Resist; -public sealed class ResistLockerSystem : EntitySystem +public sealed partial class ResistLockerSystem : EntitySystem { - [Dependency] private readonly EntityStorageSystem _entityStorage = default!; - [Dependency] private readonly LockSystem _lockSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly WeldableSystem _weldable = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private EntityStorageSystem _entityStorage = default!; + [Dependency] private LockSystem _lockSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private WeldableSystem _weldable = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; public override void Initialize() { diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs index 45229b74185..201113b7b17 100644 --- a/Content.Server/Respawn/SpecialRespawnSystem.cs +++ b/Content.Server/Respawn/SpecialRespawnSystem.cs @@ -14,16 +14,16 @@ namespace Content.Server.Respawn; -public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem +public sealed partial class SpecialRespawnSystem : SharedSpecialRespawnSystem { - [Dependency] private readonly IAdminLogManager _adminLog = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IAdminLogManager _adminLog = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; public override void Initialize() { diff --git a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs index 51dfbf6fa25..733d62233e8 100644 --- a/Content.Server/Revenant/EntitySystems/CorporealSystem.cs +++ b/Content.Server/Revenant/EntitySystems/CorporealSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Revenant.EntitySystems; -public sealed class CorporealSystem : SharedCorporealSystem +public sealed partial class CorporealSystem : SharedCorporealSystem { - [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private VisibilitySystem _visibilitySystem = default!; + [Dependency] private GameTicker _ticker = default!; public override void OnStartup(EntityUid uid, CorporealComponent component, ComponentStartup args) { diff --git a/Content.Server/Revenant/EntitySystems/EssenceSystem.cs b/Content.Server/Revenant/EntitySystems/EssenceSystem.cs index f6de79fee54..018a41cf989 100644 --- a/Content.Server/Revenant/EntitySystems/EssenceSystem.cs +++ b/Content.Server/Revenant/EntitySystems/EssenceSystem.cs @@ -12,9 +12,9 @@ namespace Content.Server.Revenant.EntitySystems; /// Attached to entities when a revenant drains them in order to /// manage their essence. /// -public sealed class EssenceSystem : EntitySystem +public sealed partial class EssenceSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs index f4121591af2..1930c059ba7 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantOverloadedLightsSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Revenant.EntitySystems; /// /// This handles... /// -public sealed class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLightsSystem +public sealed partial class RevenantOverloadedLightsSystem : SharedRevenantOverloadedLightsSystem { - [Dependency] private readonly BeamSystem _beam = default!; + [Dependency] private BeamSystem _beam = default!; protected override void OnZap(Entity lights) { diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs index 3add44547b6..01a68e2e776 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs @@ -35,16 +35,16 @@ namespace Content.Server.Revenant.EntitySystems; public sealed partial class RevenantSystem { - [Dependency] private readonly EmagSystem _emagSystem = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly EntityStorageSystem _entityStorage = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - [Dependency] private readonly GhostSystem _ghost = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private EmagSystem _emagSystem = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private EntityStorageSystem _entityStorage = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private GhostSystem _ghost = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; private static readonly ProtoId WindowTag = "Window"; diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs index 25d8bb68dd8..4a07ca0df0a 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.cs @@ -25,23 +25,23 @@ namespace Content.Server.Revenant.EntitySystems; public sealed partial class RevenantSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly DamageableSystem _damage = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; - [Dependency] private readonly SharedInteractionSystem _interact = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly StoreSystem _store = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly VisibilitySystem _visibility = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private DamageableSystem _damage = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedEyeSystem _eye = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; + [Dependency] private SharedInteractionSystem _interact = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private StoreSystem _store = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private VisibilitySystem _visibility = default!; + [Dependency] private TurfSystem _turf = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs b/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs index f95f403135a..7e4212b96f9 100644 --- a/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs +++ b/Content.Server/Robotics/Systems/RoboticsConsoleSystem.cs @@ -17,14 +17,14 @@ namespace Content.Server.Research.Systems; /// Handles UI and state receiving for the robotics control console. /// BorgTransponderComponent broadcasts state from the station's borgs to consoles. /// -public sealed class RoboticsConsoleSystem : SharedRoboticsConsoleSystem +public sealed partial class RoboticsConsoleSystem : SharedRoboticsConsoleSystem { - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private UserInterfaceSystem _ui = default!; // almost never timing out more than 1 per tick so initialize with that capacity private List _removing = new(1); diff --git a/Content.Server/Roles/AddRoleCommand.cs b/Content.Server/Roles/AddRoleCommand.cs index 47305cec7f9..506ad0b9c80 100644 --- a/Content.Server/Roles/AddRoleCommand.cs +++ b/Content.Server/Roles/AddRoleCommand.cs @@ -10,11 +10,11 @@ namespace Content.Server.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class AddRoleCommand : LocalizedEntityCommands + public sealed partial class AddRoleCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly JobSystem _jobSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private JobSystem _jobSystem = default!; public override string Command => "addrole"; diff --git a/Content.Server/Roles/Jobs/JobSystem.cs b/Content.Server/Roles/Jobs/JobSystem.cs index 4117d49df9f..fd77d47ead4 100644 --- a/Content.Server/Roles/Jobs/JobSystem.cs +++ b/Content.Server/Roles/Jobs/JobSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Roles.Jobs; /// /// Handles the job data on mind entities. /// -public sealed class JobSystem : SharedJobSystem +public sealed partial class JobSystem : SharedJobSystem { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly RoleSystem _roles = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private RoleSystem _roles = default!; public override void Initialize() { diff --git a/Content.Server/Roles/ListRolesCommand.cs b/Content.Server/Roles/ListRolesCommand.cs index 081843afe06..c531a9d6b1b 100644 --- a/Content.Server/Roles/ListRolesCommand.cs +++ b/Content.Server/Roles/ListRolesCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class ListRolesCommand : LocalizedCommands + public sealed partial class ListRolesCommand : LocalizedCommands { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override string Command => "listroles"; diff --git a/Content.Server/Roles/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs index 54654dc810b..931135bd334 100644 --- a/Content.Server/Roles/RemoveRoleCommand.cs +++ b/Content.Server/Roles/RemoveRoleCommand.cs @@ -10,11 +10,11 @@ namespace Content.Server.Roles { [AdminCommand(AdminFlags.Admin)] - public sealed class RemoveRoleCommand : LocalizedEntityCommands + public sealed partial class RemoveRoleCommand : LocalizedEntityCommands { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly SharedJobSystem _jobs = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private SharedJobSystem _jobs = default!; + [Dependency] private SharedRoleSystem _roles = default!; public override string Command => "rmrole"; diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs index abf9dd50ecb..96eaecfbba9 100644 --- a/Content.Server/Roles/RoleSystem.cs +++ b/Content.Server/Roles/RoleSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Roles; -public sealed class RoleSystem : SharedRoleSystem +public sealed partial class RoleSystem : SharedRoleSystem { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; public string? MindGetBriefing(EntityUid? mindId) { diff --git a/Content.Server/RoundEnd/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs index 98a7291ffbb..1b39fb21d06 100644 --- a/Content.Server/RoundEnd/RoundEndSystem.cs +++ b/Content.Server/RoundEnd/RoundEndSystem.cs @@ -28,19 +28,19 @@ namespace Content.Server.RoundEnd /// Handles ending rounds normally and also via requesting it (e.g. via comms console) /// If you request a round end then an escape shuttle will be used. /// - public sealed class RoundEndSystem : EntitySystem + public sealed partial class RoundEndSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly EmergencyShuttleSystem _shuttle = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private EmergencyShuttleSystem _shuttle = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StationSystem _stationSystem = default!; public TimeSpan DefaultCooldownDuration { get; set; } = TimeSpan.FromSeconds(30); diff --git a/Content.Server/Salvage/FultonSystem.cs b/Content.Server/Salvage/FultonSystem.cs index d686ab95ed0..180efa5865c 100644 --- a/Content.Server/Salvage/FultonSystem.cs +++ b/Content.Server/Salvage/FultonSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Salvage; /// /// Transports attached entities to the linked beacon after a timer has elapsed. /// -public sealed class FultonSystem : SharedFultonSystem +public sealed partial class FultonSystem : SharedFultonSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs b/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs index d8f6b4af86f..768e0daf999 100644 --- a/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs +++ b/Content.Server/Salvage/JobBoard/SalvageJobBoardSystem.cs @@ -18,17 +18,17 @@ namespace Content.Server.Salvage.JobBoard; -public sealed class SalvageJobBoardSystem : EntitySystem +public sealed partial class SalvageJobBoardSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly CargoSystem _cargo = default!; - [Dependency] private readonly LabelSystem _label = default!; - [Dependency] private readonly PaperSystem _paper = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private CargoSystem _cargo = default!; + [Dependency] private LabelSystem _label = default!; + [Dependency] private PaperSystem _paper = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _ui = default!; /// /// Radio channel that unlock messages are broadcast on. diff --git a/Content.Server/Salvage/RestrictedRangeSystem.cs b/Content.Server/Salvage/RestrictedRangeSystem.cs index 41248a66726..9173cad1748 100644 --- a/Content.Server/Salvage/RestrictedRangeSystem.cs +++ b/Content.Server/Salvage/RestrictedRangeSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Salvage; -public sealed class RestrictedRangeSystem : SharedRestrictedRangeSystem +public sealed partial class RestrictedRangeSystem : SharedRestrictedRangeSystem { - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() { diff --git a/Content.Server/Salvage/SalvageRulerCommand.cs b/Content.Server/Salvage/SalvageRulerCommand.cs index 81623585047..8e7aa8a47f4 100644 --- a/Content.Server/Salvage/SalvageRulerCommand.cs +++ b/Content.Server/Salvage/SalvageRulerCommand.cs @@ -6,10 +6,10 @@ namespace Content.Server.Salvage; [AdminCommand(AdminFlags.Admin)] -sealed class SalvageRulerCommand : IConsoleCommand +sealed partial class SalvageRulerCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly IMapManager _maps = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private IMapManager _maps = default!; public string Command => "salvageruler"; diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 3e351863f0f..df26db6ca1e 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -14,7 +14,7 @@ namespace Content.Server.Salvage; public sealed partial class SalvageSystem { - [Dependency] private readonly IRuntimeLog _runtimeLog = default!; + [Dependency] private IRuntimeLog _runtimeLog = default!; private static readonly ProtoId MagnetChannel = "Supply"; diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs index 46f660165de..f891c66b294 100644 --- a/Content.Server/Salvage/SalvageSystem.Runner.cs +++ b/Content.Server/Salvage/SalvageSystem.Runner.cs @@ -21,7 +21,7 @@ public sealed partial class SalvageSystem * Handles actively running a salvage expedition. */ - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private MobStateSystem _mobState = default!; private void InitializeRunner() { diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs index f0c97577f45..3d9433d3cb7 100644 --- a/Content.Server/Salvage/SalvageSystem.cs +++ b/Content.Server/Salvage/SalvageSystem.cs @@ -23,28 +23,28 @@ namespace Content.Server.Salvage { public sealed partial class SalvageSystem : SharedSalvageSystem { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AnchorableSystem _anchorable = default!; - [Dependency] private readonly BiomeSystem _biome = default!; - [Dependency] private readonly DungeonSystem _dungeon = default!; - [Dependency] private readonly GravitySystem _gravity = default!; - [Dependency] private readonly LabelSystem _labelSystem = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly RadioSystem _radioSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly ShuttleSystem _shuttle = default!; - [Dependency] private readonly ShuttleConsoleSystem _shuttleConsoles = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AnchorableSystem _anchorable = default!; + [Dependency] private BiomeSystem _biome = default!; + [Dependency] private DungeonSystem _dungeon = default!; + [Dependency] private GravitySystem _gravity = default!; + [Dependency] private LabelSystem _labelSystem = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private RadioSystem _radioSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private ShuttleSystem _shuttle = default!; + [Dependency] private ShuttleConsoleSystem _shuttleConsoles = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _ui = default!; private EntityQuery _gridQuery; private EntityQuery _xformQuery; diff --git a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs index 8237ccb2eb7..98e72b6a05a 100644 --- a/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs +++ b/Content.Server/Sandbox/Commands/ColorNetworkCommand.cs @@ -9,11 +9,11 @@ namespace Content.Server.Sandbox.Commands { [AnyCommand] - public sealed class ColorNetworkCommand : LocalizedEntityCommands + public sealed partial class ColorNetworkCommand : LocalizedEntityCommands { - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly AtmosPipeColorSystem _pipeColorSystem = default!; - [Dependency] private readonly SandboxSystem _sandboxSystem = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private AtmosPipeColorSystem _pipeColorSystem = default!; + [Dependency] private SandboxSystem _sandboxSystem = default!; public override string Command => "colornetwork"; diff --git a/Content.Server/Sandbox/SandboxSystem.cs b/Content.Server/Sandbox/SandboxSystem.cs index 430e87c019c..fd1dab29caf 100644 --- a/Content.Server/Sandbox/SandboxSystem.cs +++ b/Content.Server/Sandbox/SandboxSystem.cs @@ -19,17 +19,17 @@ namespace Content.Server.Sandbox { - public sealed class SandboxSystem : SharedSandboxSystem + public sealed partial class SandboxSystem : SharedSandboxSystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IPlacementManager _placementManager = default!; - [Dependency] private readonly IConGroupController _conGroupController = default!; - [Dependency] private readonly IServerConsoleHost _host = default!; - [Dependency] private readonly SharedAccessSystem _access = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IPlacementManager _placementManager = default!; + [Dependency] private IConGroupController _conGroupController = default!; + [Dependency] private IServerConsoleHost _host = default!; + [Dependency] private SharedAccessSystem _access = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; private bool _isSandboxEnabled; diff --git a/Content.Server/Screens/Systems/ScreenSystem.cs b/Content.Server/Screens/Systems/ScreenSystem.cs index e2385cba9c1..71ba7009d84 100644 --- a/Content.Server/Screens/Systems/ScreenSystem.cs +++ b/Content.Server/Screens/Systems/ScreenSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Screens.Systems; /// /// Controls the wallmounted screens on stations and shuttles displaying e.g. FTL duration, ETA /// -public sealed class ScreenSystem : EntitySystem +public sealed partial class ScreenSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; public override void Initialize() { diff --git a/Content.Server/Sectors/Systems/SectorWeatherSystem.cs b/Content.Server/Sectors/Systems/SectorWeatherSystem.cs index 36b51449800..aa37bcf8029 100644 --- a/Content.Server/Sectors/Systems/SectorWeatherSystem.cs +++ b/Content.Server/Sectors/Systems/SectorWeatherSystem.cs @@ -15,11 +15,11 @@ namespace Content.Server.Sectors.Systems; /// /// Tracks active sector weather events and broadcasts changes for UI systems. /// -public sealed class SectorWeatherSystem : EntitySystem +public sealed partial class SectorWeatherSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _players = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private IPlayerManager _players = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private IAdminLogManager _adminLog = default!; private readonly Dictionary _activeWeather = new(); diff --git a/Content.Server/SensorMonitoring/BatterySensorSystem.cs b/Content.Server/SensorMonitoring/BatterySensorSystem.cs index b33f33f95b4..3f031826f39 100644 --- a/Content.Server/SensorMonitoring/BatterySensorSystem.cs +++ b/Content.Server/SensorMonitoring/BatterySensorSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.SensorMonitoring; -public sealed class BatterySensorSystem : EntitySystem +public sealed partial class BatterySensorSystem : EntitySystem { public const string DeviceNetworkCommandSyncData = "bat_sync_data"; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private SharedBatterySystem _battery = default!; public override void Initialize() { diff --git a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs index 00dd69ded2d..520dce57995 100644 --- a/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs +++ b/Content.Server/SensorMonitoring/SensorMonitoringConsoleSystem.cs @@ -28,9 +28,9 @@ public sealed partial class SensorMonitoringConsoleSystem : EntitySystem private EntityQuery _deviceNetworkQuery; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; public override void Initialize() { diff --git a/Content.Server/ServerInfo/ServerInfoManager.cs b/Content.Server/ServerInfo/ServerInfoManager.cs index d88c02e17fb..1c30cf935c7 100644 --- a/Content.Server/ServerInfo/ServerInfoManager.cs +++ b/Content.Server/ServerInfo/ServerInfoManager.cs @@ -8,7 +8,7 @@ namespace Content.Server.ServerInfo; /// /// Adds additional data like info links to the server info endpoint /// -public sealed class ServerInfoManager +public sealed partial class ServerInfoManager { private static readonly (CVarDef cVar, string icon, string name)[] Vars = { @@ -22,9 +22,9 @@ private static readonly (CVarDef cVar, string icon, string name)[] Vars // @formatter:on }; - [Dependency] private readonly IStatusHost _statusHost = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IStatusHost _statusHost = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILocalizationManager _loc = default!; public void Initialize() { diff --git a/Content.Server/ServerUpdates/ServerUpdateManager.cs b/Content.Server/ServerUpdates/ServerUpdateManager.cs index 058d9a59e43..ef4b641895c 100644 --- a/Content.Server/ServerUpdates/ServerUpdateManager.cs +++ b/Content.Server/ServerUpdates/ServerUpdateManager.cs @@ -18,15 +18,15 @@ namespace Content.Server.ServerUpdates; /// This was originally only designed for restarting on *update*, /// but now also handles periodic restarting to keep server uptime via . /// -public sealed class ServerUpdateManager : IPostInjectInit +public sealed partial class ServerUpdateManager : IPostInjectInit { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IWatchdogApi _watchdog = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IBaseServer _server = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IWatchdogApi _watchdog = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IBaseServer _server = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs b/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs index 4750cd77c11..4e15b4fb598 100644 --- a/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs +++ b/Content.Server/Shuttles/Commands/DelayShuttleRoundEndCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Shuttles.Commands; /// Delays the round from ending via the shuttle call. Can still be ended via other means. /// [AdminCommand(AdminFlags.Fun)] -public sealed class DelayRoundEndCommand : LocalizedEntityCommands +public sealed partial class DelayRoundEndCommand : LocalizedEntityCommands { - [Dependency] private readonly EmergencyShuttleSystem _shuttleSystem = default!; + [Dependency] private EmergencyShuttleSystem _shuttleSystem = default!; public override string Command => "delayroundend"; diff --git a/Content.Server/Shuttles/Commands/DockCommand.cs b/Content.Server/Shuttles/Commands/DockCommand.cs index 14042cd9530..4b5fe184a7c 100644 --- a/Content.Server/Shuttles/Commands/DockCommand.cs +++ b/Content.Server/Shuttles/Commands/DockCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Shuttles.Commands; [AdminCommand(AdminFlags.Mapping)] -public sealed class DockCommand : LocalizedEntityCommands +public sealed partial class DockCommand : LocalizedEntityCommands { - [Dependency] private readonly DockingSystem _dockSystem = default!; + [Dependency] private DockingSystem _dockSystem = default!; public override string Command => "dock"; diff --git a/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs b/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs index b95cecc894e..cf6e61ad48a 100644 --- a/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs +++ b/Content.Server/Shuttles/Commands/DockEmergencyShuttleCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Shuttles.Commands; /// Calls in the emergency shuttle. /// [AdminCommand(AdminFlags.Fun)] -public sealed class DockEmergencyShuttleCommand : LocalizedEntityCommands +public sealed partial class DockEmergencyShuttleCommand : LocalizedEntityCommands { - [Dependency] private readonly EmergencyShuttleSystem _shuttleSystem = default!; + [Dependency] private EmergencyShuttleSystem _shuttleSystem = default!; public override string Command => "dockemergencyshuttle"; diff --git a/Content.Server/Shuttles/Commands/FTLDiskCommand.cs b/Content.Server/Shuttles/Commands/FTLDiskCommand.cs index e76d8313f3d..1f54c23698b 100644 --- a/Content.Server/Shuttles/Commands/FTLDiskCommand.cs +++ b/Content.Server/Shuttles/Commands/FTLDiskCommand.cs @@ -18,10 +18,10 @@ namespace Content.Server.Shuttles.Commands; /// [AdminCommand(AdminFlags.Fun)] -public sealed class FTLDiskCommand : LocalizedCommands +public sealed partial class FTLDiskCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IEntitySystemManager _entSystemManager = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IEntitySystemManager _entSystemManager = default!; public override string Command => "ftldisk"; diff --git a/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs b/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs index 7f129e6d209..9efc36f86d5 100644 --- a/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs +++ b/Content.Server/Shuttles/Commands/LaunchEmergencyShuttleCommand.cs @@ -9,9 +9,9 @@ namespace Content.Server.Shuttles.Commands; /// Early launches in the emergency shuttle. /// [AdminCommand(AdminFlags.Fun)] -public sealed class LaunchEmergencyShuttleCommand : LocalizedEntityCommands +public sealed partial class LaunchEmergencyShuttleCommand : LocalizedEntityCommands { - [Dependency] private readonly EmergencyShuttleSystem _shuttleSystem = default!; + [Dependency] private EmergencyShuttleSystem _shuttleSystem = default!; public override string Command => "launchemergencyshuttle"; diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index ac1d90025f8..75c9a481c41 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -43,26 +43,26 @@ namespace Content.Server.Shuttles.Systems; /// /// If enabled spawns players on a separate arrivals station before they can transfer to the main station. /// -public sealed class ArrivalsSystem : EntitySystem +public sealed partial class ArrivalsSystem : EntitySystem { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IConsoleHost _console = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ActorSystem _actor = default!; - [Dependency] private readonly BiomeSystem _biomes = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ShuttleSystem _shuttles = default!; - [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IConsoleHost _console = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ActorSystem _actor = default!; + [Dependency] private BiomeSystem _biomes = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ShuttleSystem _shuttles = default!; + [Dependency] private StationSpawningSystem _stationSpawning = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private AntagSelectionSystem _antag = default!; private EntityQuery _pendingQuery; private EntityQuery _blacklistQuery; diff --git a/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs b/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs index 34cade7f1c1..483778d201a 100644 --- a/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSignalControlSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.Shuttles.Systems; -public sealed class DockingSignalControlSystem : EntitySystem +public sealed partial class DockingSignalControlSystem : EntitySystem { - [Dependency] private readonly DeviceLinkSystem _deviceLinkSystem = default!; + [Dependency] private DeviceLinkSystem _deviceLinkSystem = default!; public override void Initialize() { diff --git a/Content.Server/Shuttles/Systems/DockingSystem.cs b/Content.Server/Shuttles/Systems/DockingSystem.cs index ea4b4a202eb..1a4c23fbc1d 100644 --- a/Content.Server/Shuttles/Systems/DockingSystem.cs +++ b/Content.Server/Shuttles/Systems/DockingSystem.cs @@ -18,15 +18,15 @@ namespace Content.Server.Shuttles.Systems { public sealed partial class DockingSystem : SharedDockingSystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly DoorSystem _doorSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly PathfindingSystem _pathfinding = default!; - [Dependency] private readonly ShuttleConsoleSystem _console = default!; - [Dependency] private readonly SharedJointSystem _jointSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private DoorSystem _doorSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private PathfindingSystem _pathfinding = default!; + [Dependency] private ShuttleConsoleSystem _console = default!; + [Dependency] private SharedJointSystem _jointSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; private const string DockingJoint = "docking"; diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs index aea711855e6..103e4a5357f 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs @@ -46,27 +46,27 @@ public sealed partial class EmergencyShuttleSystem : SharedEmergencyShuttleSyste * Handles the escape shuttle + CentCom. */ - [Dependency] private readonly IAdminLogManager _logger = default!; - [Dependency] private readonly IAdminManager _admin = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly AccessReaderSystem _reader = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly CommunicationsConsoleSystem _commsConsole = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly DockingSystem _dock = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly IdCardSystem _idSystem = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ShuttleSystem _shuttle = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; + [Dependency] private IAdminLogManager _logger = default!; + [Dependency] private IAdminManager _admin = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private AccessReaderSystem _reader = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private CommunicationsConsoleSystem _commsConsole = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private DockingSystem _dock = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private IdCardSystem _idSystem = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ShuttleSystem _shuttle = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private TransformSystem _transformSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; private const float ShuttleSpawnBuffer = 1f; diff --git a/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs b/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs index b87efccdda8..a2e4c27b511 100644 --- a/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Shuttles.Systems; -public sealed class RadarConsoleSystem : SharedRadarConsoleSystem +public sealed partial class RadarConsoleSystem : SharedRadarConsoleSystem { - [Dependency] private readonly ShuttleConsoleSystem _console = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SectorWeatherSystem _sectorWeather = default!; + [Dependency] private ShuttleConsoleSystem _console = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SectorWeatherSystem _sectorWeather = default!; private float _refreshTimer; private const float RefreshInterval = 1f; @@ -41,14 +41,14 @@ private void OnRadarStartup(EntityUid uid, RadarConsoleComponent component, Comp UpdateState(uid, component); } - private void OnSectorWeatherChanged(SectorWeatherChangedEvent ev) + private void OnSectorWeatherChanged(SectorWeatherChangedEvent ev) + { + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var comp)) { - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var comp)) - { - UpdateState(uid, comp); - } + UpdateState(uid, comp); } + } protected override void UpdateState(EntityUid uid, RadarConsoleComponent component) { diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs index 4ab4fe48ead..f5cc25b1321 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -30,18 +30,18 @@ namespace Content.Server.Shuttles.Systems; public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem { - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ShuttleSystem _shuttle = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly TagSystem _tags = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedContentEyeSystem _eyeSystem = default!; - [Dependency] private readonly SectorWeatherSystem _sectorWeather = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ShuttleSystem _shuttle = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private TagSystem _tags = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private SharedContentEyeSystem _eyeSystem = default!; + [Dependency] private SectorWeatherSystem _sectorWeather = default!; private EntityQuery _metaQuery; private EntityQuery _xformQuery; diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index d64c4b1e466..0feba93a518 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -36,34 +36,34 @@ namespace Content.Server.Shuttles.Systems; [UsedImplicitly] public sealed partial class ShuttleSystem : SharedShuttleSystem { - [Dependency] private readonly IAdminLogManager _logger = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly BiomeSystem _biomes = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly BuckleSystem _buckle = default!; - [Dependency] private readonly DamageableSystem _damageSys = default!; - [Dependency] private readonly DockingSystem _dockSystem = default!; - [Dependency] private readonly DungeonSystem _dungeon = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly MapLoaderSystem _loader = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly PvsOverrideSystem _pvs = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedSalvageSystem _salvage = default!; - [Dependency] private readonly ShuttleConsoleSystem _console = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StunSystem _stuns = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly ThrusterSystem _thruster = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IAdminLogManager _logger = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private BiomeSystem _biomes = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private BuckleSystem _buckle = default!; + [Dependency] private DamageableSystem _damageSys = default!; + [Dependency] private DockingSystem _dockSystem = default!; + [Dependency] private DungeonSystem _dungeon = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private MapLoaderSystem _loader = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private PvsOverrideSystem _pvs = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedSalvageSystem _salvage = default!; + [Dependency] private ShuttleConsoleSystem _console = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StunSystem _stuns = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private ThrusterSystem _thruster = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private TurfSystem _turf = default!; private EntityQuery _buckleQuery; diff --git a/Content.Server/Shuttles/Systems/StationAnchorSystem.cs b/Content.Server/Shuttles/Systems/StationAnchorSystem.cs index def1796836e..348a49d3d0a 100644 --- a/Content.Server/Shuttles/Systems/StationAnchorSystem.cs +++ b/Content.Server/Shuttles/Systems/StationAnchorSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Shuttles.Systems; -public sealed class StationAnchorSystem : EntitySystem +public sealed partial class StationAnchorSystem : EntitySystem { - [Dependency] private readonly ShuttleSystem _shuttleSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private ShuttleSystem _shuttleSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; public override void Initialize() { @@ -87,7 +87,7 @@ private void SetStatus(Entity ent, bool enabled, Shuttle } else { - if(!TryComp(grid, out _)) + if (!TryComp(grid, out _)) _shuttleSystem.Enable(grid.Value); } diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs index 93e02bd9b28..32cd6c54551 100644 --- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs +++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs @@ -27,18 +27,18 @@ namespace Content.Server.Shuttles.Systems; -public sealed class ThrusterSystem : EntitySystem +public sealed partial class ThrusterSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly AmbientSoundSystem _ambient = default!; - [Dependency] private readonly FixtureSystem _fixtureSystem = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ConstructionSystem _construction = default!; // Frontier - [Dependency] private readonly SharedTransformSystem _transform = default!; // Frontier - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private AmbientSoundSystem _ambient = default!; + [Dependency] private FixtureSystem _fixtureSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private ConstructionSystem _construction = default!; // Frontier + [Dependency] private SharedTransformSystem _transform = default!; // Frontier + [Dependency] private TurfSystem _turf = default!; // Essentially whenever thruster enables we update the shuttle's available impulses which are used for movement. // This is done for each direction available. @@ -65,7 +65,7 @@ public override void Initialize() SubscribeLocalEvent(OnSignalReceived); // Frontier } - // Frontier: signal handler + // Frontier: signal handler private void OnSignalReceived(EntityUid uid, ThrusterComponent component, ref SignalReceivedEvent args) { if (args.Port == component.OffPort) diff --git a/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs b/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs index 7d8d0c50e10..ff73638bb84 100644 --- a/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSwitchableTypeSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Silicons.Borgs; /// /// Server-side logic for borg type switching. Handles more heavyweight and server-specific switching logic. /// -public sealed class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem +public sealed partial class BorgSwitchableTypeSystem : SharedBorgSwitchableTypeSystem { - [Dependency] private readonly BorgSystem _borgSystem = default!; - [Dependency] private readonly ServerInventorySystem _inventorySystem = default!; + [Dependency] private BorgSystem _borgSystem = default!; + [Dependency] private ServerInventorySystem _inventorySystem = default!; protected override void SelectBorgModule(Entity ent, ProtoId borgType) { diff --git a/Content.Server/Silicons/Borgs/BorgSystem.cs b/Content.Server/Silicons/Borgs/BorgSystem.cs index 063514060e9..16e5b3e2812 100644 --- a/Content.Server/Silicons/Borgs/BorgSystem.cs +++ b/Content.Server/Silicons/Borgs/BorgSystem.cs @@ -20,19 +20,19 @@ namespace Content.Server.Silicons.Borgs; /// public sealed partial class BorgSystem : SharedBorgSystem { - [Dependency] private readonly IBanManager _banManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly TriggerSystem _trigger = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IBanManager _banManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private TriggerSystem _trigger = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private DamageableSystem _damageable = default!; public static readonly ProtoId BorgJobId = "Borg"; diff --git a/Content.Server/Silicons/Bots/HugBotSystem.cs b/Content.Server/Silicons/Bots/HugBotSystem.cs index 46bacfb49b3..54a4cfabcf8 100644 --- a/Content.Server/Silicons/Bots/HugBotSystem.cs +++ b/Content.Server/Silicons/Bots/HugBotSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Silicons.Bots; /// Beyond what does, this system manages the "lifecycle" of /// . /// -public sealed class HugBotSystem : SharedHugBotSystem +public sealed partial class HugBotSystem : SharedHugBotSystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs b/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs index 82db14a32fc..1c83c345aee 100644 --- a/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs +++ b/Content.Server/Silicons/Laws/IonLawLocalizationSystem.cs @@ -1,10 +1,10 @@ namespace Content.Server.Silicons.Laws; -public sealed class IonLawLocalizationSystem : EntitySystem +public sealed partial class IonLawLocalizationSystem : EntitySystem { - [Dependency] private readonly ILocalizationManager _loc = default!; - [Dependency] private readonly IonLawSystem _ionLaw = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private ILocalizationManager _loc = default!; + [Dependency] private IonLawSystem _ionLaw = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Silicons/Laws/IonLawSystem.cs b/Content.Server/Silicons/Laws/IonLawSystem.cs index 723d9575bf7..f3c8e86c58c 100644 --- a/Content.Server/Silicons/Laws/IonLawSystem.cs +++ b/Content.Server/Silicons/Laws/IonLawSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Silicons.Laws; /// /// This handles generating random ion laws. /// -public sealed class IonLawSystem : EntitySystem +public sealed partial class IonLawSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedStationSystem _stationSystem = default!; - [Dependency] private readonly SharedStationRecordsSystem _stationRecordsSystem = default!; - [Dependency] private readonly ILogManager _logManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedStationSystem _stationSystem = default!; + [Dependency] private SharedStationRecordsSystem _stationRecordsSystem = default!; + [Dependency] private ILogManager _logManager = default!; private ISawmill _sawmill = default!; private readonly Dictionary> _selectors = new(); diff --git a/Content.Server/Silicons/Laws/IonStormSystem.cs b/Content.Server/Silicons/Laws/IonStormSystem.cs index 9210f95faf4..ed06fb4d1e5 100644 --- a/Content.Server/Silicons/Laws/IonStormSystem.cs +++ b/Content.Server/Silicons/Laws/IonStormSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Silicons.Laws; -public sealed class IonStormSystem : EntitySystem +public sealed partial class IonStormSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SiliconLawSystem _siliconLaw = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly IonLawSystem _ionLaw = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SiliconLawSystem _siliconLaw = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private IonLawSystem _ionLaw = default!; /// /// Randomly alters the laws of an individual silicon. diff --git a/Content.Server/Silicons/Laws/SiliconLawSystem.cs b/Content.Server/Silicons/Laws/SiliconLawSystem.cs index 76a496d1fbd..4fbc69d865c 100644 --- a/Content.Server/Silicons/Laws/SiliconLawSystem.cs +++ b/Content.Server/Silicons/Laws/SiliconLawSystem.cs @@ -24,15 +24,15 @@ namespace Content.Server.Silicons.Laws; /// -public sealed class SiliconLawSystem : SharedSiliconLawSystem +public sealed partial class SiliconLawSystem : SharedSiliconLawSystem { - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private EmagSystem _emag = default!; private static readonly ProtoId DefaultCrewLawset = "Crewsimov"; diff --git a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs index e973c202de5..bd11bf11fd4 100644 --- a/Content.Server/Silicons/Laws/StartIonStormedSystem.cs +++ b/Content.Server/Silicons/Laws/StartIonStormedSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Silicons.Laws; /// /// This handles running the ion storm event a on specific entity when that entity is spawned in. /// -public sealed class StartIonStormedSystem : EntitySystem +public sealed partial class StartIonStormedSystem : EntitySystem { - [Dependency] private readonly IonStormSystem _ionStorm = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SiliconLawSystem _siliconLaw = default!; + [Dependency] private IonStormSystem _ionStorm = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SiliconLawSystem _siliconLaw = default!; public override void Initialize() { diff --git a/Content.Server/Silicons/StationAi/StationAiFixerConsoleSystem.cs b/Content.Server/Silicons/StationAi/StationAiFixerConsoleSystem.cs index f123d757fff..dcab7884136 100644 --- a/Content.Server/Silicons/StationAi/StationAiFixerConsoleSystem.cs +++ b/Content.Server/Silicons/StationAi/StationAiFixerConsoleSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Silicons.StationAi; public sealed partial class StationAiFixerConsoleSystem : SharedStationAiFixerConsoleSystem { - [Dependency] private readonly EuiManager _eui = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private EuiManager _eui = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; protected override void FinalizeAction(Entity ent) { diff --git a/Content.Server/Silicons/StationAi/StationAiSystem.cs b/Content.Server/Silicons/StationAi/StationAiSystem.cs index 645b2703631..4e569747dc8 100644 --- a/Content.Server/Silicons/StationAi/StationAiSystem.cs +++ b/Content.Server/Silicons/StationAi/StationAiSystem.cs @@ -40,26 +40,26 @@ namespace Content.Server.Silicons.StationAi; -public sealed class StationAiSystem : SharedStationAiSystem +public sealed partial class StationAiSystem : SharedStationAiSystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedTransformSystem _xforms = default!; - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly RoleSystem _roles = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly GhostSystem _ghost = default!; - [Dependency] private readonly ToggleableGhostRoleSystem _ghostrole = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly DestructibleSystem _destructible = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedPopupSystem _popups = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StationJobsSystem _stationJobs = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedTransformSystem _xforms = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private RoleSystem _roles = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private GhostSystem _ghost = default!; + [Dependency] private ToggleableGhostRoleSystem _ghostrole = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private DestructibleSystem _destructible = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedPopupSystem _popups = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StationJobsSystem _stationJobs = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; private readonly HashSet> _stationAiCores = new(); diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs index e82626a6c50..3a6f4568ccb 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs @@ -17,15 +17,15 @@ namespace Content.Server.Singularity.EntitySystems; -public sealed class ContainmentFieldGeneratorSystem : EntitySystem +public sealed partial class ContainmentFieldGeneratorSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly AppearanceSystem _visualizer = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private AppearanceSystem _visualizer = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private TagSystem _tags = default!; private bool _pendingConnectionRebuild; diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs index 59a3d47c691..45da7229f3b 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Singularity.EntitySystems; -public sealed class ContainmentFieldSystem : EntitySystem +public sealed partial class ContainmentFieldSystem : EntitySystem { - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public override void Initialize() { diff --git a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs index 6309144cde7..e9c01b7ee7e 100644 --- a/Content.Server/Singularity/EntitySystems/EmitterSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EmitterSystem.cs @@ -28,16 +28,16 @@ namespace Content.Server.Singularity.EntitySystems { - public sealed class EmitterSystem : SharedEmitterSystem + public sealed partial class EmitterSystem : SharedEmitterSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ProjectileSystem _projectile = default!; - [Dependency] private readonly GunSystem _gun = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ProjectileSystem _projectile = default!; + [Dependency] private GunSystem _gun = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private NavMapSystem _navMap = default!; private readonly HashSet _pendingEmitterReinitialization = new(); diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index f49f5a42c98..1c3850915c8 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -23,19 +23,19 @@ namespace Content.Server.Singularity.EntitySystems; /// The entity system primarily responsible for managing s. /// Handles their consumption of entities. /// -public sealed class EventHorizonSystem : SharedEventHorizonSystem +public sealed partial class EventHorizonSystem : SharedEventHorizonSystem { #region Dependencies - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly WhiteHoleSystem _whiteHole = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private WhiteHoleSystem _whiteHole = default!; #endregion Dependencies private static readonly ProtoId HighRiskItemTag = "HighRiskItem"; diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs index b16d00b6449..1fc2785aa70 100644 --- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs +++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs @@ -16,14 +16,14 @@ namespace Content.Server.Singularity.EntitySystems; /// Primarily responsible for managing s. /// Handles the gravitational pulses they can emit. /// -public sealed class GravityWellSystem : SharedGravityWellSystem +public sealed partial class GravityWellSystem : SharedGravityWellSystem { #region Dependencies - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IViewVariablesManager _vvManager = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IViewVariablesManager _vvManager = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; #endregion Dependencies /// diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs index 1f9814e2a8c..0eea6fc3126 100644 --- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs @@ -17,13 +17,13 @@ namespace Content.Server.Singularity.EntitySystems; -public sealed class RadiationCollectorSystem : EntitySystem +public sealed partial class RadiationCollectorSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private UseDelaySystem _useDelay = default!; private const string GasTankContainer = "gas_tank"; diff --git a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs index 099b2d89b06..8d7813ed969 100644 --- a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Singularity.EntitySystems; /// /// Handles singularity attractors. /// -public sealed class SingularityAttractorSystem : EntitySystem +public sealed partial class SingularityAttractorSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// /// The minimum range at which the attraction will act. diff --git a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs index e303717e9ae..ee270b35c66 100644 --- a/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularityGeneratorSystem.cs @@ -10,13 +10,13 @@ namespace Content.Server.Singularity.EntitySystems; -public sealed class SingularityGeneratorSystem : SharedSingularityGeneratorSystem +public sealed partial class SingularityGeneratorSystem : SharedSingularityGeneratorSystem { #region Dependencies - [Dependency] private readonly IViewVariablesManager _vvm = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly PhysicsSystem _physics = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IViewVariablesManager _vvm = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private PhysicsSystem _physics = default!; + [Dependency] private IGameTiming _timing = default!; #endregion Dependencies public override void Initialize() diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs index 7d60479513d..3180666e5ce 100644 --- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs @@ -16,12 +16,12 @@ namespace Content.Server.Singularity.EntitySystems; /// Handles their accumulation of energy upon consuming entities (see ) and gradual dissipation. /// Also handles synchronizing server-side components with the singuarities level. /// -public sealed class SingularitySystem : SharedSingularitySystem +public sealed partial class SingularitySystem : SharedSingularitySystem { #region Dependencies - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly PvsOverrideSystem _pvs = default!; - [Dependency] private readonly WhiteHoleSystem _whiteHole = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private PvsOverrideSystem _pvs = default!; + [Dependency] private WhiteHoleSystem _whiteHole = default!; #endregion Dependencies /// diff --git a/Content.Server/Singularity/StartSingularityEngineCommand.cs b/Content.Server/Singularity/StartSingularityEngineCommand.cs index 7b45e38ec85..03d09b809bf 100644 --- a/Content.Server/Singularity/StartSingularityEngineCommand.cs +++ b/Content.Server/Singularity/StartSingularityEngineCommand.cs @@ -12,12 +12,12 @@ namespace Content.Server.Singularity { [AdminCommand(AdminFlags.Admin)] - public sealed class StartSingularityEngineCommand : LocalizedEntityCommands + public sealed partial class StartSingularityEngineCommand : LocalizedEntityCommands { - [Dependency] private readonly EmitterSystem _emitterSystem = default!; - [Dependency] private readonly MultipartMachineSystem _multipartSystem = default!; - [Dependency] private readonly ParticleAcceleratorSystem _paSystem = default!; - [Dependency] private readonly RadiationCollectorSystem _radCollectorSystem = default!; + [Dependency] private EmitterSystem _emitterSystem = default!; + [Dependency] private MultipartMachineSystem _multipartSystem = default!; + [Dependency] private ParticleAcceleratorSystem _paSystem = default!; + [Dependency] private RadiationCollectorSystem _radCollectorSystem = default!; public override string Command => "startsingularityengine"; diff --git a/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs index 0b4c6ab4ef4..6f4ce160397 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Solar.EntitySystems /// Responsible for updating solar control consoles. /// [UsedImplicitly] - internal sealed class PowerSolarControlConsoleSystem : EntitySystem + internal sealed partial class PowerSolarControlConsoleSystem : EntitySystem { - [Dependency] private readonly PowerSolarSystem _powerSolarSystem = default!; - [Dependency] private readonly PowerSolarTrackerSystem _powerSolarTracker = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private PowerSolarSystem _powerSolarSystem = default!; + [Dependency] private PowerSolarTrackerSystem _powerSolarTracker = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// /// Timer used to avoid updating the UI state every frame (which would be overkill) diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs index 44cf76dba94..1f88bf12728 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Solar.EntitySystems /// Responsible for maintaining the solar-panel sun angle and updating coverage. /// [UsedImplicitly] - internal sealed class PowerSolarSystem : EntitySystem + internal sealed partial class PowerSolarSystem : EntitySystem { - [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SolarPositioningSystem _solarPositioning = default!; + [Dependency] private SharedPhysicsSystem _physicsSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SolarPositioningSystem _solarPositioning = default!; /// /// Maximum panel angular velocity range - used to stop people rotating panels fast enough that the lag prevention becomes noticable diff --git a/Content.Server/Solar/EntitySystems/PowerSolarTrackerSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarTrackerSystem.cs index b897e6dfbe0..616ca19f06f 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarTrackerSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarTrackerSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Solar.EntitySystems { [UsedImplicitly] - public sealed class PowerSolarTrackerSystem : EntitySystem + public sealed partial class PowerSolarTrackerSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; public Dictionary> TrackersByGrid = new(); diff --git a/Content.Server/Solar/EntitySystems/SolarPositioningSystem.cs b/Content.Server/Solar/EntitySystems/SolarPositioningSystem.cs index 3213f72f83a..def5409668a 100644 --- a/Content.Server/Solar/EntitySystems/SolarPositioningSystem.cs +++ b/Content.Server/Solar/EntitySystems/SolarPositioningSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Solar.EntitySystems { [UsedImplicitly] - internal sealed class SolarPositioningSystem : EntitySystem + internal sealed partial class SolarPositioningSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index 34e5ade0fac..291e09449f2 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.Sound; -public sealed class EmitSoundSystem : SharedEmitSoundSystem +public sealed partial class EmitSoundSystem : SharedEmitSoundSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; public override void Update(float frameTime) { diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs index a8b04f80985..2939a64ae98 100644 --- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Spawners.EntitySystems { [UsedImplicitly] - public sealed class ConditionalSpawnerSystem : EntitySystem + public sealed partial class ConditionalSpawnerSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private EntityTableSystem _entityTable = default!; public override void Initialize() { diff --git a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs index 69b153667cf..0f19d31fdc5 100644 --- a/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs @@ -9,14 +9,14 @@ namespace Content.Server.Spawners.EntitySystems; -public sealed class ContainerSpawnPointSystem : EntitySystem +public sealed partial class ContainerSpawnPointSystem : EntitySystem { - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StationSpawningSystem _stationSpawning = default!; public override void Initialize() { diff --git a/Content.Server/Spawners/EntitySystems/RandomDecalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/RandomDecalSpawnerSystem.cs index ad008664b1d..dcfa8dfd7bc 100644 --- a/Content.Server/Spawners/EntitySystems/RandomDecalSpawnerSystem.cs +++ b/Content.Server/Spawners/EntitySystems/RandomDecalSpawnerSystem.cs @@ -8,13 +8,13 @@ namespace Content.Server.Spawners.EntitySystems; -public sealed class RandomDecalSpawnerSystem : EntitySystem +public sealed partial class RandomDecalSpawnerSystem : EntitySystem { - [Dependency] private readonly DecalSystem _decal = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefs = default!; + [Dependency] private DecalSystem _decal = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ITileDefinitionManager _tileDefs = default!; public override void Initialize() { diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs index dd17e649fb8..7e9cd5a7ad6 100644 --- a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs +++ b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs @@ -6,12 +6,12 @@ namespace Content.Server.Spawners.EntitySystems; -public sealed class SpawnPointSystem : EntitySystem +public sealed partial class SpawnPointSystem : EntitySystem { - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private StationSystem _stationSystem = default!; + [Dependency] private StationSpawningSystem _stationSpawning = default!; public override void Initialize() { diff --git a/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs index 6e0b0f384d0..bcbfdb626e1 100644 --- a/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs +++ b/Content.Server/Spawners/EntitySystems/SpawnerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Server.Spawners.EntitySystems; -public sealed class SpawnerSystem : EntitySystem +public sealed partial class SpawnerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs index 6d2d56465eb..0bdc22f607c 100644 --- a/Content.Server/Species/Systems/NymphSystem.cs +++ b/Content.Server/Species/Systems/NymphSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Species.Systems; public sealed partial class NymphSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly ZombieSystem _zombie = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private MindSystem _mindSystem = default!; + [Dependency] private ZombieSystem _zombie = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EmotesMenuSystem.cs b/Content.Server/Speech/EmotesMenuSystem.cs index a5006b744b1..d03dc27afbc 100644 --- a/Content.Server/Speech/EmotesMenuSystem.cs +++ b/Content.Server/Speech/EmotesMenuSystem.cs @@ -6,8 +6,8 @@ namespace Content.Server.Speech; public sealed partial class EmotesMenuSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs index 2fe43f4ce1e..6936b037633 100644 --- a/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/BarkAccentSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.Speech.EntitySystems { - public sealed class BarkAccentSystem : EntitySystem + public sealed partial class BarkAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly IReadOnlyList Barks = new List{ " Woof!", " WOOF", " wof-wof" diff --git a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs index a6fb40f31b4..578b2bfe415 100644 --- a/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/DamagedSiliconAccentSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class DamagedSiliconAccentSystem : EntitySystem +public sealed partial class DamagedSiliconAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly DestructibleSystem _destructibleSystem = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private DestructibleSystem _destructibleSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs index f433a0a86e8..3985108491a 100644 --- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Speech.EntitySystems; /// /// System that gives the speaker a faux-French accent. /// -public sealed class FrenchAccentSystem : EntitySystem +public sealed partial class FrenchAccentSystem : EntitySystem { - [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + [Dependency] private ReplacementAccentSystem _replacement = default!; private static readonly Regex RegexTh = new(@"th", RegexOptions.IgnoreCase); private static readonly Regex RegexStartH = new(@"(?(OnAccent);; + SubscribeLocalEvent(OnAccent); ; } // converts left word when typed into the right word. For example typing you becomes ye. diff --git a/Content.Server/Speech/EntitySystems/ListeningSystem.cs b/Content.Server/Speech/EntitySystems/ListeningSystem.cs index 1515ed67410..8efd4fa508f 100644 --- a/Content.Server/Speech/EntitySystems/ListeningSystem.cs +++ b/Content.Server/Speech/EntitySystems/ListeningSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Speech.EntitySystems; /// /// This system redirects local chat messages to listening entities (e.g., radio microphones). /// -public sealed class ListeningSystem : EntitySystem +public sealed partial class ListeningSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _xforms = default!; + [Dependency] private SharedTransformSystem _xforms = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs b/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs index 4299bcda073..e9e224dddb3 100644 --- a/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs +++ b/Content.Server/Speech/EntitySystems/MeleeSpeechSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class MeleeSpeechSystem : SharedMeleeSpeechSystem +public sealed partial class MeleeSpeechSystem : SharedMeleeSpeechSystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedActionsSystem _actionSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedActionsSystem _actionSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs index e18b5627c37..822dbfd13cc 100644 --- a/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MobsterAccentSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class MobsterAccentSystem : EntitySystem +public sealed partial class MobsterAccentSystem : EntitySystem { private static readonly Regex RegexIng = new(@"(?<=\w\w)(in)g(?!\w)", RegexOptions.IgnoreCase); private static readonly Regex RegexLowerOr = new(@"(?<=\w)o[Rr](?=\w)"); @@ -16,8 +16,8 @@ public sealed class MobsterAccentSystem : EntitySystem private static readonly Regex RegexFirstWord = new(@"^(\S+)"); private static readonly Regex RegexLastWord = new(@"(\S+)$"); private static readonly Regex RegexLastPunctuation = new(@"([.!?]+$)(?!.*[.!?])|(? Faces = new List{ " (•`ω´•)", " ;;w;;", " owo", " UwU", " >w<", " ^w^" diff --git a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs index 695eb3caa35..1d2b6485da4 100644 --- a/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/ParrotAccentSystem.cs @@ -10,7 +10,7 @@ public sealed partial class ParrotAccentSystem : EntitySystem { private static readonly Regex WordCleanupRegex = new Regex("[^A-Za-z0-9 -]"); - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs index e8292e82082..564bf447fe3 100644 --- a/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/PirateAccentSystem.cs @@ -6,12 +6,12 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class PirateAccentSystem : EntitySystem +public sealed partial class PirateAccentSystem : EntitySystem { private static readonly Regex FirstWordAllCapsRegex = new(@"^(\S+)"); - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ReplacementAccentSystem _replacement = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs index 6b6ebb606ab..4ffb9f20baa 100644 --- a/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs +++ b/Content.Server/Speech/EntitySystems/RatvarianLanguageSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class RatvarianLanguageSystem : SharedRatvarianLanguageSystem +public sealed partial class RatvarianLanguageSystem : SharedRatvarianLanguageSystem { - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; private static readonly ProtoId RatvarianKey = "RatvarianLanguage"; diff --git a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs index 2f8ccabd5f6..9c04f950cbc 100644 --- a/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/ReplacementAccentSystem.cs @@ -13,11 +13,11 @@ namespace Content.Server.Speech.EntitySystems /// /// Replaces text in messages, either with full replacements or word replacements. /// - public sealed class ReplacementAccentSystem : EntitySystem + public sealed partial class ReplacementAccentSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ILocalizationManager _loc = default!; private readonly Dictionary, (Regex regex, string replacement)[]> _cachedReplacements = new(); diff --git a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs index 30bfd73895f..a8e1742d4e1 100644 --- a/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/RussianAccentSystem.cs @@ -4,9 +4,9 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class RussianAccentSystem : EntitySystem +public sealed partial class RussianAccentSystem : EntitySystem { - [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + [Dependency] private ReplacementAccentSystem _replacement = default!; public override void Initialize() { SubscribeLocalEvent(OnAccent); diff --git a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs index e2a7b87312f..1176972e674 100644 --- a/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/ScrambledAccentSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Speech.EntitySystems { - public sealed class ScrambledAccentSystem : EntitySystem + public sealed partial class ScrambledAccentSystem : EntitySystem { private static readonly Regex RegexLoneI = new(@"(?<=\ )i(?=[\ \.\?]|$)"); - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs b/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs index e72fb686f10..66551524c5f 100644 --- a/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/SkeletonAccentSystem.cs @@ -7,8 +7,8 @@ namespace Content.Server.Speech.EntitySystems; public sealed partial class SkeletonAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ReplacementAccentSystem _replacement = default!; [GeneratedRegex(@"(? /// Divisor applied to total seconds used to get the odds of slurred speech occuring. diff --git a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs index 8d3ad1e3a7b..20eb89f2c95 100644 --- a/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/SouthernAccentSystem.cs @@ -4,7 +4,7 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class SouthernAccentSystem : EntitySystem +public sealed partial class SouthernAccentSystem : EntitySystem { private static readonly Regex RegexLowerIng = new(@"ing\b"); private static readonly Regex RegexUpperIng = new(@"ING\b"); @@ -13,7 +13,7 @@ public sealed class SouthernAccentSystem : EntitySystem private static readonly Regex RegexLowerDve = new(@"d've\b"); private static readonly Regex RegexUpperDve = new(@"D'VE\b"); - [Dependency] private readonly ReplacementAccentSystem _replacement = default!; + [Dependency] private ReplacementAccentSystem _replacement = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs b/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs index 6b52e69d7af..de4a8143453 100644 --- a/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs +++ b/Content.Server/Speech/EntitySystems/SpeakOnActionSystem.cs @@ -12,9 +12,9 @@ namespace Content.Server.Speech.EntitySystems; /// As soon as the chat refactor moves to Shared /// the logic here can move to the shared /// -public sealed class SpeakOnActionSystem : SharedSpeakOnActionSystem +public sealed partial class SpeakOnActionSystem : SharedSpeakOnActionSystem { - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/StutteringSystem.cs b/Content.Server/Speech/EntitySystems/StutteringSystem.cs index 559a2a4bd20..7fd6afdc47e 100644 --- a/Content.Server/Speech/EntitySystems/StutteringSystem.cs +++ b/Content.Server/Speech/EntitySystems/StutteringSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Speech.EntitySystems { - public sealed class StutteringSystem : SharedStutteringSystem + public sealed partial class StutteringSystem : SharedStutteringSystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; // Regex of characters to stutter. private static readonly Regex Stutter = new(@"[b-df-hj-np-tv-wxyz]", diff --git a/Content.Server/Speech/EntitySystems/VocalSystem.cs b/Content.Server/Speech/EntitySystems/VocalSystem.cs index 2b2bb0e807d..645461b81ed 100644 --- a/Content.Server/Speech/EntitySystems/VocalSystem.cs +++ b/Content.Server/Speech/EntitySystems/VocalSystem.cs @@ -11,13 +11,13 @@ namespace Content.Server.Speech.EntitySystems; -public sealed class VocalSystem : EntitySystem +public sealed partial class VocalSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly ActionsSystem _actions = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private ActionsSystem _actions = default!; public override void Initialize() { diff --git a/Content.Server/Speech/Muting/MutingSystem.cs b/Content.Server/Speech/Muting/MutingSystem.cs index 9e2a0602a43..d8748b6d193 100644 --- a/Content.Server/Speech/Muting/MutingSystem.cs +++ b/Content.Server/Speech/Muting/MutingSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Speech.Muting { - public sealed class MutingSystem : EntitySystem + public sealed partial class MutingSystem : EntitySystem { - [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Speech/SpeechNoiseSystem.cs b/Content.Server/Speech/SpeechNoiseSystem.cs index f25f5fdc47a..39f86906008 100644 --- a/Content.Server/Speech/SpeechNoiseSystem.cs +++ b/Content.Server/Speech/SpeechNoiseSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Speech { - public sealed class SpeechSoundSystem : EntitySystem + public sealed partial class SpeechSoundSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/Spider/SpiderSystem.cs b/Content.Server/Spider/SpiderSystem.cs index cd7883fd3c6..abc0c5c04a4 100644 --- a/Content.Server/Spider/SpiderSystem.cs +++ b/Content.Server/Spider/SpiderSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Spider; -public sealed class SpiderSystem : SharedSpiderSystem +public sealed partial class SpiderSystem : SharedSpiderSystem { - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MobStateSystem _mobState = default!; /// /// A recycled hashset used to check turfs for spiderwebs. diff --git a/Content.Server/SprayPainter/SprayPainterSystem.cs b/Content.Server/SprayPainter/SprayPainterSystem.cs index 1216d9758a8..3689361f7df 100644 --- a/Content.Server/SprayPainter/SprayPainterSystem.cs +++ b/Content.Server/SprayPainter/SprayPainterSystem.cs @@ -24,14 +24,14 @@ namespace Content.Server.SprayPainter; /// Handles spraying pipes and decals using a spray painter. /// Other paintable objects are handled in shared. /// -public sealed class SprayPainterSystem : SharedSprayPainterSystem +public sealed partial class SprayPainterSystem : SharedSprayPainterSystem { - [Dependency] private readonly AtmosPipeColorSystem _pipeColor = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly DecalSystem _decals = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly ChargesSystem _charges = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private AtmosPipeColorSystem _pipeColor = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private DecalSystem _decals = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private ChargesSystem _charges = default!; + [Dependency] private TransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Spreader/KudzuSystem.cs b/Content.Server/Spreader/KudzuSystem.cs index ef9102d7e60..ab163a241f2 100644 --- a/Content.Server/Spreader/KudzuSystem.cs +++ b/Content.Server/Spreader/KudzuSystem.cs @@ -8,13 +8,13 @@ namespace Content.Server.Spreader; -public sealed class KudzuSystem : EntitySystem +public sealed partial class KudzuSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private DamageableSystem _damageable = default!; private static readonly ProtoId KudzuGroup = "Kudzu"; diff --git a/Content.Server/Spreader/SpreaderSystem.cs b/Content.Server/Spreader/SpreaderSystem.cs index 154c4a3e7d3..0c24ea444f0 100644 --- a/Content.Server/Spreader/SpreaderSystem.cs +++ b/Content.Server/Spreader/SpreaderSystem.cs @@ -17,13 +17,13 @@ namespace Content.Server.Spreader; /// /// Handles generic spreading logic, where one anchored entity spreads to neighboring tiles. /// -public sealed class SpreaderSystem : EntitySystem +public sealed partial class SpreaderSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private TurfSystem _turf = default!; /// /// Cached maximum number of updates per spreader prototype. This is applied per-grid. diff --git a/Content.Server/Sprite/RandomSpriteSystem.cs b/Content.Server/Sprite/RandomSpriteSystem.cs index 0eddef4b192..6dfe01b314f 100644 --- a/Content.Server/Sprite/RandomSpriteSystem.cs +++ b/Content.Server/Sprite/RandomSpriteSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Sprite; -public sealed class RandomSpriteSystem : SharedRandomSpriteSystem +public sealed partial class RandomSpriteSystem : SharedRandomSpriteSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Stack/StackSystem.cs b/Content.Server/Stack/StackSystem.cs index a0d923dd1ed..410a7d560d6 100644 --- a/Content.Server/Stack/StackSystem.cs +++ b/Content.Server/Stack/StackSystem.cs @@ -11,9 +11,9 @@ namespace Content.Server.Stack /// This is a good example for learning how to code in an ECS manner. /// [UsedImplicitly] - public sealed class StackSystem : SharedStackSystem + public sealed partial class StackSystem : SharedStackSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; #region Spawning diff --git a/Content.Server/Station/Systems/StationBiomeSystem.cs b/Content.Server/Station/Systems/StationBiomeSystem.cs index 61bc70794a4..5b97e68f989 100644 --- a/Content.Server/Station/Systems/StationBiomeSystem.cs +++ b/Content.Server/Station/Systems/StationBiomeSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Station.Systems; public sealed partial class StationBiomeSystem : EntitySystem { - [Dependency] private readonly BiomeSystem _biome = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private BiomeSystem _biome = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs index 6b86b66ca84..1d3527d5a3d 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.Roundstart.cs @@ -15,9 +15,9 @@ namespace Content.Server.Station.Systems; // Contains code for round-start spawning. public sealed partial class StationJobsSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IBanManager _banManager = default!; - [Dependency] private readonly AntagSelectionSystem _antag = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IBanManager _banManager = default!; + [Dependency] private AntagSelectionSystem _antag = default!; private Dictionary> _jobsByWeight = default!; private List _orderedWeights = default!; diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs index d7d5570df0b..05bb0310234 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.cs @@ -23,10 +23,10 @@ namespace Content.Server.Station.Systems; [PublicAPI] public sealed partial class StationJobsSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private GameTicker _gameTicker = default!; /// public override void Initialize() diff --git a/Content.Server/Station/Systems/StationNameSystem.cs b/Content.Server/Station/Systems/StationNameSystem.cs index 8a8a3576ac7..dbf268e4a1e 100644 --- a/Content.Server/Station/Systems/StationNameSystem.cs +++ b/Content.Server/Station/Systems/StationNameSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Station.Systems; /// /// This handles naming stations. /// -public sealed class StationNameSystem : EntitySystem +public sealed partial class StationNameSystem : EntitySystem { - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private StationSystem _station = default!; /// public override void Initialize() diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs index d731066c445..fa7cd2f1eb6 100644 --- a/Content.Server/Station/Systems/StationSpawningSystem.cs +++ b/Content.Server/Station/Systems/StationSpawningSystem.cs @@ -30,19 +30,19 @@ namespace Content.Server.Station.Systems; /// Also provides helpers for spawning in the player's mob. /// [PublicAPI] -public sealed class StationSpawningSystem : SharedStationSpawningSystem +public sealed partial class StationSpawningSystem : SharedStationSpawningSystem { - [Dependency] private readonly SharedAccessSystem _accessSystem = default!; - [Dependency] private readonly ActorSystem _actors = default!; - [Dependency] private readonly IdCardSystem _cardSystem = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly HumanoidProfileSystem _humanoidProfile = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly IdentitySystem _identity = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly PdaSystem _pdaSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; + [Dependency] private SharedAccessSystem _accessSystem = default!; + [Dependency] private ActorSystem _actors = default!; + [Dependency] private IdCardSystem _cardSystem = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private HumanoidProfileSystem _humanoidProfile = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private IdentitySystem _identity = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private PdaSystem _pdaSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private MindSystem _mindSystem = default!; /// /// Attempts to spawn a player character onto the given station. diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index b06351fa4fb..0bdace943bc 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -33,16 +33,16 @@ namespace Content.Server.Station.Systems; [PublicAPI] public sealed partial class StationSystem : SharedStationSystem { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly PvsOverrideSystem _pvsOverride = default!; - [Dependency] private readonly CrewMetaRecordsSystem _metaRecords = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly CrewManifestSystem _crewManifest = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private PvsOverrideSystem _pvsOverride = default!; + [Dependency] private CrewMetaRecordsSystem _metaRecords = default!; + [Dependency] private MapSystem _mapSystem = default!; + [Dependency] private CrewManifestSystem _crewManifest = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs index 547b0b8f98d..77023e1e64c 100644 --- a/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs +++ b/Content.Server/StationEvents/BasicStationEventSchedulerSystem.cs @@ -18,10 +18,10 @@ namespace Content.Server.StationEvents /// game presets use. /// [UsedImplicitly] - public sealed class BasicStationEventSchedulerSystem : GameRuleSystem + public sealed partial class BasicStationEventSchedulerSystem : GameRuleSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EventManagerSystem _event = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EventManagerSystem _event = default!; protected override void Started(EntityUid uid, BasicStationEventSchedulerComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs index 2b9f4071993..f38546f7c61 100644 --- a/Content.Server/StationEvents/EventManagerSystem.cs +++ b/Content.Server/StationEvents/EventManagerSystem.cs @@ -12,15 +12,15 @@ namespace Content.Server.StationEvents; -public sealed class EventManagerSystem : EntitySystem +public sealed partial class EventManagerSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] public readonly GameTicker GameTicker = default!; - [Dependency] private readonly RoundEndSystem _roundEnd = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] public GameTicker GameTicker = default!; + [Dependency] private RoundEndSystem _roundEnd = default!; public bool EventsEnabled { get; private set; } private void SetEnabled(bool value) => EventsEnabled = value; diff --git a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs index a0af3ff5ea9..1d8845e8673 100644 --- a/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs +++ b/Content.Server/StationEvents/Events/AlertLevelInterceptionRule.cs @@ -4,9 +4,9 @@ namespace Content.Server.StationEvents.Events; -public sealed class AlertLevelInterceptionRule : StationEventSystem +public sealed partial class AlertLevelInterceptionRule : StationEventSystem { - [Dependency] private readonly AlertLevelSystem _alertLevelSystem = default!; + [Dependency] private AlertLevelSystem _alertLevelSystem = default!; protected override void Started(EntityUid uid, AlertLevelInterceptionRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) diff --git a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs index 823f0cc0bf7..c5274475dec 100644 --- a/Content.Server/StationEvents/Events/AnomalySpawnRule.cs +++ b/Content.Server/StationEvents/Events/AnomalySpawnRule.cs @@ -5,9 +5,9 @@ namespace Content.Server.StationEvents.Events; -public sealed class AnomalySpawnRule : StationEventSystem +public sealed partial class AnomalySpawnRule : StationEventSystem { - [Dependency] private readonly AnomalySystem _anomaly = default!; + [Dependency] private AnomalySystem _anomaly = default!; protected override void Added(EntityUid uid, AnomalySpawnRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/StationEvents/Events/BluespaceLockerRule.cs b/Content.Server/StationEvents/Events/BluespaceLockerRule.cs index 86b16336064..821f63a40b9 100644 --- a/Content.Server/StationEvents/Events/BluespaceLockerRule.cs +++ b/Content.Server/StationEvents/Events/BluespaceLockerRule.cs @@ -9,10 +9,10 @@ namespace Content.Server.StationEvents.Events; -public sealed class BluespaceLockerRule : StationEventSystem +public sealed partial class BluespaceLockerRule : StationEventSystem { - [Dependency] private readonly BluespaceLockerSystem _bluespaceLocker = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private BluespaceLockerSystem _bluespaceLocker = default!; + [Dependency] private SharedTransformSystem _transform = default!; protected override void Started(EntityUid uid, BluespaceLockerRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/BreakerFlipRule.cs b/Content.Server/StationEvents/Events/BreakerFlipRule.cs index 3ab9fbd2092..c6e459ae464 100644 --- a/Content.Server/StationEvents/Events/BreakerFlipRule.cs +++ b/Content.Server/StationEvents/Events/BreakerFlipRule.cs @@ -8,9 +8,9 @@ namespace Content.Server.StationEvents.Events; [UsedImplicitly] -public sealed class BreakerFlipRule : StationEventSystem +public sealed partial class BreakerFlipRule : StationEventSystem { - [Dependency] private readonly ApcSystem _apcSystem = default!; + [Dependency] private ApcSystem _apcSystem = default!; protected override void Added(EntityUid uid, BreakerFlipRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs index 6af757c5fa7..6466b6c597b 100644 --- a/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs +++ b/Content.Server/StationEvents/Events/BureaucraticErrorRule.cs @@ -9,9 +9,9 @@ namespace Content.Server.StationEvents.Events; [UsedImplicitly] -public sealed class BureaucraticErrorRule : StationEventSystem +public sealed partial class BureaucraticErrorRule : StationEventSystem { - [Dependency] private readonly StationJobsSystem _stationJobs = default!; + [Dependency] private StationJobsSystem _stationJobs = default!; protected override void Started(EntityUid uid, BureaucraticErrorRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/CargoGiftsRule.cs b/Content.Server/StationEvents/Events/CargoGiftsRule.cs index ccf9b23c921..2088a77b5a8 100644 --- a/Content.Server/StationEvents/Events/CargoGiftsRule.cs +++ b/Content.Server/StationEvents/Events/CargoGiftsRule.cs @@ -9,11 +9,11 @@ namespace Content.Server.StationEvents.Events; -public sealed class CargoGiftsRule : StationEventSystem +public sealed partial class CargoGiftsRule : StationEventSystem { - [Dependency] private readonly CargoSystem _cargoSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private CargoSystem _cargoSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private GameTicker _ticker = default!; protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/StationEvents/Events/ClericalErrorRule.cs b/Content.Server/StationEvents/Events/ClericalErrorRule.cs index 4ddd7aa9bcb..380be0bc5e4 100644 --- a/Content.Server/StationEvents/Events/ClericalErrorRule.cs +++ b/Content.Server/StationEvents/Events/ClericalErrorRule.cs @@ -6,9 +6,9 @@ namespace Content.Server.StationEvents.Events; -public sealed class ClericalErrorRule : StationEventSystem +public sealed partial class ClericalErrorRule : StationEventSystem { - [Dependency] private readonly StationRecordsSystem _stationRecords = default!; + [Dependency] private StationRecordsSystem _stationRecords = default!; protected override void Started(EntityUid uid, ClericalErrorRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/FalseAlarmRule.cs b/Content.Server/StationEvents/Events/FalseAlarmRule.cs index 8df56b420c7..7f0dba821a6 100644 --- a/Content.Server/StationEvents/Events/FalseAlarmRule.cs +++ b/Content.Server/StationEvents/Events/FalseAlarmRule.cs @@ -7,9 +7,9 @@ namespace Content.Server.StationEvents.Events; [UsedImplicitly] -public sealed class FalseAlarmRule : StationEventSystem +public sealed partial class FalseAlarmRule : StationEventSystem { - [Dependency] private readonly EventManagerSystem _event = default!; + [Dependency] private EventManagerSystem _event = default!; protected override void Started(EntityUid uid, FalseAlarmRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/GasLeakRule.cs b/Content.Server/StationEvents/Events/GasLeakRule.cs index 6ac8b94c111..be84b48607f 100644 --- a/Content.Server/StationEvents/Events/GasLeakRule.cs +++ b/Content.Server/StationEvents/Events/GasLeakRule.cs @@ -7,10 +7,10 @@ namespace Content.Server.StationEvents.Events { - internal sealed class GasLeakRule : StationEventSystem + internal sealed partial class GasLeakRule : StationEventSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; protected override void Started(EntityUid uid, GasLeakRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/GreytideVirusRule.cs b/Content.Server/StationEvents/Events/GreytideVirusRule.cs index 54fac742c9b..e6310df29f3 100644 --- a/Content.Server/StationEvents/Events/GreytideVirusRule.cs +++ b/Content.Server/StationEvents/Events/GreytideVirusRule.cs @@ -17,13 +17,13 @@ namespace Content.Server.StationEvents.Events; /// Greytide Virus event /// This will open and bolt airlocks and unlock lockers from randomly selected access groups. /// -public sealed class GreytideVirusRule : StationEventSystem +public sealed partial class GreytideVirusRule : StationEventSystem { - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly SharedDoorSystem _door = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private SharedDoorSystem _door = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Added(EntityUid uid, GreytideVirusRuleComponent virusComp, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/StationEvents/Events/ImmovableRodRule.cs b/Content.Server/StationEvents/Events/ImmovableRodRule.cs index af322465ce1..4ab07b6404a 100644 --- a/Content.Server/StationEvents/Events/ImmovableRodRule.cs +++ b/Content.Server/StationEvents/Events/ImmovableRodRule.cs @@ -10,11 +10,11 @@ namespace Content.Server.StationEvents.Events; -public sealed class ImmovableRodRule : StationEventSystem +public sealed partial class ImmovableRodRule : StationEventSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly GunSystem _gun = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private GunSystem _gun = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; protected override void Started(EntityUid uid, ImmovableRodRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/IonStormRule.cs b/Content.Server/StationEvents/Events/IonStormRule.cs index e7c2d563ba9..cb46ec579aa 100644 --- a/Content.Server/StationEvents/Events/IonStormRule.cs +++ b/Content.Server/StationEvents/Events/IonStormRule.cs @@ -6,9 +6,9 @@ namespace Content.Server.StationEvents.Events; -public sealed class IonStormRule : StationEventSystem +public sealed partial class IonStormRule : StationEventSystem { - [Dependency] private readonly IonStormSystem _ionStorm = default!; + [Dependency] private IonStormSystem _ionStorm = default!; protected override void Started(EntityUid uid, IonStormRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs index 37fcb379f04..455e7f53db4 100644 --- a/Content.Server/StationEvents/Events/MassHallucinationsRule.cs +++ b/Content.Server/StationEvents/Events/MassHallucinationsRule.cs @@ -8,9 +8,9 @@ namespace Content.Server.StationEvents.Events; -public sealed class MassHallucinationsRule : StationEventSystem +public sealed partial class MassHallucinationsRule : StationEventSystem { - [Dependency] private readonly ParacusiaSystem _paracusia = default!; + [Dependency] private ParacusiaSystem _paracusia = default!; protected override void Started(EntityUid uid, MassHallucinationsRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs index 5e0c8e53467..b0c68a082ea 100644 --- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs +++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.StationEvents.Events; -public sealed class MeteorSwarmSystem : GameRuleSystem +public sealed partial class MeteorSwarmSystem : GameRuleSystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private StationSystem _station = default!; protected override void Added(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs index d217212cc45..0c0df38139a 100644 --- a/Content.Server/StationEvents/Events/PowerGridCheckRule.cs +++ b/Content.Server/StationEvents/Events/PowerGridCheckRule.cs @@ -12,9 +12,9 @@ namespace Content.Server.StationEvents.Events { [UsedImplicitly] - public sealed class PowerGridCheckRule : StationEventSystem + public sealed partial class PowerGridCheckRule : StationEventSystem { - [Dependency] private readonly ApcSystem _apcSystem = default!; + [Dependency] private ApcSystem _apcSystem = default!; protected override void Started(EntityUid uid, PowerGridCheckRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs index 2c2d2414b74..0b959a98e9b 100644 --- a/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs +++ b/Content.Server/StationEvents/Events/RandomEntityStorageSpawnRule.cs @@ -7,9 +7,9 @@ namespace Content.Server.StationEvents.Events; -public sealed class RandomEntityStorageSpawnRule : StationEventSystem +public sealed partial class RandomEntityStorageSpawnRule : StationEventSystem { - [Dependency] private readonly EntityStorageSystem _entityStorage = default!; + [Dependency] private EntityStorageSystem _entityStorage = default!; protected override void Started(EntityUid uid, RandomEntityStorageSpawnRuleComponent comp, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/RandomSentienceRule.cs b/Content.Server/StationEvents/Events/RandomSentienceRule.cs index 856556a5b40..69b3b5dc9db 100644 --- a/Content.Server/StationEvents/Events/RandomSentienceRule.cs +++ b/Content.Server/StationEvents/Events/RandomSentienceRule.cs @@ -9,13 +9,13 @@ namespace Content.Server.StationEvents.Events; -public sealed class RandomSentienceRule : StationEventSystem +public sealed partial class RandomSentienceRule : StationEventSystem { private static readonly ProtoId DataSourceNames = "RandomSentienceEventData"; private static readonly ProtoId IntelligenceLevelNames = "RandomSentienceEventStrength"; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/SolarFlareRule.cs b/Content.Server/StationEvents/Events/SolarFlareRule.cs index 1507bfea2da..8842a676825 100644 --- a/Content.Server/StationEvents/Events/SolarFlareRule.cs +++ b/Content.Server/StationEvents/Events/SolarFlareRule.cs @@ -10,10 +10,10 @@ namespace Content.Server.StationEvents.Events; -public sealed class SolarFlareRule : StationEventSystem +public sealed partial class SolarFlareRule : StationEventSystem { - [Dependency] private readonly PoweredLightSystem _poweredLight = default!; - [Dependency] private readonly SharedDoorSystem _door = default!; + [Dependency] private PoweredLightSystem _poweredLight = default!; + [Dependency] private SharedDoorSystem _door = default!; private float _effectTimer = 0; diff --git a/Content.Server/StationEvents/Events/SpaceSpawnRule.cs b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs index b14c947ad61..9cd8289ba1d 100644 --- a/Content.Server/StationEvents/Events/SpaceSpawnRule.cs +++ b/Content.Server/StationEvents/Events/SpaceSpawnRule.cs @@ -9,9 +9,9 @@ namespace Content.Server.StationEvents.Events; /// /// Station event component for spawning this rules antags in space around a station. /// -public sealed class SpaceSpawnRule : StationEventSystem +public sealed partial class SpaceSpawnRule : StationEventSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs index aaa48a482ec..76bce37875c 100644 --- a/Content.Server/StationEvents/Events/StationEventSystem.cs +++ b/Content.Server/StationEvents/Events/StationEventSystem.cs @@ -15,13 +15,13 @@ namespace Content.Server.StationEvents.Events; /// /// An abstract entity system inherited by all station events for their behavior. /// -public abstract class StationEventSystem : GameRuleSystem where T : IComponent +public abstract partial class StationEventSystem : GameRuleSystem where T : IComponent { - [Dependency] protected readonly IAdminLogManager AdminLogManager = default!; - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly ChatSystem ChatSystem = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly StationSystem StationSystem = default!; + [Dependency] protected IAdminLogManager AdminLogManager = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected ChatSystem ChatSystem = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected StationSystem StationSystem = default!; protected ISawmill Sawmill = default!; diff --git a/Content.Server/StationEvents/Events/VentClogRule.cs b/Content.Server/StationEvents/Events/VentClogRule.cs index eb89bac3c82..de133bb29f6 100644 --- a/Content.Server/StationEvents/Events/VentClogRule.cs +++ b/Content.Server/StationEvents/Events/VentClogRule.cs @@ -14,9 +14,9 @@ namespace Content.Server.StationEvents.Events; [UsedImplicitly] -public sealed class VentClogRule : StationEventSystem +public sealed partial class VentClogRule : StationEventSystem { - [Dependency] private readonly SmokeSystem _smoke = default!; + [Dependency] private SmokeSystem _smoke = default!; protected override void Started(EntityUid uid, VentClogRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args) { diff --git a/Content.Server/StationEvents/Events/VentHordeRule.cs b/Content.Server/StationEvents/Events/VentHordeRule.cs index d89083a9169..11eccbf8809 100644 --- a/Content.Server/StationEvents/Events/VentHordeRule.cs +++ b/Content.Server/StationEvents/Events/VentHordeRule.cs @@ -14,19 +14,19 @@ namespace Content.Server.StationEvents.Events; /// /// Variant of that selects a single vent and spawns all entities there. /// -public sealed class VentHordeRule : StationEventSystem +public sealed partial class VentHordeRule : StationEventSystem { /* * DO NOT COPY PASTE THIS TO MAKE YOUR MOB EVENT. * USE THE PROTOTYPE. */ - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityTableSystem _table = default!; - [Dependency] private readonly VentHordeSystem _horde = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityTableSystem _table = default!; + [Dependency] private VentHordeSystem _horde = default!; + [Dependency] private IGameTiming _timing = default!; protected override void Added(EntityUid uid, VentHordeRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { diff --git a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs index b34028c9c2b..1f8388a0d68 100644 --- a/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs +++ b/Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.StationEvents; -public sealed class RampingStationEventSchedulerSystem : GameRuleSystem +public sealed partial class RampingStationEventSchedulerSystem : GameRuleSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EventManagerSystem _event = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EventManagerSystem _event = default!; + [Dependency] private GameTicker _gameTicker = default!; /// /// Returns the ChaosModifier which increases as round time increases to a point. diff --git a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs index e72bf5b14be..15a8aa696b7 100644 --- a/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs +++ b/Content.Server/StationRecords/Systems/GeneralStationRecordConsoleSystem.cs @@ -6,11 +6,11 @@ namespace Content.Server.StationRecords.Systems; -public sealed class GeneralStationRecordConsoleSystem : EntitySystem +public sealed partial class GeneralStationRecordConsoleSystem : EntitySystem { - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly StationRecordsSystem _stationRecords = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private StationRecordsSystem _stationRecords = default!; public override void Initialize() { diff --git a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs index 0609be74ccc..43588f43f0c 100644 --- a/Content.Server/StationRecords/Systems/StationRecordsSystem.cs +++ b/Content.Server/StationRecords/Systems/StationRecordsSystem.cs @@ -31,12 +31,12 @@ namespace Content.Server.StationRecords.Systems; /// depend on this general record being created. This is subject /// to change. /// -public sealed class StationRecordsSystem : SharedStationRecordsSystem +public sealed partial class StationRecordsSystem : SharedStationRecordsSystem { - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly StationRecordKeyStorageSystem _keyStorage = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IdCardSystem _idCard = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private StationRecordKeyStorageSystem _keyStorage = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IdCardSystem _idCard = default!; public override void Initialize() { diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs index 1454ef1a44b..cb1bd122cc7 100644 --- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs +++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs @@ -20,17 +20,17 @@ namespace Content.Server.Storage.EntitySystems; -public sealed class BluespaceLockerSystem : EntitySystem +public sealed partial class BluespaceLockerSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly EntityStorageSystem _entityStorage = default!; - [Dependency] private readonly WeldableSystem _weldableSystem = default!; - [Dependency] private readonly LockSystem _lockSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly ExplosionSystem _explosionSystem = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private EntityStorageSystem _entityStorage = default!; + [Dependency] private WeldableSystem _weldableSystem = default!; + [Dependency] private LockSystem _lockSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private ExplosionSystem _explosionSystem = default!; public override void Initialize() { diff --git a/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs index 4e1d0647eed..83419fa0b53 100644 --- a/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/CursedEntityStorageSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.Storage.EntitySystems; -public sealed class CursedEntityStorageSystem : EntitySystem +public sealed partial class CursedEntityStorageSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityStorageSystem _entityStorage = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityStorageSystem _entityStorage = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs index 8fb898dfa84..ed9522f3f29 100644 --- a/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/EntityStorageSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Storage.EntitySystems; -public sealed class EntityStorageSystem : SharedEntityStorageSystem +public sealed partial class EntityStorageSystem : SharedEntityStorageSystem { - [Dependency] private readonly ConstructionSystem _construction = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly IMapManager _map = default!; - [Dependency] private readonly MapSystem _mapSystem = default!; + [Dependency] private ConstructionSystem _construction = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private IMapManager _map = default!; + [Dependency] private MapSystem _mapSystem = default!; public override void Initialize() { diff --git a/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs b/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs index a1ac2bfdbb6..e45e66d4e2c 100644 --- a/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs +++ b/Content.Server/Storage/EntitySystems/ItemCounterSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Storage.EntitySystems { [UsedImplicitly] - public sealed class ItemCounterSystem : SharedItemCounterSystem + public sealed partial class ItemCounterSystem : SharedItemCounterSystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter) { if (!TryComp(msg.Container.Owner, out StorageComponent? component)) diff --git a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs index ec02006b270..25ea9bfd48f 100644 --- a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs +++ b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs @@ -12,14 +12,14 @@ namespace Content.Server.Storage.EntitySystems { - public sealed class SpawnItemsOnUseSystem : EntitySystem + public sealed partial class SpawnItemsOnUseSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly PricingSystem _pricing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private PricingSystem _pricing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Storage/EntitySystems/SpawnTableOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnTableOnUseSystem.cs index 1f96b39a4e9..12e41afd215 100644 --- a/Content.Server/Storage/EntitySystems/SpawnTableOnUseSystem.cs +++ b/Content.Server/Storage/EntitySystems/SpawnTableOnUseSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.Storage.EntitySystems; -public sealed class SpawnTableOnUseSystem : EntitySystem +public sealed partial class SpawnTableOnUseSystem : EntitySystem { - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/Storage/EntitySystems/StorageSystem.cs b/Content.Server/Storage/EntitySystems/StorageSystem.cs index cdbac12d804..3d78552cb2b 100644 --- a/Content.Server/Storage/EntitySystems/StorageSystem.cs +++ b/Content.Server/Storage/EntitySystems/StorageSystem.cs @@ -10,7 +10,7 @@ namespace Content.Server.Storage.EntitySystems; public sealed partial class StorageSystem : SharedStorageSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Server/Store/Systems/StoreSystem.Command.cs b/Content.Server/Store/Systems/StoreSystem.Command.cs index 3ae4c5ab3b2..f2db8e801c8 100644 --- a/Content.Server/Store/Systems/StoreSystem.Command.cs +++ b/Content.Server/Store/Systems/StoreSystem.Command.cs @@ -9,7 +9,7 @@ namespace Content.Server.Store.Systems; public sealed partial class StoreSystem { - [Dependency] private readonly IConsoleHost _consoleHost = default!; + [Dependency] private IConsoleHost _consoleHost = default!; public void InitializeCommand() { diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 374a5212b8f..7d83d43b0b8 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -23,16 +23,16 @@ namespace Content.Server.Store.Systems; public sealed partial class StoreSystem { - [Dependency] private readonly IAdminLogManager _admin = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly ActionUpgradeSystem _actionUpgrade = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly NpcFactionSystem _npcFaction = default!; + [Dependency] private IAdminLogManager _admin = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private ActionUpgradeSystem _actionUpgrade = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private NpcFactionSystem _npcFaction = default!; private void InitializeUi() { diff --git a/Content.Server/Store/Systems/StoreSystem.cs b/Content.Server/Store/Systems/StoreSystem.cs index aaecad76a98..b157defa07e 100644 --- a/Content.Server/Store/Systems/StoreSystem.cs +++ b/Content.Server/Store/Systems/StoreSystem.cs @@ -20,9 +20,9 @@ namespace Content.Server.Store.Systems; /// public sealed partial class StoreSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs index 7500ae5a40a..c6f45a2866e 100644 --- a/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs +++ b/Content.Server/StoreDiscount/Systems/StoreDiscountSystem.cs @@ -12,12 +12,12 @@ namespace Content.Server.StoreDiscount.Systems; /// /// Discount system that is part of . /// -public sealed class StoreDiscountSystem : EntitySystem +public sealed partial class StoreDiscountSystem : EntitySystem { private static readonly ProtoId DiscountedStoreCategoryPrototypeKey = "DiscountedItems"; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; /// public override void Initialize() diff --git a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs index 2bd03f95293..8305f06ad52 100644 --- a/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs +++ b/Content.Server/Stunnable/Systems/StunOnCollideSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Stunnable.Systems; [UsedImplicitly] -internal sealed class StunOnCollideSystem : EntitySystem +internal sealed partial class StunOnCollideSystem : EntitySystem { - [Dependency] private readonly StunSystem _stunSystem = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; + [Dependency] private StunSystem _stunSystem = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; public override void Initialize() { diff --git a/Content.Server/Stunnable/Systems/StunbatonSystem.cs b/Content.Server/Stunnable/Systems/StunbatonSystem.cs index 660cb0145e4..0560203ff34 100644 --- a/Content.Server/Stunnable/Systems/StunbatonSystem.cs +++ b/Content.Server/Stunnable/Systems/StunbatonSystem.cs @@ -14,12 +14,12 @@ namespace Content.Server.Stunnable.Systems { - public sealed class StunbatonSystem : SharedStunbatonSystem + public sealed partial class StunbatonSystem : SharedStunbatonSystem { - [Dependency] private readonly RiggableSystem _riggableSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly ItemToggleSystem _itemToggle = default!; + [Dependency] private RiggableSystem _riggableSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private ItemToggleSystem _itemToggle = default!; public override void Initialize() { diff --git a/Content.Server/SubFloor/SubFloorHideSystem.cs b/Content.Server/SubFloor/SubFloorHideSystem.cs index 304fa6d7c13..aed94cff70b 100644 --- a/Content.Server/SubFloor/SubFloorHideSystem.cs +++ b/Content.Server/SubFloor/SubFloorHideSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.SubFloor; -public sealed class SubFloorHideSystem : SharedSubFloorHideSystem +public sealed partial class SubFloorHideSystem : SharedSubFloorHideSystem { - [Dependency] private readonly IPlayerManager _player = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; + [Dependency] private IPlayerManager _player = default!; + [Dependency] private SharedEyeSystem _eye = default!; private HashSet _showFloors = new(); diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs index 985e46dada1..c703517e079 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMapSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.SurveillanceCamera; -public sealed class SurveillanceCameraMapSystem : EntitySystem +public sealed partial class SurveillanceCameraMapSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs index e8c53de9ebf..212c2cb911d 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMicrophoneSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.SurveillanceCamera; -public sealed class SurveillanceCameraMicrophoneSystem : EntitySystem +public sealed partial class SurveillanceCameraMicrophoneSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _xforms = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedTransformSystem _xforms = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs index f3b68785883..a1aa0783d43 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraMonitorSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.SurveillanceCamera; -public sealed class SurveillanceCameraMonitorSystem : EntitySystem +public sealed partial class SurveillanceCameraMonitorSystem : EntitySystem { - [Dependency] private readonly SurveillanceCameraSystem _surveillanceCameras = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private SurveillanceCameraSystem _surveillanceCameras = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; public override void Initialize() { diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs index cd4e27ec56b..f94ba6fd0e7 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraRouterSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.SurveillanceCamera; -public sealed class SurveillanceCameraRouterSystem : EntitySystem +public sealed partial class SurveillanceCameraRouterSystem : EntitySystem { - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; public override void Initialize() { SubscribeLocalEvent(OnInitialize); diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs index 68e6997f8e5..41f30d10795 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSpeakerSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.SurveillanceCamera; /// /// This handles speech for surveillance camera monitors. /// -public sealed class SurveillanceCameraSpeakerSystem : EntitySystem +public sealed partial class SurveillanceCameraSpeakerSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SpeechSoundSystem _speechSound = default!; - [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SpeechSoundSystem _speechSound = default!; + [Dependency] private ChatSystem _chatSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; /// public override void Initialize() diff --git a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs index 105fa81b216..0a69bb3079c 100644 --- a/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs +++ b/Content.Server/SurveillanceCamera/Systems/SurveillanceCameraSystem.cs @@ -13,15 +13,15 @@ namespace Content.Server.SurveillanceCamera; -public sealed class SurveillanceCameraSystem : SharedSurveillanceCameraSystem +public sealed partial class SurveillanceCameraSystem : SharedSurveillanceCameraSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly UserInterfaceSystem _userInterface = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SurveillanceCameraMapSystem _cameraMapSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ViewSubscriberSystem _viewSubscriberSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private UserInterfaceSystem _userInterface = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SurveillanceCameraMapSystem _cameraMapSystem = default!; // Pings a surveillance camera subnet. All cameras will always respond // with a data message if they are on the same subnet. diff --git a/Content.Server/Tabletop/TabletopSystem.cs b/Content.Server/Tabletop/TabletopSystem.cs index a5103309703..621cbdcdb91 100644 --- a/Content.Server/Tabletop/TabletopSystem.cs +++ b/Content.Server/Tabletop/TabletopSystem.cs @@ -21,12 +21,12 @@ namespace Content.Server.Tabletop [UsedImplicitly] public sealed partial class TabletopSystem : SharedTabletopSystem { - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly EyeSystem _eye = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly ViewSubscriberSystem _viewSubscriberSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private EyeSystem _eye = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private ViewSubscriberSystem _viewSubscriberSystem = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override void Initialize() { diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs index f1d4348dde9..14900b3c228 100644 --- a/Content.Server/Telephone/TelephoneSystem.cs +++ b/Content.Server/Telephone/TelephoneSystem.cs @@ -24,18 +24,18 @@ namespace Content.Server.Telephone; -public sealed class TelephoneSystem : SharedTelephoneSystem +public sealed partial class TelephoneSystem : SharedTelephoneSystem { - [Dependency] private readonly AppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly InteractionSystem _interaction = default!; - [Dependency] private readonly IdCardSystem _idCardSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IReplayRecordingManager _replay = default!; + [Dependency] private AppearanceSystem _appearanceSystem = default!; + [Dependency] private InteractionSystem _interaction = default!; + [Dependency] private IdCardSystem _idCardSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IReplayRecordingManager _replay = default!; // Has set used to prevent telephone feedback loops private HashSet<(EntityUid, string, Entity)> _recentChatMessages = new(); diff --git a/Content.Server/Teleportation/HandTeleporterSystem.cs b/Content.Server/Teleportation/HandTeleporterSystem.cs index 3cc64685c85..3dc0ba7e1bc 100644 --- a/Content.Server/Teleportation/HandTeleporterSystem.cs +++ b/Content.Server/Teleportation/HandTeleporterSystem.cs @@ -13,13 +13,13 @@ namespace Content.Server.Teleportation; /// /// This handles creating portals from a hand teleporter. /// -public sealed class HandTeleporterSystem : EntitySystem +public sealed partial class HandTeleporterSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly LinkedEntitySystem _link = default!; - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doafter = default!; - [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private LinkedEntitySystem _link = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doafter = default!; + [Dependency] private PopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Server/Teleportation/PortalSystem.cs b/Content.Server/Teleportation/PortalSystem.cs index 27fec274351..fe952ea157d 100644 --- a/Content.Server/Teleportation/PortalSystem.cs +++ b/Content.Server/Teleportation/PortalSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Teleportation; -public sealed class PortalSystem : SharedPortalSystem +public sealed partial class PortalSystem : SharedPortalSystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; // TODO Move to shared protected override void LogTeleport(EntityUid portal, EntityUid subject, EntityCoordinates source, diff --git a/Content.Server/Teleportation/TeleportLocationsSystem.cs b/Content.Server/Teleportation/TeleportLocationsSystem.cs index 40f938b40bb..ac720cf33a9 100644 --- a/Content.Server/Teleportation/TeleportLocationsSystem.cs +++ b/Content.Server/Teleportation/TeleportLocationsSystem.cs @@ -14,8 +14,8 @@ namespace Content.Server.Teleportation; /// public sealed partial class TeleportLocationsSystem : SharedTeleportLocationsSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; public override void Initialize() { diff --git a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs index 8452edf8e9a..a9c6ede33f4 100644 --- a/Content.Server/Temperature/Systems/EntityHeaterSystem.cs +++ b/Content.Server/Temperature/Systems/EntityHeaterSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Temperature.Systems; /// /// Handles the server-only parts of /// -public sealed class EntityHeaterSystem : SharedEntityHeaterSystem +public sealed partial class EntityHeaterSystem : SharedEntityHeaterSystem { - [Dependency] private readonly TemperatureSystem _temperature = default!; + [Dependency] private TemperatureSystem _temperature = default!; public override void Initialize() { diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs index d436977daf3..2ebdd7b6996 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.Damage.cs @@ -19,10 +19,10 @@ namespace Content.Server.Temperature.Systems; /// public sealed partial class TemperatureSystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _gameTiming = default!; private EntityQuery _tempDamageQuery; private EntityQuery _containerTemperatureQuery; diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index 2cf83921aaa..bebd76955e4 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -12,7 +12,7 @@ namespace Content.Server.Temperature.Systems; public sealed partial class TemperatureSystem : SharedTemperatureSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; public override void Initialize() { diff --git a/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs b/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs index 9948537c3c9..da6de0fa395 100644 --- a/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs +++ b/Content.Server/Tesla/EntitySystem/LightningArcShooterSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Tesla.EntitySystems; /// /// Fires electric arcs at surrounding objects. /// -public sealed class LightningArcShooterSystem : EntitySystem +public sealed partial class LightningArcShooterSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly LightningSystem _lightning = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private LightningSystem _lightning = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs b/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs index 90e346dbfad..aad502f9e90 100644 --- a/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs +++ b/Content.Server/Tesla/EntitySystem/LightningSparkingSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Tesla.EntitySystems; /// /// The component changes the visual of an object after it is struck by lightning /// -public sealed class LightningSparkingSystem : EntitySystem +public sealed partial class LightningSparkingSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs b/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs index 7f7873803cb..0b0a9864572 100644 --- a/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs +++ b/Content.Server/Tesla/EntitySystem/TeslaCoilSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Tesla.EntitySystems; /// /// Generates electricity from lightning bolts /// -public sealed class TeslaCoilSystem : EntitySystem +public sealed partial class TeslaCoilSystem : EntitySystem { - [Dependency] private readonly BatterySystem _battery = default!; + [Dependency] private BatterySystem _battery = default!; public override void Initialize() { diff --git a/Content.Server/Tesla/EntitySystem/TeslaEnergyBallSystem.cs b/Content.Server/Tesla/EntitySystem/TeslaEnergyBallSystem.cs index 9d973780854..f67e1c349e1 100644 --- a/Content.Server/Tesla/EntitySystem/TeslaEnergyBallSystem.cs +++ b/Content.Server/Tesla/EntitySystem/TeslaEnergyBallSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Tesla.EntitySystems; /// /// A component that tracks an entity's saturation level from absorbing other creatures by touch, and spawns new entities when the saturation limit is reached. /// -public sealed class TeslaEnergyBallSystem : EntitySystem +public sealed partial class TeslaEnergyBallSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; + [Dependency] private AudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs b/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs index 4ddccd5d231..90c0cc29e47 100644 --- a/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs +++ b/Content.Server/Thief/Systems/ThiefUndeterminedBackpackSystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.Thief.Systems; /// /// this system links the interface to the logic, and will output to the player a set of items selected by him in the interface /// -public sealed class ThiefUndeterminedBackpackSystem : EntitySystem +public sealed partial class ThiefUndeterminedBackpackSystem : EntitySystem { - [Dependency] private readonly AudioSystem _audio = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private AudioSystem _audio = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Server/Tiles/RequiresTileSystem.cs b/Content.Server/Tiles/RequiresTileSystem.cs index 42751eae7d5..d3df4ee1383 100644 --- a/Content.Server/Tiles/RequiresTileSystem.cs +++ b/Content.Server/Tiles/RequiresTileSystem.cs @@ -3,13 +3,13 @@ namespace Content.Server.Tiles; -public sealed class RequiresTileSystem : EntitySystem +public sealed partial class RequiresTileSystem : EntitySystem { /* * Needs to be on server as client can't predict QueueDel. */ - [Dependency] private readonly SharedMapSystem _maps = default!; + [Dependency] private SharedMapSystem _maps = default!; private EntityQuery _tilesQuery; diff --git a/Content.Server/Tiles/TileEntityEffectSystem.cs b/Content.Server/Tiles/TileEntityEffectSystem.cs index 57679e9d9a6..8ba66d94b91 100644 --- a/Content.Server/Tiles/TileEntityEffectSystem.cs +++ b/Content.Server/Tiles/TileEntityEffectSystem.cs @@ -3,9 +3,9 @@ namespace Content.Server.Tiles; -public sealed class TileEntityEffectSystem : EntitySystem +public sealed partial class TileEntityEffectSystem : EntitySystem { - [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!; + [Dependency] private SharedEntityEffectsSystem _entityEffects = default!; public override void Initialize() { diff --git a/Content.Server/Tips/TipsSystem.cs b/Content.Server/Tips/TipsSystem.cs index 406ee76ca6b..84eafad83b6 100644 --- a/Content.Server/Tips/TipsSystem.cs +++ b/Content.Server/Tips/TipsSystem.cs @@ -12,14 +12,14 @@ namespace Content.Server.Tips; -public sealed class TipsSystem : SharedTipsSystem +public sealed partial class TipsSystem : SharedTipsSystem { - [Dependency] private readonly IChatManager _chat = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private IChatManager _chat = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private GameTicker _ticker = default!; private bool _tipsEnabled; private float _tipTimeOutOfRound; diff --git a/Content.Server/Tools/Innate/InnateToolSystem.cs b/Content.Server/Tools/Innate/InnateToolSystem.cs index 02db7be43c0..1f88fbdd94c 100644 --- a/Content.Server/Tools/Innate/InnateToolSystem.cs +++ b/Content.Server/Tools/Innate/InnateToolSystem.cs @@ -15,11 +15,11 @@ namespace Content.Server.Tools.Innate; /// Spawns a list unremovable tools in hands if possible. Used for drones, /// borgs, or maybe even stuff like changeling armblades! /// -public sealed class InnateToolSystem : EntitySystem +public sealed partial class InnateToolSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private SharedHandsSystem _sharedHandsSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; private static readonly ProtoId InnateDontDeleteTag = "InnateDontDelete"; diff --git a/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs b/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs index 3d63d69fff8..a3e5826f6c7 100644 --- a/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs +++ b/Content.Server/Toolshed/Commands/AdminDebug/ACmdCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Toolshed.Commands.AdminDebug; [ToolshedCommand, AdminCommand(AdminFlags.Debug)] -public sealed class ACmdCommand : ToolshedCommand +public sealed partial class ACmdCommand : ToolshedCommand { - [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private IAdminManager _adminManager = default!; [CommandImplementation("perms")] public AdminFlags[]? Perms([PipedArgument] CommandSpec command) diff --git a/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs b/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs index 4708ae82d5b..4fa22743f92 100644 --- a/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs +++ b/Content.Server/Toolshed/Commands/Misc/MsgCommand.cs @@ -13,7 +13,7 @@ namespace Content.Server.Toolshed.Commands.Misc; [ToolshedCommand, AdminCommand(AdminFlags.Fun)] -public sealed class MsgCommand : ToolshedCommand +public sealed partial class MsgCommand : ToolshedCommand { [Dependency] private IChatManager _chatManager = default!; diff --git a/Content.Server/Toolshed/Commands/VisualizeCommand.cs b/Content.Server/Toolshed/Commands/VisualizeCommand.cs index bbf39e81b6f..eecef5f5b55 100644 --- a/Content.Server/Toolshed/Commands/VisualizeCommand.cs +++ b/Content.Server/Toolshed/Commands/VisualizeCommand.cs @@ -10,9 +10,9 @@ namespace Content.Server.Toolshed.Commands; [ToolshedCommand, AdminCommand(AdminFlags.VarEdit)] -public sealed class VisualizeCommand : ToolshedCommand +public sealed partial class VisualizeCommand : ToolshedCommand { - [Dependency] private readonly EuiManager _euiManager = default!; + [Dependency] private EuiManager _euiManager = default!; [CommandImplementation] public void VisualizeEntities( diff --git a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs index ec7ce4d4bee..6fd4d47c5f0 100644 --- a/Content.Server/Traitor/Systems/AutoTraitorSystem.cs +++ b/Content.Server/Traitor/Systems/AutoTraitorSystem.cs @@ -8,10 +8,10 @@ namespace Content.Server.Traitor.Systems; /// /// Makes entities with a traitor either immediately if they have a mind or when a mind is added. /// -public sealed class AutoTraitorSystem : EntitySystem +public sealed partial class AutoTraitorSystem : EntitySystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private ISharedPlayerManager _player = default!; public override void Initialize() { diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs index 5bc38716240..07f534fffb5 100644 --- a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs +++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Traitor.Systems; -public sealed class TraitorCodePaperSystem : EntitySystem +public sealed partial class TraitorCodePaperSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PaperSystem _paper = default!; - [Dependency] private readonly CodewordSystem _codewordSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private PaperSystem _paper = default!; + [Dependency] private CodewordSystem _codewordSystem = default!; public override void Initialize() { diff --git a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs index 8350c01f7aa..d3995fb656c 100644 --- a/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs +++ b/Content.Server/Traitor/Uplink/Commands/AddUplinkCommand.cs @@ -7,10 +7,10 @@ namespace Content.Server.Traitor.Uplink.Commands; [AdminCommand(AdminFlags.Admin)] -public sealed class AddUplinkCommand : LocalizedEntityCommands +public sealed partial class AddUplinkCommand : LocalizedEntityCommands { - [Dependency] private readonly UplinkSystem _uplinkSystem = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private UplinkSystem _uplinkSystem = default!; + [Dependency] private IPlayerManager _playerManager = default!; public override string Command => "adduplink"; diff --git a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs index a2347cc0781..aa91be17a58 100644 --- a/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs +++ b/Content.Server/Traitor/Uplink/SurplusBundle/SurplusBundleSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Traitor.Uplink.SurplusBundle; -public sealed class SurplusBundleSystem : EntitySystem +public sealed partial class SurplusBundleSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityStorageSystem _entityStorage = default!; - [Dependency] private readonly StoreSystem _store = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityStorageSystem _entityStorage = default!; + [Dependency] private StoreSystem _store = default!; public override void Initialize() { diff --git a/Content.Server/Traitor/Uplink/UplinkSystem.cs b/Content.Server/Traitor/Uplink/UplinkSystem.cs index e9c3e2900e3..e81fbcf5fe5 100644 --- a/Content.Server/Traitor/Uplink/UplinkSystem.cs +++ b/Content.Server/Traitor/Uplink/UplinkSystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.Traitor.Uplink; -public sealed class UplinkSystem : EntitySystem +public sealed partial class UplinkSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly StoreSystem _store = default!; - [Dependency] private readonly SharedSubdermalImplantSystem _subdermalImplant = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private StoreSystem _store = default!; + [Dependency] private SharedSubdermalImplantSystem _subdermalImplant = default!; + [Dependency] private SharedMindSystem _mind = default!; public static readonly ProtoId TelecrystalCurrencyPrototype = "Telecrystal"; private static readonly EntProtoId FallbackUplinkImplant = "UplinkImplant"; diff --git a/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs b/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs index 55a5bc7d8b7..e0a07a67f1b 100644 --- a/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs +++ b/Content.Server/Traits/Assorted/BuckleOnMapInitSystem.cs @@ -2,9 +2,9 @@ namespace Content.Server.Traits.Assorted; -public sealed class BuckleOnMapInitSystem : EntitySystem +public sealed partial class BuckleOnMapInitSystem : EntitySystem { - [Dependency] private readonly SharedBuckleSystem _buckleSystem = default!; + [Dependency] private SharedBuckleSystem _buckleSystem = default!; public override void Initialize() { diff --git a/Content.Server/Traits/TraitSystem.cs b/Content.Server/Traits/TraitSystem.cs index 0956bcb4019..4f8895c738d 100644 --- a/Content.Server/Traits/TraitSystem.cs +++ b/Content.Server/Traits/TraitSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Traits; -public sealed class TraitSystem : EntitySystem +public sealed partial class TraitSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedHandsSystem _sharedHandsSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs index fcbf804c844..c34d2ab42ce 100644 --- a/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/AlertLevelChangeOnTriggerSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.Trigger.Systems; -public sealed class AlertLevelChangeOnTriggerSystem : EntitySystem +public sealed partial class AlertLevelChangeOnTriggerSystem : EntitySystem { - [Dependency] private readonly AlertLevelSystem _alertLevelSystem = default!; - [Dependency] private readonly StationSystem _station = default!; + [Dependency] private AlertLevelSystem _alertLevelSystem = default!; + [Dependency] private StationSystem _station = default!; public override void Initialize() { diff --git a/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs b/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs index b1d89bda051..e19dc40463c 100644 --- a/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/FireStackOnTriggerSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Trigger.Systems; /// Trigger system for adding or removing fire stacks from an entity with . /// /// -public sealed class FireStackOnTriggerSystem : EntitySystem +public sealed partial class FireStackOnTriggerSystem : EntitySystem { - [Dependency] private readonly FlammableSystem _flame = default!; + [Dependency] private FlammableSystem _flame = default!; /// public override void Initialize() diff --git a/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs b/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs index 245b9c84080..db7cf5973a7 100644 --- a/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/GameRuleTriggerSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Trigger.Systems; /// /// Trigger system for game rules. /// -public sealed class GameRuleTriggerSystem : EntitySystem +public sealed partial class GameRuleTriggerSystem : EntitySystem { - [Dependency] private readonly GameTicker _ticker = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private GameTicker _ticker = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; /// public override void Initialize() diff --git a/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs index cdc7a1476b7..9c1abf6b827 100644 --- a/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/GhostKickUserOnTriggerSystem.cs @@ -5,9 +5,9 @@ namespace Content.Server.Trigger.Systems; -public sealed class GhostKickUserOnTriggerSystem : EntitySystem +public sealed partial class GhostKickUserOnTriggerSystem : EntitySystem { - [Dependency] private readonly GhostKickManager _ghostKickManager = default!; + [Dependency] private GhostKickManager _ghostKickManager = default!; public override void Initialize() { diff --git a/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs index c6ae16ec78f..be771ed283d 100644 --- a/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/IgniteOnTriggerSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Trigger.Systems; /// Handles igniting when triggered and stopping ignition after the delay. /// /// -public sealed class IgniteOnTriggerSystem : EntitySystem +public sealed partial class IgniteOnTriggerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedIgnitionSourceSystem _source = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedIgnitionSourceSystem _source = default!; public override void Initialize() { diff --git a/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs index 8b4741b9ad3..e39142fb804 100644 --- a/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/PolymorphOnTriggerSystem.cs @@ -8,7 +8,7 @@ namespace Content.Server.Trigger.Systems; public sealed partial class PolymorphOnTriggerSystem : EntitySystem { - [Dependency] private readonly PolymorphSystem _polymorph = default!; + [Dependency] private PolymorphSystem _polymorph = default!; /// /// Need to do this so we don't get a collection enumeration error in physics by polymorphing diff --git a/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs index a9c3379c469..bc8a3b2540d 100644 --- a/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/RattleOnTriggerSystem.cs @@ -8,11 +8,11 @@ namespace Content.Server.Trigger.Systems; -public sealed class RattleOnTriggerSystem : EntitySystem +public sealed partial class RattleOnTriggerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly RadioSystem _radio = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private RadioSystem _radio = default!; + [Dependency] private NavMapSystem _navMap = default!; public override void Initialize() { diff --git a/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs index a38ca2a7598..6871dc4f001 100644 --- a/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/ReleaseGasOnTriggerSystem.cs @@ -5,11 +5,11 @@ namespace Content.Server.Trigger.Systems; -public sealed class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem +public sealed partial class ReleaseGasOnTriggerSystem : SharedReleaseGasOnTriggerSystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; public override void Update(float frameTime) diff --git a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs index 97799b9cc6c..574f9db0000 100644 --- a/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/SmokeOnTriggerSystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.Trigger.Systems; /// /// Handles creating smoke when is triggered. /// -public sealed class SmokeOnTriggerSystem : EntitySystem +public sealed partial class SmokeOnTriggerSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly MapSystem _map = default!; - [Dependency] private readonly SmokeSystem _smoke = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly SpreaderSystem _spreader = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private MapSystem _map = default!; + [Dependency] private SmokeSystem _smoke = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private SpreaderSystem _spreader = default!; + [Dependency] private TurfSystem _turf = default!; public override void Initialize() { diff --git a/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs index 48ead111618..7194db977f6 100644 --- a/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs +++ b/Content.Server/Trigger/Systems/SpeakOnTriggerSystem.cs @@ -7,11 +7,11 @@ namespace Content.Server.Trigger.Systems; -public sealed class SpeakOnTriggerSystem : EntitySystem +public sealed partial class SpeakOnTriggerSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ChatSystem _chat = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ChatSystem _chat = default!; public override void Initialize() { diff --git a/Content.Server/TurretController/DeployableTurretControllerSystem.cs b/Content.Server/TurretController/DeployableTurretControllerSystem.cs index a953912a0ae..bb64af48596 100644 --- a/Content.Server/TurretController/DeployableTurretControllerSystem.cs +++ b/Content.Server/TurretController/DeployableTurretControllerSystem.cs @@ -17,9 +17,9 @@ namespace Content.Server.TurretController; /// public sealed partial class DeployableTurretControllerSystem : SharedDeployableTurretControllerSystem { - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; /// Keys for the device network. See for further examples. public const string CmdSetArmamemtState = "set_armament_state"; diff --git a/Content.Server/Turrets/DeployableTurretSystem.cs b/Content.Server/Turrets/DeployableTurretSystem.cs index 610b90a307c..0d805c781ce 100644 --- a/Content.Server/Turrets/DeployableTurretSystem.cs +++ b/Content.Server/Turrets/DeployableTurretSystem.cs @@ -23,13 +23,13 @@ namespace Content.Server.Turrets; public sealed partial class DeployableTurretSystem : SharedDeployableTurretSystem { - [Dependency] private readonly HTNSystem _htn = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DeviceNetworkSystem _deviceNetwork = default!; - [Dependency] private readonly BatteryWeaponFireModesSystem _fireModes = default!; - [Dependency] private readonly TurretTargetSettingsSystem _turretTargetingSettings = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private HTNSystem _htn = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DeviceNetworkSystem _deviceNetwork = default!; + [Dependency] private BatteryWeaponFireModesSystem _fireModes = default!; + [Dependency] private TurretTargetSettingsSystem _turretTargetingSettings = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Server/UserInterface/StatValuesCommand.cs b/Content.Server/UserInterface/StatValuesCommand.cs index 4e83d61d68c..46338893b94 100644 --- a/Content.Server/UserInterface/StatValuesCommand.cs +++ b/Content.Server/UserInterface/StatValuesCommand.cs @@ -18,11 +18,11 @@ namespace Content.Server.UserInterface; [AdminCommand(AdminFlags.Debug)] -public sealed class StatValuesCommand : IConsoleCommand +public sealed partial class StatValuesCommand : IConsoleCommand { - [Dependency] private readonly EuiManager _eui = default!; - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private EuiManager _eui = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _proto = default!; public string Command => "showvalues"; public string Description => Loc.GetString("stat-values-desc"); diff --git a/Content.Server/VendingMachines/VendingMachineSystem.cs b/Content.Server/VendingMachines/VendingMachineSystem.cs index 633e7e34043..6fbf3319874 100644 --- a/Content.Server/VendingMachines/VendingMachineSystem.cs +++ b/Content.Server/VendingMachines/VendingMachineSystem.cs @@ -15,11 +15,11 @@ namespace Content.Server.VendingMachines { - public sealed class VendingMachineSystem : SharedVendingMachineSystem + public sealed partial class VendingMachineSystem : SharedVendingMachineSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PricingSystem _pricing = default!; - [Dependency] private readonly ThrowingSystem _throwingSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private PricingSystem _pricing = default!; + [Dependency] private ThrowingSystem _throwingSystem = default!; private const float WallVendEjectDistanceFromWall = 1f; diff --git a/Content.Server/VentHorde/Systems/VentHordeSystem.cs b/Content.Server/VentHorde/Systems/VentHordeSystem.cs index a2834e01459..2dba51ac4c8 100644 --- a/Content.Server/VentHorde/Systems/VentHordeSystem.cs +++ b/Content.Server/VentHorde/Systems/VentHordeSystem.cs @@ -9,13 +9,13 @@ namespace Content.Server.VentHorde.Systems; -public sealed class VentHordeSystem : EntitySystem +public sealed partial class VentHordeSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedJitteringSystem _jitter = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedJitteringSystem _jitter = default!; public override void Initialize() { diff --git a/Content.Server/Verbs/Commands/InvokeVerbCommand.cs b/Content.Server/Verbs/Commands/InvokeVerbCommand.cs index 25b2af821d2..932250aff0c 100644 --- a/Content.Server/Verbs/Commands/InvokeVerbCommand.cs +++ b/Content.Server/Verbs/Commands/InvokeVerbCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Verbs.Commands { [AdminCommand(AdminFlags.Admin)] - public sealed class InvokeVerbCommand : IConsoleCommand + public sealed partial class InvokeVerbCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "invokeverb"; public string Description => Loc.GetString("invoke-verb-command-description"); diff --git a/Content.Server/Verbs/Commands/ListVerbsCommand.cs b/Content.Server/Verbs/Commands/ListVerbsCommand.cs index b969eb33535..7b64570128f 100644 --- a/Content.Server/Verbs/Commands/ListVerbsCommand.cs +++ b/Content.Server/Verbs/Commands/ListVerbsCommand.cs @@ -6,9 +6,9 @@ namespace Content.Server.Verbs.Commands { [AdminCommand(AdminFlags.Moderator)] - public sealed class ListVerbsCommand : IConsoleCommand + public sealed partial class ListVerbsCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; + [Dependency] private IEntityManager _entManager = default!; public string Command => "listverbs"; public string Description => Loc.GetString("list-verbs-command-description"); diff --git a/Content.Server/Verbs/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs index 3e73583d997..8316aaa793f 100644 --- a/Content.Server/Verbs/VerbSystem.cs +++ b/Content.Server/Verbs/VerbSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Verbs { - public sealed class VerbSystem : SharedVerbSystem + public sealed partial class VerbSystem : SharedVerbSystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IAdminManager _adminMgr = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private PopupSystem _popupSystem = default!; + [Dependency] private IAdminManager _adminMgr = default!; public override void Initialize() { diff --git a/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs b/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs index fcca5605f42..95500a5e1a7 100644 --- a/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs +++ b/Content.Server/Vocalization/Systems/DatasetVocalizationSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Vocalization.Systems; /// -public sealed class DatasetVocalizationSystem : EntitySystem +public sealed partial class DatasetVocalizationSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs b/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs index 00f6b7bbd1a..a8869a829d7 100644 --- a/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs +++ b/Content.Server/Vocalization/Systems/RadioVocalizationSystem.cs @@ -14,10 +14,10 @@ namespace Content.Server.Vocalization.Systems; /// public sealed partial class RadioVocalizationSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private InventorySystem _inventory = default!; public override void Initialize() { diff --git a/Content.Server/Vocalization/Systems/VocalizationSystem.cs b/Content.Server/Vocalization/Systems/VocalizationSystem.cs index 8801e057b7e..3c13f0f3a34 100644 --- a/Content.Server/Vocalization/Systems/VocalizationSystem.cs +++ b/Content.Server/Vocalization/Systems/VocalizationSystem.cs @@ -15,10 +15,10 @@ namespace Content.Server.Vocalization.Systems; /// public sealed partial class VocalizationSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs index a67bfb8b669..d1d6b8437a4 100644 --- a/Content.Server/VoiceMask/VoiceMaskSystem.cs +++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs @@ -21,15 +21,15 @@ namespace Content.Server.VoiceMask; public sealed partial class VoiceMaskSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly IdentitySystem _identity = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private IdentitySystem _identity = default!; // CCVar. private int _maxNameLength; diff --git a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs index 7b58278d08f..341013aa054 100644 --- a/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs +++ b/Content.Server/VoiceTrigger/StorageVoiceControlSystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.VoiceTrigger; /// /// Allows storages to be manipulated using voice commands. /// -public sealed class StorageVoiceControlSystem : EntitySystem +public sealed partial class StorageVoiceControlSystem : EntitySystem { - [Dependency] private readonly ContainerSystem _container = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly StorageSystem _storage = default!; + [Dependency] private ContainerSystem _container = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private StorageSystem _storage = default!; public override void Initialize() { diff --git a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs index 5e4d686a41d..8d9569c4435 100644 --- a/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs +++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs @@ -22,10 +22,10 @@ namespace Content.Server.Voting.Managers { public sealed partial class VoteManager { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IBanManager _bans = default!; - [Dependency] private readonly VoteWebhooks _voteWebhooks = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IBanManager _bans = default!; + [Dependency] private VoteWebhooks _voteWebhooks = default!; private VotingSystem? _votingSystem; private RoleSystem? _roleSystem; diff --git a/Content.Server/Voting/Managers/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs index 3f477bbe6b3..8a0c3b359b9 100644 --- a/Content.Server/Voting/Managers/VoteManager.cs +++ b/Content.Server/Voting/Managers/VoteManager.cs @@ -28,18 +28,18 @@ namespace Content.Server.Voting.Managers { public sealed partial class VoteManager : IVoteManager { - [Dependency] private readonly IServerNetManager _netManager = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly IAdminManager _adminMgr = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameMapManager _gameMapManager = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!; + [Dependency] private IServerNetManager _netManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private IAdminManager _adminMgr = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameMapManager _gameMapManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private ISharedPlaytimeManager _playtimeManager = default!; private int _nextVoteId = 1; diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs index a859e5578f4..88e2dda0788 100644 --- a/Content.Server/Voting/VoteCommands.cs +++ b/Content.Server/Voting/VoteCommands.cs @@ -14,10 +14,10 @@ namespace Content.Server.Voting { [AnyCommand] - public sealed class CreateVoteCommand : LocalizedEntityCommands + public sealed partial class CreateVoteCommand : LocalizedEntityCommands { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IVoteManager _voteManager = default!; public override string Command => "createvote"; @@ -64,13 +64,13 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Round)] - public sealed class CreateCustomCommand : LocalizedEntityCommands + public sealed partial class CreateCustomCommand : LocalizedEntityCommands { - [Dependency] private readonly IVoteManager _voteManager = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IChatManager _chatManager = default!; - [Dependency] private readonly VoteWebhooks _voteWebhooks = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IVoteManager _voteManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IChatManager _chatManager = default!; + [Dependency] private VoteWebhooks _voteWebhooks = default!; + [Dependency] private IConfigurationManager _cfg = default!; private const int MaxArgCount = 10; @@ -145,9 +145,9 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AnyCommand] - public sealed class VoteCommand : LocalizedEntityCommands + public sealed partial class VoteCommand : LocalizedEntityCommands { - [Dependency] private readonly IVoteManager _voteManager = default!; + [Dependency] private IVoteManager _voteManager = default!; public override string Command => "vote"; @@ -203,9 +203,9 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AnyCommand] - public sealed class ListVotesCommand : LocalizedEntityCommands + public sealed partial class ListVotesCommand : LocalizedEntityCommands { - [Dependency] private readonly IVoteManager _voteManager = default!; + [Dependency] private IVoteManager _voteManager = default!; public override string Command => "listvotes"; @@ -219,10 +219,10 @@ public override void Execute(IConsoleShell shell, string argStr, string[] args) } [AdminCommand(AdminFlags.Round)] - public sealed class CancelVoteCommand : LocalizedEntityCommands + public sealed partial class CancelVoteCommand : LocalizedEntityCommands { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IVoteManager _voteManager = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private IVoteManager _voteManager = default!; public override string Command => "cancelvote"; diff --git a/Content.Server/Voting/VotingSystem.cs b/Content.Server/Voting/VotingSystem.cs index b7e5f442ac9..ce1abe5e458 100644 --- a/Content.Server/Voting/VotingSystem.cs +++ b/Content.Server/Voting/VotingSystem.cs @@ -16,17 +16,17 @@ namespace Content.Server.Voting; -public sealed class VotingSystem : EntitySystem +public sealed partial class VotingSystem : EntitySystem { - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IAdminManager _adminManager = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly JobSystem _jobs = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly ISharedPlaytimeManager _playtimeManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IAdminManager _adminManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private JobSystem _jobs = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private ISharedPlaytimeManager _playtimeManager = default!; public override void Initialize() { diff --git a/Content.Server/Wagging/WaggingSystem.cs b/Content.Server/Wagging/WaggingSystem.cs index 5d39e5c0336..2467bc4c1e4 100644 --- a/Content.Server/Wagging/WaggingSystem.cs +++ b/Content.Server/Wagging/WaggingSystem.cs @@ -13,11 +13,11 @@ namespace Content.Server.Wagging; /// /// Adds an action to toggle wagging animation for tails markings that supporting this /// -public sealed class WaggingSystem : EntitySystem +public sealed partial class WaggingSystem : EntitySystem { - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs index fba4a370dca..1c1eb3af72d 100644 --- a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs +++ b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Weapons.Melee.Balloon; /// /// This handles popping ballons when attacked with /// -public sealed class BalloonPopperSystem : EntitySystem +public sealed partial class BalloonPopperSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private TagSystem _tag = default!; /// public override void Initialize() diff --git a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs index 2efe94c20e5..e7f4d9bf445 100644 --- a/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs +++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Weapons.Melee; -public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem +public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem { - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly LagCompensationSystem _lag = default!; - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private LagCompensationSystem _lag = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; public override void Initialize() { diff --git a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs index 743268e8cb7..9a39f78b543 100644 --- a/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs +++ b/Content.Server/Weapons/Melee/WeaponRandom/WeaponRandomSystem.cs @@ -7,10 +7,10 @@ namespace Content.Server.Weapons.Melee.WeaponRandom; /// /// This adds a random damage bonus to melee attacks based on damage bonus amount and probability. /// -public sealed class WeaponRandomSystem : EntitySystem +public sealed partial class WeaponRandomSystem : EntitySystem { - [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.Server/Weapons/Misc/TetherGunSystem.cs b/Content.Server/Weapons/Misc/TetherGunSystem.cs index d1984448c5d..78e35fe8847 100644 --- a/Content.Server/Weapons/Misc/TetherGunSystem.cs +++ b/Content.Server/Weapons/Misc/TetherGunSystem.cs @@ -5,10 +5,10 @@ namespace Content.Server.Weapons.Misc; -public sealed class TetherGunSystem : SharedTetherGunSystem +public sealed partial class TetherGunSystem : SharedTetherGunSystem { - [Dependency] private readonly PowerCellSystem _cell = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private PowerCellSystem _cell = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Server/Weapons/Ranged/Systems/AutoEquipOnHitSystem.cs b/Content.Server/Weapons/Ranged/Systems/AutoEquipOnHitSystem.cs index 050eb540f96..9e80c04540c 100644 --- a/Content.Server/Weapons/Ranged/Systems/AutoEquipOnHitSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/AutoEquipOnHitSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Weapons.Ranged.Systems; /// Auto-equip items that have AutoEquipOnHitComponent when they hit people. /// Removes AutoEquipOnHitComponent when the item equips successfully or lands. /// -public sealed class AutoEquipOnHitSystem : EntitySystem +public sealed partial class AutoEquipOnHitSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private InventorySystem _inventory = default!; public override void Initialize() { diff --git a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs index 4ee1e9fd929..c47fcd31b7d 100644 --- a/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/ChemicalAmmoSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server.Weapons.Ranged.Systems; -public sealed class ChemicalAmmoSystem : EntitySystem +public sealed partial class ChemicalAmmoSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public override void Initialize() { diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs index eddc8739bb3..894e89be93e 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.Solution.cs @@ -11,7 +11,7 @@ namespace Content.Server.Weapons.Ranged.Systems; public sealed partial class GunSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void InitializeSolution() { diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index 73e926c20cb..e522fcaac85 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -21,8 +21,8 @@ namespace Content.Server.Weapons.Ranged.Systems; public sealed partial class GunSystem : SharedGunSystem { - [Dependency] private readonly PricingSystem _pricing = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private PricingSystem _pricing = default!; + [Dependency] private SharedMapSystem _map = default!; private const float DamagePitchVariation = 0.05f; diff --git a/Content.Server/Weapons/Ranged/Systems/LightSmokableOnShootSystem.cs b/Content.Server/Weapons/Ranged/Systems/LightSmokableOnShootSystem.cs index 3eabc06f0aa..823346f2cd8 100644 --- a/Content.Server/Weapons/Ranged/Systems/LightSmokableOnShootSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/LightSmokableOnShootSystem.cs @@ -10,9 +10,9 @@ namespace Content.Server.Weapons.Ranged.Systems; /// System for lighting smokeable projectiles shot from weapons which light them /// (Tactical cigarette dispensers) /// -public sealed class LightSmokableOnShootSystem : EntitySystem +public sealed partial class LightSmokableOnShootSystem : EntitySystem { - [Dependency] private readonly SmokingSystem _smoking = default!; + [Dependency] private SmokingSystem _smoking = default!; public override void Initialize() { diff --git a/Content.Server/Weather/Commands/WeatherAddCommand.cs b/Content.Server/Weather/Commands/WeatherAddCommand.cs index 6054012db0c..c3ea94ca1f4 100644 --- a/Content.Server/Weather/Commands/WeatherAddCommand.cs +++ b/Content.Server/Weather/Commands/WeatherAddCommand.cs @@ -12,12 +12,12 @@ namespace Content.Server.Weather.Commands; /// Add specific weather to map. /// [AdminCommand(AdminFlags.Fun)] -public sealed class WeatherAddCommand : LocalizedEntityCommands +public sealed partial class WeatherAddCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly WeatherSystem _weather = default!; - [Dependency] private readonly IComponentFactory _compFactory = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private WeatherSystem _weather = default!; + [Dependency] private IComponentFactory _compFactory = default!; public override string Command => "weatheradd"; diff --git a/Content.Server/Weather/Commands/WeatherRemoveCommand.cs b/Content.Server/Weather/Commands/WeatherRemoveCommand.cs index df8f91003f0..19ae23133e9 100644 --- a/Content.Server/Weather/Commands/WeatherRemoveCommand.cs +++ b/Content.Server/Weather/Commands/WeatherRemoveCommand.cs @@ -12,12 +12,12 @@ namespace Content.Server.Weather.Commands; /// Remove specific weather from map. /// [AdminCommand(AdminFlags.Fun)] -public sealed class WeatherRemoveCommand : LocalizedEntityCommands +public sealed partial class WeatherRemoveCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly WeatherSystem _weather = default!; - [Dependency] private readonly IComponentFactory _compFactory = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private WeatherSystem _weather = default!; + [Dependency] private IComponentFactory _compFactory = default!; public override string Command => "weatherremove"; diff --git a/Content.Server/Weather/Commands/WeatherSetCommand.cs b/Content.Server/Weather/Commands/WeatherSetCommand.cs index 77e8ed786d7..ee787085c10 100644 --- a/Content.Server/Weather/Commands/WeatherSetCommand.cs +++ b/Content.Server/Weather/Commands/WeatherSetCommand.cs @@ -12,12 +12,12 @@ namespace Content.Server.Weather.Commands; /// Removes all weather except the specified one. If the specified weather does not exist on the map, it adds it. /// [AdminCommand(AdminFlags.Fun)] -public sealed class WeatherSetCommand : LocalizedEntityCommands +public sealed partial class WeatherSetCommand : LocalizedEntityCommands { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly WeatherSystem _weather = default!; - [Dependency] private readonly IComponentFactory _compFactory = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private WeatherSystem _weather = default!; + [Dependency] private IComponentFactory _compFactory = default!; public override string Command => "weatherset"; diff --git a/Content.Server/Weather/WeatherSystem.cs b/Content.Server/Weather/WeatherSystem.cs index 58e1eb2b988..69f17c3b900 100644 --- a/Content.Server/Weather/WeatherSystem.cs +++ b/Content.Server/Weather/WeatherSystem.cs @@ -3,10 +3,10 @@ namespace Content.Server.Weather; -public sealed class WeatherSystem : SharedWeatherSystem +public sealed partial class WeatherSystem : SharedWeatherSystem { //I dont really like to PVS override weather entities, but map status effect containers dont PVS-ing out of the box - [Dependency] private readonly PvsOverrideSystem _pvs = default!; + [Dependency] private PvsOverrideSystem _pvs = default!; public override void Initialize() { diff --git a/Content.Server/Whitelist/WhitelistCommands.cs b/Content.Server/Whitelist/WhitelistCommands.cs index 6e24831fe48..6a9580ebcee 100644 --- a/Content.Server/Whitelist/WhitelistCommands.cs +++ b/Content.Server/Whitelist/WhitelistCommands.cs @@ -10,10 +10,10 @@ namespace Content.Server.Whitelist; [AdminCommand(AdminFlags.Ban)] -public sealed class AddWhitelistCommand : LocalizedCommands +public sealed partial class AddWhitelistCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IServerDbManager _dbManager = default!; public override string Command => "whitelistadd"; public override async void Execute(IConsoleShell shell, string argStr, string[] args) @@ -58,10 +58,10 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Ban)] -public sealed class RemoveWhitelistCommand : LocalizedCommands +public sealed partial class RemoveWhitelistCommand : LocalizedCommands { - [Dependency] private readonly IPlayerLocator _locator = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; + [Dependency] private IPlayerLocator _locator = default!; + [Dependency] private IServerDbManager _dbManager = default!; public override string Command => "whitelistremove"; @@ -107,12 +107,12 @@ public override CompletionResult GetCompletion(IConsoleShell shell, string[] arg } [AdminCommand(AdminFlags.Ban)] -public sealed class KickNonWhitelistedCommand : LocalizedCommands +public sealed partial class KickNonWhitelistedCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly IServerNetManager _netManager = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly IServerDbManager _dbManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private IServerNetManager _netManager = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private IServerDbManager _dbManager = default!; public override string Command => "kicknonwhitelisted"; diff --git a/Content.Server/Wieldable/WieldableSystem.cs b/Content.Server/Wieldable/WieldableSystem.cs index 35f75276a8f..fadaa42ea85 100644 --- a/Content.Server/Wieldable/WieldableSystem.cs +++ b/Content.Server/Wieldable/WieldableSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Wieldable; -public sealed class WieldableSystem : SharedWieldableSystem +public sealed partial class WieldableSystem : SharedWieldableSystem { - [Dependency] private readonly ContentEyeSystem _eye = default!; + [Dependency] private ContentEyeSystem _eye = default!; public override void Initialize() { diff --git a/Content.Server/Wires/CutWireOnMapInitSystem.cs b/Content.Server/Wires/CutWireOnMapInitSystem.cs index 1de1d786306..3238bb5eea6 100644 --- a/Content.Server/Wires/CutWireOnMapInitSystem.cs +++ b/Content.Server/Wires/CutWireOnMapInitSystem.cs @@ -7,7 +7,7 @@ namespace Content.Server.Wires; /// public sealed partial class CutWireOnMapInitSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs index 616a93f405f..fb9982c9ca9 100644 --- a/Content.Server/Wires/WiresSystem.cs +++ b/Content.Server/Wires/WiresSystem.cs @@ -20,16 +20,16 @@ namespace Content.Server.Wires; -public sealed class WiresSystem : SharedWiresSystem +public sealed partial class WiresSystem : SharedWiresSystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ConstructionSystem _construction = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ConstructionSystem _construction = default!; private static readonly ProtoId CuttingQuality = "Cutting"; private static readonly ProtoId PulsingQuality = "Pulsing"; diff --git a/Content.Server/Worldgen/Systems/BaseWorldSystem.cs b/Content.Server/Worldgen/Systems/BaseWorldSystem.cs index fdd6ea3dee6..bcb83264d2d 100644 --- a/Content.Server/Worldgen/Systems/BaseWorldSystem.cs +++ b/Content.Server/Worldgen/Systems/BaseWorldSystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Worldgen.Systems; /// Exists primarily for convenience and to avoid code duplication. /// [PublicAPI] -public abstract class BaseWorldSystem : EntitySystem +public abstract partial class BaseWorldSystem : EntitySystem { - [Dependency] private readonly WorldControllerSystem _worldController = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private WorldControllerSystem _worldController = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; /// /// Gets a chunk's coordinates in chunk space as an integer value. diff --git a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs index cc9506117af..8d1373805ef 100644 --- a/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs +++ b/Content.Server/Worldgen/Systems/Biomes/BiomeSelectionSystem.cs @@ -9,11 +9,11 @@ namespace Content.Server.Worldgen.Systems.Biomes; /// /// This handles biome selection, evaluating which biome to apply to a chunk based on noise channels. /// -public sealed class BiomeSelectionSystem : BaseWorldSystem +public sealed partial class BiomeSelectionSystem : BaseWorldSystem { - [Dependency] private readonly NoiseIndexSystem _noiseIdx = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ISerializationManager _ser = default!; + [Dependency] private NoiseIndexSystem _noiseIdx = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ISerializationManager _ser = default!; /// public override void Initialize() diff --git a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs index 1207d6f157e..8cfb873ef1f 100644 --- a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs +++ b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs @@ -6,10 +6,10 @@ namespace Content.Server.Worldgen.Systems.Carvers; /// /// This handles carving out holes in world generation according to a noise channel. /// -public sealed class NoiseRangeCarverSystem : EntitySystem +public sealed partial class NoiseRangeCarverSystem : EntitySystem { - [Dependency] private readonly NoiseIndexSystem _index = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private NoiseIndexSystem _index = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// public override void Initialize() diff --git a/Content.Server/Worldgen/Systems/Debris/BlobFloorPlanBuilderSystem.cs b/Content.Server/Worldgen/Systems/Debris/BlobFloorPlanBuilderSystem.cs index df5137c1086..b7773bd9af0 100644 --- a/Content.Server/Worldgen/Systems/Debris/BlobFloorPlanBuilderSystem.cs +++ b/Content.Server/Worldgen/Systems/Debris/BlobFloorPlanBuilderSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Worldgen.Systems.Debris; /// /// This handles building the floor plans for "blobby" debris. /// -public sealed class BlobFloorPlanBuilderSystem : BaseWorldSystem +public sealed partial class BlobFloorPlanBuilderSystem : BaseWorldSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinition = default!; - [Dependency] private readonly TileSystem _tiles = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ITileDefinitionManager _tileDefinition = default!; + [Dependency] private TileSystem _tiles = default!; + [Dependency] private SharedMapSystem _map = default!; /// public override void Initialize() diff --git a/Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs b/Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs index d9a12dc40a4..1a89f14e575 100644 --- a/Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs +++ b/Content.Server/Worldgen/Systems/Debris/DebrisFeaturePlacerSystem.cs @@ -15,14 +15,14 @@ namespace Content.Server.Worldgen.Systems.Debris; /// /// This handles placing debris within the world evenly with rng, primarily for structures like asteroid fields. /// -public sealed class DebrisFeaturePlacerSystem : BaseWorldSystem +public sealed partial class DebrisFeaturePlacerSystem : BaseWorldSystem { - [Dependency] private readonly NoiseIndexSystem _noiseIndex = default!; - [Dependency] private readonly PoissonDiskSampler _sampler = default!; - [Dependency] private readonly TransformSystem _xformSys = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private NoiseIndexSystem _noiseIndex = default!; + [Dependency] private PoissonDiskSampler _sampler = default!; + [Dependency] private TransformSystem _xformSys = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IRobustRandom _random = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Worldgen/Systems/Debris/NoiseDrivenDebrisSelectorSystem.cs b/Content.Server/Worldgen/Systems/Debris/NoiseDrivenDebrisSelectorSystem.cs index 85b08f99405..2a7903c40b8 100644 --- a/Content.Server/Worldgen/Systems/Debris/NoiseDrivenDebrisSelectorSystem.cs +++ b/Content.Server/Worldgen/Systems/Debris/NoiseDrivenDebrisSelectorSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.Worldgen.Systems.Debris; /// /// This handles selecting debris with probability decided by a noise channel. /// -public sealed class NoiseDrivenDebrisSelectorSystem : BaseWorldSystem +public sealed partial class NoiseDrivenDebrisSelectorSystem : BaseWorldSystem { - [Dependency] private readonly NoiseIndexSystem _index = default!; - [Dependency] private readonly TransformSystem _xformSys = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private NoiseIndexSystem _index = default!; + [Dependency] private TransformSystem _xformSys = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IRobustRandom _random = default!; private ISawmill _sawmill = default!; diff --git a/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs b/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs index 99587a1cea8..4fcb85d7eea 100644 --- a/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs +++ b/Content.Server/Worldgen/Systems/Debris/SimpleFloorPlanPopulatorSystem.cs @@ -15,17 +15,17 @@ namespace Content.Server.Worldgen.Systems.Debris; /// /// This handles populating simple structures, simply using a loot table for each tile. /// -public sealed class SimpleFloorPlanPopulatorSystem : BaseWorldSystem +public sealed partial class SimpleFloorPlanPopulatorSystem : BaseWorldSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly BiomeSelectionSystem _biomeSelection = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly WorldControllerSystem _world = default!; - [Dependency] private readonly ChunkOwnedEntitySystem _ownedEntity = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private BiomeSelectionSystem _biomeSelection = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private WorldControllerSystem _world = default!; + [Dependency] private ChunkOwnedEntitySystem _ownedEntity = default!; /// public override void Initialize() diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs index dbad39ea966..10a9b1f3db7 100644 --- a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs +++ b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs @@ -7,9 +7,9 @@ namespace Content.Server.Worldgen.Systems; /// /// This handles loading in objects based on distance from player, using some metadata on chunks. /// -public sealed class LocalityLoaderSystem : BaseWorldSystem +public sealed partial class LocalityLoaderSystem : BaseWorldSystem { - [Dependency] private readonly TransformSystem _xformSys = default!; + [Dependency] private TransformSystem _xformSys = default!; /// /// Max amount of LocalityLoaders to check per tick diff --git a/Content.Server/Worldgen/Systems/NoiseIndexSystem.cs b/Content.Server/Worldgen/Systems/NoiseIndexSystem.cs index d56a3388d6f..64cd9271f77 100644 --- a/Content.Server/Worldgen/Systems/NoiseIndexSystem.cs +++ b/Content.Server/Worldgen/Systems/NoiseIndexSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Worldgen.Systems; /// /// This handles the noise index. /// -public sealed class NoiseIndexSystem : EntitySystem +public sealed partial class NoiseIndexSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; /// /// Gets a particular noise channel from the index on the given entity. diff --git a/Content.Server/Worldgen/Systems/WorldControllerSystem.cs b/Content.Server/Worldgen/Systems/WorldControllerSystem.cs index 22b2c5d274c..e8309841e67 100644 --- a/Content.Server/Worldgen/Systems/WorldControllerSystem.cs +++ b/Content.Server/Worldgen/Systems/WorldControllerSystem.cs @@ -19,19 +19,19 @@ namespace Content.Server.Worldgen.Systems; /// /// This handles putting together chunk entities and notifying them about important changes. /// -public sealed class WorldControllerSystem : EntitySystem +public sealed partial class WorldControllerSystem : EntitySystem { - [Dependency] private readonly TransformSystem _xformSys = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly BiomeSelectionSystem _biomeSelection = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ChunkOwnedEntitySystem _ownedEntity = default!; + [Dependency] private TransformSystem _xformSys = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private MetaDataSystem _metaData = default!; + + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private BiomeSelectionSystem _biomeSelection = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ChunkOwnedEntitySystem _ownedEntity = default!; private const int PlayerLoadRadius = 2; diff --git a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs index cc0ec627338..f51190fa02f 100644 --- a/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs +++ b/Content.Server/Worldgen/Systems/WorldgenConfigSystem.cs @@ -17,14 +17,14 @@ namespace Content.Server.Worldgen.Systems; /// /// This handles configuring world generation during round start. /// -public sealed class WorldgenConfigSystem : EntitySystem +public sealed partial class WorldgenConfigSystem : EntitySystem { - [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IConsoleHost _conHost = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ISerializationManager _ser = default!; + [Dependency] private GameTicker _gameTicker = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IConsoleHost _conHost = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ISerializationManager _ser = default!; private bool _enabled; private string _worldgenConfig = default!; diff --git a/Content.Server/Worldgen/Tools/PoissonDiskSampler.cs b/Content.Server/Worldgen/Tools/PoissonDiskSampler.cs index eaccbee638b..d50977be266 100644 --- a/Content.Server/Worldgen/Tools/PoissonDiskSampler.cs +++ b/Content.Server/Worldgen/Tools/PoissonDiskSampler.cs @@ -8,10 +8,10 @@ namespace Content.Server.Worldgen.Tools; /// /// An implementation of Poisson Disk Sampling, for evenly spreading points across a given area. /// -public sealed class PoissonDiskSampler +public sealed partial class PoissonDiskSampler { public const int DefaultPointsPerIteration = 30; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; /// /// Samples for points within the given circle. diff --git a/Content.Server/Xenoarchaeology/Artifact/RandomArtifactSpriteSystem.cs b/Content.Server/Xenoarchaeology/Artifact/RandomArtifactSpriteSystem.cs index 645dac24e20..9f2fbc1f0a0 100644 --- a/Content.Server/Xenoarchaeology/Artifact/RandomArtifactSpriteSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/RandomArtifactSpriteSystem.cs @@ -7,12 +7,12 @@ namespace Content.Server.Xenoarchaeology.Artifact; -public sealed class RandomArtifactSpriteSystem : EntitySystem +public sealed partial class RandomArtifactSpriteSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _time = default!; - [Dependency] private readonly AppearanceSystem _appearance = default!; - [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _time = default!; + [Dependency] private AppearanceSystem _appearance = default!; + [Dependency] private SharedItemSystem _item = default!; public override void Initialize() { diff --git a/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs b/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs index de8691604ae..f1a07a8c590 100644 --- a/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs +++ b/Content.Server/Xenoarchaeology/Artifact/UnlockNodeCommand.cs @@ -7,9 +7,9 @@ namespace Content.Server.Xenoarchaeology.Artifact; /// Command for unlocking a specific node of a xeno artifact. [AdminCommand(AdminFlags.Debug)] -public sealed class UnlockNodeCommand : LocalizedEntityCommands +public sealed partial class UnlockNodeCommand : LocalizedEntityCommands { - [Dependency] private readonly XenoArtifactSystem _artiSystem = default!; + [Dependency] private XenoArtifactSystem _artiSystem = default!; public override string Command => "unlocknode"; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs index 914e8d0fe38..17e98a15f94 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEChargeBatterySystem.cs @@ -9,10 +9,10 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact activation effect that is fully charging batteries in certain range. /// -public sealed class XAEChargeBatterySystem : BaseXAESystem +public sealed partial class XAEChargeBatterySystem : BaseXAESystem { - [Dependency] private readonly BatterySystem _battery = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private BatterySystem _battery = default!; + [Dependency] private EntityLookupSystem _lookup = default!; /// Pre-allocated and re-used collection. private readonly HashSet> _batteryEntities = new(); diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreateGasSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreateGasSystem.cs index 517e2144e05..b896a088cdd 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreateGasSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreateGasSystem.cs @@ -12,11 +12,11 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that creates certain atmospheric gas on artifact tile / adjacent tiles. /// -public sealed class XAECreateGasSystem : BaseXAESystem +public sealed partial class XAECreateGasSystem : BaseXAESystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; - [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly MapSystem _map = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; + [Dependency] private TransformSystem _transform = default!; + [Dependency] private MapSystem _map = default!; protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) { diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreatePuddleSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreatePuddleSystem.cs index 8074866739f..d9cae214686 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreatePuddleSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAECreatePuddleSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that creates puddle of chemical reagents under artifact. /// -public sealed class XAECreatePuddleSystem : BaseXAESystem +public sealed partial class XAECreatePuddleSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly PuddleSystem _puddle = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private PuddleSystem _puddle = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; /// public override void Initialize() diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEEmpInAreaSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEEmpInAreaSystem.cs index 43a8ed99297..687ce29f586 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEEmpInAreaSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEEmpInAreaSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that creates EMP on use. /// -public sealed class XAEEmpInAreaSystem : BaseXAESystem +public sealed partial class XAEEmpInAreaSystem : BaseXAESystem { - [Dependency] private readonly EmpSystem _emp = default!; + [Dependency] private EmpSystem _emp = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEFoamSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEFoamSystem.cs index 8113d58a655..e5ca7a6b879 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEFoamSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEFoamSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that starts Foam chemical reaction with random-ish reagents inside. /// -public sealed class XAEFoamSystem : BaseXAESystem +public sealed partial class XAEFoamSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SmokeSystem _smoke = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SmokeSystem _smoke = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private MetaDataSystem _metaData = default!; /// public override void Initialize() diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEIgniteSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEIgniteSystem.cs index 7e8fff73ad3..1ca5419915b 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEIgniteSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEIgniteSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact activation effect that ignites any flammable entity in range. /// -public sealed class XAEIgniteSystem : BaseXAESystem +public sealed partial class XAEIgniteSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly FlammableSystem _flammable = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private FlammableSystem _flammable = default!; private EntityQuery _flammables; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAELightFlickerSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAELightFlickerSystem.cs index 6e7c4fc4ad9..1948e50769f 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAELightFlickerSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAELightFlickerSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact activation effect that flickers light on and off. /// -public sealed class XAELightFlickerSystem : BaseXAESystem +public sealed partial class XAELightFlickerSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly GhostSystem _ghost = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private GhostSystem _ghost = default!; private EntityQuery _lights; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPolymorphSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPolymorphSystem.cs index faf9c3a384d..35a95e24805 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPolymorphSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPolymorphSystem.cs @@ -11,12 +11,12 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact activation effect that is polymorphing all humanoid entities in range. /// -public sealed class XAEPolymorphSystem : BaseXAESystem +public sealed partial class XAEPolymorphSystem : BaseXAESystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly MobStateSystem _mob = default!; - [Dependency] private readonly PolymorphSystem _poly = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private MobStateSystem _mob = default!; + [Dependency] private PolymorphSystem _poly = default!; + [Dependency] private SharedAudioSystem _audio = default!; /// Pre-allocated and re-used collection. private readonly HashSet> _humanoids = new(); diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs index fcb773111b5..1049d3153ea 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEPortalSystem.cs @@ -13,12 +13,12 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that creates temporary portal between places on station. /// -public sealed class XAEPortalSystem : BaseXAESystem +public sealed partial class XAEPortalSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly LinkedEntitySystem _link = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private LinkedEntitySystem _link = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedContainerSystem _container = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAETelepathicSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAETelepathicSystem.cs index 1755248a5b6..8bbee530bf2 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAETelepathicSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAETelepathicSystem.cs @@ -10,11 +10,11 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact activation effect that sends sublime telepathic messages. /// -public sealed class XAETelepathicSystem : BaseXAESystem +public sealed partial class XAETelepathicSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; /// Pre-allocated and re-used collection. private readonly HashSet _entities = new(); diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAETemperatureSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAETemperatureSystem.cs index 01a11b946fb..54c26134acd 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAETemperatureSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAETemperatureSystem.cs @@ -10,10 +10,10 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that changes atmospheric temperature on adjacent tiles. /// -public sealed class XAETemperatureSystem : BaseXAESystem +public sealed partial class XAETemperatureSystem : BaseXAESystem { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; + [Dependency] private AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private TransformSystem _transformSystem = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEThrowThingsAroundSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEThrowThingsAroundSystem.cs index a73a7b6c76a..052e3007835 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAEThrowThingsAroundSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAEThrowThingsAroundSystem.cs @@ -13,14 +13,14 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact activation effect that pries tiles and throws stuff around. /// -public sealed class XAEThrowThingsAroundSystem : BaseXAESystem +public sealed partial class XAEThrowThingsAroundSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; private EntityQuery _physQuery; diff --git a/Content.Server/Xenoarchaeology/Artifact/XAE/XAETriggerExplosivesSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAE/XAETriggerExplosivesSystem.cs index 2cb98148497..08541ab1a93 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAE/XAETriggerExplosivesSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAE/XAETriggerExplosivesSystem.cs @@ -9,9 +9,9 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect of triggering explosion. /// -public sealed class XAETriggerExplosivesSystem : BaseXAESystem +public sealed partial class XAETriggerExplosivesSystem : BaseXAESystem { - [Dependency] private readonly ExplosionSystem _explosion = default!; + [Dependency] private ExplosionSystem _explosion = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Server/Xenoarchaeology/Artifact/XAT/XATGasSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAT/XATGasSystem.cs index 49f24acbd1e..8d9925945d2 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAT/XATGasSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAT/XATGasSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAT; /// /// System for xeno artifact trigger, which gets activated from some gas being on the same time as artifact with certain concentration. /// -public sealed class XATGasSystem : BaseQueryUpdateXATSystem +public sealed partial class XATGasSystem : BaseQueryUpdateXATSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; protected override void UpdateXAT(Entity artifact, Entity node, float frameTime) { diff --git a/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs index 7af908533a8..d05d587da87 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAT/XATMagnetSystem.cs @@ -11,10 +11,10 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAT; /// System for checking if magnets-related xeno artifact node should be triggered. /// Works with magboots and salvage magnet, salvage magnet triggers only upon pulsing on activation. /// -public sealed class XATMagnetSystem : BaseQueryUpdateXATSystem +public sealed partial class XATMagnetSystem : BaseQueryUpdateXATSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; /// Pre-allocated and re-used collection. private HashSet> _magbootEntities = new(); diff --git a/Content.Server/Xenoarchaeology/Artifact/XAT/XATPressureSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAT/XATPressureSystem.cs index 571bbee9a8c..689d830d49c 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAT/XATPressureSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAT/XATPressureSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAT; /// /// System for checking if pressure-related xeno artifact node should be triggered. /// -public sealed class XATPressureSystem : BaseQueryUpdateXATSystem +public sealed partial class XATPressureSystem : BaseQueryUpdateXATSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; /// protected override void UpdateXAT(Entity artifact, Entity node, float frameTime) diff --git a/Content.Server/Xenoarchaeology/Artifact/XAT/XATTemperatureSystem.cs b/Content.Server/Xenoarchaeology/Artifact/XAT/XATTemperatureSystem.cs index 99e2b72eef9..ec2f464f0bb 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XAT/XATTemperatureSystem.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XAT/XATTemperatureSystem.cs @@ -8,9 +8,9 @@ namespace Content.Server.Xenoarchaeology.Artifact.XAT; /// /// System for checking if temperature-related xeno artifact node should be triggered. /// -public sealed class XATTemperatureSystem : BaseQueryUpdateXATSystem +public sealed partial class XATTemperatureSystem : BaseQueryUpdateXATSystem { - [Dependency] private readonly AtmosphereSystem _atmosphere = default!; + [Dependency] private AtmosphereSystem _atmosphere = default!; /// protected override void UpdateXAT(Entity artifact, Entity node, float frameTime) diff --git a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs index 5a27fbff91f..1f5d9ec26e8 100644 --- a/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs +++ b/Content.Server/Xenoarchaeology/Artifact/XenoArtifactSystem.ProcGen.cs @@ -9,7 +9,7 @@ namespace Content.Server.Xenoarchaeology.Artifact; public sealed partial class XenoArtifactSystem { - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; private void GenerateArtifactStructure(Entity ent) { diff --git a/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs index ee9bcf8ec9a..74b9eb42561 100644 --- a/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/ArtifactAnalyzerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Server.Xenoarchaeology.Equipment; /// -public sealed class ArtifactAnalyzerSystem : SharedArtifactAnalyzerSystem +public sealed partial class ArtifactAnalyzerSystem : SharedArtifactAnalyzerSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ResearchSystem _research = default!; - [Dependency] private readonly XenoArtifactSystem _xenoArtifact = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ResearchSystem _research = default!; + [Dependency] private XenoArtifactSystem _xenoArtifact = default!; /// public override void Initialize() diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs index 7087499c93a..e447cd02ecd 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactCrusherSystem.cs @@ -10,12 +10,12 @@ namespace Content.Server.Xenoarchaeology.Equipment.Systems; /// -public sealed class ArtifactCrusherSystem : SharedArtifactCrusherSystem +public sealed partial class ArtifactCrusherSystem : SharedArtifactCrusherSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly StackSystem _stack = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private StackSystem _stack = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; // TODO: Move to shared once StackSystem spawning is in Shared and we have RandomPredicted public override void FinishCrushing(Entity ent) diff --git a/Content.Server/Xenoborgs/XenoborgSystem.cs b/Content.Server/Xenoborgs/XenoborgSystem.cs index de5ad3176ed..39d88539aa7 100644 --- a/Content.Server/Xenoborgs/XenoborgSystem.cs +++ b/Content.Server/Xenoborgs/XenoborgSystem.cs @@ -13,10 +13,10 @@ namespace Content.Server.Xenoborgs; public sealed partial class XenoborgSystem : EntitySystem { - [Dependency] private readonly AntagSelectionSystem _antag = default!; - [Dependency] private readonly BorgSystem _borg = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly XenoborgsRuleSystem _xenoborgsRule = default!; + [Dependency] private AntagSelectionSystem _antag = default!; + [Dependency] private BorgSystem _borg = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private XenoborgsRuleSystem _xenoborgsRule = default!; private static readonly Color XenoborgBriefingColor = Color.BlueViolet; diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index 105247b0bce..797ad205f22 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -55,22 +55,22 @@ namespace Content.Server.Zombies; /// public sealed partial class ZombieSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IBanManager _ban = default!; - [Dependency] private readonly IChatManager _chatMan = default!; - [Dependency] private readonly SharedCombatModeSystem _combat = default!; - [Dependency] private readonly NpcFactionSystem _faction = default!; - [Dependency] private readonly GhostSystem _ghost = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly IdentitySystem _identity = default!; - [Dependency] private readonly ServerInventorySystem _inventory = default!; - [Dependency] private readonly MindSystem _mind = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly NPCSystem _npc = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IBanManager _ban = default!; + [Dependency] private IChatManager _chatMan = default!; + [Dependency] private SharedCombatModeSystem _combat = default!; + [Dependency] private NpcFactionSystem _faction = default!; + [Dependency] private GhostSystem _ghost = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private IdentitySystem _identity = default!; + [Dependency] private ServerInventorySystem _inventory = default!; + [Dependency] private MindSystem _mind = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private NameModifierSystem _nameMod = default!; + [Dependency] private NPCSystem _npc = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private ISharedPlayerManager _player = default!; private static readonly ProtoId InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell"; private static readonly ProtoId CannotSuicideTag = "CannotSuicide"; diff --git a/Content.Server/Zombies/ZombieSystem.cs b/Content.Server/Zombies/ZombieSystem.cs index a9052b0a691..2d366bf615f 100644 --- a/Content.Server/Zombies/ZombieSystem.cs +++ b/Content.Server/Zombies/ZombieSystem.cs @@ -30,18 +30,18 @@ namespace Content.Server.Zombies { public sealed partial class ZombieSystem : SharedZombieSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly BloodstreamSystem _bloodstream = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly ChatSystem _chat = default!; - [Dependency] private readonly ActionsSystem _actions = default!; - [Dependency] private readonly AutoEmoteSystem _autoEmote = default!; - [Dependency] private readonly EmoteOnDamageSystem _emoteOnDamage = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private BloodstreamSystem _bloodstream = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private ChatSystem _chat = default!; + [Dependency] private ActionsSystem _actions = default!; + [Dependency] private AutoEmoteSystem _autoEmote = default!; + [Dependency] private EmoteOnDamageSystem _emoteOnDamage = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedRoleSystem _role = default!; public readonly ProtoId Faction = "Zombie"; diff --git a/Content.Server/_Funkystation/Atmos/Piping/Binary/EntitySystems/HeatPumpSystem.cs b/Content.Server/_Funkystation/Atmos/Piping/Binary/EntitySystems/HeatPumpSystem.cs index 48de659282a..be65541a74b 100644 --- a/Content.Server/_Funkystation/Atmos/Piping/Binary/EntitySystems/HeatPumpSystem.cs +++ b/Content.Server/_Funkystation/Atmos/Piping/Binary/EntitySystems/HeatPumpSystem.cs @@ -21,15 +21,15 @@ namespace Content.Server.Atmos.Piping.Binary.EntitySystems { [UsedImplicitly] - public sealed class HeatPumpSystem : EntitySystem + public sealed partial class HeatPumpSystem : EntitySystem { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly NodeContainerSystem _nodeContainer = default!; - [Dependency] private readonly AtmosphereSystem _atmos = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private UserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private NodeContainerSystem _nodeContainer = default!; + [Dependency] private AtmosphereSystem _atmos = default!; + [Dependency] private SharedPopupSystem _popup = default!; private const float MaxHeatTransferRate = 100f; public override void Initialize() diff --git a/Content.Server/_NF/Bank/ATMSystem.cs b/Content.Server/_NF/Bank/ATMSystem.cs index 52ab370c8dc..655cb25306e 100644 --- a/Content.Server/_NF/Bank/ATMSystem.cs +++ b/Content.Server/_NF/Bank/ATMSystem.cs @@ -23,15 +23,15 @@ namespace Content.Server._NF.Bank; public sealed partial class BankSystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly PopupSystem _popup = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly HandsSystem _hands = default!; - [Dependency] private readonly TransformSystem _transform = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private PopupSystem _popup = default!; + [Dependency] private StackSystem _stackSystem = default!; + [Dependency] private UserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private IAdminLogManager _adminLogger = default!; + [Dependency] private HandsSystem _hands = default!; + [Dependency] private TransformSystem _transform = default!; private void InitializeATM() { diff --git a/Content.Server/_NF/Bank/BankSystem.Sector.cs b/Content.Server/_NF/Bank/BankSystem.Sector.cs index 6460912541e..4b1ce67ac73 100644 --- a/Content.Server/_NF/Bank/BankSystem.Sector.cs +++ b/Content.Server/_NF/Bank/BankSystem.Sector.cs @@ -9,7 +9,7 @@ namespace Content.Server._NF.Bank; public sealed partial class BankSystem : SharedBankSystem { - [Dependency] private readonly SectorServiceSystem _sectorService = default!; + [Dependency] private SectorServiceSystem _sectorService = default!; // The interval between sector account increases, in seconds. private const float AccountIncreaseInterval = 10.0f; @@ -69,7 +69,7 @@ public bool TrySectorWithdraw(SectorBankAccount account, int amount, LedgerEntry /// The purpose of this withdrawal /// true if the transaction was successful, false if it was not [PublicAPI] - public bool TrySectorDeposit(SectorBankAccount account, int amount, LedgerEntryType reason, SectorBankComponent? bank=null) + public bool TrySectorDeposit(SectorBankAccount account, int amount, LedgerEntryType reason, SectorBankComponent? bank = null) { if (amount <= 0) { diff --git a/Content.Server/_NF/Bank/BankSystem.cs b/Content.Server/_NF/Bank/BankSystem.cs index 14244f3dca6..c7982a51753 100644 --- a/Content.Server/_NF/Bank/BankSystem.cs +++ b/Content.Server/_NF/Bank/BankSystem.cs @@ -9,8 +9,8 @@ namespace Content.Server._NF.Bank; public sealed partial class BankSystem : SharedBankSystem { - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private GameTicker _gameTicker = default!; private ISawmill _log = default!; diff --git a/Content.Server/_NF/Bank/Commands/CheckBankBalance.cs b/Content.Server/_NF/Bank/Commands/CheckBankBalance.cs index 2378346793c..6cec48a8b9b 100644 --- a/Content.Server/_NF/Bank/Commands/CheckBankBalance.cs +++ b/Content.Server/_NF/Bank/Commands/CheckBankBalance.cs @@ -16,9 +16,9 @@ namespace Content.Server._NF.Bank.Commands; /// Ported from Monolith. /// [AdminCommand(AdminFlags.Admin)] -public sealed class CheckBankBalance : IConsoleCommand +public sealed partial class CheckBankBalance : IConsoleCommand { - [Dependency] private readonly EntityManager _entityManager = default!; + [Dependency] private EntityManager _entityManager = default!; public string Command => "checkbalance"; public string Description => "Check a characters's bank balance by character name."; public string Help => "checkbalance "; diff --git a/Content.Server/_NF/Bank/StationATMSystem.cs b/Content.Server/_NF/Bank/StationATMSystem.cs index ca0225630d6..34bbc28df4e 100644 --- a/Content.Server/_NF/Bank/StationATMSystem.cs +++ b/Content.Server/_NF/Bank/StationATMSystem.cs @@ -18,7 +18,7 @@ namespace Content.Server._NF.Bank; public sealed partial class BankSystem { - [Dependency] private readonly AccessReaderSystem _access = default!; + [Dependency] private AccessReaderSystem _access = default!; private void InitializeStationATM() { diff --git a/Content.Server/_RMC14/Examine/RMCSetPoseSystem.cs b/Content.Server/_RMC14/Examine/RMCSetPoseSystem.cs index 7b3b3e3d572..55cbc67b05f 100644 --- a/Content.Server/_RMC14/Examine/RMCSetPoseSystem.cs +++ b/Content.Server/_RMC14/Examine/RMCSetPoseSystem.cs @@ -6,9 +6,9 @@ namespace Content.Server._RMC14.Examine; -public sealed class RMCSetPoseSystem : SharedRMCSetPoseSystem +public sealed partial class RMCSetPoseSystem : SharedRMCSetPoseSystem { - [Dependency] private readonly QuickDialogSystem _quickDialog = default!; + [Dependency] private QuickDialogSystem _quickDialog = default!; public override void Initialize() { diff --git a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs index 039891a3baf..3e48388fbe7 100644 --- a/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs +++ b/Content.Shared/Abilities/Goliath/GoliathTentacleSystem.cs @@ -10,15 +10,15 @@ namespace Content.Shared.Abilities.Goliath; -public sealed class GoliathTentacleSystem : EntitySystem +public sealed partial class GoliathTentacleSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private SharedPopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Shared/Abilities/Mime/MimePowersSystem.cs b/Content.Shared/Abilities/Mime/MimePowersSystem.cs index 6f05b37a268..4d6a7da1430 100644 --- a/Content.Shared/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Shared/Abilities/Mime/MimePowersSystem.cs @@ -14,15 +14,15 @@ namespace Content.Shared.Abilities.Mime; -public sealed class MimePowersSystem : EntitySystem +public sealed partial class MimePowersSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly IMapManager _mapMan = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private IMapManager _mapMan = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Access/Systems/AccessReaderSystem.cs b/Content.Shared/Access/Systems/AccessReaderSystem.cs index 215d956cde1..41d53e3dcd0 100644 --- a/Content.Shared/Access/Systems/AccessReaderSystem.cs +++ b/Content.Shared/Access/Systems/AccessReaderSystem.cs @@ -28,17 +28,17 @@ namespace Content.Shared.Access.Systems; -public sealed class AccessReaderSystem : EntitySystem +public sealed partial class AccessReaderSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly SharedGameTicker _gameTicker = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedStationRecordsSystem _recordsSystem = default!; - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private SharedGameTicker _gameTicker = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedStationRecordsSystem _recordsSystem = default!; + [Dependency] private SharedStationSystem _station = default!; private static readonly ProtoId PreventAccessLoggingTag = "PreventAccessLogging"; public override void Initialize() diff --git a/Content.Shared/Access/Systems/AccessToggleSystem.cs b/Content.Shared/Access/Systems/AccessToggleSystem.cs index 564aca06812..fadf8f267b7 100644 --- a/Content.Shared/Access/Systems/AccessToggleSystem.cs +++ b/Content.Shared/Access/Systems/AccessToggleSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Access.Systems; -public sealed class AccessToggleSystem : EntitySystem +public sealed partial class AccessToggleSystem : EntitySystem { - [Dependency] private readonly SharedAccessSystem _access = default!; + [Dependency] private SharedAccessSystem _access = default!; public override void Initialize() { diff --git a/Content.Shared/Access/Systems/ActivatableUIRequiresAccessSystem.cs b/Content.Shared/Access/Systems/ActivatableUIRequiresAccessSystem.cs index 8a9276c529d..731ce42a825 100644 --- a/Content.Shared/Access/Systems/ActivatableUIRequiresAccessSystem.cs +++ b/Content.Shared/Access/Systems/ActivatableUIRequiresAccessSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Access.Systems; -public sealed class ActivatableUIRequiresAccessSystem : EntitySystem +public sealed partial class ActivatableUIRequiresAccessSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Access/Systems/IdExaminableSystem.cs b/Content.Shared/Access/Systems/IdExaminableSystem.cs index c05262f2f61..babe04d89af 100644 --- a/Content.Shared/Access/Systems/IdExaminableSystem.cs +++ b/Content.Shared/Access/Systems/IdExaminableSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Access.Systems; -public sealed class IdExaminableSystem : EntitySystem +public sealed partial class IdExaminableSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; public override void Initialize() { diff --git a/Content.Shared/Access/Systems/SharedAccessOverriderSystem.cs b/Content.Shared/Access/Systems/SharedAccessOverriderSystem.cs index 7c6233298ae..75d92f8c510 100644 --- a/Content.Shared/Access/Systems/SharedAccessOverriderSystem.cs +++ b/Content.Shared/Access/Systems/SharedAccessOverriderSystem.cs @@ -9,8 +9,8 @@ namespace Content.Shared.Access.Systems [UsedImplicitly] public abstract partial class SharedAccessOverriderSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private ILogManager _log = default!; public const string Sawmill = "accessoverrider"; protected ISawmill _sawmill = default!; diff --git a/Content.Shared/Access/Systems/SharedAccessSystem.cs b/Content.Shared/Access/Systems/SharedAccessSystem.cs index 0f449301d7b..470f6898914 100644 --- a/Content.Shared/Access/Systems/SharedAccessSystem.cs +++ b/Content.Shared/Access/Systems/SharedAccessSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Access.Systems { - public abstract class SharedAccessSystem : EntitySystem + public abstract partial class SharedAccessSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override void Initialize() { diff --git a/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs b/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs index d55e084c72e..434bbbaa8bc 100644 --- a/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs +++ b/Content.Shared/Access/Systems/SharedIdCardConsoleSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Access.Systems { [UsedImplicitly] - public abstract class SharedIdCardConsoleSystem : EntitySystem + public abstract partial class SharedIdCardConsoleSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private ILogManager _log = default!; public const string Sawmill = "idconsole"; protected ISawmill _sawmill = default!; diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs index 10d6ea92713..fadc9d37885 100644 --- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs +++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs @@ -15,17 +15,17 @@ namespace Content.Shared.Access.Systems; -public abstract class SharedIdCardSystem : EntitySystem +public abstract partial class SharedIdCardSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAccessSystem _access = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedJobStatusSystem _jobStatus = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAccessSystem _access = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedJobStatusSystem _jobStatus = default!; // CCVar. private int _maxNameLength; diff --git a/Content.Shared/Access/Systems/SharedJobStatusSystem.cs b/Content.Shared/Access/Systems/SharedJobStatusSystem.cs index 0e74716aa49..dba4050f7a2 100644 --- a/Content.Shared/Access/Systems/SharedJobStatusSystem.cs +++ b/Content.Shared/Access/Systems/SharedJobStatusSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Access.Systems; -public abstract class SharedJobStatusSystem : EntitySystem +public abstract partial class SharedJobStatusSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private IPrototypeManager _prototype = default!; private static readonly ProtoId JobIconForNoId = "JobIconNoId"; diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index 485dc895804..5ae7a01c943 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -19,9 +19,9 @@ namespace Content.Shared.ActionBlocker /// Utility methods to check if a specific entity is allowed to perform an action. /// [UsedImplicitly] - public sealed class ActionBlockerSystem : EntitySystem + public sealed partial class ActionBlockerSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; private EntityQuery _complexInteractionQuery; diff --git a/Content.Shared/Actions/ActionContainerSystem.cs b/Content.Shared/Actions/ActionContainerSystem.cs index 99e50e95f39..94d0c967964 100644 --- a/Content.Shared/Actions/ActionContainerSystem.cs +++ b/Content.Shared/Actions/ActionContainerSystem.cs @@ -14,14 +14,14 @@ namespace Content.Shared.Actions; /// /// Handles storing & spawning action entities in a container. /// -public sealed class ActionContainerSystem : EntitySystem +public sealed partial class ActionContainerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMindSystem _mind = default!; private EntityQuery _query; diff --git a/Content.Shared/Actions/ActionGrantSystem.cs b/Content.Shared/Actions/ActionGrantSystem.cs index 3711d266ad1..06061b5a23c 100644 --- a/Content.Shared/Actions/ActionGrantSystem.cs +++ b/Content.Shared/Actions/ActionGrantSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Actions; /// /// /// -public sealed class ActionGrantSystem : EntitySystem +public sealed partial class ActionGrantSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private SharedActionsSystem _actions = default!; public override void Initialize() { diff --git a/Content.Shared/Actions/ActionUpgradeSystem.cs b/Content.Shared/Actions/ActionUpgradeSystem.cs index ab92ca82362..e7b4b34b82e 100644 --- a/Content.Shared/Actions/ActionUpgradeSystem.cs +++ b/Content.Shared/Actions/ActionUpgradeSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Actions; -public sealed class ActionUpgradeSystem : EntitySystem +public sealed partial class ActionUpgradeSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; public override void Initialize() { diff --git a/Content.Shared/Actions/ConfirmableActionSystem.cs b/Content.Shared/Actions/ConfirmableActionSystem.cs index bed44984fde..82989ff450b 100644 --- a/Content.Shared/Actions/ConfirmableActionSystem.cs +++ b/Content.Shared/Actions/ConfirmableActionSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Actions; /// /// Handles action priming, confirmation and automatic unpriming. /// -public sealed class ConfirmableActionSystem : EntitySystem +public sealed partial class ConfirmableActionSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index bcdc2c58833..caf320e75a1 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -22,16 +22,16 @@ namespace Content.Shared.Actions; public abstract partial class SharedActionsSystem : EntitySystem { - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly RotateToFaceSystem _rotateToFace = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private RotateToFaceSystem _rotateToFace = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; private EntityQuery _actionQuery; private EntityQuery _actionsQuery; diff --git a/Content.Shared/Administration/AdminFrozenSystem.cs b/Content.Shared/Administration/AdminFrozenSystem.cs index ee0afb543a8..dbd9bd27a20 100644 --- a/Content.Shared/Administration/AdminFrozenSystem.cs +++ b/Content.Shared/Administration/AdminFrozenSystem.cs @@ -13,10 +13,10 @@ namespace Content.Shared.Administration; // TODO deduplicate with BlockMovementComponent -public sealed class AdminFrozenSystem : EntitySystem +public sealed partial class AdminFrozenSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly PullingSystem _pulling = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private PullingSystem _pulling = default!; public override void Initialize() { diff --git a/Content.Shared/Administration/Logs/SharedAdminLogManager.cs b/Content.Shared/Administration/Logs/SharedAdminLogManager.cs index 6620b370d39..cf8f3acf22a 100644 --- a/Content.Shared/Administration/Logs/SharedAdminLogManager.cs +++ b/Content.Shared/Administration/Logs/SharedAdminLogManager.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Administration.Logs; [Virtual] -public class SharedAdminLogManager : ISharedAdminLogManager +public partial class SharedAdminLogManager : ISharedAdminLogManager { - [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private IEntityManager _entityManager = default!; public IEntityManager EntityManager => _entityManager; public bool Enabled { get; protected set; } diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs index 212f6c0c481..0d5e9c2ba17 100644 --- a/Content.Shared/Alert/AlertsSystem.cs +++ b/Content.Shared/Alert/AlertsSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Alert; -public abstract class AlertsSystem : EntitySystem +public abstract partial class AlertsSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; private EntityQuery _alertsQuery; private FrozenDictionary, AlertPrototype> _typeToAlert = default!; diff --git a/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs index fb8e3309ea2..22048bb5c0f 100644 --- a/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs +++ b/Content.Shared/Animals/Systems/SharedParrotMemorySystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Animals.Systems; -public abstract class SharedParrotMemorySystem : EntitySystem +public abstract partial class SharedParrotMemorySystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ISharedAdminManager _admin = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminManager _admin = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/Animals/UdderSystem.cs b/Content.Shared/Animals/UdderSystem.cs index ad813f259a2..e6d01eb600f 100644 --- a/Content.Shared/Animals/UdderSystem.cs +++ b/Content.Shared/Animals/UdderSystem.cs @@ -16,14 +16,14 @@ namespace Content.Shared.Animals; /// Gives the ability to produce milkable reagents; /// produces endlessly if the owner does not have a HungerComponent. /// -public sealed class UdderSystem : EntitySystem +public sealed partial class UdderSystem : EntitySystem { - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Animals/WoolySystem.cs b/Content.Shared/Animals/WoolySystem.cs index 09b029a7d08..12e44de356d 100644 --- a/Content.Shared/Animals/WoolySystem.cs +++ b/Content.Shared/Animals/WoolySystem.cs @@ -11,12 +11,12 @@ namespace Content.Shared.Animals; /// Gives ability to produce fiber reagents; /// produces endlessly if the owner has no HungerComponent. /// -public sealed class WoolySystem : EntitySystem +public sealed partial class WoolySystem : EntitySystem { - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; public override void Initialize() { diff --git a/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs index 7a3d413926e..77382f507b1 100644 --- a/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs +++ b/Content.Shared/Anomaly/AnomalySynchronizerSystem.cs @@ -17,14 +17,14 @@ namespace Content.Shared.Anomaly; /// public sealed partial class AnomalySynchronizerSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAnomalySystem _anomaly = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAnomalySystem _anomaly = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDeviceLinkSystem _deviceLink = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs index 499c60852eb..b18e000018f 100644 --- a/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs +++ b/Content.Shared/Anomaly/Effects/SharedGravityAnomalySystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Anomaly.Effects; -public abstract class SharedGravityAnomalySystem : EntitySystem +public abstract partial class SharedGravityAnomalySystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; /// public override void Initialize() diff --git a/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs b/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs index 70735dbb405..57ae3357251 100644 --- a/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.Anomaly; /// /// This component reduces the value of the entity during decay /// -public sealed class SharedAnomalyCoreSystem : EntitySystem +public sealed partial class SharedAnomalyCoreSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; public override void Initialize() { diff --git a/Content.Shared/Anomaly/SharedAnomalyScannerSystem.cs b/Content.Shared/Anomaly/SharedAnomalyScannerSystem.cs index 42d57c65f0d..c9bd3a32a75 100644 --- a/Content.Shared/Anomaly/SharedAnomalyScannerSystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalyScannerSystem.cs @@ -8,14 +8,14 @@ namespace Content.Shared.Anomaly; /// System for controlling anomaly scanner device. -public abstract class SharedAnomalyScannerSystem : EntitySystem +public abstract partial class SharedAnomalyScannerSystem : EntitySystem { - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; public override void Initialize() { diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs index 94ec57af609..818d239c411 100644 --- a/Content.Shared/Anomaly/SharedAnomalySystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs @@ -24,19 +24,19 @@ namespace Content.Shared.Anomaly; -public abstract class SharedAnomalySystem : EntitySystem +public abstract partial class SharedAnomalySystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] protected readonly IRobustRandom Random = default!; - [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] protected IRobustRandom Random = default!; + [Dependency] protected ISharedAdminLogManager AdminLog = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; public override void Initialize() { diff --git a/Content.Shared/Armable/ArmableSystem.cs b/Content.Shared/Armable/ArmableSystem.cs index 27989703034..bdbbbab890f 100644 --- a/Content.Shared/Armable/ArmableSystem.cs +++ b/Content.Shared/Armable/ArmableSystem.cs @@ -9,9 +9,9 @@ namespace Content.Shared.Armable; /// state. If ItemComponent.Activated is true then the item is considered to be armed and should be able to be /// triggered. /// -public sealed class ArmableSystem : EntitySystem +public sealed partial class ArmableSystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _itemToggle = default!; + [Dependency] private ItemToggleSystem _itemToggle = default!; public override void Initialize() { diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs index bbf97384da7..aac4d93a99d 100644 --- a/Content.Shared/Armor/SharedArmorSystem.cs +++ b/Content.Shared/Armor/SharedArmorSystem.cs @@ -12,9 +12,9 @@ namespace Content.Shared.Armor; /// /// This handles logic relating to /// -public abstract class SharedArmorSystem : EntitySystem +public abstract partial class SharedArmorSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private ExamineSystemShared _examine = default!; /// public override void Initialize() diff --git a/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs b/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs index e2b2e05b0af..b629feabd34 100644 --- a/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/ExtinguishableSetCollisionWakeSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Atmos.EntitySystems; /// /// Implements . /// -public sealed class ExtinguishableSetCollisionWakeSystem : EntitySystem +public sealed partial class ExtinguishableSetCollisionWakeSystem : EntitySystem { [Dependency] - private readonly CollisionWakeSystem _collisionWake = null!; + private CollisionWakeSystem _collisionWake = null!; public override void Initialize() { diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosPipeLayersSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosPipeLayersSystem.cs index 708f8ecb3fa..d1ac4a550f5 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedAtmosPipeLayersSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosPipeLayersSystem.cs @@ -20,11 +20,11 @@ namespace Content.Shared.Atmos.EntitySystems; /// public abstract partial class SharedAtmosPipeLayersSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs index 04f02219947..15828a35675 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedAtmosphereSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Atmos.EntitySystems; public abstract partial class SharedAtmosphereSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] protected readonly IPrototypeManager ProtoMan = default!; - [Dependency] private readonly SharedInternalsSystem _internals = default!; - [Dependency] protected readonly SharedTransformSystem XformSystem = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] protected IPrototypeManager ProtoMan = default!; + [Dependency] private SharedInternalsSystem _internals = default!; + [Dependency] protected SharedTransformSystem XformSystem = default!; private EntityQuery _internalsQuery; diff --git a/Content.Shared/Atmos/EntitySystems/SharedFirestarterSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedFirestarterSystem.cs index 584e502db16..b2dbd0ab881 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedFirestarterSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedFirestarterSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Atmos.EntitySystems; -public abstract class SharedFirestarterSystem : EntitySystem +public abstract partial class SharedFirestarterSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs index 957ff6fde4b..755dd191177 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Atmos.EntitySystems; -public abstract class SharedGasMinerSystem : EntitySystem +public abstract partial class SharedGasMinerSystem : EntitySystem { - [Dependency] private readonly SharedAtmosphereSystem _sharedAtmosphereSystem = default!; + [Dependency] private SharedAtmosphereSystem _sharedAtmosphereSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs index 5f1fc4c127d..ca41aa8fac3 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedGasPressurePumpSystem.cs @@ -10,12 +10,12 @@ namespace Content.Shared.Atmos.EntitySystems; -public abstract class SharedGasPressurePumpSystem : EntitySystem +public abstract partial class SharedGasPressurePumpSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; + [Dependency] protected SharedUserInterfaceSystem UserInterfaceSystem = default!; // TODO: Check enabled for activatableUI // TODO: Add activatableUI to it. diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs index 3ff969bf68d..9022e6a5227 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedGasPressureRegulatorSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Atmos.EntitySystems; /// /// Handles all shared interactions with the gas pressure regulator. /// -public abstract class SharedGasPressureRegulatorSystem : EntitySystem +public abstract partial class SharedGasPressureRegulatorSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] protected SharedUserInterfaceSystem UserInterfaceSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs index a15adff0f0a..b1e89d24782 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedGasTankSystem.cs @@ -12,14 +12,14 @@ namespace Content.Shared.Atmos.EntitySystems; -public abstract class SharedGasTankSystem : EntitySystem +public abstract partial class SharedGasTankSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedInternalsSystem _internals = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedInternalsSystem _internals = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; + [Dependency] private UseDelaySystem _delay = default!; public const string GasTankDelay = "gasTank"; diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs index 7a228f1341f..ad4daef9244 100644 --- a/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs +++ b/Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs @@ -6,15 +6,15 @@ namespace Content.Shared.Atmos.EntitySystems; -public abstract class SharedGasTileOverlaySystem : EntitySystem +public abstract partial class SharedGasTileOverlaySystem : EntitySystem { public const byte ChunkSize = 8; protected float AccumulatedFrameTime; protected bool PvsEnabled; - [Dependency] protected readonly IPrototypeManager ProtoMan = default!; - [Dependency] protected readonly IConfigurationManager ConfMan = default!; - [Dependency] private readonly SharedAtmosphereSystem _atmosphere = default!; + [Dependency] protected IPrototypeManager ProtoMan = default!; + [Dependency] protected IConfigurationManager ConfMan = default!; + [Dependency] private SharedAtmosphereSystem _atmosphere = default!; /// /// array of the ids of all visible gases. diff --git a/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasValveSystem.cs b/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasValveSystem.cs index 1736c466e24..d40d512db29 100644 --- a/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasValveSystem.cs +++ b/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasValveSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Atmos.Piping.Binary.Systems; -public abstract class SharedGasValveSystem : EntitySystem +public abstract partial class SharedGasValveSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasVolumePumpSystem.cs b/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasVolumePumpSystem.cs index d6fee5c9d26..d2a680bcc8c 100644 --- a/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasVolumePumpSystem.cs +++ b/Content.Shared/Atmos/Piping/Binary/Systems/SharedGasVolumePumpSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.Atmos.Piping.Binary.Systems; -public abstract class SharedGasVolumePumpSystem : EntitySystem +public abstract partial class SharedGasVolumePumpSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasCanisterSystem.cs b/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasCanisterSystem.cs index 38cbb3aea3d..ff5f0192e71 100644 --- a/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasCanisterSystem.cs +++ b/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasCanisterSystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Atmos.Piping.Unary.Systems; -public abstract class SharedGasCanisterSystem : EntitySystem +public abstract partial class SharedGasCanisterSystem : EntitySystem { - [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; + [Dependency] protected ISharedAdminLogManager AdminLogger = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasThermoMachineSystem.cs b/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasThermoMachineSystem.cs index 10dea7a1abc..f4ca407d52a 100644 --- a/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasThermoMachineSystem.cs +++ b/Content.Shared/Atmos/Piping/Unary/Systems/SharedGasThermoMachineSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Atmos.Piping.Unary.Systems; -public abstract class SharedGasThermoMachineSystem : EntitySystem +public abstract partial class SharedGasThermoMachineSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; public override void Initialize() { diff --git a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs index 015079453e8..9ca58b543ea 100644 --- a/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs +++ b/Content.Shared/Atmos/Rotting/SharedRottingSystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.Atmos.Rotting; -public abstract class SharedRottingSystem : EntitySystem +public abstract partial class SharedRottingSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private MobStateSystem _mobState = default!; public const int MaxStages = 3; diff --git a/Content.Shared/Audio/Jukebox/SharedJukeboxSystem.cs b/Content.Shared/Audio/Jukebox/SharedJukeboxSystem.cs index aa37e604087..2ca9b900501 100644 --- a/Content.Shared/Audio/Jukebox/SharedJukeboxSystem.cs +++ b/Content.Shared/Audio/Jukebox/SharedJukeboxSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Audio.Jukebox; -public abstract class SharedJukeboxSystem : EntitySystem +public abstract partial class SharedJukeboxSystem : EntitySystem { - [Dependency] protected readonly SharedAudioSystem Audio = default!; + [Dependency] protected SharedAudioSystem Audio = default!; /// /// Returns whether or not the given jukebox is currently playing a song. diff --git a/Content.Shared/Audio/SharedContentAudioSystem.cs b/Content.Shared/Audio/SharedContentAudioSystem.cs index 53e0ab65d4d..9a49f5a8ffb 100644 --- a/Content.Shared/Audio/SharedContentAudioSystem.cs +++ b/Content.Shared/Audio/SharedContentAudioSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Audio; -public abstract class SharedContentAudioSystem : EntitySystem +public abstract partial class SharedContentAudioSystem : EntitySystem { - [Dependency] protected readonly SharedAudioSystem Audio = default!; + [Dependency] protected SharedAudioSystem Audio = default!; /// /// Standard variation to use for sounds. diff --git a/Content.Shared/BarSign/BarSignSystem.cs b/Content.Shared/BarSign/BarSignSystem.cs index 099d4966809..4ee4d7a124f 100644 --- a/Content.Shared/BarSign/BarSignSystem.cs +++ b/Content.Shared/BarSign/BarSignSystem.cs @@ -5,13 +5,13 @@ namespace Content.Shared.BarSign; -public sealed class BarSignSystem : EntitySystem +public sealed partial class BarSignSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() diff --git a/Content.Shared/Bed/BedSystem.cs b/Content.Shared/Bed/BedSystem.cs index 6f62d7b34eb..12983a205dd 100644 --- a/Content.Shared/Bed/BedSystem.cs +++ b/Content.Shared/Bed/BedSystem.cs @@ -14,17 +14,17 @@ namespace Content.Shared.Bed; -public sealed class BedSystem : EntitySystem +public sealed partial class BedSystem : EntitySystem { - [Dependency] private readonly ActionContainerSystem _actConts = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MetabolizerSystem _metabolizer = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; - [Dependency] private readonly SleepingSystem _sleepingSystem = default!; + [Dependency] private ActionContainerSystem _actConts = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MetabolizerSystem _metabolizer = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!; + [Dependency] private SleepingSystem _sleepingSystem = default!; private EntityQuery _sleepingQuery; diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs index ff887d5bcc5..afb0a87bde0 100644 --- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs +++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs @@ -16,18 +16,18 @@ namespace Content.Shared.Bed.Cryostorage; /// /// This handles /// -public abstract class SharedCryostorageSystem : EntitySystem +public abstract partial class SharedCryostorageSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!; - [Dependency] protected readonly SharedMindSystem Mind = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] protected readonly NameModifierSystem _nameModifier = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected ISharedAdminLogManager AdminLog = default!; + [Dependency] protected SharedMindSystem Mind = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] protected NameModifierSystem _nameModifier = default!; protected EntityUid? PausedMap { get; private set; } @@ -54,7 +54,7 @@ public override void Initialize() private void OnRefreshName(Entity ent, ref RefreshNameModifiersEvent args) { - if(ent.Comp.PersonalMode && ent.Comp.PersonalName != null) + if (ent.Comp.PersonalMode && ent.Comp.PersonalName != null) { args.AddModifier($"Personal Cryopod ({ent.Comp.PersonalName})", 1); } @@ -101,7 +101,7 @@ private void OnRemovedContainer(Entity ent, ref EntRemoved ent.Comp.PersonalName = null; } - if(!ent.Comp.PersonalOccupied) + if (!ent.Comp.PersonalOccupied) _appearance.SetData(ent, CryostorageVisuals.Full, args.Container.ContainedEntities.Count > 0); } @@ -116,9 +116,9 @@ private void OnInsertAttempt(Entity ent, ref ContainerIsIn if (args.Container.ID != comp.ContainerId) return; - if(ent.Comp.PersonalMode == true) + if (ent.Comp.PersonalMode == true) { - if(ent.Comp.PersonalName != null && ent.Comp.PersonalName != Name(args.EntityUid)) + if (ent.Comp.PersonalName != null && ent.Comp.PersonalName != Name(args.EntityUid)) { args.Cancel(); return; diff --git a/Content.Shared/Bed/Sleep/SleepingSystem.cs b/Content.Shared/Bed/Sleep/SleepingSystem.cs index 13d60777844..ea0770ef03d 100644 --- a/Content.Shared/Bed/Sleep/SleepingSystem.cs +++ b/Content.Shared/Bed/Sleep/SleepingSystem.cs @@ -32,14 +32,14 @@ namespace Content.Shared.Bed.Sleep; public sealed partial class SleepingSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly BlindableSystem _blindableSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffect = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private BlindableSystem _blindableSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedEmitSoundSystem _emitSound = default!; + [Dependency] private StatusEffectsSystem _statusEffect = default!; + [Dependency] private SharedStunSystem _stun = default!; public static readonly EntProtoId SleepActionId = "ActionSleep"; public static readonly EntProtoId WakeActionId = "ActionWake"; diff --git a/Content.Shared/Beeper/Systems/BeeperSystem.cs b/Content.Shared/Beeper/Systems/BeeperSystem.cs index 779c31ad41e..ec8e1510812 100644 --- a/Content.Shared/Beeper/Systems/BeeperSystem.cs +++ b/Content.Shared/Beeper/Systems/BeeperSystem.cs @@ -10,12 +10,12 @@ namespace Content.Shared.Beeper.Systems; //This handles generic proximity beeper logic -public sealed class BeeperSystem : EntitySystem +public sealed partial class BeeperSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Update(float frameTime) { diff --git a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs index b67fcdfa1be..dbae3949c0f 100644 --- a/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs +++ b/Content.Shared/Beeper/Systems/ProximityBeeperSystem.cs @@ -10,9 +10,9 @@ namespace Content.Shared.Beeper.Systems; /// /// This handles controlling a beeper from proximity detector events. /// -public sealed class ProximityBeeperSystem : EntitySystem +public sealed partial class ProximityBeeperSystem : EntitySystem { - [Dependency] private readonly BeeperSystem _beeper = default!; + [Dependency] private BeeperSystem _beeper = default!; /// public override void Initialize() diff --git a/Content.Shared/Blocking/BlockingSystem.User.cs b/Content.Shared/Blocking/BlockingSystem.User.cs index 983ca246bb5..339acc807f3 100644 --- a/Content.Shared/Blocking/BlockingSystem.User.cs +++ b/Content.Shared/Blocking/BlockingSystem.User.cs @@ -9,8 +9,8 @@ namespace Content.Shared.Blocking; public sealed partial class BlockingSystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedAudioSystem _audio = default!; private void InitializeUser() { diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs index 7394c43ec03..4152534ce71 100644 --- a/Content.Shared/Blocking/BlockingSystem.cs +++ b/Content.Shared/Blocking/BlockingSystem.cs @@ -22,16 +22,16 @@ namespace Content.Shared.Blocking; public sealed partial class BlockingSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly FixtureSystem _fixtureSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private FixtureSystem _fixtureSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private TurfSystem _turf = default!; public override void Initialize() { diff --git a/Content.Shared/Body/BodySystem.cs b/Content.Shared/Body/BodySystem.cs index 4cd5a4e7924..3e0d1d47cd5 100644 --- a/Content.Shared/Body/BodySystem.cs +++ b/Content.Shared/Body/BodySystem.cs @@ -16,7 +16,7 @@ namespace Content.Shared.Body; /// public sealed partial class BodySystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; private EntityQuery _bodyQuery; private EntityQuery _organQuery; diff --git a/Content.Shared/Body/HandOrganSystem.cs b/Content.Shared/Body/HandOrganSystem.cs index 0c3a0b0824b..52f386baefa 100644 --- a/Content.Shared/Body/HandOrganSystem.cs +++ b/Content.Shared/Body/HandOrganSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Body; -public sealed class HandOrganSystem : EntitySystem +public sealed partial class HandOrganSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Shared/Body/InitialBodySystem.cs b/Content.Shared/Body/InitialBodySystem.cs index cb505699ee5..226cc5fe103 100644 --- a/Content.Shared/Body/InitialBodySystem.cs +++ b/Content.Shared/Body/InitialBodySystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Body; -public sealed class InitialBodySystem : EntitySystem +public sealed partial class InitialBodySystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/Body/SharedVisualBodySystem.Modifiers.cs b/Content.Shared/Body/SharedVisualBodySystem.Modifiers.cs index 89145c4dcf2..9917ce09450 100644 --- a/Content.Shared/Body/SharedVisualBodySystem.Modifiers.cs +++ b/Content.Shared/Body/SharedVisualBodySystem.Modifiers.cs @@ -15,8 +15,8 @@ namespace Content.Shared.Body; public abstract partial class SharedVisualBodySystem { - [Dependency] private readonly ISharedAdminManager _admin = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private ISharedAdminManager _admin = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; private void InitializeModifiers() { diff --git a/Content.Shared/Body/SharedVisualBodySystem.cs b/Content.Shared/Body/SharedVisualBodySystem.cs index 578f949de3b..51f8c1118e5 100644 --- a/Content.Shared/Body/SharedVisualBodySystem.cs +++ b/Content.Shared/Body/SharedVisualBodySystem.cs @@ -12,9 +12,9 @@ namespace Content.Shared.Body; /// public abstract partial class SharedVisualBodySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly MarkingManager _marking = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private MarkingManager _marking = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/Body/Systems/BrainSystem.cs b/Content.Shared/Body/Systems/BrainSystem.cs index ff6acf738e4..689beca05ea 100644 --- a/Content.Shared/Body/Systems/BrainSystem.cs +++ b/Content.Shared/Body/Systems/BrainSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Body.Systems; -public sealed class BrainSystem : EntitySystem +public sealed partial class BrainSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; + [Dependency] private SharedActionsSystem _actions = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/Body/Systems/LungSystem.cs b/Content.Shared/Body/Systems/LungSystem.cs index ed4145d17b9..c2fb48f9fc5 100644 --- a/Content.Shared/Body/Systems/LungSystem.cs +++ b/Content.Shared/Body/Systems/LungSystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.Body.Systems; -public sealed class LungSystem : EntitySystem +public sealed partial class LungSystem : EntitySystem { - [Dependency] private readonly SharedAtmosphereSystem _atmos = default!; - [Dependency] private readonly SharedInternalsSystem _internals = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedAtmosphereSystem _atmos = default!; + [Dependency] private SharedInternalsSystem _internals = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs index 60d68d7b80f..218996abb0e 100644 --- a/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs +++ b/Content.Shared/Body/Systems/SharedBloodstreamSystem.cs @@ -25,20 +25,20 @@ namespace Content.Shared.Body.Systems; -public abstract class SharedBloodstreamSystem : EntitySystem +public abstract partial class SharedBloodstreamSystem : EntitySystem { public static readonly EntProtoId Bloodloss = "StatusEffectBloodloss"; - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected SharedSolutionContainerSystem SolutionContainer = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Body/Systems/SharedInternalsSystem.cs b/Content.Shared/Body/Systems/SharedInternalsSystem.cs index c0dc6c11727..a907a3720f9 100644 --- a/Content.Shared/Body/Systems/SharedInternalsSystem.cs +++ b/Content.Shared/Body/Systems/SharedInternalsSystem.cs @@ -18,13 +18,13 @@ namespace Content.Shared.Body.Systems; /// /// Handles lung breathing with gas tanks for entities. /// -public abstract class SharedInternalsSystem : EntitySystem +public abstract partial class SharedInternalsSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedGasTankSystem _gasTank = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedGasTankSystem _gasTank = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Body/Systems/StomachSystem.cs b/Content.Shared/Body/Systems/StomachSystem.cs index 6db15129081..7d23ac544c7 100644 --- a/Content.Shared/Body/Systems/StomachSystem.cs +++ b/Content.Shared/Body/Systems/StomachSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Body.Systems; -public sealed class StomachSystem : EntitySystem +public sealed partial class StomachSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public const string DefaultSolutionName = "stomach"; diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 23cb1b707b9..83d3ff58137 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -29,7 +29,7 @@ public abstract partial class SharedBuckleSystem { public static ProtoId BuckledAlertCategory = "Buckled"; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; private void InitializeBuckle() { diff --git a/Content.Shared/Buckle/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs index da1d111f977..ef75050d190 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.cs @@ -17,25 +17,25 @@ namespace Content.Shared.Buckle; public abstract partial class SharedBuckleSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; - [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; + [Dependency] protected ActionBlockerSystem ActionBlocker = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly StandingStateSystem _standing = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedRotationVisualsSystem _rotationVisuals = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedJointSystem _joints = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private StandingStateSystem _standing = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedRotationVisualsSystem _rotationVisuals = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; /// public override void Initialize() diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs index 5216e39dc88..73e7c5b997d 100644 --- a/Content.Shared/Burial/BurialSystem.cs +++ b/Content.Shared/Burial/BurialSystem.cs @@ -11,13 +11,13 @@ namespace Content.Shared.Burial; -public sealed class BurialSystem : EntitySystem +public sealed partial class BurialSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedEntityStorageSystem _storageSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedEntityStorageSystem _storageSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; public override void Initialize() { diff --git a/Content.Shared/Cabinet/ItemCabinetSystem.cs b/Content.Shared/Cabinet/ItemCabinetSystem.cs index f346d0138e2..0cbb03f2248 100644 --- a/Content.Shared/Cabinet/ItemCabinetSystem.cs +++ b/Content.Shared/Cabinet/ItemCabinetSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.Cabinet; /// /// Controls ItemCabinet slot locking and visuals. /// -public sealed class ItemCabinetSystem : EntitySystem +public sealed partial class ItemCabinetSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; /// public override void Initialize() diff --git a/Content.Shared/Camera/SharedCameraRecoilSystem.cs b/Content.Shared/Camera/SharedCameraRecoilSystem.cs index 2b4b50c20a2..016427b67c6 100644 --- a/Content.Shared/Camera/SharedCameraRecoilSystem.cs +++ b/Content.Shared/Camera/SharedCameraRecoilSystem.cs @@ -7,7 +7,7 @@ namespace Content.Shared.Camera; [UsedImplicitly] -public abstract class SharedCameraRecoilSystem : EntitySystem +public abstract partial class SharedCameraRecoilSystem : EntitySystem { /// /// Maximum rate of magnitude restore towards 0 kick. @@ -29,8 +29,8 @@ public abstract class SharedCameraRecoilSystem : EntitySystem /// protected const float KickMagnitudeMax = 1f; - [Dependency] private readonly SharedContentEyeSystem _eye = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedContentEyeSystem _eye = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/Cargo/SharedCargoSystem.cs b/Content.Shared/Cargo/SharedCargoSystem.cs index d65becc6831..de95461b579 100644 --- a/Content.Shared/Cargo/SharedCargoSystem.cs +++ b/Content.Shared/Cargo/SharedCargoSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Cargo; -public abstract class SharedCargoSystem : EntitySystem +public abstract partial class SharedCargoSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IGameTiming Timing = default!; public override void Initialize() { diff --git a/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs b/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs index 179bdf1682e..dc3e0e4ae28 100644 --- a/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs +++ b/Content.Shared/CartridgeLoader/SharedCartridgeLoaderSystem.cs @@ -3,13 +3,13 @@ namespace Content.Shared.CartridgeLoader; -public abstract class SharedCartridgeLoaderSystem : EntitySystem +public abstract partial class SharedCartridgeLoaderSystem : EntitySystem { public const string InstalledContainerId = "program-container"; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/ChangeNameInContainer/ChangeNameInContainerSystem.cs b/Content.Shared/ChangeNameInContainer/ChangeNameInContainerSystem.cs index e1f6113757e..7c401c27c98 100644 --- a/Content.Shared/ChangeNameInContainer/ChangeNameInContainerSystem.cs +++ b/Content.Shared/ChangeNameInContainer/ChangeNameInContainerSystem.cs @@ -7,8 +7,8 @@ namespace Content.Shared.ChangeNameInContainer; public sealed partial class ChangeNameInContainerSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; public override void Initialize() { diff --git a/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs b/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs index 385ed5c9e98..3b7e02a376b 100644 --- a/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs +++ b/Content.Shared/Changeling/Systems/ChangelingClonerSystem.cs @@ -17,19 +17,19 @@ namespace Content.Shared.Changeling.Systems; -public sealed class ChangelingClonerSystem : EntitySystem +public sealed partial class ChangelingClonerSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedCloningSystem _cloning = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedChangelingIdentitySystem _changelingIdentity = default!; - [Dependency] private readonly SharedForensicsSystem _forensics = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedCloningSystem _cloning = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedChangelingIdentitySystem _changelingIdentity = default!; + [Dependency] private SharedForensicsSystem _forensics = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; public override void Initialize() { diff --git a/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs b/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs index b56f1a55244..07ecca0c248 100644 --- a/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs +++ b/Content.Shared/Changeling/Systems/ChangelingDevourSystem.cs @@ -22,21 +22,21 @@ namespace Content.Shared.Changeling.Systems; -public sealed class ChangelingDevourSystem : EntitySystem +public sealed partial class ChangelingDevourSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedChangelingIdentitySystem _changelingIdentitySystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedChangelingIdentitySystem _changelingIdentitySystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IRobustRandom _robustRandom = default!; public override void Initialize() { diff --git a/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs b/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs index 5365033f861..7893af64ea9 100644 --- a/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs +++ b/Content.Shared/Changeling/Systems/ChangelingTransformSystem.cs @@ -15,17 +15,17 @@ namespace Content.Shared.Changeling.Systems; public sealed partial class ChangelingTransformSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedCloningSystem _cloningSystem = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedCloningSystem _cloningSystem = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private IPrototypeManager _prototype = default!; private const string ChangelingBuiXmlGeneratedName = "ChangelingTransformBoundUserInterface"; public override void Initialize() diff --git a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs index 515a5f52fdc..eb89f7b82c4 100644 --- a/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs +++ b/Content.Shared/Changeling/Systems/SharedChangelingIdentitySystem.cs @@ -12,16 +12,16 @@ namespace Content.Shared.Changeling.Systems; -public abstract class SharedChangelingIdentitySystem : EntitySystem +public abstract partial class SharedChangelingIdentitySystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly SharedCloningSystem _cloningSystem = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly SharedPvsOverrideSystem _pvsOverrideSystem = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private NameModifierSystem _nameMod = default!; + [Dependency] private SharedCloningSystem _cloningSystem = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedPvsOverrideSystem _pvsOverrideSystem = default!; public MapId? PausedMapId; diff --git a/Content.Shared/Charges/Systems/SharedChargesSystem.cs b/Content.Shared/Charges/Systems/SharedChargesSystem.cs index d7aaddf3a63..e340b3008a5 100644 --- a/Content.Shared/Charges/Systems/SharedChargesSystem.cs +++ b/Content.Shared/Charges/Systems/SharedChargesSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Charges.Systems; -public abstract class SharedChargesSystem : EntitySystem +public abstract partial class SharedChargesSystem : EntitySystem { - [Dependency] protected readonly IGameTiming _timing = default!; + [Dependency] protected IGameTiming _timing = default!; /* * Despite what a bunch of systems do you don't need to continuously tick linear number updates and can just derive it easily. diff --git a/Content.Shared/Chasm/ChasmSystem.cs b/Content.Shared/Chasm/ChasmSystem.cs index f57f7a81e43..93770c25d50 100644 --- a/Content.Shared/Chasm/ChasmSystem.cs +++ b/Content.Shared/Chasm/ChasmSystem.cs @@ -11,13 +11,13 @@ namespace Content.Shared.Chasm; /// /// Handles making entities fall into chasms when stepped on. /// -public sealed class ChasmSystem : EntitySystem +public sealed partial class ChasmSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedGrapplingGunSystem _grapple = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedGrapplingGunSystem _grapple = default!; public override void Initialize() { diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 18e4814a8b1..93dd6bf9206 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -44,13 +44,13 @@ public static readonly SoundSpecifier DefaultAnnouncementSound public static readonly string DefaultChannelPrefix = $"{RadioChannelPrefix}{DefaultChannelKey}"; public static readonly ProtoId DefaultSpeechVerb = "Default"; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private INetManager _net = default!; /// /// Cache of the keycodes for faster lookup. diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs index cfde369485c..12a92522b66 100644 --- a/Content.Shared/Chat/SharedSuicideSystem.cs +++ b/Content.Shared/Chat/SharedSuicideSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Chat; -public sealed class SharedSuicideSystem : EntitySystem +public sealed partial class SharedSuicideSystem : EntitySystem { private static readonly ProtoId FallbackDamageType = "Blunt"; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; /// /// Applies lethal damage spread out across the damage types given. diff --git a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs index 20f2741f0bc..94677f2e544 100644 --- a/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs +++ b/Content.Shared/Chat/TypingIndicator/SharedTypingIndicatorSystem.cs @@ -10,11 +10,11 @@ namespace Content.Shared.Chat.TypingIndicator; /// /// Supports typing indicators on entities. /// -public abstract class SharedTypingIndicatorSystem : EntitySystem +public abstract partial class SharedTypingIndicatorSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; /// /// Default ID of diff --git a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs index 38001c38c77..362c3f47d0a 100644 --- a/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/InjectorSystem.cs @@ -31,17 +31,17 @@ namespace Content.Shared.Chemistry.EntitySystems; /// public sealed partial class InjectorSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedForensicsSystem _forensics = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ReactiveSystem _reactiveSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly StandingStateSystem _standingState = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedForensicsSystem _forensics = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ReactiveSystem _reactiveSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private StandingStateSystem _standingState = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs index 2bfa1c9de38..77c240c97e4 100644 --- a/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/ReactiveContainerSystem.cs @@ -5,12 +5,12 @@ namespace Content.Shared.Chemistry.EntitySystems; -public sealed class ReactiveContainerSystem : EntitySystem +public sealed partial class ReactiveContainerSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly ReactiveSystem _reactiveSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private ReactiveSystem _reactiveSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs index 697605af1d6..56c9c222bc6 100644 --- a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs @@ -9,15 +9,15 @@ namespace Content.Shared.Chemistry.EntitySystems; -public sealed class RehydratableSystem : EntitySystem +public sealed partial class RehydratableSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutions = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs index a40c28b5866..975f18c5a63 100644 --- a/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/ScoopableSolutionSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Chemistry.EntitySystems; /// /// Handles solution transfer when a beaker is used on a scoopable entity. /// -public sealed class ScoopableSolutionSystem : EntitySystem +public sealed partial class ScoopableSolutionSystem : EntitySystem { - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly SolutionTransferSystem _solutionTransfer = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private SolutionTransferSystem _solutionTransfer = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs index 15155658c1c..99d8b6bb651 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerMixerSystem.cs @@ -14,17 +14,17 @@ namespace Content.Shared.Chemistry.EntitySystems; /// /// This handles /// -public abstract class SharedSolutionContainerMixerSystem : EntitySystem +public abstract partial class SharedSolutionContainerMixerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly SharedPowerStateSystem _powerState = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private SharedPowerStateSystem _powerState = default!; /// public override void Initialize() diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs index efd295b39d4..ad82696e4ef 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs @@ -69,16 +69,16 @@ public partial record struct SolutionAccessAttemptEvent(string SolutionName) [UsedImplicitly] public abstract partial class SharedSolutionContainerSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly ChemicalReactionSystem ChemicalReactionSystem = default!; - [Dependency] protected readonly ExamineSystemShared ExamineSystem = default!; - [Dependency] protected readonly OpenableSystem Openable = default!; - [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!; - [Dependency] protected readonly SharedHandsSystem Hands = default!; - [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] protected readonly MetaDataSystem MetaDataSys = default!; - [Dependency] protected readonly INetManager NetManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected ChemicalReactionSystem ChemicalReactionSystem = default!; + [Dependency] protected ExamineSystemShared ExamineSystem = default!; + [Dependency] protected OpenableSystem Openable = default!; + [Dependency] protected SharedAppearanceSystem AppearanceSystem = default!; + [Dependency] protected SharedHandsSystem Hands = default!; + [Dependency] protected SharedContainerSystem ContainerSystem = default!; + [Dependency] protected MetaDataSystem MetaDataSys = default!; + [Dependency] protected INetManager NetManager = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs index 725a2bff861..94c9973e206 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionPurgeSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Chemistry.EntitySystems; -public sealed class SolutionPurgeSystem : EntitySystem +public sealed partial class SolutionPurgeSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs index 369b837202c..618b1e382aa 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionRegenerationSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Chemistry.EntitySystems; -public sealed class SolutionRegenerationSystem : EntitySystem +public sealed partial class SolutionRegenerationSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionSpikerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionSpikerSystem.cs index 7d2642c7f1b..642d08f3178 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionSpikerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionSpikerSystem.cs @@ -14,10 +14,10 @@ namespace Content.Shared.Chemistry.EntitySystems; /// Examples of spikable entity interactions include pills being dropped into glasses, /// eggs being cracked into bowls, and so on. /// -public sealed class SolutionSpikerSystem : EntitySystem +public sealed partial class SolutionSpikerSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs index a46f9332876..b886473bd1b 100644 --- a/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SolutionTransferSystem.cs @@ -15,13 +15,13 @@ namespace Content.Shared.Chemistry.EntitySystems; /// Allows an entity to transfer solutions with a customizable amount -per click-. /// Also provides , and API for other systems. /// -public sealed class SolutionTransferSystem : EntitySystem +public sealed partial class SolutionTransferSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; private EntityQuery _refillableQuery; private EntityQuery _drainableQuery; diff --git a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs index 1b17c2bad15..4322ad62724 100644 --- a/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs +++ b/Content.Shared/Chemistry/Reaction/ChemicalReactionSystem.cs @@ -14,7 +14,7 @@ namespace Content.Shared.Chemistry.Reaction { - public sealed class ChemicalReactionSystem : EntitySystem + public sealed partial class ChemicalReactionSystem : EntitySystem { /// /// Foam reaction protoId. @@ -26,12 +26,12 @@ public sealed class ChemicalReactionSystem : EntitySystem /// private const int MaxReactionIterations = 20; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private SharedEntityEffectsSystem _entityEffects = default!; /// /// A cache of all reactions indexed by at most ONE of their required reactants. diff --git a/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs b/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs index 04440fd147d..ea6c5686179 100644 --- a/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs +++ b/Content.Shared/Chemistry/Reaction/ReactionMixerSystem.cs @@ -12,10 +12,10 @@ namespace Content.Shared.Chemistry.Reaction; public sealed partial class ReactionMixerSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Chemistry/ReactiveSystem.cs b/Content.Shared/Chemistry/ReactiveSystem.cs index 60d3d70daa5..dab853068ae 100644 --- a/Content.Shared/Chemistry/ReactiveSystem.cs +++ b/Content.Shared/Chemistry/ReactiveSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Chemistry; [UsedImplicitly] -public sealed class ReactiveSystem : EntitySystem +public sealed partial class ReactiveSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; public void DoEntityReaction(EntityUid uid, Solution solution, ReactionMethod method) { diff --git a/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs b/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs index b72b86d4cd0..2fa07fd6ade 100644 --- a/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs +++ b/Content.Shared/Chemistry/SharedChemistryGuideDataSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Chemistry; /// /// This handles the chemistry guidebook and caching it. /// -public abstract class SharedChemistryGuideDataSystem : EntitySystem +public abstract partial class SharedChemistryGuideDataSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; protected readonly Dictionary Registry = new(); diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 95f79d49224..8eba65ad05a 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -29,18 +29,18 @@ namespace Content.Shared.Climbing.Systems; public sealed partial class ClimbSystem : VirtualController { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly FixtureSystem _fixtureSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private FixtureSystem _fixtureSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedStunSystem _stunSystem = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; private const string ClimbingFixtureName = "climb"; private const int ClimbingCollisionGroup = (int)(CollisionGroup.TableLayer | CollisionGroup.LowImpassable); diff --git a/Content.Shared/Clock/SharedClockSystem.cs b/Content.Shared/Clock/SharedClockSystem.cs index f1f9596c92a..7575e823623 100644 --- a/Content.Shared/Clock/SharedClockSystem.cs +++ b/Content.Shared/Clock/SharedClockSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Clock; -public abstract class SharedClockSystem : EntitySystem +public abstract partial class SharedClockSystem : EntitySystem { - [Dependency] private readonly SharedGameTicker _ticker = default!; + [Dependency] private SharedGameTicker _ticker = default!; /// public override void Initialize() diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index 55a09792b31..4ff9b33d33c 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -11,13 +11,13 @@ namespace Content.Shared.Clothing; -public sealed class ClothingSpeedModifierSystem : EntitySystem +public sealed partial class ClothingSpeedModifierSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly StandingStateSystem _standing = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeed = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private StandingStateSystem _standing = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs index 554db51a234..216e000b95f 100644 --- a/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/AntiGravityClothingSystem.cs @@ -10,10 +10,10 @@ namespace Content.Shared.Clothing.EntitySystems; /// This is for balance reasons as it prevents you from wearing anti-grav clothing to cheese being stun cuffed, as /// well as other worse things. /// -public sealed class AntiGravityClothingSystem : EntitySystem +public sealed partial class AntiGravityClothingSystem : EntitySystem { - [Dependency] private readonly StandingStateSystem _standing = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private StandingStateSystem _standing = default!; + [Dependency] private SharedGravitySystem _gravity = default!; /// public override void Initialize() diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index eca9e08b097..41a7c5f4b20 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.Clothing.EntitySystems; -public abstract class ClothingSystem : EntitySystem +public abstract partial class ClothingSystem : EntitySystem { - [Dependency] private readonly SharedItemSystem _itemSys = default!; - [Dependency] private readonly InventorySystem _invSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedItemSystem _itemSys = default!; + [Dependency] private InventorySystem _invSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs index 76b7b9aa66d..cb90a75d8a9 100644 --- a/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/FactionClothingSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Clothing.EntitySystems; /// /// Handles faction adding and removal. /// -public sealed class FactionClothingSystem : EntitySystem +public sealed partial class FactionClothingSystem : EntitySystem { - [Dependency] private readonly NpcFactionSystem _faction = default!; + [Dependency] private NpcFactionSystem _faction = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs index 3c40db22add..78e53892afc 100644 --- a/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/FoldableClothingSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.Clothing.EntitySystems; -public sealed class FoldableClothingSystem : EntitySystem +public sealed partial class FoldableClothingSystem : EntitySystem { - [Dependency] private readonly ClothingSystem _clothingSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedItemSystem _itemSystem = default!; + [Dependency] private ClothingSystem _clothingSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedItemSystem _itemSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs index ee0f3932d6c..7d0189c8d73 100644 --- a/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Clothing.EntitySystems; -public sealed class HideLayerClothingSystem : EntitySystem +public sealed partial class HideLayerClothingSystem : EntitySystem { - [Dependency] private readonly SharedHideableHumanoidLayersSystem _hideableHumanoidLayers = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedHideableHumanoidLayersSystem _hideableHumanoidLayers = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs index d851f8bfbcb..1eb9fb08c33 100644 --- a/Content.Shared/Clothing/EntitySystems/MaskSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/MaskSystem.cs @@ -8,13 +8,13 @@ namespace Content.Shared.Clothing.EntitySystems; -public sealed class MaskSystem : EntitySystem +public sealed partial class MaskSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ClothingSystem _clothing = default!; + [Dependency] private SharedActionsSystem _actionSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ClothingSystem _clothing = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs index 49df7aee943..dbc9ce538e7 100644 --- a/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/PilotedClothingSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.Clothing.EntitySystems; public sealed partial class PilotedClothingSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMoverController _moverController = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedMoverController _moverController = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs index 09bb4086634..56942a55324 100644 --- a/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs @@ -17,20 +17,20 @@ namespace Content.Shared.Clothing.EntitySystems; -public abstract class SharedChameleonClothingSystem : EntitySystem +public abstract partial class SharedChameleonClothingSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ClothingSystem _clothingSystem = default!; - [Dependency] private readonly ContrabandSystem _contraband = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedItemSystem _itemSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ClothingSystem _clothingSystem = default!; + [Dependency] private ContrabandSystem _contraband = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedItemSystem _itemSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; + [Dependency] private INetManager _net = default!; private static readonly SlotFlags[] IgnoredSlots = { diff --git a/Content.Shared/Clothing/EntitySystems/SkatesSystem.cs b/Content.Shared/Clothing/EntitySystems/SkatesSystem.cs index e36ba854ed7..bbfdd3919b7 100644 --- a/Content.Shared/Clothing/EntitySystems/SkatesSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/SkatesSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Clothing.EntitySystems; /// /// Changes the friction and acceleration of the wearer and also the damage on impact variables of thew wearer when hitting a static object. /// -public sealed class SkatesSystem : EntitySystem +public sealed partial class SkatesSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _move = default!; - [Dependency] private readonly DamageOnHighSpeedImpactSystem _impact = default!; + [Dependency] private MovementSpeedModifierSystem _move = default!; + [Dependency] private DamageOnHighSpeedImpactSystem _impact = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/ToggleClothingPrefixSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleClothingPrefixSystem.cs index 129db309383..2d1125e214a 100644 --- a/Content.Shared/Clothing/EntitySystems/ToggleClothingPrefixSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ToggleClothingPrefixSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Clothing.EntitySystems; /// /// On toggle handles the changes to ItemComponent.HeldPrefix. . /// -public sealed class ToggleClothingPrefixSystem : EntitySystem +public sealed partial class ToggleClothingPrefixSystem : EntitySystem { - [Dependency] private readonly ClothingSystem _clothing = default!; + [Dependency] private ClothingSystem _clothing = default!; /// public override void Initialize() diff --git a/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs index 4cb1fea4d58..c26267f52c5 100644 --- a/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ToggleClothingSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Clothing.EntitySystems; /// /// Handles adding and using a toggle action for . /// -public sealed class ToggleClothingSystem : EntitySystem +public sealed partial class ToggleClothingSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs index 0c8b8264e30..a4a397052ba 100644 --- a/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ToggleableClothingSystem.cs @@ -16,17 +16,17 @@ namespace Content.Shared.Clothing.EntitySystems; -public sealed class ToggleableClothingSystem : EntitySystem +public sealed partial class ToggleableClothingSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedStrippableSystem _strippable = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedStrippableSystem _strippable = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs index 506c25e15df..dc3df13aded 100644 --- a/Content.Shared/Clothing/LoadoutSystem.cs +++ b/Content.Shared/Clothing/LoadoutSystem.cs @@ -15,14 +15,14 @@ namespace Content.Shared.Clothing; /// /// Assigns a loadout to an entity based on the RoleLoadout prototype /// -public sealed class LoadoutSystem : EntitySystem +public sealed partial class LoadoutSystem : EntitySystem { // Shared so we can predict it for placement manager. - [Dependency] private readonly ActorSystem _actors = default!; - [Dependency] private readonly SharedStationSpawningSystem _station = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private ActorSystem _actors = default!; + [Dependency] private SharedStationSpawningSystem _station = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs index 8a9c8685d18..b89e0f721a0 100644 --- a/Content.Shared/Clothing/MagbootsSystem.cs +++ b/Content.Shared/Clothing/MagbootsSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Clothing; -public sealed class SharedMagbootsSystem : EntitySystem +public sealed partial class SharedMagbootsSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedGravitySystem _gravity = default!; public override void Initialize() { diff --git a/Content.Shared/Clothing/SharedCursedMaskSystem.cs b/Content.Shared/Clothing/SharedCursedMaskSystem.cs index 3cd700f4102..082591fb854 100644 --- a/Content.Shared/Clothing/SharedCursedMaskSystem.cs +++ b/Content.Shared/Clothing/SharedCursedMaskSystem.cs @@ -13,11 +13,11 @@ namespace Content.Shared.Clothing; /// /// This handles /// -public abstract class SharedCursedMaskSystem : EntitySystem +public abstract partial class SharedCursedMaskSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; /// public override void Initialize() diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs index 8c740f2f5c4..18acccfc4f3 100644 --- a/Content.Shared/Clumsy/ClumsySystem.cs +++ b/Content.Shared/Clumsy/ClumsySystem.cs @@ -18,15 +18,15 @@ namespace Content.Shared.Clumsy; -public sealed class ClumsySystem : EntitySystem +public sealed partial class ClumsySystem : EntitySystem { - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs index f1b09241f66..8831cf57ab0 100644 --- a/Content.Shared/CombatMode/Pacification/PacificationSystem.cs +++ b/Content.Shared/CombatMode/Pacification/PacificationSystem.cs @@ -12,13 +12,13 @@ namespace Content.Shared.CombatMode.Pacification; -public sealed class PacificationSystem : EntitySystem +public sealed partial class PacificationSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedCombatModeSystem _combatSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedCombatModeSystem _combatSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs index ea30f2b54e3..9ce7545ce40 100644 --- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs +++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs @@ -8,13 +8,13 @@ namespace Content.Shared.CombatMode; -public abstract class SharedCombatModeSystem : EntitySystem +public abstract partial class SharedCombatModeSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedNPCSystem _npc = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedNPCSystem _npc = default!; public override void Initialize() { diff --git a/Content.Shared/ComponentTable/SharedComponentTableSystem.cs b/Content.Shared/ComponentTable/SharedComponentTableSystem.cs index e4ff8553521..811a82200f9 100644 --- a/Content.Shared/ComponentTable/SharedComponentTableSystem.cs +++ b/Content.Shared/ComponentTable/SharedComponentTableSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.ComponentTable; /// /// Applies an entity prototype to an entity on map init. Taken from entities inside an EntityTableSelector. /// -public sealed class SharedComponentTableSystem : EntitySystem +public sealed partial class SharedComponentTableSystem : EntitySystem { - [Dependency] private readonly EntityTableSystem _entTable = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private EntityTableSystem _entTable = default!; + [Dependency] private IPrototypeManager _proto = default!; public override void Initialize() { diff --git a/Content.Shared/Configurable/SharedConfigurationSystem.cs b/Content.Shared/Configurable/SharedConfigurationSystem.cs index 704965188e0..8534ca14160 100644 --- a/Content.Shared/Configurable/SharedConfigurationSystem.cs +++ b/Content.Shared/Configurable/SharedConfigurationSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Configurable; /// /// /// -public abstract class SharedConfigurationSystem : EntitySystem +public abstract partial class SharedConfigurationSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs index 80f249d577d..419a93c01a2 100644 --- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs +++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs @@ -23,15 +23,15 @@ namespace Content.Shared.Construction.EntitySystems; public sealed partial class AnchorableSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PullingSystem _pulling = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; private EntityQuery _physicsQuery; diff --git a/Content.Shared/Construction/EntitySystems/BlockAnchorOnSystem.cs b/Content.Shared/Construction/EntitySystems/BlockAnchorOnSystem.cs index 46550fb0fca..a11519559b2 100644 --- a/Content.Shared/Construction/EntitySystems/BlockAnchorOnSystem.cs +++ b/Content.Shared/Construction/EntitySystems/BlockAnchorOnSystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Construction.EntitySystems; /// Prevents anchoring an item in the same tile as an item matching the . /// /// -public sealed class BlockAnchorOnSystem : EntitySystem +public sealed partial class BlockAnchorOnSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _xform = default!; /// public override void Initialize() diff --git a/Content.Shared/Construction/MachinePartSystem.cs b/Content.Shared/Construction/MachinePartSystem.cs index d261a1cd95d..f4b2f892394 100644 --- a/Content.Shared/Construction/MachinePartSystem.cs +++ b/Content.Shared/Construction/MachinePartSystem.cs @@ -10,11 +10,11 @@ namespace Content.Shared.Construction /// /// Deals with machine parts and machine boards. /// - public sealed class MachinePartSystem : EntitySystem + public sealed partial class MachinePartSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedLatheSystem _lathe = default!; - [Dependency] private readonly SharedConstructionSystem _construction = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedLatheSystem _lathe = default!; + [Dependency] private SharedConstructionSystem _construction = default!; public override void Initialize() { diff --git a/Content.Shared/Construction/PartAssemblySystem.cs b/Content.Shared/Construction/PartAssemblySystem.cs index 474b4324e28..4fbc2f4692e 100644 --- a/Content.Shared/Construction/PartAssemblySystem.cs +++ b/Content.Shared/Construction/PartAssemblySystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Construction; /// /// This handles /// -public sealed class PartAssemblySystem : EntitySystem +public sealed partial class PartAssemblySystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private TagSystem _tag = default!; /// public override void Initialize() diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs index 8029c05083c..64c96973c05 100644 --- a/Content.Shared/Construction/SharedConstructionSystem.cs +++ b/Content.Shared/Construction/SharedConstructionSystem.cs @@ -6,12 +6,12 @@ namespace Content.Shared.Construction { - public abstract class SharedConstructionSystem : EntitySystem + public abstract partial class SharedConstructionSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; /// /// Get predicate for construction obstruction checks. diff --git a/Content.Shared/Construction/SharedFlatpackSystem.cs b/Content.Shared/Construction/SharedFlatpackSystem.cs index d94d3370e64..9bd953c8500 100644 --- a/Content.Shared/Construction/SharedFlatpackSystem.cs +++ b/Content.Shared/Construction/SharedFlatpackSystem.cs @@ -16,21 +16,21 @@ namespace Content.Shared.Construction; -public abstract class SharedFlatpackSystem : EntitySystem +public abstract partial class SharedFlatpackSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] protected readonly MachinePartSystem MachinePart = default!; - [Dependency] protected readonly SharedMaterialStorageSystem MaterialStorage = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private INetManager _net = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] protected MachinePartSystem MachinePart = default!; + [Dependency] protected SharedMaterialStorageSystem MaterialStorage = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedToolSystem _tool = default!; /// public override void Initialize() diff --git a/Content.Shared/ContainerHeld/ContainerHeldSystem.cs b/Content.Shared/ContainerHeld/ContainerHeldSystem.cs index fe927f2fa93..913450e045d 100644 --- a/Content.Shared/ContainerHeld/ContainerHeldSystem.cs +++ b/Content.Shared/ContainerHeld/ContainerHeldSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.ContainerHeld; -public sealed class ContainerHeldSystem : EntitySystem +public sealed partial class ContainerHeldSystem : EntitySystem { - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedStorageSystem _storage = default!; public override void Initialize() { diff --git a/Content.Shared/Containers/ContainerCompSystem.cs b/Content.Shared/Containers/ContainerCompSystem.cs index d9eac28dabc..bb095986a78 100644 --- a/Content.Shared/Containers/ContainerCompSystem.cs +++ b/Content.Shared/Containers/ContainerCompSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Containers; /// /// Applies / removes an entity prototype from a child entity when it's inserted into a container. /// -public sealed class ContainerCompSystem : EntitySystem +public sealed partial class ContainerCompSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; public override void Initialize() { diff --git a/Content.Shared/Containers/ContainerFillSystem.cs b/Content.Shared/Containers/ContainerFillSystem.cs index ff5c70b8fd0..798950bbc8f 100644 --- a/Content.Shared/Containers/ContainerFillSystem.cs +++ b/Content.Shared/Containers/ContainerFillSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.Containers; -public sealed class ContainerFillSystem : EntitySystem +public sealed partial class ContainerFillSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/Containers/DragInsertContainerSystem.cs b/Content.Shared/Containers/DragInsertContainerSystem.cs index 64bf36df38d..92f9e82d9c1 100644 --- a/Content.Shared/Containers/DragInsertContainerSystem.cs +++ b/Content.Shared/Containers/DragInsertContainerSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.Containers; public sealed partial class DragInsertContainerSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; public override void Initialize() { diff --git a/Content.Shared/Containers/ExitContainerOnMoveSystem.cs b/Content.Shared/Containers/ExitContainerOnMoveSystem.cs index 8b156186494..c3d6d12dc89 100644 --- a/Content.Shared/Containers/ExitContainerOnMoveSystem.cs +++ b/Content.Shared/Containers/ExitContainerOnMoveSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Containers; -public sealed class ExitContainerOnMoveSystem : EntitySystem +public sealed partial class ExitContainerOnMoveSystem : EntitySystem { - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs index e3f1380f402..311d06a13b8 100644 --- a/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs +++ b/Content.Shared/Containers/ItemSlot/ItemSlotsSystem.cs @@ -26,13 +26,13 @@ namespace Content.Shared.Containers.ItemSlots /// public sealed partial class ItemSlotsSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Containers/SlotBasedConnectedContainerSystem.cs b/Content.Shared/Containers/SlotBasedConnectedContainerSystem.cs index cb33c1e8f79..e46f7c65e0f 100644 --- a/Content.Shared/Containers/SlotBasedConnectedContainerSystem.cs +++ b/Content.Shared/Containers/SlotBasedConnectedContainerSystem.cs @@ -10,11 +10,11 @@ namespace Content.Shared.Containers; /// System for getting container that is linked to subject entity. Container is supposed to be present in certain character slot. /// Can be used for linking ammo feeder, solution source for spray nozzle, etc. /// -public sealed class SlotBasedConnectedContainerSystem : EntitySystem +public sealed partial class SlotBasedConnectedContainerSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private InventorySystem _inventory = default!; /// public override void Initialize() diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs index 2f654e80d0b..cc211c39ee6 100644 --- a/Content.Shared/Contraband/ContrabandSystem.cs +++ b/Content.Shared/Contraband/ContrabandSystem.cs @@ -14,12 +14,12 @@ namespace Content.Shared.Contraband; /// /// This handles showing examine messages for contraband-marked items. /// -public sealed class ContrabandSystem : EntitySystem +public sealed partial class ContrabandSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedIdCardSystem _id = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedIdCardSystem _id = default!; + [Dependency] private ExamineSystemShared _examine = default!; private bool _contrabandExamineEnabled; private bool _contrabandExamineOnlyInHudEnabled; diff --git a/Content.Shared/CrewAccesses/Systems/SharedCrewAccessesSystem.cs b/Content.Shared/CrewAccesses/Systems/SharedCrewAccessesSystem.cs index 4e3c2bdae6e..192f496917a 100644 --- a/Content.Shared/CrewAccesses/Systems/SharedCrewAccessesSystem.cs +++ b/Content.Shared/CrewAccesses/Systems/SharedCrewAccessesSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.CrewAccesses.Systems; public abstract partial class SharedCrewAccessesystem : EntitySystem { - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private SharedStationSystem _station = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/CrewAssignments/Systems/SharedCrewAssignmentSystem.cs b/Content.Shared/CrewAssignments/Systems/SharedCrewAssignmentSystem.cs index 1b81c6b1078..fb4450e455e 100644 --- a/Content.Shared/CrewAssignments/Systems/SharedCrewAssignmentSystem.cs +++ b/Content.Shared/CrewAssignments/Systems/SharedCrewAssignmentSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.CrewAssignments.Systems; public abstract partial class SharedCrewAssignmentSystem : EntitySystem { - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private SharedStationSystem _station = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs b/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs index 7be7ceb6758..139571df344 100644 --- a/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs +++ b/Content.Shared/CrewAssignments/Systems/SharedJobNetSystem.cs @@ -18,8 +18,8 @@ namespace Content.Shared.CrewAssignments.Systems; public abstract partial class SharedJobNetSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IGameTiming _timing = default!; public virtual void ReagentObjectiveComplete(JobNetComponent component, ProtoId objective) { diff --git a/Content.Shared/CrewRecords/Systems/SharedCrewRecordsSystem.cs b/Content.Shared/CrewRecords/Systems/SharedCrewRecordsSystem.cs index b50c1731697..88022618594 100644 --- a/Content.Shared/CrewRecords/Systems/SharedCrewRecordsSystem.cs +++ b/Content.Shared/CrewRecords/Systems/SharedCrewRecordsSystem.cs @@ -4,7 +4,7 @@ namespace Content.Shared.CrewRecords.Systems; public abstract partial class SharedCrewRecordSystem : EntitySystem { - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private SharedStationSystem _station = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs index 7b894f0087c..4a1ae1fff4a 100644 --- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs +++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsConsoleSystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.CriminalRecords.Systems; /// /// Station records aren't predicted, just exists for access. /// -public abstract class SharedCriminalRecordsConsoleSystem : EntitySystem +public abstract partial class SharedCriminalRecordsConsoleSystem : EntitySystem { - [Dependency] private readonly SharedCriminalRecordsSystem _criminalRecords = default!; - [Dependency] private readonly SharedStationRecordsSystem _records = default!; - [Dependency] private readonly SharedStationSystem _station = default!; + [Dependency] private SharedCriminalRecordsSystem _criminalRecords = default!; + [Dependency] private SharedStationRecordsSystem _records = default!; + [Dependency] private SharedStationSystem _station = default!; /// /// Checks if the new identity's name has a criminal record attached to it, and gives the entity the icon that diff --git a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs index 10f9863b465..a4ed89d4671 100644 --- a/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs +++ b/Content.Shared/CriminalRecords/Systems/SharedCriminalRecordsHackerSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.CriminalRecords.Systems; -public abstract class SharedCriminalRecordsHackerSystem : EntitySystem +public abstract partial class SharedCriminalRecordsHackerSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedNinjaGlovesSystem _gloves = default!; public override void Initialize() { diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 982efdcce01..555d3a339cb 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -42,20 +42,20 @@ namespace Content.Shared.Cuffs // TODO remove all the IsServer() checks. public abstract partial class SharedCuffableSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedVirtualItemSystem _virtualItem = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; - [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedVirtualItemSystem _virtualItem = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UseDelaySystem _delay = default!; + [Dependency] private SharedCombatModeSystem _combatMode = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageContactsSystem.cs b/Content.Shared/Damage/Systems/DamageContactsSystem.cs index 9a53d83eb26..7dff3233a09 100644 --- a/Content.Shared/Damage/Systems/DamageContactsSystem.cs +++ b/Content.Shared/Damage/Systems/DamageContactsSystem.cs @@ -7,12 +7,12 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamageContactsSystem : EntitySystem +public sealed partial class DamageContactsSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageExamineSystem.cs b/Content.Shared/Damage/Systems/DamageExamineSystem.cs index fe97a40d1b5..410757be27b 100644 --- a/Content.Shared/Damage/Systems/DamageExamineSystem.cs +++ b/Content.Shared/Damage/Systems/DamageExamineSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamageExamineSystem : EntitySystem +public sealed partial class DamageExamineSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs index e3cf521d9b2..e1d01fbc905 100644 --- a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs @@ -10,14 +10,14 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamageOnAttackedSystem : EntitySystem +public sealed partial class DamageOnAttackedSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs index 915e484658c..5ad6f918c1a 100644 --- a/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnHighSpeedImpactSystem.cs @@ -10,14 +10,14 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamageOnHighSpeedImpactSystem : EntitySystem +public sealed partial class DamageOnHighSpeedImpactSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; + [Dependency] private SharedStunSystem _stun = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs index 78e86f5ab42..0ba6f211a3a 100644 --- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs @@ -4,11 +4,11 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamageOnHoldingSystem : EntitySystem +public sealed partial class DamageOnHoldingSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs index efa4e16b587..98df8b4b75d 100644 --- a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs @@ -13,17 +13,17 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamageOnInteractSystem : EntitySystem +public sealed partial class DamageOnInteractSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly ThrowingSystem _throwingSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private ThrowingSystem _throwingSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedStunSystem _stun = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamagePopupSystem.cs b/Content.Shared/Damage/Systems/DamagePopupSystem.cs index d6a8e0beba9..0e77fc555c8 100644 --- a/Content.Shared/Damage/Systems/DamagePopupSystem.cs +++ b/Content.Shared/Damage/Systems/DamagePopupSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Damage.Systems; -public sealed class DamagePopupSystem : EntitySystem +public sealed partial class DamagePopupSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/DamageableSystem.cs b/Content.Shared/Damage/Systems/DamageableSystem.cs index 7a604640a86..61e6dce948c 100644 --- a/Content.Shared/Damage/Systems/DamageableSystem.cs +++ b/Content.Shared/Damage/Systems/DamageableSystem.cs @@ -13,13 +13,13 @@ namespace Content.Shared.Damage.Systems; public sealed partial class DamageableSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] private readonly SharedChemistryGuideDataSystem _chemistryGuideData = default!; - [Dependency] private readonly SharedExplosionSystem _explosion = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private MobThresholdSystem _mobThreshold = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] private SharedChemistryGuideDataSystem _chemistryGuideData = default!; + [Dependency] private SharedExplosionSystem _explosion = default!; private EntityQuery _appearanceQuery; private EntityQuery _damageableQuery; diff --git a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs index ed4d35193bf..e66d7c0dc55 100644 --- a/Content.Shared/Damage/Systems/PassiveDamageSystem.cs +++ b/Content.Shared/Damage/Systems/PassiveDamageSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Damage.Systems; -public sealed class PassiveDamageSystem : EntitySystem +public sealed partial class PassiveDamageSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs index e298a1783e1..5e7c7d569a3 100644 --- a/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs +++ b/Content.Shared/Damage/Systems/RequireProjectileTargetSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Damage.Systems; -public sealed class RequireProjectileTargetSystem : EntitySystem +public sealed partial class RequireProjectileTargetSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs index f17a91972db..9979dfbd6d9 100644 --- a/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs +++ b/Content.Shared/Damage/Systems/SharedDamageOtherOnHitSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Damage.Systems; -public abstract class SharedDamageOtherOnHitSystem : EntitySystem +public abstract partial class SharedDamageOtherOnHitSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly DamageExamineSystem _damageExamine = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private DamageExamineSystem _damageExamine = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs index 4016e74025f..e9b4badd3cc 100644 --- a/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs +++ b/Content.Shared/Damage/Systems/SharedGodmodeSystem.cs @@ -13,9 +13,9 @@ namespace Content.Shared.Damage.Systems; -public abstract class SharedGodmodeSystem : EntitySystem +public abstract partial class SharedGodmodeSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private IPrototypeManager _protoMan = default!; public override void Initialize() { diff --git a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs index a094af596a5..f77cfbfb230 100644 --- a/Content.Shared/Damage/Systems/SharedStaminaSystem.cs +++ b/Content.Shared/Damage/Systems/SharedStaminaSystem.cs @@ -33,17 +33,17 @@ public abstract partial class SharedStaminaSystem : EntitySystem { public static readonly EntProtoId StaminaLow = "StatusEffectStaminaLow"; - [Dependency] private readonly IConfigurationManager _config = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] protected readonly SharedStunSystem StunSystem = default!; + [Dependency] private IConfigurationManager _config = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] protected SharedStunSystem StunSystem = default!; /// /// How much of a buffer is there between the stun duration and when stuns can be re-applied. diff --git a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs index 4c80aa89d0f..12e7e34c0e5 100644 --- a/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs +++ b/Content.Shared/Damage/Systems/SlowOnDamageSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Damage.Systems; -public sealed class SlowOnDamageSystem : EntitySystem +public sealed partial class SlowOnDamageSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; - [Dependency] private readonly DamageableSystem _damage = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; + [Dependency] private DamageableSystem _damage = default!; public override void Initialize() { diff --git a/Content.Shared/Decals/SharedDecalSystem.cs b/Content.Shared/Decals/SharedDecalSystem.cs index b731f093d48..5a180890f90 100644 --- a/Content.Shared/Decals/SharedDecalSystem.cs +++ b/Content.Shared/Decals/SharedDecalSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Decals { - public abstract class SharedDecalSystem : EntitySystem + public abstract partial class SharedDecalSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly IMapManager MapManager = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected IMapManager MapManager = default!; protected bool PvsEnabled; diff --git a/Content.Shared/Delivery/DeliveryModifierSystem.cs b/Content.Shared/Delivery/DeliveryModifierSystem.cs index 0e3f620f268..26fddb229c7 100644 --- a/Content.Shared/Delivery/DeliveryModifierSystem.cs +++ b/Content.Shared/Delivery/DeliveryModifierSystem.cs @@ -16,13 +16,13 @@ namespace Content.Shared.Delivery; /// public sealed partial class DeliveryModifierSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly NameModifierSystem _nameModifier = default!; - [Dependency] private readonly SharedDeliverySystem _delivery = default!; - [Dependency] private readonly SharedExplosionSystem _explosion = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private NameModifierSystem _nameModifier = default!; + [Dependency] private SharedDeliverySystem _delivery = default!; + [Dependency] private SharedExplosionSystem _explosion = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSound = default!; public override void Initialize() { diff --git a/Content.Shared/Delivery/SharedDeliverySystem.cs b/Content.Shared/Delivery/SharedDeliverySystem.cs index a863a1545c4..04538fbd461 100644 --- a/Content.Shared/Delivery/SharedDeliverySystem.cs +++ b/Content.Shared/Delivery/SharedDeliverySystem.cs @@ -21,16 +21,16 @@ namespace Content.Shared.Delivery; /// Shared side of the DeliverySystem. /// This covers for letters/packages, as well as spawning a reward for the player upon opening. /// -public abstract class SharedDeliverySystem : EntitySystem +public abstract partial class SharedDeliverySystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly FingerprintReaderSystem _fingerprintReader = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly NameModifierSystem _nameModifier = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private FingerprintReaderSystem _fingerprintReader = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private NameModifierSystem _nameModifier = default!; private static readonly ProtoId TrashTag = "Trash"; private static readonly ProtoId RecyclableTag = "Recyclable"; diff --git a/Content.Shared/DeltaV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs b/Content.Shared/DeltaV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs index 8ce2c35a4fa..358d681f45a 100644 --- a/Content.Shared/DeltaV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs +++ b/Content.Shared/DeltaV/TapeRecorder/Systems/SharedTapeRecorderSystem.cs @@ -21,16 +21,16 @@ namespace Content.Shared.DeltaV.TapeRecorder.Systems; -public abstract class SharedTapeRecorderSystem : EntitySystem +public abstract partial class SharedTapeRecorderSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; protected const string SlotName = "cassette_tape"; diff --git a/Content.Shared/Destructible/SharedDestructibleSystem.cs b/Content.Shared/Destructible/SharedDestructibleSystem.cs index 4917ded3267..a25089a095f 100644 --- a/Content.Shared/Destructible/SharedDestructibleSystem.cs +++ b/Content.Shared/Destructible/SharedDestructibleSystem.cs @@ -2,10 +2,10 @@ namespace Content.Shared.Destructible; -public abstract class SharedDestructibleSystem : EntitySystem +public abstract partial class SharedDestructibleSystem : EntitySystem { // TODO: I don't really like this but this is out of scope to re-do destructible triggers while refactoring damageable - [Dependency] public readonly DamageableSystem Damageable = default!; + [Dependency] public DamageableSystem Damageable = default!; /// /// Force entity to be destroyed and deleted. diff --git a/Content.Shared/DetailExaminable/DetailExaminableystem.cs b/Content.Shared/DetailExaminable/DetailExaminableystem.cs index c934a70b832..e00cf87a39c 100644 --- a/Content.Shared/DetailExaminable/DetailExaminableystem.cs +++ b/Content.Shared/DetailExaminable/DetailExaminableystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.DetailExaminable; -public sealed class DetailExaminableSystem : EntitySystem +public sealed partial class DetailExaminableSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private ExamineSystemShared _examine = default!; public override void Initialize() { diff --git a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs index 3a18641c26f..7f89189e50d 100644 --- a/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs +++ b/Content.Shared/DeviceLinking/SharedDeviceLinkSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.DeviceLinking; -public abstract class SharedDeviceLinkSystem : EntitySystem +public abstract partial class SharedDeviceLinkSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IGameTiming _gameTiming = default!; public const string InvokedPort = "link_port"; diff --git a/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs b/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs index 74d25cd8a6d..18d5f7fff5c 100644 --- a/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs +++ b/Content.Shared/DeviceLinking/Systems/SharedRandomGateSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.DeviceLinking.Systems; -public abstract class SharedRandomGateSystem : EntitySystem +public abstract partial class SharedRandomGateSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; public override void Initialize() { diff --git a/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs index 8378cea36b5..f0f3681796d 100644 --- a/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs +++ b/Content.Shared/DeviceLinking/Systems/TwoWayLeverSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.DeviceLinking.Systems { - public sealed class TwoWayLeverSystem : EntitySystem + public sealed partial class TwoWayLeverSystem : EntitySystem { - [Dependency] private readonly SharedDeviceLinkSystem _signalSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedDeviceLinkSystem _signalSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; const string _leftToggleImage = "rotate_ccw.svg.192dpi.png"; const string _rightToggleImage = "rotate_cw.svg.192dpi.png"; diff --git a/Content.Shared/Devour/DevourSystem.cs b/Content.Shared/Devour/DevourSystem.cs index 26313765b06..6439265bed2 100644 --- a/Content.Shared/Devour/DevourSystem.cs +++ b/Content.Shared/Devour/DevourSystem.cs @@ -14,15 +14,15 @@ namespace Content.Shared.Devour; -public sealed class DevourSystem : EntitySystem +public sealed partial class DevourSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedBloodstreamSystem _bloodstreamSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Dice/SharedDiceSystem.cs b/Content.Shared/Dice/SharedDiceSystem.cs index ed62355dca5..c289da59394 100644 --- a/Content.Shared/Dice/SharedDiceSystem.cs +++ b/Content.Shared/Dice/SharedDiceSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.Dice; -public abstract class SharedDiceSystem : EntitySystem +public abstract partial class SharedDiceSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs b/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs index 077649f7a8a..146e02cbf34 100644 --- a/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs +++ b/Content.Shared/Disposal/Mailing/SharedMailingUnitSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.Disposal.Mailing; -public abstract class SharedMailingUnitSystem : EntitySystem +public abstract partial class SharedMailingUnitSystem : EntitySystem { - [Dependency] private readonly SharedDeviceNetworkSystem _deviceNetworkSystem = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!; + [Dependency] private SharedDeviceNetworkSystem _deviceNetworkSystem = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; + [Dependency] protected SharedUserInterfaceSystem UserInterfaceSystem = default!; private const string MailTag = "mail"; diff --git a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs index c71e71061d5..dff1278ccb0 100644 --- a/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs +++ b/Content.Shared/Disposal/Unit/SharedDisposalUnitSystem.cs @@ -40,26 +40,26 @@ public sealed partial class DisposalDoAfterEvent : SimpleDoAfterEvent { } -public abstract class SharedDisposalUnitSystem : EntitySystem +public abstract partial class SharedDisposalUnitSystem : EntitySystem { - [Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] protected readonly MetaDataSystem Metadata = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] protected readonly SharedContainerSystem Containers = default!; - [Dependency] protected readonly SharedJointSystem Joints = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; - [Dependency] private readonly SharedDisposalTubeSystem _disposalTubeSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] protected ActionBlockerSystem ActionBlockerSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] protected MetaDataSystem Metadata = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] protected SharedContainerSystem Containers = default!; + [Dependency] protected SharedJointSystem Joints = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; + [Dependency] private SharedDisposalTubeSystem _disposalTubeSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedMapSystem _map = default!; protected static TimeSpan ExitAttemptDelay = TimeSpan.FromSeconds(0.5); diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs index 14c2ae67d3e..c362d8a8c6e 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs @@ -9,14 +9,14 @@ namespace Content.Shared.DoAfter; public abstract partial class SharedDoAfterSystem : EntitySystem { - [Dependency] private readonly IDynamicTypeFactory _factory = default!; + [Dependency] private IDynamicTypeFactory _factory = default!; #if EXCEPTION_TOLERANCE - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly IRuntimeLog _runtimeLog = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private IRuntimeLog _runtimeLog = default!; #endif - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedHandsSystem _hands = default!; private DoAfter[] _doAfters = Array.Empty(); diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs index 71ef35c4618..9b009e37527 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs @@ -16,10 +16,10 @@ namespace Content.Shared.DoAfter; public abstract partial class SharedDoAfterSystem : EntitySystem { - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tag = default!; /// /// We'll use an excess time so stuff like finishing effects can show. diff --git a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs index 7efc9724c1d..9c3077b9642 100644 --- a/Content.Shared/Doors/Systems/SharedAirlockSystem.cs +++ b/Content.Shared/Doors/Systems/SharedAirlockSystem.cs @@ -7,14 +7,14 @@ namespace Content.Shared.Doors.Systems; -public abstract class SharedAirlockSystem : EntitySystem +public abstract partial class SharedAirlockSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedDoorSystem DoorSystem = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedWiresSystem _wiresSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedDoorSystem DoorSystem = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedWiresSystem _wiresSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Doors/Systems/SharedDoorSystem.cs b/Content.Shared/Doors/Systems/SharedDoorSystem.cs index 4d7cd1ba78a..55620a8c281 100644 --- a/Content.Shared/Doors/Systems/SharedDoorSystem.cs +++ b/Content.Shared/Doors/Systems/SharedDoorSystem.cs @@ -29,23 +29,23 @@ namespace Content.Shared.Doors.Systems; public abstract partial class SharedDoorSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] protected readonly SharedPhysicsSystem PhysicsSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] protected readonly TagSystem Tags = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] protected readonly SharedAppearanceSystem AppearanceSystem = default!; - [Dependency] private readonly OccluderSystem _occluder = default!; - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly PryingSystem _pryingSystem = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] private INetManager _net = default!; + [Dependency] protected SharedPhysicsSystem PhysicsSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private SharedStunSystem _stunSystem = default!; + [Dependency] protected TagSystem Tags = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] protected SharedAppearanceSystem AppearanceSystem = default!; + [Dependency] private OccluderSystem _occluder = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private PryingSystem _pryingSystem = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!; public static readonly ProtoId DoorBumpTag = "DoorBumpOpener"; diff --git a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs index 3a6784f6fb3..b4b1efe5b84 100644 --- a/Content.Shared/Doors/Systems/SharedFirelockSystem.cs +++ b/Content.Shared/Doors/Systems/SharedFirelockSystem.cs @@ -8,13 +8,13 @@ namespace Content.Shared.Doors.Systems; -public abstract class SharedFirelockSystem : EntitySystem +public abstract partial class SharedFirelockSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedDoorSystem _doorSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedDoorSystem _doorSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs b/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs index 573c85ac004..12621b92655 100644 --- a/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs +++ b/Content.Shared/Doors/Systems/SharedTurnstileSystem.cs @@ -14,13 +14,13 @@ namespace Content.Shared.Doors.Systems; /// public abstract partial class SharedTurnstileSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private PullingSystem _pulling = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Shared/DragDrop/SharedDragDropSystem.cs b/Content.Shared/DragDrop/SharedDragDropSystem.cs index b3d76f98e0f..af5215b5646 100644 --- a/Content.Shared/DragDrop/SharedDragDropSystem.cs +++ b/Content.Shared/DragDrop/SharedDragDropSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.DragDrop; -public abstract class SharedDragDropSystem : EntitySystem +public abstract partial class SharedDragDropSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; public override void Initialize() { diff --git a/Content.Shared/Drugs/SharedSpecificDrugSystem.cs b/Content.Shared/Drugs/SharedSpecificDrugSystem.cs index 2a932ed1da7..aa7f79ad473 100644 --- a/Content.Shared/Drugs/SharedSpecificDrugSystem.cs +++ b/Content.Shared/Drugs/SharedSpecificDrugSystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Drugs; -public abstract class SharedSpecificDrugSystem : EntitySystem +public abstract partial class SharedSpecificDrugSystem : EntitySystem { public static EntProtoId Drunk = "StatusEffectDrunk"; - [Dependency] protected readonly StatusEffectsSystem Status = default!; + [Dependency] protected StatusEffectsSystem Status = default!; public override void Initialize() { diff --git a/Content.Shared/Drunk/SharedDrunkSystem.cs b/Content.Shared/Drunk/SharedDrunkSystem.cs index c4d60043c66..10b62cc50f1 100644 --- a/Content.Shared/Drunk/SharedDrunkSystem.cs +++ b/Content.Shared/Drunk/SharedDrunkSystem.cs @@ -4,11 +4,11 @@ namespace Content.Shared.Drunk; -public abstract class SharedDrunkSystem : EntitySystem +public abstract partial class SharedDrunkSystem : EntitySystem { public static EntProtoId Drunk = "StatusEffectDrunk"; - [Dependency] protected readonly StatusEffectsSystem Status = default!; + [Dependency] protected StatusEffectsSystem Status = default!; public override void Initialize() { diff --git a/Content.Shared/Electrocution/InsulatedSystem.cs b/Content.Shared/Electrocution/InsulatedSystem.cs index 1e6ec6a1491..d35dbfa8807 100644 --- a/Content.Shared/Electrocution/InsulatedSystem.cs +++ b/Content.Shared/Electrocution/InsulatedSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Electrocution; -public sealed class InsulatedSystem : EntitySystem +public sealed partial class InsulatedSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private ExamineSystemShared _examine = default!; /// public override void Initialize() diff --git a/Content.Shared/Electrocution/SharedElectrocutionSystem.cs b/Content.Shared/Electrocution/SharedElectrocutionSystem.cs index 5da344e023a..c6c9b17657a 100644 --- a/Content.Shared/Electrocution/SharedElectrocutionSystem.cs +++ b/Content.Shared/Electrocution/SharedElectrocutionSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Electrocution { - public abstract class SharedElectrocutionSystem : EntitySystem + public abstract partial class SharedElectrocutionSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Emag/Systems/EmagSystem.cs b/Content.Shared/Emag/Systems/EmagSystem.cs index 912c4bdaeae..0558f094c15 100644 --- a/Content.Shared/Emag/Systems/EmagSystem.cs +++ b/Content.Shared/Emag/Systems/EmagSystem.cs @@ -18,13 +18,13 @@ namespace Content.Shared.Emag.Systems; /// 3. Have some check for if this actually needs to be emagged or is already emagged (to stop charge waste) /// 4. Past the check, add all the effects you desire and HANDLE THE EVENT ARGUMENT so a charge is spent /// 5. Optionally, set Repeatable on the event to true if you don't want the emagged component to be added -public sealed class EmagSystem : EntitySystem +public sealed partial class EmagSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Emp/SharedEmpSystem.cs b/Content.Shared/Emp/SharedEmpSystem.cs index 6355d45296c..c370ce893b1 100644 --- a/Content.Shared/Emp/SharedEmpSystem.cs +++ b/Content.Shared/Emp/SharedEmpSystem.cs @@ -9,13 +9,13 @@ namespace Content.Shared.Emp; -public abstract class SharedEmpSystem : EntitySystem +public abstract partial class SharedEmpSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; private HashSet _entSet = new(); private EntityQuery _resistanceQuery; diff --git a/Content.Shared/Engineering/Systems/DisassembleOnAltVerbSystem.cs b/Content.Shared/Engineering/Systems/DisassembleOnAltVerbSystem.cs index 0c2e5398fc0..c1be22c4de7 100644 --- a/Content.Shared/Engineering/Systems/DisassembleOnAltVerbSystem.cs +++ b/Content.Shared/Engineering/Systems/DisassembleOnAltVerbSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Engineering.Systems; public sealed partial class DisassembleOnAltVerbSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs b/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs index 153e1c97356..51cff118f16 100644 --- a/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs +++ b/Content.Shared/Engineering/Systems/InflatableSafeDisassemblySystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Engineering.Systems; /// /// Implements /// -public sealed class InflatableSafeDisassemblySystem : EntitySystem +public sealed partial class InflatableSafeDisassemblySystem : EntitySystem { - [Dependency] private readonly DisassembleOnAltVerbSystem _disassembleOnAltVerbSystem = null!; - [Dependency] private readonly SharedPopupSystem _popupSystem = null!; + [Dependency] private DisassembleOnAltVerbSystem _disassembleOnAltVerbSystem = null!; + [Dependency] private SharedPopupSystem _popupSystem = null!; public override void Initialize() { diff --git a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs index c302a516393..098af580855 100644 --- a/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs +++ b/Content.Shared/Ensnaring/SharedEnsnareableSystem.cs @@ -21,17 +21,17 @@ public sealed partial class EnsnareableDoAfterEvent : SimpleDoAfterEvent { } -public abstract class SharedEnsnareableSystem : EntitySystem +public abstract partial class SharedEnsnareableSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speedModifier = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private MovementSpeedModifierSystem _speedModifier = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; public override void Initialize() { diff --git a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs index 6578645452f..4aab4ebcfa4 100644 --- a/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/Body/HungerEntityConditionSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityConditions.Conditions.Body; /// public sealed partial class TotalHungerEntityConditionSystem : EntityConditionSystem { - [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private HungerSystem _hunger = default!; protected override void Condition(Entity entity, ref EntityConditionEvent args) { diff --git a/Content.Shared/EntityConditions/Conditions/NestedCondition.cs b/Content.Shared/EntityConditions/Conditions/NestedCondition.cs index 2af0d0d0e73..9e115838e50 100644 --- a/Content.Shared/EntityConditions/Conditions/NestedCondition.cs +++ b/Content.Shared/EntityConditions/Conditions/NestedCondition.cs @@ -20,9 +20,9 @@ public override string EntityConditionGuidebookText(IPrototypeManager prototype) /// /// Handles . /// -public sealed class NestedConditionSystem : EntityConditionSystem +public sealed partial class NestedConditionSystem : EntityConditionSystem { - [Dependency] private readonly SharedEntityConditionsSystem _conditions = default!; + [Dependency] private SharedEntityConditionsSystem _conditions = default!; protected override void Condition(Entity ent, ref EntityConditionEvent args) { diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs index 25a72310d2a..ac12303a0a4 100644 --- a/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAllTagsEntityConditionSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityConditions.Conditions.Tags; /// public sealed partial class HasAllTagsEntityConditionSystem : EntityConditionSystem { - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private TagSystem _tag = default!; protected override void Condition(Entity entity, ref EntityConditionEvent args) { diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs index 0321ce57d1e..919c015520a 100644 --- a/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/Tags/HasAnyTagEntityConditionSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityConditions.Conditions.Tags; /// public sealed partial class HasAnyTagEntityConditionSystem : EntityConditionSystem { - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private TagSystem _tag = default!; protected override void Condition(Entity entity, ref EntityConditionEvent args) { diff --git a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs index 418a1f6427c..64661b07aae 100644 --- a/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs +++ b/Content.Shared/EntityConditions/Conditions/Tags/HasTagEntityConditionSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.EntityConditions.Conditions.Tags; /// public sealed partial class HasTagEntityConditionSystem : EntityConditionSystem { - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private TagSystem _tag = default!; protected override void Condition(Entity entity, ref EntityConditionEvent args) { diff --git a/Content.Shared/EntityConditions/SharedEntityConditionsSystem.Nested.cs b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.Nested.cs index 72f84881b0d..dbbefea6f81 100644 --- a/Content.Shared/EntityConditions/SharedEntityConditionsSystem.Nested.cs +++ b/Content.Shared/EntityConditions/SharedEntityConditionsSystem.Nested.cs @@ -7,7 +7,7 @@ namespace Content.Shared.EntityConditions; /// public sealed partial class SharedEntityConditionsSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; /// /// TryCondition overload that uses a instead of . diff --git a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs index 0fd347ea794..8d07810f077 100644 --- a/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/AdjustAlertEntityEffectSystem.cs @@ -10,8 +10,8 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class AdjustAlertEntityEffectSysten : EntityEffectSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private AlertsSystem _alerts = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs index d4283d31d87..eea209b1d62 100644 --- a/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs +++ b/Content.Shared/EntityEffects/Effects/AdjustTemperatureEntityEffectsSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class AdjustTemperatureEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedTemperatureSystem _temperature = default!; + [Dependency] private SharedTemperatureSystem _temperature = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { var amount = args.Effect.Amount * args.Scale; diff --git a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs index a3becd706fb..11d4ead82f7 100644 --- a/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs +++ b/Content.Shared/EntityEffects/Effects/ArtifactEntityEffectsSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ArtifactDurabilityRestoreEntityEffectsSystem : EntityEffectSystem { - [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!; + [Dependency] private SharedXenoArtifactSystem _xenoArtifact = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { @@ -30,8 +30,8 @@ protected override void Effect(Entity entity, ref EntityE /// public sealed partial class ArtifactUnlockEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedXenoArtifactSystem _xenoArtifact = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs index 488f8026dde..f470d189106 100644 --- a/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/CleanBloodstreamEntityEffectSystem.cs @@ -13,7 +13,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class CleanBloodstreamEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; + [Dependency] private SharedBloodstreamSystem _bloodstream = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs index 7671bcba857..b145c94bd1f 100644 --- a/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/EyeDamageEntityEffectSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class EyeDamageEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly BlindableSystem _blindable = default!; + [Dependency] private BlindableSystem _blindable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs index 894c854b96a..49cc0491572 100644 --- a/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBleedEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class ModifyBleedEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; + [Dependency] private SharedBloodstreamSystem _bloodstream = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs index ab7a01a3cd6..8867d4d0ded 100644 --- a/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/ModifyBloodLevelEntityEffectSystem.cs @@ -12,7 +12,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class ModifyBloodLevelEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; + [Dependency] private SharedBloodstreamSystem _bloodstream = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs index 826ad2da470..87f47a0a899 100644 --- a/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/ReduceRottingEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class ReduceRottingEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedRottingSystem _rotting = default!; + [Dependency] private SharedRottingSystem _rotting = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs index e36b02f0a0d..e3b163e17a5 100644 --- a/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/SatiateEntityEffectSystem.cs @@ -12,7 +12,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class SatiateThirstEntityEffectsSystem : EntityEffectSystem { - [Dependency] private readonly ThirstSystem _thirst = default!; + [Dependency] private ThirstSystem _thirst = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { _thirst.ModifyThirst(entity, entity.Comp, args.Effect.Factor * args.Scale); @@ -25,7 +25,7 @@ protected override void Effect(Entity entity, ref EntityEffectE /// public sealed partial class SatiateHungerEntityEffectsSystem : EntityEffectSystem { - [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private HungerSystem _hunger = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { _hunger.ModifyHunger(entity, args.Effect.Factor * args.Scale, entity.Comp); diff --git a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs index b7d0a6956ee..0d83edc190e 100644 --- a/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Body/VomitEntityEffectSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.EntityEffects.Effects.Body; /// public sealed partial class VomitEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly VomitSystem _vomit = default!; + [Dependency] private VomitSystem _vomit = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs index 19ffbf79c94..4672dc67488 100644 --- a/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Damage/DistributedHealthChangeEntityEffectSystem.cs @@ -15,7 +15,7 @@ namespace Content.Shared.EntityEffects.Effects.Damage; /// public sealed partial class DistributedHealthChangeEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DamageableSystem _damageable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs index 6d98e9857ae..8dab5a2f543 100644 --- a/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Damage/EvenHealthChangeEntityEffectSystem.cs @@ -14,7 +14,7 @@ namespace Content.Shared.EntityEffects.Effects.Damage; /// public sealed partial class EvenHealthChangeEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DamageableSystem _damageable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs index 1097a997aec..95e99f0b086 100644 --- a/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Damage/HealthChangeEntityEffectSystem.cs @@ -15,7 +15,7 @@ namespace Content.Shared.EntityEffects.Effects.Damage; /// public sealed partial class HealthChangeEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DamageableSystem _damageable = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs index 5b35bcf4857..84a5c333d82 100644 --- a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class EmoteEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedChatSystem _chat = default!; + [Dependency] private SharedChatSystem _chat = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs index 893018a8c06..cde6a8266b4 100644 --- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityEntityEffectSystem.cs @@ -9,7 +9,7 @@ namespace Content.Shared.EntityEffects.Effects.EntitySpawning; /// public sealed partial class SpawnEntityEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly INetManager _net = default!; + [Dependency] private INetManager _net = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs index c186740d49d..a0eed98c553 100644 --- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects.EntitySpawning; /// public sealed partial class SpawnEntityInContainerEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly INetManager _net = default!; + [Dependency] private INetManager _net = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs index 4ff972d41ec..9c22c8c7dfb 100644 --- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInContainerOrDropEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects.EntitySpawning; /// public sealed partial class SpawnEntityInContainerOrDropEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly INetManager _net = default!; + [Dependency] private INetManager _net = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs index b710033d600..158cffe4fb3 100644 --- a/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EntitySpawning/SpawnEntityInInventoryEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects.EntitySpawning; /// public sealed partial class SpawnEntityInInventoryEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private InventorySystem _inventory = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs index 141e0a65eed..f0d3b32a0e4 100644 --- a/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/GlowEntityEffectSystem.cs @@ -9,9 +9,9 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class GlowEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPointLightSystem _lightSystem = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPointLightSystem _lightSystem = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs index 05fd826f2db..6f04c7608d0 100644 --- a/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/MetaData/DestructibleActEntityEffectSystem.cs @@ -7,7 +7,7 @@ namespace Content.Shared.EntityEffects.Effects.MetaData; /// public sealed partial class DestructibleActEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedDestructibleSystem _destructible = default!; + [Dependency] private SharedDestructibleSystem _destructible = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/NestedEffect.cs b/Content.Shared/EntityEffects/Effects/NestedEffect.cs index 46c415bf606..f96cb19a83e 100644 --- a/Content.Shared/EntityEffects/Effects/NestedEffect.cs +++ b/Content.Shared/EntityEffects/Effects/NestedEffect.cs @@ -54,9 +54,9 @@ public sealed partial class NestedEffect : EntityEffectBase /// /// Handles . /// -public sealed class NestedEffectSystem : EntityEffectSystem +public sealed partial class NestedEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedEntityEffectsSystem _effects = default!; + [Dependency] private SharedEntityEffectsSystem _effects = default!; protected override void Effect(Entity ent, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs index 0eda28b0ea3..a491737fafa 100644 --- a/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/ResetNarcolepsyEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class ResetNarcolepsyEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly NarcolepsySystem _narcolepsy = default!; + [Dependency] private NarcolepsySystem _narcolepsy = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs index 1baa0e6c106..438ac2c2339 100644 --- a/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/SlipifyEntityEffectSystem.cs @@ -13,8 +13,8 @@ namespace Content.Shared.EntityEffects.Effects; /// public sealed partial class SlipifyEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly CollisionWakeSystem _collisionWake = default!; - [Dependency] private readonly FixtureSystem _fixture = default!; + [Dependency] private CollisionWakeSystem _collisionWake = default!; + [Dependency] private FixtureSystem _fixture = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs index f69a36201ce..8664648ebbe 100644 --- a/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Solution/AddReagentToSolutionEntityEffectSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.EntityEffects.Effects.Solution; /// Quantity is modified by scale. /// /// -public sealed class AddReagentToSolutionEntityEffectSystem : EntityEffectSystem +public sealed partial class AddReagentToSolutionEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs index b2e0ea0b99e..52b51ee60ec 100644 --- a/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Solution/AdjustReagentEntityEffectSystem.cs @@ -13,7 +13,7 @@ namespace Content.Shared.EntityEffects.Effects.Solution; /// public sealed partial class AdjustReagentEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs index 1acc76830d9..6f222f4a22c 100644 --- a/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Solution/SolutionTemperatureEntityEffectsSystem.cs @@ -9,9 +9,9 @@ namespace Content.Shared.EntityEffects.Effects.Solution; /// Sets the temperature of this solution to a fixed value. /// /// -public sealed class SetSolutionTemperatureEntityEffectSystem : EntityEffectSystem +public sealed partial class SetSolutionTemperatureEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { @@ -39,9 +39,9 @@ public override string EntityEffectGuidebookText(IPrototypeManager prototype, IE /// The temperature adjustment is modified by scale. /// /// -public sealed class AdjustSolutionTemperatureEntityEffectSystem : EntityEffectSystem +public sealed partial class AdjustSolutionTemperatureEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { @@ -86,9 +86,9 @@ public override string EntityEffectGuidebookText(IPrototypeManager prototype, IE /// The energy adjustment is modified by scale. /// /// -public sealed class AdjustSolutionThermalEnergyEntityEffectSystem : EntityEffectSystem +public sealed partial class AdjustSolutionThermalEnergyEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs index d3a7fd70059..9808c3bba3b 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/DrunkEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class DrunkEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedDrunkSystem _drunk = default!; + [Dependency] private SharedDrunkSystem _drunk = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs index 59279824c44..07e49c3b408 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ElectrocuteEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class ElectrocuteEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; + [Dependency] private SharedElectrocutionSystem _electrocution = default!; // TODO: When electrocution is new status, change this to new status protected override void Effect(Entity entity, ref EntityEffectEvent args) diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs index b448be4c110..e69d52112e3 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/GenericStatusEffectEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; [Obsolete("Use ModifyStatusEffect instead")] public sealed partial class GenericStatusEffectEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly StatusEffectsSystem _status = default!; + [Dependency] private StatusEffectsSystem _status = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs index eb5ba8b4d11..fd579f856e3 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/JitterEntityEffectSystem.cs @@ -12,7 +12,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class JitterEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedJitteringSystem _jittering = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs index c70776d1899..6d2d6271231 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyKnockdownEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class ModifyKnockdownEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private SharedStunSystem _stun = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs index 5231ae382ca..316e0c6552c 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyParalysisEntityEffectSystem.cs @@ -11,8 +11,8 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class ModifyParalysisEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private SharedStunSystem _stun = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs index e1460bb9301..f7f20f5ccde 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/ModifyStatusEffectEntityEffectSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class ModifyStatusEffectEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly StatusEffectsSystem _status = default!; + [Dependency] private StatusEffectsSystem _status = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs index 6f4c6352430..123739098c2 100644 --- a/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/StatusEffects/MovementSpeedModifierEntityEffectSystem.cs @@ -12,8 +12,8 @@ namespace Content.Shared.EntityEffects.Effects.StatusEffects; /// public sealed partial class MovementSpeedModifierEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly MovementModStatusSystem _movementModStatus = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private MovementModStatusSystem _movementModStatus = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs index 98bbf4617a8..b3b006a140c 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/EmpEntityEffectSystem.cs @@ -11,8 +11,8 @@ namespace Content.Shared.EntityEffects.Effects.Transform; /// public sealed partial class EmpEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedEmpSystem _emp = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private SharedEmpSystem _emp = default!; + [Dependency] private SharedTransformSystem _xform = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs index df788e94d61..db365e28d13 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/FlashEntityEffectSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.EntityEffects.Effects.Transform; /// public sealed partial class FlashEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedFlashSystem _flash = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; + [Dependency] private SharedFlashSystem _flash = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private SharedPointLightSystem _pointLight = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs index 21363631190..c5c3e9a0b1c 100644 --- a/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.EntityEffects.Effects.Transform; /// public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPopupSystem _popup = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs index e8c6cb9ad92..fed9a544b83 100644 --- a/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/WashCreamPieEntityEffectSystem.cs @@ -11,7 +11,7 @@ namespace Content.Shared.EntityEffects.Effects; /// TODO: This can probably be made into a generic "CleanEntityEffect" which multiple components listen to... public sealed partial class WashCreamPieEntityEffectSystem : EntityEffectSystem { - [Dependency] private readonly SharedCreamPieSystem _creamPie = default!; + [Dependency] private SharedCreamPieSystem _creamPie = default!; protected override void Effect(Entity entity, ref EntityEffectEvent args) { diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.Nested.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.Nested.cs index 4c0a8d14b02..f9018d5bca5 100644 --- a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.Nested.cs +++ b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.Nested.cs @@ -7,7 +7,7 @@ namespace Content.Shared.EntityEffects; // public sealed partial class SharedEntityEffectsSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; /// /// TryApplyEffect overload using a instead of . diff --git a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs index 99649610a8f..cb26a40835e 100644 --- a/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs +++ b/Content.Shared/EntityEffects/SharedEntityEffectsSystem.cs @@ -15,9 +15,9 @@ namespace Content.Shared.EntityEffects; /// public sealed partial class SharedEntityEffectsSystem : EntitySystem, IEntityEffectRaiser { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedEntityConditionsSystem _condition = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private SharedEntityConditionsSystem _condition = default!; public override void Initialize() { diff --git a/Content.Shared/EntityTable/EntityTableSystem.cs b/Content.Shared/EntityTable/EntityTableSystem.cs index 2da89e232be..00cd6682222 100644 --- a/Content.Shared/EntityTable/EntityTableSystem.cs +++ b/Content.Shared/EntityTable/EntityTableSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.EntityTable; -public sealed class EntityTableSystem : EntitySystem +public sealed partial class EntityTableSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; public IEnumerable GetSpawns(EntityTablePrototype entTableProto, System.Random? rand = null, EntityTableContext? ctx = null) { diff --git a/Content.Shared/Entry/EntryPoint.cs b/Content.Shared/Entry/EntryPoint.cs index d29a59c762c..35c4b8525ac 100644 --- a/Content.Shared/Entry/EntryPoint.cs +++ b/Content.Shared/Entry/EntryPoint.cs @@ -15,13 +15,13 @@ namespace Content.Shared.Entry { - public sealed class EntryPoint : GameShared + public sealed partial class EntryPoint : GameShared { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly IResourceManager _resMan = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private IResourceManager _resMan = default!; #if DEBUG - [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; #endif private readonly ResPath _ignoreFileDirectory = new("/IgnoredPrototypes/"); diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 760273e9c9e..710164fcf86 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -15,11 +15,11 @@ namespace Content.Shared.Examine { public abstract partial class ExamineSystemShared : EntitySystem { - [Dependency] private readonly OccluderSystem _occluder = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] protected readonly MobStateSystem MobStateSystem = default!; + [Dependency] private OccluderSystem _occluder = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] protected MobStateSystem MobStateSystem = default!; public const float MaxRaycastRange = 100; diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs index 8cfe89e97c4..1fcc9c1e9d9 100644 --- a/Content.Shared/Execution/SharedExecutionSystem.cs +++ b/Content.Shared/Execution/SharedExecutionSystem.cs @@ -20,17 +20,17 @@ namespace Content.Shared.Execution; /// /// Verb for violently murdering cuffed creatures. /// -public sealed class SharedExecutionSystem : EntitySystem +public sealed partial class SharedExecutionSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSuicideSystem _suicide = default!; - [Dependency] private readonly SharedCombatModeSystem _combat = default!; - [Dependency] private readonly SharedExecutionSystem _execution = default!; - [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSuicideSystem _suicide = default!; + [Dependency] private SharedCombatModeSystem _combat = default!; + [Dependency] private SharedExecutionSystem _execution = default!; + [Dependency] private SharedMeleeWeaponSystem _melee = default!; /// public override void Initialize() diff --git a/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs index 19aeba42de6..39f4ab9fa0b 100644 --- a/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs +++ b/Content.Shared/Explosion/EntitySystems/SharedScatteringGrenadeSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.Explosion.EntitySystems; -public abstract class SharedScatteringGrenadeSystem : EntitySystem +public abstract partial class SharedScatteringGrenadeSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs b/Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs index 1309e229ca9..f9926f503c3 100644 --- a/Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs +++ b/Content.Shared/Eye/Blinding/Systems/ActivatableUIRequiresVisionSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Eye.Blinding.Systems; -public sealed class ActivatableUIRequiresVisionSystem : EntitySystem +public sealed partial class ActivatableUIRequiresVisionSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedUserInterfaceSystem _userInterfaceSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs b/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs index ae81226a4b2..1d4aa6f6eb9 100644 --- a/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs +++ b/Content.Shared/Eye/Blinding/Systems/BlindableSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Eye.Blinding.Systems; -public sealed class BlindableSystem : EntitySystem +public sealed partial class BlindableSystem : EntitySystem { - [Dependency] private readonly BlurryVisionSystem _blurriness = default!; - [Dependency] private readonly EyeClosingSystem _eyelids = default!; + [Dependency] private BlurryVisionSystem _blurriness = default!; + [Dependency] private EyeClosingSystem _eyelids = default!; public override void Initialize() { diff --git a/Content.Shared/Eye/Blinding/Systems/BlindfoldSystem.cs b/Content.Shared/Eye/Blinding/Systems/BlindfoldSystem.cs index 63ebfcf7e9b..3bdf738390b 100644 --- a/Content.Shared/Eye/Blinding/Systems/BlindfoldSystem.cs +++ b/Content.Shared/Eye/Blinding/Systems/BlindfoldSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Eye.Blinding.Systems; -public sealed class BlindfoldSystem : EntitySystem +public sealed partial class BlindfoldSystem : EntitySystem { - [Dependency] private readonly BlindableSystem _blindableSystem = default!; + [Dependency] private BlindableSystem _blindableSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs index 4402e93b522..84da19d86b8 100644 --- a/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs +++ b/Content.Shared/Eye/Blinding/Systems/EyeClosingSystem.cs @@ -7,14 +7,14 @@ namespace Content.Shared.Eye.Blinding.Systems; -public sealed class EyeClosingSystem : EntitySystem +public sealed partial class EyeClosingSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly BlindableSystem _blindableSystem = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ISharedPlayerManager _playerManager = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private BlindableSystem _blindableSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ISharedPlayerManager _playerManager = default!; public override void Initialize() { diff --git a/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs b/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs index 6cc15162eb6..54ad9081a2c 100644 --- a/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs +++ b/Content.Shared/Eye/Blinding/Systems/EyeProtectionSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Eye.Blinding.Systems { - public sealed class EyeProtectionSystem : EntitySystem + public sealed partial class EyeProtectionSystem : EntitySystem { - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly BlindableSystem _blindingSystem = default!; + [Dependency] private StatusEffectsSystem _statusEffectsSystem = default!; + [Dependency] private BlindableSystem _blindingSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs b/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs index 34680b12efe..87f72c56246 100644 --- a/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs +++ b/Content.Shared/Eye/Blinding/Systems/TemporaryBlindnessSystem.cs @@ -4,11 +4,11 @@ namespace Content.Shared.Eye.Blinding.Systems; -public sealed class TemporaryBlindnessSystem : EntitySystem +public sealed partial class TemporaryBlindnessSystem : EntitySystem { public static readonly ProtoId BlindingStatusEffect = "TemporaryBlindness"; - [Dependency] private readonly BlindableSystem _blindableSystem = default!; + [Dependency] private BlindableSystem _blindableSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Fax/Systems/FaxecuteSystem.cs b/Content.Shared/Fax/Systems/FaxecuteSystem.cs index 7c43b7f06bb..47c7acd7309 100644 --- a/Content.Shared/Fax/Systems/FaxecuteSystem.cs +++ b/Content.Shared/Fax/Systems/FaxecuteSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Fax.Systems; /// /// System for handling execution of a mob within fax when copy or send attempt is made. /// -public sealed class FaxecuteSystem : EntitySystem +public sealed partial class FaxecuteSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs b/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs index 8e7ac4fb6f6..6b00bc384d8 100644 --- a/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs +++ b/Content.Shared/FeedbackSystem/SharedFeedbackManager.Events.cs @@ -6,7 +6,7 @@ namespace Content.Shared.FeedbackSystem; public abstract partial class SharedFeedbackManager : IEntityEventSubscriber { - [Dependency] private readonly IConfigurationManager _configManager = null!; + [Dependency] private IConfigurationManager _configManager = null!; private void InitSubscriptions() { diff --git a/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs b/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs index 24a200d9180..db81ad91158 100644 --- a/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs +++ b/Content.Shared/FeedbackSystem/SharedFeedbackManager.cs @@ -83,8 +83,8 @@ void OpenForAllSessions() { } /// public abstract partial class SharedFeedbackManager : ISharedFeedbackManager { - [Dependency] private readonly IPrototypeManager _proto = null!; - [Dependency] protected readonly INetManager NetManager = null!; + [Dependency] private IPrototypeManager _proto = null!; + [Dependency] protected INetManager NetManager = null!; public virtual IReadOnlySet>? DisplayedPopups => null; diff --git a/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs b/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs index 5dc321c4560..89ccc0f597e 100644 --- a/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs +++ b/Content.Shared/FingerprintReader/FingerprintReaderSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.FingerprintReader; // TODO: This has a lot of overlap with the AccessReaderSystem, maybe merge them in the future? -public sealed class FingerprintReaderSystem : EntitySystem +public sealed partial class FingerprintReaderSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Flash/DamagedByFlashingSystem.cs b/Content.Shared/Flash/DamagedByFlashingSystem.cs index 46d5f07b86d..768d99c6e6a 100644 --- a/Content.Shared/Flash/DamagedByFlashingSystem.cs +++ b/Content.Shared/Flash/DamagedByFlashingSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Flash; -public sealed class DamagedByFlashingSystem : EntitySystem +public sealed partial class DamagedByFlashingSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Shared/Flash/SharedFlashSystem.cs b/Content.Shared/Flash/SharedFlashSystem.cs index 4e9450a95b7..ed8375b1537 100644 --- a/Content.Shared/Flash/SharedFlashSystem.cs +++ b/Content.Shared/Flash/SharedFlashSystem.cs @@ -25,21 +25,21 @@ namespace Content.Shared.Flash; -public abstract class SharedFlashSystem : EntitySystem +public abstract partial class SharedFlashSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private StatusEffectsSystem _statusEffectsSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private UseDelaySystem _useDelay = default!; private EntityQuery _statusEffectsQuery; private EntityQuery _damagedByFlashingQuery; diff --git a/Content.Shared/Fluids/EntitySystems/DrainSystem.cs b/Content.Shared/Fluids/EntitySystems/DrainSystem.cs index 8b5fefdd8b5..a1e0585632a 100644 --- a/Content.Shared/Fluids/EntitySystems/DrainSystem.cs +++ b/Content.Shared/Fluids/EntitySystems/DrainSystem.cs @@ -24,19 +24,19 @@ namespace Content.Shared.Fluids.EntitySystems; /// /// Handles the draining of solutions from containers into drains. /// -public sealed class DrainSystem : EntitySystem +public sealed partial class DrainSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private IGameTiming _timing = default!; private readonly HashSet> _puddles = []; diff --git a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs index 55303e6bc04..0d2a04806fc 100644 --- a/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs +++ b/Content.Shared/Fluids/EntitySystems/SolutionDumpingSystem.cs @@ -19,14 +19,14 @@ namespace Content.Shared.Fluids.EntitySystems; /// /// /// -public sealed class SolutionDumpingSystem : EntitySystem +public sealed partial class SolutionDumpingSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solContainer = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solContainer = default!; private EntityQuery _dumpQuery; diff --git a/Content.Shared/Fluids/EntitySystems/SpillWhenWornSystem.cs b/Content.Shared/Fluids/EntitySystems/SpillWhenWornSystem.cs index 210dbfd4de7..1325ed3e82c 100644 --- a/Content.Shared/Fluids/EntitySystems/SpillWhenWornSystem.cs +++ b/Content.Shared/Fluids/EntitySystems/SpillWhenWornSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Fluids.EntitySystems; /// -public sealed class SpillWhenWornSystem : EntitySystem +public sealed partial class SpillWhenWornSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; public override void Initialize() { diff --git a/Content.Shared/Fluids/SharedAbsorbentSystem.cs b/Content.Shared/Fluids/SharedAbsorbentSystem.cs index 1e0d0a4fa64..c3a8e81c923 100644 --- a/Content.Shared/Fluids/SharedAbsorbentSystem.cs +++ b/Content.Shared/Fluids/SharedAbsorbentSystem.cs @@ -18,19 +18,19 @@ namespace Content.Shared.Fluids; /// /// Mopping logic for interacting with puddle components. /// -public abstract class SharedAbsorbentSystem : EntitySystem +public abstract partial class SharedAbsorbentSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popups = default!; - [Dependency] protected readonly SharedPuddleSystem Puddle = default!; - [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainer = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popups = default!; + [Dependency] protected SharedPuddleSystem Puddle = default!; + [Dependency] private SharedMeleeWeaponSystem _melee = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] protected SharedSolutionContainerSystem SolutionContainer = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs index ddce2526230..1b601abfdfb 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.Spillable.cs @@ -22,7 +22,7 @@ namespace Content.Shared.Fluids; public abstract partial class SharedPuddleSystem { private static readonly FixedPoint2 MeleeHitTransferProportion = 0.25; - [Dependency] private readonly InjectorSystem _injectorSystem = default!; + [Dependency] private InjectorSystem _injectorSystem = default!; protected virtual void InitializeSpillable() { diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs index b27a4238918..ce9d2801176 100644 --- a/Content.Shared/Fluids/SharedPuddleSystem.cs +++ b/Content.Shared/Fluids/SharedPuddleSystem.cs @@ -29,20 +29,20 @@ namespace Content.Shared.Fluids; public abstract partial class SharedPuddleSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!; - [Dependency] protected readonly OpenableSystem Openable = default!; - [Dependency] protected readonly ReactiveSystem Reactive = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] protected readonly SharedPopupSystem Popups = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; - [Dependency] private readonly SpeedModifierContactsSystem _speedModContacts = default!; - [Dependency] private readonly StepTriggerSystem _stepTrigger = default!; - [Dependency] private readonly TileFrictionController _tile = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] protected ISharedAdminLogManager AdminLogger = default!; + [Dependency] protected OpenableSystem Openable = default!; + [Dependency] protected ReactiveSystem Reactive = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] protected SharedPopupSystem Popups = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SpeedModifierContactsSystem _speedModContacts = default!; + [Dependency] private StepTriggerSystem _stepTrigger = default!; + [Dependency] private TileFrictionController _tile = default!; + [Dependency] private INetManager _net = default!; private ProtoId[] _standoutReagents = []; diff --git a/Content.Shared/Fluids/SpraySafetySystem.cs b/Content.Shared/Fluids/SpraySafetySystem.cs index fa5377f046d..5bc3e84956c 100644 --- a/Content.Shared/Fluids/SpraySafetySystem.cs +++ b/Content.Shared/Fluids/SpraySafetySystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Fluids; -public sealed class SpraySafetySystem : EntitySystem +public sealed partial class SpraySafetySystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs index 8b510664e4e..43595f09ba4 100644 --- a/Content.Shared/Foldable/DeployFoldableSystem.cs +++ b/Content.Shared/Foldable/DeployFoldableSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Foldable; -public sealed class DeployFoldableSystem : EntitySystem +public sealed partial class DeployFoldableSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly FoldableSystem _foldable = default!; - [Dependency] private readonly AnchorableSystem _anchorable = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private FoldableSystem _foldable = default!; + [Dependency] private AnchorableSystem _anchorable = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Foldable/FoldableSystem.cs b/Content.Shared/Foldable/FoldableSystem.cs index a36a0825100..d7fbe9b5fe7 100644 --- a/Content.Shared/Foldable/FoldableSystem.cs +++ b/Content.Shared/Foldable/FoldableSystem.cs @@ -12,13 +12,13 @@ namespace Content.Shared.Foldable; // TODO: This system could arguably be refactored into a general state system, as it is being utilized for a lot of different objects with various needs. -public sealed class FoldableSystem : EntitySystem +public sealed partial class FoldableSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedBuckleSystem _buckle = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly AnchorableSystem _anchorable = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedBuckleSystem _buckle = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private AnchorableSystem _anchorable = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs index 16eef778914..2cc579cba0f 100644 --- a/Content.Shared/Follower/FollowerSystem.cs +++ b/Content.Shared/Follower/FollowerSystem.cs @@ -24,15 +24,15 @@ namespace Content.Shared.Follower; -public sealed class FollowerSystem : EntitySystem +public sealed partial class FollowerSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedJointSystem _jointSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly ISharedAdminManager _adminManager = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedJointSystem _jointSystem = default!; + [Dependency] private SharedPhysicsSystem _physicsSystem = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private ISharedAdminManager _adminManager = default!; private static readonly ProtoId ForceableFollowTag = "ForceableFollow"; private static readonly ProtoId PreventGhostnadoWarpTag = "NotGhostnadoWarpable"; diff --git a/Content.Shared/Friction/TileFrictionController.cs b/Content.Shared/Friction/TileFrictionController.cs index 7b7634344e5..ff33c69a69e 100644 --- a/Content.Shared/Friction/TileFrictionController.cs +++ b/Content.Shared/Friction/TileFrictionController.cs @@ -17,13 +17,13 @@ namespace Content.Shared.Friction { - public sealed class TileFrictionController : VirtualController + public sealed partial class TileFrictionController : VirtualController { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedMapSystem _map = default!; private EntityQuery _frictionQuery; private EntityQuery _pullerQuery; diff --git a/Content.Shared/Friends/Systems/PettableFriendSystem.cs b/Content.Shared/Friends/Systems/PettableFriendSystem.cs index 35cd109c3ea..9ad60c53442 100644 --- a/Content.Shared/Friends/Systems/PettableFriendSystem.cs +++ b/Content.Shared/Friends/Systems/PettableFriendSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.Friends.Systems; -public sealed class PettableFriendSystem : EntitySystem +public sealed partial class PettableFriendSystem : EntitySystem { - [Dependency] private readonly NpcFactionSystem _factionException = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private NpcFactionSystem _factionException = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private UseDelaySystem _useDelay = default!; private EntityQuery _exceptionQuery; private EntityQuery _useDelayQuery; @@ -56,6 +56,6 @@ private void OnRehydrated(Entity ent, ref GotRehydrated // can only pet before hydrating, after that the fish cannot be negotiated with if (!TryComp(ent, out var comp)) return; - // _factionException.IgnoreEntities(args.Target, comp.Ignored); + // _factionException.IgnoreEntities(args.Target, comp.Ignored); } } diff --git a/Content.Shared/GPS/Systems/HandheldGpsSystem.cs b/Content.Shared/GPS/Systems/HandheldGpsSystem.cs index 7689c5b0094..c502bb7c1f7 100644 --- a/Content.Shared/GPS/Systems/HandheldGpsSystem.cs +++ b/Content.Shared/GPS/Systems/HandheldGpsSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.GPS.Systems; -public sealed class HandheldGpsSystem : EntitySystem +public sealed partial class HandheldGpsSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// public override void Initialize() diff --git a/Content.Shared/GameTicking/SharedGameTicker.cs b/Content.Shared/GameTicking/SharedGameTicker.cs index 4a093f16d8c..1aa96cf029e 100644 --- a/Content.Shared/GameTicking/SharedGameTicker.cs +++ b/Content.Shared/GameTicking/SharedGameTicker.cs @@ -11,10 +11,10 @@ namespace Content.Shared.GameTicking { - public abstract class SharedGameTicker : EntitySystem + public abstract partial class SharedGameTicker : EntitySystem { - [Dependency] private readonly IReplayRecordingManager _replay = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IReplayRecordingManager _replay = default!; + [Dependency] private IGameTiming _gameTiming = default!; /// /// A list storing the start times of all game rules that have been started this round. diff --git a/Content.Shared/Ghost/SharedGhostSystem.cs b/Content.Shared/Ghost/SharedGhostSystem.cs index 6ed6fae775a..3cd89fde3c2 100644 --- a/Content.Shared/Ghost/SharedGhostSystem.cs +++ b/Content.Shared/Ghost/SharedGhostSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.Ghost /// System for the . /// Prevents ghosts from interacting when is false. /// - public abstract class SharedGhostSystem : EntitySystem + public abstract partial class SharedGhostSystem : EntitySystem { - [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected SharedPopupSystem Popup = default!; public override void Initialize() { diff --git a/Content.Shared/GhostTypes/GhostSpriteStateSystem.cs b/Content.Shared/GhostTypes/GhostSpriteStateSystem.cs index a8d88c4083e..a4592b6ec02 100644 --- a/Content.Shared/GhostTypes/GhostSpriteStateSystem.cs +++ b/Content.Shared/GhostTypes/GhostSpriteStateSystem.cs @@ -10,12 +10,12 @@ namespace Content.Shared.GhostTypes; -public sealed class GhostSpriteStateSystem : EntitySystem +public sealed partial class GhostSpriteStateSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _proto = default!; /// /// It goes through an entity damage and assigns them a sprite according to the highest damage type/s diff --git a/Content.Shared/GhostTypes/StoreDamageTakenOnMindSystem.cs b/Content.Shared/GhostTypes/StoreDamageTakenOnMindSystem.cs index 94e3492f778..3648e768d88 100644 --- a/Content.Shared/GhostTypes/StoreDamageTakenOnMindSystem.cs +++ b/Content.Shared/GhostTypes/StoreDamageTakenOnMindSystem.cs @@ -11,10 +11,10 @@ namespace Content.Shared.GhostTypes; -public sealed class StoreDamageTakenOnMindSystem : EntitySystem +public sealed partial class StoreDamageTakenOnMindSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Shared/Gibbing/GibbingSystem.cs b/Content.Shared/Gibbing/GibbingSystem.cs index 31b30db3fcd..fdb45509201 100644 --- a/Content.Shared/Gibbing/GibbingSystem.cs +++ b/Content.Shared/Gibbing/GibbingSystem.cs @@ -7,14 +7,14 @@ namespace Content.Shared.Gibbing; -public sealed class GibbingSystem : EntitySystem +public sealed partial class GibbingSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDestructibleSystem _destructible = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDestructibleSystem _destructible = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; private static readonly SoundSpecifier? GibSound = new SoundCollectionSpecifier("gib", AudioParams.Default.WithVariation(0.025f)); diff --git a/Content.Shared/Glue/GlueSystem.cs b/Content.Shared/Glue/GlueSystem.cs index 9782b48b2da..437a8e81427 100644 --- a/Content.Shared/Glue/GlueSystem.cs +++ b/Content.Shared/Glue/GlueSystem.cs @@ -14,15 +14,15 @@ namespace Content.Shared.Glue; -public sealed class GlueSystem : EntitySystem +public sealed partial class GlueSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly NameModifierSystem _nameMod = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private NameModifierSystem _nameMod = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; public override void Initialize() { diff --git a/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs b/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs index 0fea117db4d..d622f76e480 100644 --- a/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs +++ b/Content.Shared/Gravity/SharedFloatingVisualizerSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Gravity; /// /// Handles offsetting a sprite when there is no gravity /// -public abstract class SharedFloatingVisualizerSystem : EntitySystem +public abstract partial class SharedFloatingVisualizerSystem : EntitySystem { - [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private SharedGravitySystem _gravity = default!; public override void Initialize() { diff --git a/Content.Shared/Gravity/SharedGravityGeneratorSystem.cs b/Content.Shared/Gravity/SharedGravityGeneratorSystem.cs index 36c9edb0b6f..f030c4fdc20 100644 --- a/Content.Shared/Gravity/SharedGravityGeneratorSystem.cs +++ b/Content.Shared/Gravity/SharedGravityGeneratorSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Gravity; -public abstract class SharedGravityGeneratorSystem : EntitySystem +public abstract partial class SharedGravityGeneratorSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs index fe5e8cc86a2..69a1a20eb7a 100644 --- a/Content.Shared/Gravity/SharedGravitySystem.cs +++ b/Content.Shared/Gravity/SharedGravitySystem.cs @@ -14,8 +14,8 @@ namespace Content.Shared.Gravity; public abstract partial class SharedGravitySystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private AlertsSystem _alerts = default!; public static readonly ProtoId WeightlessAlert = "Weightless"; diff --git a/Content.Shared/GridControl/Systems/SharedBluespaceParkingSystem.cs b/Content.Shared/GridControl/Systems/SharedBluespaceParkingSystem.cs index b9551ab465c..401f9d6a5d3 100644 --- a/Content.Shared/GridControl/Systems/SharedBluespaceParkingSystem.cs +++ b/Content.Shared/GridControl/Systems/SharedBluespaceParkingSystem.cs @@ -10,9 +10,9 @@ namespace Content.Shared.GridControl.Systems; [UsedImplicitly] public abstract partial class SharedBluespaceParkingSystem : EntitySystem { - [Dependency] protected readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] protected readonly ILogManager _log = default!; - [Dependency] protected readonly SharedAppearanceSystem _appearance = default!; + [Dependency] protected ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] protected ILogManager _log = default!; + [Dependency] protected SharedAppearanceSystem _appearance = default!; public const string Sawmill = "BluespaceParking"; protected ISawmill _sawmill = default!; diff --git a/Content.Shared/GridControl/Systems/SharedGridConfigSystem.cs b/Content.Shared/GridControl/Systems/SharedGridConfigSystem.cs index 1e8cf3b29bf..4e4ed6773cf 100644 --- a/Content.Shared/GridControl/Systems/SharedGridConfigSystem.cs +++ b/Content.Shared/GridControl/Systems/SharedGridConfigSystem.cs @@ -9,8 +9,8 @@ namespace Content.Shared.GridControl.Systems; [UsedImplicitly] public abstract partial class SharedGridConfigSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private ILogManager _log = default!; public const string Sawmill = "GridConfig"; protected ISawmill _sawmill = default!; diff --git a/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs b/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs index 4b96f89d811..a319aae649b 100644 --- a/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs +++ b/Content.Shared/Hands/EntitySystems/ExtraHandsEquipmentSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Hands.EntitySystems; -public sealed class ExtraHandsEquipmentSystem : EntitySystem +public sealed partial class ExtraHandsEquipmentSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs index a0b467ea9f5..28287fe734f 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs @@ -14,7 +14,7 @@ namespace Content.Shared.Hands.EntitySystems; public abstract partial class SharedHandsSystem { - [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; private static readonly ProtoId BypassDropChecksTag = "BypassDropChecks"; diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs index b6d2d76bcd5..91a95aad86d 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.cs @@ -17,15 +17,15 @@ namespace Content.Shared.Hands.EntitySystems; public abstract partial class SharedHandsSystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly SharedVirtualItemSystem _virtualSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] protected SharedContainerSystem ContainerSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] private SharedVirtualItemSystem _virtualSystem = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; public event Action, string, HandLocation>? OnPlayerAddHand; public event Action, string>? OnPlayerRemoveHand; diff --git a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs index 38b60b66b6c..4a0bfde017d 100644 --- a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs +++ b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.HealthExaminable; -public sealed class HealthExaminableSystem : EntitySystem +public sealed partial class HealthExaminableSystem : EntitySystem { - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Shared/Holopad/SharedHolopadSystem.cs b/Content.Shared/Holopad/SharedHolopadSystem.cs index ea122828bf1..63c91928c2c 100644 --- a/Content.Shared/Holopad/SharedHolopadSystem.cs +++ b/Content.Shared/Holopad/SharedHolopadSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Holopad; -public abstract class SharedHolopadSystem : EntitySystem +public abstract partial class SharedHolopadSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public bool IsHolopadControlLocked(Entity entity, EntityUid? user = null) { diff --git a/Content.Shared/Holosign/HolosignSystem.cs b/Content.Shared/Holosign/HolosignSystem.cs index 195b46c1f76..2d709d35f83 100644 --- a/Content.Shared/Holosign/HolosignSystem.cs +++ b/Content.Shared/Holosign/HolosignSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Holosign; -public sealed class HolosignSystem : EntitySystem +public sealed partial class HolosignSystem : EntitySystem { - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs index 6f2f498782d..06d4386c194 100644 --- a/Content.Shared/HotPotato/SharedHotPotatoSystem.cs +++ b/Content.Shared/HotPotato/SharedHotPotatoSystem.cs @@ -11,13 +11,13 @@ namespace Content.Shared.HotPotato; -public abstract class SharedHotPotatoSystem : EntitySystem +public abstract partial class SharedHotPotatoSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSound = default!; - [Dependency] private readonly DamageOnHoldingSystem _damageOnHolding = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSound = default!; + [Dependency] private DamageOnHoldingSystem _damageOnHolding = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() diff --git a/Content.Shared/Humanoid/HumanoidProfileSystem.cs b/Content.Shared/Humanoid/HumanoidProfileSystem.cs index bc4f64d72a3..68d69e99608 100644 --- a/Content.Shared/Humanoid/HumanoidProfileSystem.cs +++ b/Content.Shared/Humanoid/HumanoidProfileSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Humanoid; -public sealed class HumanoidProfileSystem : EntitySystem +public sealed partial class HumanoidProfileSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly GrammarSystem _grammar = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private GrammarSystem _grammar = default!; public override void Initialize() { diff --git a/Content.Shared/Humanoid/Markings/MarkingManager.cs b/Content.Shared/Humanoid/Markings/MarkingManager.cs index 118f8bd0737..07ff775fffb 100644 --- a/Content.Shared/Humanoid/Markings/MarkingManager.cs +++ b/Content.Shared/Humanoid/Markings/MarkingManager.cs @@ -10,10 +10,10 @@ namespace Content.Shared.Humanoid.Markings; /// /// Manager responsible for sharing the logic of markings between in-simulation bodies and out-of-simulation profile editing /// -public sealed class MarkingManager +public sealed partial class MarkingManager { - [Dependency] private readonly IComponentFactory _component = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IComponentFactory _component = default!; + [Dependency] private IPrototypeManager _prototype = default!; private FrozenDictionary> _categorizedMarkings = default!; private FrozenDictionary _markings = default!; diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs index 0cc3c307372..b1d8823894e 100644 --- a/Content.Shared/Humanoid/NamingSystem.cs +++ b/Content.Shared/Humanoid/NamingSystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Humanoid /// /// Figure out how to name a humanoid with these extensions. /// - public sealed class NamingSystem : EntitySystem + public sealed partial class NamingSystem : EntitySystem { private static readonly ProtoId FallbackSpecies = "Human"; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public string GetName(string species, Gender? gender = null) { diff --git a/Content.Shared/IdentityManagement/IdentitySystem.cs b/Content.Shared/IdentityManagement/IdentitySystem.cs index fdfce093f6a..8a44cadf79f 100644 --- a/Content.Shared/IdentityManagement/IdentitySystem.cs +++ b/Content.Shared/IdentityManagement/IdentitySystem.cs @@ -20,16 +20,16 @@ namespace Content.Shared.IdentityManagement; /// /// Responsible for updating the identity of an entity on init or clothing equip/unequip. /// -public sealed class IdentitySystem : EntitySystem +public sealed partial class IdentitySystem : EntitySystem { - [Dependency] private readonly GrammarSystem _grammarSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedCriminalRecordsConsoleSystem _criminalRecordsConsole = default!; - [Dependency] private readonly HumanoidProfileSystem _humanoidProfile = default!; - [Dependency] private readonly SharedIdCardSystem _idCard = default!; + [Dependency] private GrammarSystem _grammarSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedCriminalRecordsConsoleSystem _criminalRecordsConsole = default!; + [Dependency] private HumanoidProfileSystem _humanoidProfile = default!; + [Dependency] private SharedIdCardSystem _idCard = default!; // The name of the container holding the identity entity private const string SlotName = "identity"; diff --git a/Content.Shared/IgnitionSource/EntitySystems/MatchboxSystem.cs b/Content.Shared/IgnitionSource/EntitySystems/MatchboxSystem.cs index 5ab04fcf25a..03e3728ed3c 100644 --- a/Content.Shared/IgnitionSource/EntitySystems/MatchboxSystem.cs +++ b/Content.Shared/IgnitionSource/EntitySystems/MatchboxSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.IgnitionSource.EntitySystems; -public sealed class MatchboxSystem : EntitySystem +public sealed partial class MatchboxSystem : EntitySystem { - [Dependency] private readonly MatchstickSystem _match = default!; + [Dependency] private MatchstickSystem _match = default!; public override void Initialize() { diff --git a/Content.Shared/IgnitionSource/EntitySystems/MatchstickSystem.cs b/Content.Shared/IgnitionSource/EntitySystems/MatchstickSystem.cs index e5277290b02..d4aa54eaaaf 100644 --- a/Content.Shared/IgnitionSource/EntitySystems/MatchstickSystem.cs +++ b/Content.Shared/IgnitionSource/EntitySystems/MatchstickSystem.cs @@ -10,12 +10,12 @@ namespace Content.Shared.IgnitionSource.EntitySystems; public sealed partial class MatchstickSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedPointLightSystem _lights = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedIgnitionSourceSystem _ignition = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedPointLightSystem _lights = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedIgnitionSourceSystem _ignition = default!; public override void Initialize() { diff --git a/Content.Shared/Implants/ReplacementImplantSystem.cs b/Content.Shared/Implants/ReplacementImplantSystem.cs index b206091fe33..318342aecb0 100644 --- a/Content.Shared/Implants/ReplacementImplantSystem.cs +++ b/Content.Shared/Implants/ReplacementImplantSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Implants; -public sealed class ReplacementImplantSystem : EntitySystem +public sealed partial class ReplacementImplantSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; public override void Initialize() { diff --git a/Content.Shared/Implants/SharedChameleonControllerSystem.cs b/Content.Shared/Implants/SharedChameleonControllerSystem.cs index 8074d2c4161..a603f10ce4b 100644 --- a/Content.Shared/Implants/SharedChameleonControllerSystem.cs +++ b/Content.Shared/Implants/SharedChameleonControllerSystem.cs @@ -4,7 +4,7 @@ namespace Content.Shared.Implants; public abstract partial class SharedChameleonControllerSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Implants/SharedImplanterSystem.cs b/Content.Shared/Implants/SharedImplanterSystem.cs index 8b9ecbd15c9..4314eef809b 100644 --- a/Content.Shared/Implants/SharedImplanterSystem.cs +++ b/Content.Shared/Implants/SharedImplanterSystem.cs @@ -18,16 +18,16 @@ namespace Content.Shared.Implants; -public abstract class SharedImplanterSystem : EntitySystem +public abstract partial class SharedImplanterSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private IPrototypeManager _proto = default!; public override void Initialize() { diff --git a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs index a347b3db64c..b0aca0e346a 100644 --- a/Content.Shared/Implants/SharedSubdermalImplantSystem.cs +++ b/Content.Shared/Implants/SharedSubdermalImplantSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Implants; public abstract partial class SharedSubdermalImplantSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Implants/StorageImplantSystem.cs b/Content.Shared/Implants/StorageImplantSystem.cs index 0db1946e422..92f860e872a 100644 --- a/Content.Shared/Implants/StorageImplantSystem.cs +++ b/Content.Shared/Implants/StorageImplantSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.Implants; -public sealed class StorageImplantSystem : EntitySystem +public sealed partial class StorageImplantSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs index 8df0035fc98..871381694bd 100644 --- a/Content.Shared/Interaction/InteractionPopupSystem.cs +++ b/Content.Shared/Interaction/InteractionPopupSystem.cs @@ -14,15 +14,15 @@ namespace Content.Shared.Interaction; -public sealed class InteractionPopupSystem : EntitySystem +public sealed partial class InteractionPopupSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly INetManager _netMan = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private INetManager _netMan = default!; public override void Initialize() { diff --git a/Content.Shared/Interaction/RotateToFaceSystem.cs b/Content.Shared/Interaction/RotateToFaceSystem.cs index 23b549905d7..1d612180420 100644 --- a/Content.Shared/Interaction/RotateToFaceSystem.cs +++ b/Content.Shared/Interaction/RotateToFaceSystem.cs @@ -13,10 +13,10 @@ namespace Content.Shared.Interaction /// Doesn't really fit with SharedInteractionSystem so it's not there. /// [UsedImplicitly] - public sealed class RotateToFaceSystem : EntitySystem + public sealed partial class RotateToFaceSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// /// Tries to rotate the entity towards the target rotation. Returns false if it needs to keep rotating. diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index be8a54ea609..5f009c1dd5a 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -53,27 +53,27 @@ namespace Content.Shared.Interaction [UsedImplicitly] public abstract partial class SharedInteractionSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ISharedChatManager _chat = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly PullingSystem _pullSystem = default!; - [Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly SharedPhysicsSystem _broadphase = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedVerbSystem _verbSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedStrippableSystem _strippable = default!; - [Dependency] private readonly SharedPlayerRateLimitManager _rateLimit = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ISharedChatManager _chat = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private PullingSystem _pullSystem = default!; + [Dependency] private RotateToFaceSystem _rotateToFaceSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private SharedPhysicsSystem _broadphase = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedVerbSystem _verbSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedStrippableSystem _strippable = default!; + [Dependency] private SharedPlayerRateLimitManager _rateLimit = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private UseDelaySystem _useDelay = default!; private EntityQuery _ignoreUiRangeQuery; private EntityQuery _fixtureQuery; diff --git a/Content.Shared/Interaction/SmartEquipSystem.cs b/Content.Shared/Interaction/SmartEquipSystem.cs index 5614c7ff1e4..d31db36746b 100644 --- a/Content.Shared/Interaction/SmartEquipSystem.cs +++ b/Content.Shared/Interaction/SmartEquipSystem.cs @@ -18,16 +18,16 @@ namespace Content.Shared.Interaction; /// /// This handles smart equipping or inserting/ejecting from slots through keybinds--generally shift+E and shift+B /// -public sealed class SmartEquipSystem : EntitySystem +public sealed partial class SmartEquipSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; /// public override void Initialize() diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs index 7fc2d3f9aab..7f720623faa 100644 --- a/Content.Shared/Inventory/InventorySystem.Equip.cs +++ b/Content.Shared/Inventory/InventorySystem.Equip.cs @@ -23,17 +23,17 @@ namespace Content.Shared.Inventory; public abstract partial class InventorySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeed = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedStrippableSystem _strippable = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeed = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedStrippableSystem _strippable = default!; private static readonly ProtoId PocketableItemSize = "Small"; diff --git a/Content.Shared/Inventory/InventorySystem.Helpers.cs b/Content.Shared/Inventory/InventorySystem.Helpers.cs index 465a9c33a8b..5a4078240ce 100644 --- a/Content.Shared/Inventory/InventorySystem.Helpers.cs +++ b/Content.Shared/Inventory/InventorySystem.Helpers.cs @@ -7,7 +7,7 @@ namespace Content.Shared.Inventory; public partial class InventorySystem { - [Dependency] private readonly SharedStorageSystem _storageSystem = default!; + [Dependency] private SharedStorageSystem _storageSystem = default!; /// /// Yields all entities in hands or inventory slots with the specific flags. diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs index f37a822a928..aca33a5f066 100644 --- a/Content.Shared/Inventory/InventorySystem.Slots.cs +++ b/Content.Shared/Inventory/InventorySystem.Slots.cs @@ -11,8 +11,8 @@ namespace Content.Shared.Inventory; public partial class InventorySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IViewVariablesManager _vvm = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IViewVariablesManager _vvm = default!; private void InitializeSlots() { diff --git a/Content.Shared/Inventory/SelfEquipOnlySystem.cs b/Content.Shared/Inventory/SelfEquipOnlySystem.cs index 2bd113e22b1..ce250990f1e 100644 --- a/Content.Shared/Inventory/SelfEquipOnlySystem.cs +++ b/Content.Shared/Inventory/SelfEquipOnlySystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Inventory; -public sealed class SelfEquipOnlySystem : EntitySystem +public sealed partial class SelfEquipOnlySystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; /// public override void Initialize() diff --git a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs index 5342605d747..aabc76a7749 100644 --- a/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs +++ b/Content.Shared/Inventory/VirtualItem/SharedVirtualItemSystem.cs @@ -22,13 +22,13 @@ namespace Content.Shared.Inventory.VirtualItem; /// and , see the /// references there for more information /// -public abstract class SharedVirtualItemSystem : EntitySystem +public abstract partial class SharedVirtualItemSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedItemSystem _itemSystem = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedItemSystem _itemSystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; private static readonly EntProtoId VirtualItem = "VirtualItem"; diff --git a/Content.Shared/Invoices/Systems/SharedInvoicePrinterConsoleSystem.cs b/Content.Shared/Invoices/Systems/SharedInvoicePrinterConsoleSystem.cs index 96a31cf3988..2ba897d8f12 100644 --- a/Content.Shared/Invoices/Systems/SharedInvoicePrinterConsoleSystem.cs +++ b/Content.Shared/Invoices/Systems/SharedInvoicePrinterConsoleSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Invoices.Systems { [UsedImplicitly] - public abstract class SharedInvoicePrinterConsoleSystem : EntitySystem + public abstract partial class SharedInvoicePrinterConsoleSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly ILogManager _log = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private ILogManager _log = default!; public const string Sawmill = "idconsole"; protected ISawmill _sawmill = default!; diff --git a/Content.Shared/Item/HeldSpeedModifierSystem.cs b/Content.Shared/Item/HeldSpeedModifierSystem.cs index c89afa70fbe..33b76283bf6 100644 --- a/Content.Shared/Item/HeldSpeedModifierSystem.cs +++ b/Content.Shared/Item/HeldSpeedModifierSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Item; /// /// This handles /// -public sealed class HeldSpeedModifierSystem : EntitySystem +public sealed partial class HeldSpeedModifierSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; /// public override void Initialize() diff --git a/Content.Shared/Item/ItemToggle/ItemTogglePrefixSystem.cs b/Content.Shared/Item/ItemToggle/ItemTogglePrefixSystem.cs index b401fefc440..8640d09786e 100644 --- a/Content.Shared/Item/ItemToggle/ItemTogglePrefixSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemTogglePrefixSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Item.ItemToggle; /// /// On toggle handles the changes to ItemComponent.HeldPrefix. . /// -public sealed class ItemTogglePrefixSystem : EntitySystem +public sealed partial class ItemTogglePrefixSystem : EntitySystem { - [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private SharedItemSystem _item = default!; /// public override void Initialize() diff --git a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs index 3b4fe34bb92..100a1f4b45d 100644 --- a/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs +++ b/Content.Shared/Item/ItemToggle/ItemToggleSystem.cs @@ -17,13 +17,13 @@ namespace Content.Shared.Item.ItemToggle; /// /// If you need extended functionality (e.g. requiring power) then add a new component and use events. /// -public sealed class ItemToggleSystem : EntitySystem +public sealed partial class ItemToggleSystem : EntitySystem { - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _gameTiming = default!; private EntityQuery _query; diff --git a/Content.Shared/Item/MultiHandedItemSystem.cs b/Content.Shared/Item/MultiHandedItemSystem.cs index 9d30d57a91c..e3b2f7639ad 100644 --- a/Content.Shared/Item/MultiHandedItemSystem.cs +++ b/Content.Shared/Item/MultiHandedItemSystem.cs @@ -6,12 +6,12 @@ namespace Content.Shared.Item; -public sealed class MultiHandedItemSystem : EntitySystem +public sealed partial class MultiHandedItemSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedVirtualItemSystem _virtualItem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedVirtualItemSystem _virtualItem = default!; /// public override void Initialize() diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs index 28aeef6f20a..20ac0511717 100644 --- a/Content.Shared/Item/SharedItemSystem.cs +++ b/Content.Shared/Item/SharedItemSystem.cs @@ -11,11 +11,11 @@ namespace Content.Shared.Item; -public abstract class SharedItemSystem : EntitySystem +public abstract partial class SharedItemSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] protected SharedContainerSystem Container = default!; public override void Initialize() { diff --git a/Content.Shared/ItemRecall/SharedItemRecallSystem.cs b/Content.Shared/ItemRecall/SharedItemRecallSystem.cs index fd585c449cd..f996f1981b7 100644 --- a/Content.Shared/ItemRecall/SharedItemRecallSystem.cs +++ b/Content.Shared/ItemRecall/SharedItemRecallSystem.cs @@ -15,13 +15,13 @@ namespace Content.Shared.ItemRecall; /// public abstract partial class SharedItemRecallSystem : EntitySystem { - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly SharedPvsOverrideSystem _pvs = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly SharedPopupSystem _popups = default!; - [Dependency] private readonly SharedProjectileSystem _proj = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private SharedPvsOverrideSystem _pvs = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private SharedPopupSystem _popups = default!; + [Dependency] private SharedProjectileSystem _proj = default!; public override void Initialize() { diff --git a/Content.Shared/Jaunt/JauntSystem.cs b/Content.Shared/Jaunt/JauntSystem.cs index 3adaf58638f..89886c11756 100644 --- a/Content.Shared/Jaunt/JauntSystem.cs +++ b/Content.Shared/Jaunt/JauntSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Jaunt; -public sealed class JauntSystem : EntitySystem +public sealed partial class JauntSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private SharedActionsSystem _actions = default!; public override void Initialize() { diff --git a/Content.Shared/Jittering/SharedJitteringSystem.cs b/Content.Shared/Jittering/SharedJitteringSystem.cs index bfab0c22e1c..d90addee184 100644 --- a/Content.Shared/Jittering/SharedJitteringSystem.cs +++ b/Content.Shared/Jittering/SharedJitteringSystem.cs @@ -10,11 +10,11 @@ namespace Content.Shared.Jittering /// /// A system for applying a jitter animation to any entity. /// - public abstract class SharedJitteringSystem : EntitySystem + public abstract partial class SharedJitteringSystem : EntitySystem { - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] protected readonly StatusEffectsSystem StatusEffects = default!; - [Dependency] private readonly SharedJobNetSystem _jobNetSystem = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] protected StatusEffectsSystem StatusEffects = default!; + [Dependency] private SharedJobNetSystem _jobNetSystem = default!; public float MaxAmplitude = 300f; public float MinAmplitude = 1f; diff --git a/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs b/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs index 3ed083a5a65..d955acf49ed 100644 --- a/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs +++ b/Content.Shared/Kitchen/Components/EntitySystems/HandheldGrinderSystem.cs @@ -13,16 +13,16 @@ namespace Content.Shared.Kitchen.EntitySystems; -internal sealed class HandheldGrinderSystem : EntitySystem +internal sealed partial class HandheldGrinderSystem : EntitySystem { - [Dependency] private readonly SharedReagentGrinderSystem _reagentGrinder = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; - [Dependency] private readonly SharedStackSystem _stackSystem = default!; - [Dependency] private readonly SharedDestructibleSystem _destructibleSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedReagentGrinderSystem _reagentGrinder = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedStackSystem _stackSystem = default!; + [Dependency] private SharedDestructibleSystem _destructibleSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs index 704d7ab0d2e..b48001d833f 100644 --- a/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs +++ b/Content.Shared/Kitchen/EntitySystems/SharedReagentGrinderSystem.cs @@ -21,21 +21,21 @@ namespace Content.Shared.Kitchen.EntitySystems; [UsedImplicitly] -public abstract class SharedReagentGrinderSystem : EntitySystem +public abstract partial class SharedReagentGrinderSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainersSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedStackSystem _stackSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedDestructibleSystem _destructible = default!; - [Dependency] private readonly SharedJitteringSystem _jitter = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; - [Dependency] private readonly SharedPowerStateSystem _powerState = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainersSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedStackSystem _stackSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedDestructibleSystem _destructible = default!; + [Dependency] private SharedJitteringSystem _jitter = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; + [Dependency] private SharedPowerStateSystem _powerState = default!; public override void Initialize() { diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs index 71228401931..e2997a8fb0b 100644 --- a/Content.Shared/Kitchen/RecipeManager.cs +++ b/Content.Shared/Kitchen/RecipeManager.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Kitchen { - public sealed class RecipeManager + public sealed partial class RecipeManager { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public List Recipes { get; private set; } = new(); diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs index 2246dcd7e5a..e9730b80a6b 100644 --- a/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs +++ b/Content.Shared/Kitchen/SharedKitchenSpikeSystem.cs @@ -30,21 +30,21 @@ namespace Content.Shared.Kitchen; /// /// Used to butcher some entities like monkeys. /// -public sealed class SharedKitchenSpikeSystem : EntitySystem +public sealed partial class SharedKitchenSpikeSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ISharedAdminLogManager _logger = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly ExamineSystemShared _examineSystem = default!; - [Dependency] private readonly MetaDataSystem _metaDataSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private ISharedAdminLogManager _logger = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private ExamineSystemShared _examineSystem = default!; + [Dependency] private MetaDataSystem _metaDataSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Labels/EntitySystems/LabelSystem.cs b/Content.Shared/Labels/EntitySystems/LabelSystem.cs index a341b1f8cbf..c5534442ac6 100644 --- a/Content.Shared/Labels/EntitySystems/LabelSystem.cs +++ b/Content.Shared/Labels/EntitySystems/LabelSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.Labels.EntitySystems; public sealed partial class LabelSystem : EntitySystem { - [Dependency] private readonly NameModifierSystem _nameModifier = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private NameModifierSystem _nameModifier = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public const string ContainerName = "paper_label"; diff --git a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs index a81f38e3088..98da98a38a4 100644 --- a/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs +++ b/Content.Shared/Labels/EntitySystems/SharedHandLabelerSystem.cs @@ -13,16 +13,16 @@ namespace Content.Shared.Labels.EntitySystems; -public abstract class SharedHandLabelerSystem : EntitySystem +public abstract partial class SharedHandLabelerSystem : EntitySystem { - [Dependency] protected readonly SharedUserInterfaceSystem UserInterfaceSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly LabelSystem _labelSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly MetaDataSystem _metadataSystem = default!; + [Dependency] protected SharedUserInterfaceSystem UserInterfaceSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private LabelSystem _labelSystem = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private MetaDataSystem _metadataSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Lathe/SharedLatheSystem.cs b/Content.Shared/Lathe/SharedLatheSystem.cs index cc75bdbbb2b..417fc9d0387 100644 --- a/Content.Shared/Lathe/SharedLatheSystem.cs +++ b/Content.Shared/Lathe/SharedLatheSystem.cs @@ -15,11 +15,11 @@ namespace Content.Shared.Lathe; /// /// This handles... /// -public abstract class SharedLatheSystem : EntitySystem +public abstract partial class SharedLatheSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedMaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedMaterialStorageSystem _materialStorage = default!; + [Dependency] private EmagSystem _emag = default!; public readonly Dictionary> InverseRecipes = new(); public const int MaxItemsPerRequest = 10_000; diff --git a/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs b/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs index 8a9995d74e7..316fcf59b01 100644 --- a/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs +++ b/Content.Shared/Light/EntitySystems/ItemTogglePointLightSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Light.EntitySystems; /// Implements the behavior of , causing s to /// enable and disable lights on the entity. /// -public sealed class ItemTogglePointLightSystem : EntitySystem +public sealed partial class ItemTogglePointLightSystem : EntitySystem { - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly SharedHandheldLightSystem _handheldLight = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private SharedHandheldLightSystem _handheldLight = default!; public override void Initialize() { diff --git a/Content.Shared/Light/EntitySystems/LightCollideSystem.cs b/Content.Shared/Light/EntitySystems/LightCollideSystem.cs index 2de7c5591fd..42e994c5318 100644 --- a/Content.Shared/Light/EntitySystems/LightCollideSystem.cs +++ b/Content.Shared/Light/EntitySystems/LightCollideSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Light.EntitySystems; -public sealed class LightCollideSystem : EntitySystem +public sealed partial class LightCollideSystem : EntitySystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SlimPoweredLightSystem _lights = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SlimPoweredLightSystem _lights = default!; private EntityQuery _lightQuery; diff --git a/Content.Shared/Light/EntitySystems/SharedLightBulbSystem.cs b/Content.Shared/Light/EntitySystems/SharedLightBulbSystem.cs index b2e9720984d..468d7ed4209 100644 --- a/Content.Shared/Light/EntitySystems/SharedLightBulbSystem.cs +++ b/Content.Shared/Light/EntitySystems/SharedLightBulbSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Light.EntitySystems; -public abstract class SharedLightBulbSystem : EntitySystem +public abstract partial class SharedLightBulbSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs index ca55a1a4ed1..ee2310f02eb 100644 --- a/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs +++ b/Content.Shared/Light/EntitySystems/SharedPoweredLightSystem.cs @@ -20,21 +20,21 @@ namespace Content.Shared.Light.EntitySystems; -public abstract class SharedPoweredLightSystem : EntitySystem +public abstract partial class SharedPoweredLightSystem : EntitySystem { - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] private readonly DamageOnInteractSystem _damageOnInteractSystem = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedLightBulbSystem _bulbSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] private DamageOnInteractSystem _damageOnInteractSystem = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] protected SharedContainerSystem ContainerSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedLightBulbSystem _bulbSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; + [Dependency] private SharedPointLightSystem _pointLight = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] private SharedDeviceLinkSystem _deviceLink = default!; private static readonly TimeSpan ThunkDelay = TimeSpan.FromSeconds(2); public const string LightBulbContainer = "light_bulb"; diff --git a/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs b/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs index 43b3b7732ac..ec512b5b7a7 100644 --- a/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs +++ b/Content.Shared/Light/EntitySystems/SharedRoofSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Light.EntitySystems; /// /// Handles the roof flag for tiles that gets used for the RoofOverlay. /// -public abstract class SharedRoofSystem : EntitySystem +public abstract partial class SharedRoofSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; + [Dependency] private EntityLookupSystem _lookup = default!; private HashSet> _roofSet = new(); diff --git a/Content.Shared/Light/EntitySystems/SharedSunShadowSystem.cs b/Content.Shared/Light/EntitySystems/SharedSunShadowSystem.cs index ed6069d0f96..4e65d1cf19e 100644 --- a/Content.Shared/Light/EntitySystems/SharedSunShadowSystem.cs +++ b/Content.Shared/Light/EntitySystems/SharedSunShadowSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Light.EntitySystems; -public abstract class SharedSunShadowSystem : EntitySystem +public abstract partial class SharedSunShadowSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; public override void Initialize() { diff --git a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs index 4cf9b25dadc..c6c2363acb2 100644 --- a/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs +++ b/Content.Shared/Light/EntitySystems/SlimPoweredLightSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Light.EntitySystems; -public sealed class SlimPoweredLightSystem : EntitySystem +public sealed partial class SlimPoweredLightSystem : EntitySystem { - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; - [Dependency] private readonly SharedPointLightSystem _lights = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; + [Dependency] private SharedPointLightSystem _lights = default!; private bool _setting; diff --git a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs index a6771fcf96f..508ada145a3 100644 --- a/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs +++ b/Content.Shared/Light/EntitySystems/UnpoweredFlashlightSystem.cs @@ -11,18 +11,18 @@ namespace Content.Shared.Light.EntitySystems; -public sealed class UnpoweredFlashlightSystem : EntitySystem +public sealed partial class UnpoweredFlashlightSystem : EntitySystem { // TODO: Split some of this to ItemTogglePointLight - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private EmagSystem _emag = default!; public override void Initialize() { diff --git a/Content.Shared/Light/SharedHandheldLightSystem.cs b/Content.Shared/Light/SharedHandheldLightSystem.cs index 57b5a02f782..e6dde8c3544 100644 --- a/Content.Shared/Light/SharedHandheldLightSystem.cs +++ b/Content.Shared/Light/SharedHandheldLightSystem.cs @@ -11,13 +11,13 @@ namespace Content.Shared.Light; -public abstract class SharedHandheldLightSystem : EntitySystem +public abstract partial class SharedHandheldLightSystem : EntitySystem { - [Dependency] private readonly SharedItemSystem _itemSys = default!; - [Dependency] private readonly ClothingSystem _clothingSys = default!; - [Dependency] private readonly SharedActionsSystem _actionSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedItemSystem _itemSys = default!; + [Dependency] private ClothingSystem _clothingSys = default!; + [Dependency] private SharedActionsSystem _actionSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Lightning/SharedLightningSystem.cs b/Content.Shared/Lightning/SharedLightningSystem.cs index ef9ab3977e5..5c02e5d5155 100644 --- a/Content.Shared/Lightning/SharedLightningSystem.cs +++ b/Content.Shared/Lightning/SharedLightningSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Lightning; -public abstract class SharedLightningSystem : EntitySystem +public abstract partial class SharedLightningSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; /// /// Picks a random sprite state for the lightning. It's just data that gets passed to the diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index f0e8dc5b227..d0d20d5b47e 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Localizations { - public sealed class ContentLocalizationManager + public sealed partial class ContentLocalizationManager { - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private ILocalizationManager _loc = default!; // If you want to change your codebase's language, do it here. private const string Culture = "en-US"; diff --git a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs index 04680188e03..7e8a96c6472 100644 --- a/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs +++ b/Content.Shared/Lock/BypassLock/Systems/BypassLockSystem.cs @@ -14,10 +14,10 @@ namespace Content.Shared.Lock.BypassLock.Systems; public sealed partial class BypassLockSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedWiresSystem _wires = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedWiresSystem _wires = default!; public override void Initialize() { diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs index 5873730cde2..30fcc3133dc 100644 --- a/Content.Shared/Lock/LockSystem.cs +++ b/Content.Shared/Lock/LockSystem.cs @@ -24,15 +24,15 @@ namespace Content.Shared.Lock; /// Handles (un)locking and examining of Lock components /// [UsedImplicitly] -public sealed class LockSystem : EntitySystem +public sealed partial class LockSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _sharedPopupSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _sharedPopupSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; private readonly LocId _defaultDenyReason = "lock-comp-has-user-access-fail"; diff --git a/Content.Shared/Lock/LockingWhitelistSystem.cs b/Content.Shared/Lock/LockingWhitelistSystem.cs index ba495fba905..c105d63cdbe 100644 --- a/Content.Shared/Lock/LockingWhitelistSystem.cs +++ b/Content.Shared/Lock/LockingWhitelistSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Lock; -public sealed class LockingWhitelistSystem : EntitySystem +public sealed partial class LockingWhitelistSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs index 60356a8a38f..ec305a2224e 100644 --- a/Content.Shared/Magic/SharedMagicSystem.cs +++ b/Content.Shared/Magic/SharedMagicSystem.cs @@ -42,31 +42,31 @@ namespace Content.Shared.Magic; /// /// Handles learning and using spells (actions) /// -public abstract class SharedMagicSystem : EntitySystem +public abstract partial class SharedMagicSystem : EntitySystem { - [Dependency] private readonly ISerializationManager _seriMan = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedGunSystem _gunSystem = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedDoorSystem _door = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly SharedChargesSystem _charges = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; + [Dependency] private ISerializationManager _seriMan = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedGunSystem _gunSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedDoorSystem _door = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private SharedChargesSystem _charges = default!; + [Dependency] private ExamineSystemShared _examine = default!; private static readonly ProtoId InvalidForGlobalSpawnSpellTag = "InvalidForGlobalSpawnSpell"; diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs index 90038fa9bae..2bc5251d80b 100644 --- a/Content.Shared/Magic/SpellbookSystem.cs +++ b/Content.Shared/Magic/SpellbookSystem.cs @@ -10,14 +10,14 @@ namespace Content.Shared.Magic; -public sealed class SpellbookSystem : EntitySystem +public sealed partial class SpellbookSystem : EntitySystem { - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private INetManager _netManager = default!; public override void Initialize() { diff --git a/Content.Shared/Magic/Systems/AnimateSpellSystem.cs b/Content.Shared/Magic/Systems/AnimateSpellSystem.cs index 202605a3385..fa6b3aeb01e 100644 --- a/Content.Shared/Magic/Systems/AnimateSpellSystem.cs +++ b/Content.Shared/Magic/Systems/AnimateSpellSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.Magic.Systems; -public sealed class AnimateSpellSystem : EntitySystem +public sealed partial class AnimateSpellSystem : EntitySystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/MagicMirror/MagicMirrorSystem.cs b/Content.Shared/MagicMirror/MagicMirrorSystem.cs index 5cdedcf0275..631b514c480 100644 --- a/Content.Shared/MagicMirror/MagicMirrorSystem.cs +++ b/Content.Shared/MagicMirror/MagicMirrorSystem.cs @@ -14,16 +14,16 @@ namespace Content.Shared.MagicMirror; -public sealed class MagicMirrorSystem : EntitySystem +public sealed partial class MagicMirrorSystem : EntitySystem { - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; private static readonly ProtoId HidesHairTag = "HidesHair"; diff --git a/Content.Shared/Maps/TileSystem.cs b/Content.Shared/Maps/TileSystem.cs index 2d0e1576992..27f7c98789a 100644 --- a/Content.Shared/Maps/TileSystem.cs +++ b/Content.Shared/Maps/TileSystem.cs @@ -18,16 +18,16 @@ namespace Content.Shared.Maps; /// /// Handles server-side tile manipulation like prying/deconstructing tiles. /// -public sealed class TileSystem : EntitySystem +public sealed partial class TileSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IRobustRandom _robustRandom = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly SharedDecalSystem _decal = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IRobustRandom _robustRandom = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private SharedDecalSystem _decal = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private IGameTiming _timing = default!; public const int ChunkSize = 16; diff --git a/Content.Shared/Maps/TurfSystem.cs b/Content.Shared/Maps/TurfSystem.cs index 218dc2740d6..2a3a41cbc12 100644 --- a/Content.Shared/Maps/TurfSystem.cs +++ b/Content.Shared/Maps/TurfSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.Maps; /// /// This system provides various useful helper methods for turfs & tiles. Replacement for /// -public sealed class TurfSystem : EntitySystem +public sealed partial class TurfSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitions = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private ITileDefinitionManager _tileDefinitions = default!; /// diff --git a/Content.Shared/Materials/OreSilo/SharedOreSiloSystem.cs b/Content.Shared/Materials/OreSilo/SharedOreSiloSystem.cs index 33168db1db3..986ff30b399 100644 --- a/Content.Shared/Materials/OreSilo/SharedOreSiloSystem.cs +++ b/Content.Shared/Materials/OreSilo/SharedOreSiloSystem.cs @@ -4,11 +4,11 @@ namespace Content.Shared.Materials.OreSilo; -public abstract class SharedOreSiloSystem : EntitySystem +public abstract partial class SharedOreSiloSystem : EntitySystem { - [Dependency] private readonly SharedMaterialStorageSystem _materialStorage = default!; - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedMaterialStorageSystem _materialStorage = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!; + [Dependency] private SharedTransformSystem _transform = default!; private EntityQuery _clientQuery; diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs index 8f4a5a6fa19..9ac891b799b 100644 --- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs +++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs @@ -20,15 +20,15 @@ namespace Content.Shared.Materials; /// Handles interactions and logic related to , /// , and . /// -public abstract class SharedMaterialReclaimerSystem : EntitySystem +public abstract partial class SharedMaterialReclaimerSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly SharedAmbientSoundSystem AmbientSound = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected SharedAmbientSoundSystem AmbientSound = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EmagSystem _emag = default!; public const string ActiveReclaimerContainerId = "active-material-reclaimer-container"; diff --git a/Content.Shared/Materials/SharedMaterialStorageSystem.cs b/Content.Shared/Materials/SharedMaterialStorageSystem.cs index cc3d560042e..306d59da70d 100644 --- a/Content.Shared/Materials/SharedMaterialStorageSystem.cs +++ b/Content.Shared/Materials/SharedMaterialStorageSystem.cs @@ -16,12 +16,12 @@ namespace Content.Shared.Materials; /// This handles storing materials and modifying their amounts /// /// -public abstract class SharedMaterialStorageSystem : EntitySystem +public abstract partial class SharedMaterialStorageSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; /// /// Default volume for a sheet if the material's entity prototype has no material composition. diff --git a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs index d43e9514fc6..d35c8f0dfe1 100644 --- a/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs +++ b/Content.Shared/Mech/EntitySystems/SharedMechSystem.cs @@ -29,17 +29,17 @@ namespace Content.Shared.Mech.EntitySystems; /// public abstract partial class SharedMechSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; /// public override void Initialize() diff --git a/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs b/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs index 10f92954bdc..b205dc71bd7 100644 --- a/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs +++ b/Content.Shared/Mech/Equipment/Systems/MechSoundboardSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Mech.Equipment.Systems; /// /// Handles everything for mech soundboard. /// -public sealed class MechSoundboardSystem : EntitySystem +public sealed partial class MechSoundboardSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs index c1c87b536f5..ac779439d46 100644 --- a/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs +++ b/Content.Shared/Medical/Cryogenics/SharedCryoPodSystem.cs @@ -35,24 +35,24 @@ namespace Content.Shared.Medical.Cryogenics; public abstract partial class SharedCryoPodSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly ClimbSystem _climb = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly ReactiveSystem _reactive = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPointLightSystem _light = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; - [Dependency] private readonly StandingStateSystem _standingState = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private ClimbSystem _climb = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private ReactiveSystem _reactive = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedBloodstreamSystem _bloodstream = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPointLightSystem _light = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; + [Dependency] private StandingStateSystem _standingState = default!; private EntityQuery _bloodstreamQuery; private EntityQuery _itemSlotsQuery; diff --git a/Content.Shared/Medical/Healing/HealingSystem.cs b/Content.Shared/Medical/Healing/HealingSystem.cs index 41fb24c5271..58f0802838f 100644 --- a/Content.Shared/Medical/Healing/HealingSystem.cs +++ b/Content.Shared/Medical/Healing/HealingSystem.cs @@ -18,18 +18,18 @@ namespace Content.Shared.Medical.Healing; -public sealed class HealingSystem : EntitySystem +public sealed partial class HealingSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedBloodstreamSystem _bloodstreamSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedStackSystem _stacks = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedBloodstreamSystem _bloodstreamSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedStackSystem _stacks = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Medical/SharedDefibrillatorSystem.cs b/Content.Shared/Medical/SharedDefibrillatorSystem.cs index 5ff99b5c20a..0ad7840bb4b 100644 --- a/Content.Shared/Medical/SharedDefibrillatorSystem.cs +++ b/Content.Shared/Medical/SharedDefibrillatorSystem.cs @@ -21,23 +21,23 @@ namespace Content.Shared.Medical; /// /// This handles interactions and logic relating to /// -public abstract class SharedDefibrillatorSystem : EntitySystem +public abstract partial class SharedDefibrillatorSystem : EntitySystem { - [Dependency] private readonly SharedChatSystem _chat = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedRottingSystem _rotting = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedChatSystem _chat = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedElectrocutionSystem _electrocution = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MobThresholdSystem _mobThreshold = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private SharedRottingSystem _rotting = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; private readonly HashSet _interacters = new(); diff --git a/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs b/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs index 4fe0ee04311..acd153e851e 100644 --- a/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs +++ b/Content.Shared/Medical/Stethoscope/StethoscopeSystem.cs @@ -12,13 +12,13 @@ namespace Content.Shared.Medical.Stethoscope; -public sealed class StethoscopeSystem : EntitySystem +public sealed partial class StethoscopeSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private DamageableSystem _damageable = default!; // The damage type to "listen" for with the stethoscope. private const string DamageToListenFor = "Asphyxiation"; diff --git a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs index b49605c9b91..14e37732ed9 100644 --- a/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs +++ b/Content.Shared/Medical/SuitSensors/SharedSuitSensorSystem.cs @@ -25,22 +25,22 @@ namespace Content.Shared.Medical.SuitSensors; -public abstract class SharedSuitSensorSystem : EntitySystem +public abstract partial class SharedSuitSensorSystem : EntitySystem { - [Dependency] private readonly SharedStationSystem _stationSystem = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedIdCardSystem _idCardSystem = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private SharedStationSystem _stationSystem = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedIdCardSystem _idCardSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private DamageableSystem _damageable = default!; private EntityQuery _sensorQuery; public override void Initialize() diff --git a/Content.Shared/Medical/VomitSystem.cs b/Content.Shared/Medical/VomitSystem.cs index 8c528313b88..cdb2b807ab7 100644 --- a/Content.Shared/Medical/VomitSystem.cs +++ b/Content.Shared/Medical/VomitSystem.cs @@ -19,20 +19,20 @@ namespace Content.Shared.Medical; -public sealed class VomitSystem : EntitySystem +public sealed partial class VomitSystem : EntitySystem { - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly HungerSystem _hunger = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; - [Dependency] private readonly ThirstSystem _thirst = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedBloodstreamSystem _bloodstream = default!; - [Dependency] private readonly SharedForensicsSystem _forensics = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private HungerSystem _hunger = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; + [Dependency] private ThirstSystem _thirst = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedBloodstreamSystem _bloodstream = default!; + [Dependency] private SharedForensicsSystem _forensics = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; public override void Initialize() { diff --git a/Content.Shared/Metabolism/MetabolizerSystem.cs b/Content.Shared/Metabolism/MetabolizerSystem.cs index 0c2881f085f..1384d4281df 100644 --- a/Content.Shared/Metabolism/MetabolizerSystem.cs +++ b/Content.Shared/Metabolism/MetabolizerSystem.cs @@ -22,14 +22,14 @@ namespace Content.Shared.Metabolism; /// -public sealed class MetabolizerSystem : EntitySystem +public sealed partial class MetabolizerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly SharedEntityConditionsSystem _entityConditions = default!; - [Dependency] private readonly SharedEntityEffectsSystem _entityEffects = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private SharedEntityConditionsSystem _entityConditions = default!; + [Dependency] private SharedEntityEffectsSystem _entityEffects = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainerSystem = default!; private EntityQuery _organQuery; private EntityQuery _solutionQuery; diff --git a/Content.Shared/Mind/MindExamineSystem.cs b/Content.Shared/Mind/MindExamineSystem.cs index bae0476d961..629e5904e0b 100644 --- a/Content.Shared/Mind/MindExamineSystem.cs +++ b/Content.Shared/Mind/MindExamineSystem.cs @@ -7,12 +7,12 @@ namespace Content.Shared.Mind; -public sealed class MindExamineSystem : EntitySystem +public sealed partial class MindExamineSystem : EntitySystem { - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ISharedPlayerManager _player = default!; public override void Initialize() { diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index 3274f38e822..5e2ca213ab3 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -31,15 +31,15 @@ namespace Content.Shared.Mind; public abstract partial class SharedMindSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedObjectivesSystem _objectives = default!; - [Dependency] private readonly SharedPlayerSystem _player = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedObjectivesSystem _objectives = default!; + [Dependency] private SharedPlayerSystem _player = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; [ViewVariables] protected readonly Dictionary UserMinds = new(); diff --git a/Content.Shared/Mindshield/FakeMindShield/FakeMindshieldSystem.cs b/Content.Shared/Mindshield/FakeMindShield/FakeMindshieldSystem.cs index 4fe88d290c8..d91eb3a1c05 100644 --- a/Content.Shared/Mindshield/FakeMindShield/FakeMindshieldSystem.cs +++ b/Content.Shared/Mindshield/FakeMindShield/FakeMindshieldSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.Mindshield.FakeMindShield; -public sealed class FakeMindShieldSystem : EntitySystem +public sealed partial class FakeMindShieldSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] private IGameTiming _timing = default!; // This tag should be placed on the fake mindshield action so there is a way to easily identify it. private static readonly ProtoId FakeMindShieldImplantTag = "FakeMindShieldImplant"; diff --git a/Content.Shared/Mining/MiningScannerSystem.cs b/Content.Shared/Mining/MiningScannerSystem.cs index 22e9061b09e..ea0e59c2bc1 100644 --- a/Content.Shared/Mining/MiningScannerSystem.cs +++ b/Content.Shared/Mining/MiningScannerSystem.cs @@ -8,13 +8,13 @@ namespace Content.Shared.Mining; -public sealed class MiningScannerSystem : EntitySystem +public sealed partial class MiningScannerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private InventorySystem _inventory = default!; /// public override void Initialize() diff --git a/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs b/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs index 987ec3cd532..68e4a0e4630 100644 --- a/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs +++ b/Content.Shared/Mobs/Systems/MobStateActionsSystem.cs @@ -11,11 +11,11 @@ namespace Content.Shared.Mobs.Systems; /// /// Adds and removes defined actions when a mob's changes. /// -public sealed class MobStateActionsSystem : EntitySystem +public sealed partial class MobStateActionsSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly IConfigurationManager _configurationManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private IConfigurationManager _configurationManager = default!; + [Dependency] private IGameTiming _timing = default!; /// public override void Initialize() { diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.cs b/Content.Shared/Mobs/Systems/MobStateSystem.cs index 0497f3cce0b..ea09c109220 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.Mobs.Systems; [Virtual] public partial class MobStateSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly StandingStateSystem _standing = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private StandingStateSystem _standing = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private DamageableSystem _damageable = default!; private ISawmill _sawmill = default!; private EntityQuery _mobStateQuery; diff --git a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs index 8442268df11..73ea97ad3a5 100644 --- a/Content.Shared/Mobs/Systems/MobThresholdSystem.cs +++ b/Content.Shared/Mobs/Systems/MobThresholdSystem.cs @@ -11,11 +11,11 @@ namespace Content.Shared.Mobs.Systems; -public sealed class MobThresholdSystem : EntitySystem +public sealed partial class MobThresholdSystem : EntitySystem { - [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private MobStateSystem _mobStateSystem = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs index d11695321b9..ac82bb71caa 100644 --- a/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs +++ b/Content.Shared/Morgue/EntityStorageLayingDownOverrideSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Morgue; -public sealed class EntityStorageLayingDownOverrideSystem : EntitySystem +public sealed partial class EntityStorageLayingDownOverrideSystem : EntitySystem { - [Dependency] private readonly StandingStateSystem _standing = default!; + [Dependency] private StandingStateSystem _standing = default!; public override void Initialize() { diff --git a/Content.Shared/Morgue/SharedCrematoriumSystem.cs b/Content.Shared/Morgue/SharedCrematoriumSystem.cs index 6c216f02326..9d93a6eac39 100644 --- a/Content.Shared/Morgue/SharedCrematoriumSystem.cs +++ b/Content.Shared/Morgue/SharedCrematoriumSystem.cs @@ -15,17 +15,17 @@ namespace Content.Shared.Morgue; -public abstract class SharedCrematoriumSystem : EntitySystem +public abstract partial class SharedCrematoriumSystem : EntitySystem { - [Dependency] protected readonly SharedEntityStorageSystem EntityStorage = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] protected readonly StandingStateSystem Standing = default!; - [Dependency] protected readonly SharedMindSystem Mind = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] protected SharedEntityStorageSystem EntityStorage = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] protected StandingStateSystem Standing = default!; + [Dependency] protected SharedMindSystem Mind = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; public override void Initialize() { diff --git a/Content.Shared/Morgue/SharedMorgueSystem.cs b/Content.Shared/Morgue/SharedMorgueSystem.cs index 8c0687ad408..72719f626b8 100644 --- a/Content.Shared/Morgue/SharedMorgueSystem.cs +++ b/Content.Shared/Morgue/SharedMorgueSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Morgue; -public abstract class SharedMorgueSystem : EntitySystem +public abstract partial class SharedMorgueSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs index 57613d0f6d1..caa8edab959 100644 --- a/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs +++ b/Content.Shared/MouseRotator/SharedMouseRotatorSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.MouseRotator; /// This handles rotating an entity based on mouse location /// /// -public abstract class SharedMouseRotatorSystem : EntitySystem +public abstract partial class SharedMouseRotatorSystem : EntitySystem { - [Dependency] private readonly RotateToFaceSystem _rotate = default!; + [Dependency] private RotateToFaceSystem _rotate = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 0fcdf7ebed0..ecf60b60eb7 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -38,21 +38,21 @@ namespace Content.Shared.Movement.Pulling.Systems; /// /// Allows one entity to pull another behind them via a physics distance joint. /// -public sealed class PullingSystem : EntitySystem +public sealed partial class PullingSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _modifierSystem = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly HeldSpeedModifierSystem _clothingMoveSpeed = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedVirtualItemSystem _virtual = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; + [Dependency] private MovementSpeedModifierSystem _modifierSystem = default!; + [Dependency] private SharedJointSystem _joints = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private HeldSpeedModifierSystem _clothingMoveSpeed = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedVirtualItemSystem _virtual = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Systems/AutoOrientSystem.cs b/Content.Shared/Movement/Systems/AutoOrientSystem.cs index 3bbd715df50..a00c65bdc7b 100644 --- a/Content.Shared/Movement/Systems/AutoOrientSystem.cs +++ b/Content.Shared/Movement/Systems/AutoOrientSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.Movement.Systems; -public sealed class AutoOrientSystem : EntitySystem +public sealed partial class AutoOrientSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedMoverController _mover = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedMoverController _mover = default!; private TimeSpan _delay = TimeSpan.Zero; diff --git a/Content.Shared/Movement/Systems/FrictionContactsSystem.cs b/Content.Shared/Movement/Systems/FrictionContactsSystem.cs index 3ffdd6ec26f..91e0577db1e 100644 --- a/Content.Shared/Movement/Systems/FrictionContactsSystem.cs +++ b/Content.Shared/Movement/Systems/FrictionContactsSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.Movement.Systems; -public sealed class FrictionContactsSystem : EntitySystem +public sealed partial class FrictionContactsSystem : EntitySystem { - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private MovementSpeedModifierSystem _speedModifierSystem = default!; // Comment copied from "original" SlowContactsSystem.cs (now SpeedModifierContactsSystem.cs) // TODO full-game-save diff --git a/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs b/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs index b2a05f302db..c8c1113f7f7 100644 --- a/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs +++ b/Content.Shared/Movement/Systems/MovementIgnoreGravitySystem.cs @@ -4,7 +4,7 @@ namespace Content.Shared.Movement.Systems; -public sealed class MovementIgnoreGravitySystem : EntitySystem +public sealed partial class MovementIgnoreGravitySystem : EntitySystem { [Dependency] SharedGravitySystem _gravity = default!; public override void Initialize() diff --git a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs index fe715d3623e..6d86c84d72d 100644 --- a/Content.Shared/Movement/Systems/MovementModStatusSystem.cs +++ b/Content.Shared/Movement/Systems/MovementModStatusSystem.cs @@ -17,7 +17,7 @@ namespace Content.Shared.Movement.Systems; /// could occupy same prototype, but be aware that this will make controlling duration of effect /// extra 'challenging', as it will be shared too. /// -public sealed class MovementModStatusSystem : EntitySystem +public sealed partial class MovementModStatusSystem : EntitySystem { public static readonly EntProtoId ReagentSpeed = "ReagentSpeedStatusEffect"; public static readonly EntProtoId VomitingSlowdown = "VomitingSlowdownStatusEffect"; @@ -25,8 +25,8 @@ public sealed class MovementModStatusSystem : EntitySystem public static readonly EntProtoId FlashSlowdown = "FlashSlowdownStatusEffect"; public static readonly EntProtoId StatusEffectFriction = "StatusEffectFriction"; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private StatusEffectsSystem _status = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Systems/MovementSoundSystem.cs b/Content.Shared/Movement/Systems/MovementSoundSystem.cs index 9a1146779fa..e9374d2f852 100644 --- a/Content.Shared/Movement/Systems/MovementSoundSystem.cs +++ b/Content.Shared/Movement/Systems/MovementSoundSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Movement.Systems; /// /// Plays a sound on MoveInputEvent. /// -public sealed class MovementSoundSystem : EntitySystem +public sealed partial class MovementSoundSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAudioSystem _audio = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs index e541c4c1a1a..aaeef906346 100644 --- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs +++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Movement.Systems { - public sealed class MovementSpeedModifierSystem : EntitySystem + public sealed partial class MovementSpeedModifierSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IConfigurationManager _configManager = default!; private float _frictionModifier; private float _airDamping; diff --git a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs index d3a3235a2b5..6b722880c58 100644 --- a/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs +++ b/Content.Shared/Movement/Systems/SharedContentEyeSystem.cs @@ -14,9 +14,9 @@ namespace Content.Shared.Movement.Systems; /// /// Lets specific sessions scroll and set their zoom directly. /// -public abstract class SharedContentEyeSystem : EntitySystem +public abstract partial class SharedContentEyeSystem : EntitySystem { - [Dependency] private readonly ISharedAdminManager _admin = default!; + [Dependency] private ISharedAdminManager _admin = default!; // Admin flags required to ignore normal eye restrictions. public const AdminFlags EyeFlag = AdminFlags.Debug; @@ -25,7 +25,7 @@ public abstract class SharedContentEyeSystem : EntitySystem public static readonly Vector2 DefaultZoom = Vector2.One; public static readonly Vector2 MinZoom = DefaultZoom * (float)Math.Pow(ZoomMod, -3); - [Dependency] private readonly SharedEyeSystem _eye = default!; + [Dependency] private SharedEyeSystem _eye = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs index 0d6a9858ff4..fe58f8ab9d8 100644 --- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs +++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs @@ -11,14 +11,14 @@ namespace Content.Shared.Movement.Systems; -public abstract class SharedJetpackSystem : EntitySystem +public abstract partial class SharedJetpackSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs index 598e4b564a1..3c407bd05bc 100644 --- a/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs +++ b/Content.Shared/Movement/Systems/SharedJumpAbilitySystem.cs @@ -14,13 +14,13 @@ namespace Content.Shared.Movement.Systems; public sealed partial class SharedJumpAbilitySystem : EntitySystem { - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly StandingStateSystem _standing = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private StandingStateSystem _standing = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs b/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs index c5229a6fcd9..324d0aae13c 100644 --- a/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs +++ b/Content.Shared/Movement/Systems/SharedMobCollisionSystem.cs @@ -12,13 +12,13 @@ namespace Content.Shared.Movement.Systems; -public abstract class SharedMobCollisionSystem : EntitySystem +public abstract partial class SharedMobCollisionSystem : EntitySystem { - [Dependency] protected readonly IConfigurationManager CfgManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly MovementSpeedModifierSystem _moveMod = default!; - [Dependency] protected readonly SharedPhysicsSystem Physics = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] protected IConfigurationManager CfgManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private MovementSpeedModifierSystem _moveMod = default!; + [Dependency] protected SharedPhysicsSystem Physics = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; protected EntityQuery MobQuery; protected EntityQuery PhysicsQuery; diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 2adf29d29a5..5b7c48111f6 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -34,19 +34,19 @@ namespace Content.Shared.Movement.Systems; /// public abstract partial class SharedMoverController : VirtualController { - [Dependency] private readonly IConfigurationManager _configManager = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private IConfigurationManager _configManager = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tags = default!; protected EntityQuery CanMoveInAirQuery; protected EntityQuery FootstepModifierQuery; diff --git a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs index aae698e858e..e11803cf7bd 100644 --- a/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs +++ b/Content.Shared/Movement/Systems/SpeedModifierContactsSystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Movement.Systems; -public sealed class SpeedModifierContactsSystem : EntitySystem +public sealed partial class SpeedModifierContactsSystem : EntitySystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private MovementSpeedModifierSystem _speedModifierSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; // TODO full-game-save // Either these need to be processed before a map is saved, or slowed/slowing entities need to update on init. diff --git a/Content.Shared/Movement/Systems/WormSystem.cs b/Content.Shared/Movement/Systems/WormSystem.cs index e28102c4d6c..41cd39e3a97 100644 --- a/Content.Shared/Movement/Systems/WormSystem.cs +++ b/Content.Shared/Movement/Systems/WormSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Movement.Systems; /// /// This handles the worm component /// -public sealed class WormSystem : EntitySystem +public sealed partial class WormSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private SharedStunSystem _stun = default!; public override void Initialize() { diff --git a/Content.Shared/NPC/Systems/NpcFactionSystem.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.cs index 96e7e3a6051..5422c361d7c 100644 --- a/Content.Shared/NPC/Systems/NpcFactionSystem.cs +++ b/Content.Shared/NPC/Systems/NpcFactionSystem.cs @@ -11,9 +11,9 @@ namespace Content.Shared.NPC.Systems; /// public sealed partial class NpcFactionSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedTransformSystem _xform = default!; /// /// To avoid prototype mutability we store an intermediary data class that gets used instead. diff --git a/Content.Shared/NameIdentifier/SharedNameIdentifierSystem.cs b/Content.Shared/NameIdentifier/SharedNameIdentifierSystem.cs index 05a6e43c2a9..abba2e0663b 100644 --- a/Content.Shared/NameIdentifier/SharedNameIdentifierSystem.cs +++ b/Content.Shared/NameIdentifier/SharedNameIdentifierSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.NameIdentifier; /// /// Handles unique name identifiers for entities e.g. `monkey (MK-912)` /// -public abstract class SharedNameIdentifierSystem : EntitySystem +public abstract partial class SharedNameIdentifierSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override void Initialize() { diff --git a/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs b/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs index e728e6cdb51..b77b995eab1 100644 --- a/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs +++ b/Content.Shared/NameModifier/EntitySystems/ModifyWearerNameSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.NameModifier.EntitySystems; public sealed partial class ModifyWearerNameSystem : EntitySystem { - [Dependency] private readonly NameModifierSystem _nameMod = default!; + [Dependency] private NameModifierSystem _nameMod = default!; public override void Initialize() { diff --git a/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs index 673a95de550..8ed41e87c05 100644 --- a/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs +++ b/Content.Shared/NameModifier/EntitySystems/NameModifierSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.NameModifier.EntitySystems; /// -public sealed class NameModifierSystem : EntitySystem +public sealed partial class NameModifierSystem : EntitySystem { - [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private MetaDataSystem _metaData = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs index cab9d1f3b8d..9cbfa85fb39 100644 --- a/Content.Shared/Ninja/Systems/DashAbilitySystem.cs +++ b/Content.Shared/Ninja/Systems/DashAbilitySystem.cs @@ -13,15 +13,15 @@ namespace Content.Shared.Ninja.Systems; /// /// Handles dashing logic including charge consumption and checking attempt events. /// -public sealed class DashAbilitySystem : EntitySystem +public sealed partial class DashAbilitySystem : EntitySystem { - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PullingSystem _pullingSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PullingSystem _pullingSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs index d17c4b32cca..d3e3cace7b5 100644 --- a/Content.Shared/Ninja/Systems/EmagProviderSystem.cs +++ b/Content.Shared/Ninja/Systems/EmagProviderSystem.cs @@ -12,13 +12,13 @@ namespace Content.Shared.Ninja.Systems; /// /// Handles emagging whitelisted objects when clicked. /// -public sealed class EmagProviderSystem : EntitySystem +public sealed partial class EmagProviderSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private TagSystem _tag = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs index c2425b92648..11e314417e6 100644 --- a/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs +++ b/Content.Shared/Ninja/Systems/EnergyKatanaSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Ninja.Systems; /// /// System for katana binding and dash events. Recalling is handled by the suit. /// -public sealed class EnergyKatanaSystem : EntitySystem +public sealed partial class EnergyKatanaSystem : EntitySystem { - [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!; + [Dependency] private SharedSpaceNinjaSystem _ninja = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs b/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs index 56112e9a697..bff688341c2 100644 --- a/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs +++ b/Content.Shared/Ninja/Systems/ItemCreatorSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Ninja.Systems; /// /// Handles predicting that the action exists, creating items is done serverside. /// -public abstract class SharedItemCreatorSystem : EntitySystem +public abstract partial class SharedItemCreatorSystem : EntitySystem { - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs index 2546379ca58..a19f85ef91a 100644 --- a/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs +++ b/Content.Shared/Ninja/Systems/SharedNinjaGlovesSystem.cs @@ -14,14 +14,14 @@ namespace Content.Shared.Ninja.Systems; /// /// Provides the toggle action and handles examining and unequipping. /// -public abstract class SharedNinjaGlovesSystem : EntitySystem +public abstract partial class SharedNinjaGlovesSystem : EntitySystem { - [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!; + [Dependency] private SharedCombatModeSystem _combatMode = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSpaceNinjaSystem _ninja = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs index 58419982aae..cc832a8a3c6 100644 --- a/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs +++ b/Content.Shared/Ninja/Systems/SharedNinjaSuitSystem.cs @@ -14,14 +14,14 @@ namespace Content.Shared.Ninja.Systems; /// /// Handles (un)equipping and provides some API functions. /// -public abstract class SharedNinjaSuitSystem : EntitySystem +public abstract partial class SharedNinjaSuitSystem : EntitySystem { - [Dependency] private readonly ActionContainerSystem _actionContainer = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedSpaceNinjaSystem _ninja = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private ActionContainerSystem _actionContainer = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedSpaceNinjaSystem _ninja = default!; + [Dependency] private UseDelaySystem _useDelay = default!; public override void Initialize() { diff --git a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs index 2d3e787f687..b6a0df86328 100644 --- a/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs +++ b/Content.Shared/Ninja/Systems/SharedSpaceNinjaSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Ninja.Systems; /// /// Provides shared ninja API, handles being attacked revealing ninja and stops guns from shooting. /// -public abstract class SharedSpaceNinjaSystem : EntitySystem +public abstract partial class SharedSpaceNinjaSystem : EntitySystem { - [Dependency] protected readonly SharedNinjaSuitSystem Suit = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected SharedNinjaSuitSystem Suit = default!; + [Dependency] protected SharedPopupSystem Popup = default!; public EntityQuery NinjaQuery; diff --git a/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs index 1a1418b644c..df1b246e6c7 100644 --- a/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Nutrition.EntitySystems; /// -public sealed class ExaminableHungerSystem : EntitySystem +public sealed partial class ExaminableHungerSystem : EntitySystem { - [Dependency] private readonly HungerSystem _hunger = default!; + [Dependency] private HungerSystem _hunger = default!; private EntityQuery _hungerQuery; public override void Initialize() diff --git a/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs b/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs index 50c31d9ce51..52365b91a2a 100644 --- a/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/FlavorProfileSystem.cs @@ -10,10 +10,10 @@ namespace Content.Shared.Nutrition.EntitySystems; /// /// Deals with flavor profiles when you eat something. /// -public sealed class FlavorProfileSystem : EntitySystem +public sealed partial class FlavorProfileSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IConfigurationManager _configManager = default!; private const string BackupFlavorMessage = "flavor-profile-unknown"; diff --git a/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs index 118356e4597..7550b492ef4 100644 --- a/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/FoodSequenceSystem.cs @@ -13,17 +13,17 @@ namespace Content.Shared.Nutrition.EntitySystems; -public sealed class FoodSequenceSystem : SharedFoodSequenceSystem +public sealed partial class FoodSequenceSystem : SharedFoodSequenceSystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly IngestionSystem _ingestion = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private IngestionSystem _ingestion = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tag = default!; public override void Initialize() { diff --git a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs index 9ed4a0acc30..73dc0b38aa4 100644 --- a/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/HungerSystem.cs @@ -12,16 +12,16 @@ namespace Content.Shared.Nutrition.EntitySystems; -public sealed class HungerSystem : EntitySystem +public sealed partial class HungerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly SharedJetpackSystem _jetpack = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private SharedJetpackSystem _jetpack = default!; private static readonly ProtoId HungerIconOverfedId = "HungerIconOverfed"; private static readonly ProtoId HungerIconPeckishId = "HungerIconPeckish"; diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs index 8e0dbe1ac95..5266084e655 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Blockers.cs @@ -12,7 +12,7 @@ namespace Content.Shared.Nutrition.EntitySystems; public sealed partial class IngestionSystem { - [Dependency] private readonly OpenableSystem _openable = default!; + [Dependency] private OpenableSystem _openable = default!; public void InitializeBlockers() { diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs index 39a504fdf32..7a2ad99c457 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.Utensils.cs @@ -10,8 +10,8 @@ namespace Content.Shared.Nutrition.EntitySystems; public sealed partial class IngestionSystem { - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private IGameTiming _timing = default!; private EntityQuery _utensilsQuery; diff --git a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs index a078f562f94..a83ae5030c8 100644 --- a/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/IngestionSystem.cs @@ -43,23 +43,23 @@ namespace Content.Shared.Nutrition.EntitySystems; /// public sealed partial class IngestionSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly FlavorProfileSystem _flavorProfile = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private FlavorProfileSystem _flavorProfile = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedTransformSystem _transform = default!; // Body Component Dependencies - [Dependency] private readonly BodySystem _body = default!; - [Dependency] private readonly ReactiveSystem _reaction = default!; - [Dependency] private readonly StomachSystem _stomach = default!; + [Dependency] private BodySystem _body = default!; + [Dependency] private ReactiveSystem _reaction = default!; + [Dependency] private StomachSystem _stomach = default!; /// public override void Initialize() diff --git a/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs b/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs index d8b25cabd99..b1f49c59863 100644 --- a/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/MessyDrinkerSystem.cs @@ -7,13 +7,13 @@ namespace Content.Shared.Nutrition.EntitySystems; -public sealed class MessyDrinkerSystem : EntitySystem +public sealed partial class MessyDrinkerSystem : EntitySystem { - [Dependency] private readonly IngestionSystem _ingestion = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private IngestionSystem _ingestion = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private TagSystem _tag = default!; public override void Initialize() { diff --git a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs index 1a87dd25e9f..c4ec955c00e 100644 --- a/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/OpenableSystem.cs @@ -17,10 +17,10 @@ namespace Content.Shared.Nutrition.EntitySystems; /// public sealed partial class OpenableSystem : EntitySystem { - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs b/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs index 92282bde1cb..07d6cbda38a 100644 --- a/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/PressurizedSolutionSystem.cs @@ -16,16 +16,16 @@ namespace Content.Shared.Nutrition.EntitySystems; public sealed partial class PressurizedSolutionSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; - [Dependency] private readonly OpenableSystem _openable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPuddleSystem _puddle = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private OpenableSystem _openable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPuddleSystem _puddle = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs index 1cbf682d82b..4a824e531b6 100644 --- a/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/SealableSystem.cs @@ -5,7 +5,7 @@ namespace Content.Shared.Nutrition.EntitySystems; public sealed partial class SealableSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/Nutrition/EntitySystems/ShakeableSystem.cs b/Content.Shared/Nutrition/EntitySystems/ShakeableSystem.cs index 39890aada93..a73e8d05050 100644 --- a/Content.Shared/Nutrition/EntitySystems/ShakeableSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ShakeableSystem.cs @@ -11,10 +11,10 @@ namespace Content.Shared.Nutrition.EntitySystems; public sealed partial class ShakeableSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs index e2a4f316253..e4fc45df6f1 100644 --- a/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/SharedCreamPieSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Nutrition.EntitySystems { [UsedImplicitly] - public abstract class SharedCreamPieSystem : EntitySystem + public abstract partial class SharedCreamPieSystem : EntitySystem { [Dependency] private SharedStunSystem _stunSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs index 51e244043fa..813d1c12341 100644 --- a/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs +++ b/Content.Shared/Nutrition/EntitySystems/ThirstSystem.cs @@ -13,14 +13,14 @@ namespace Content.Shared.Nutrition.EntitySystems; [UsedImplicitly] -public sealed class ThirstSystem : EntitySystem +public sealed partial class ThirstSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; - [Dependency] private readonly SharedJetpackSystem _jetpack = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private MovementSpeedModifierSystem _movement = default!; + [Dependency] private SharedJetpackSystem _jetpack = default!; private static readonly ProtoId ThirstIconOverhydratedId = "ThirstIconOverhydrated"; private static readonly ProtoId ThirstIconThirstyId = "ThirstIconThirsty"; diff --git a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs index 6decefe4a96..c49aaab98ef 100644 --- a/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs +++ b/Content.Shared/Objectives/Systems/SharedObjectivesSystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Objectives.Systems; /// /// Provides API for creating and interacting with objectives. /// -public abstract class SharedObjectivesSystem : EntitySystem +public abstract partial class SharedObjectivesSystem : EntitySystem { - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private IPrototypeManager _protoMan = default!; private EntityQuery _metaQuery; diff --git a/Content.Shared/PDA/SharedPdaSystem.cs b/Content.Shared/PDA/SharedPdaSystem.cs index 78a7575e425..6eb665747d3 100644 --- a/Content.Shared/PDA/SharedPdaSystem.cs +++ b/Content.Shared/PDA/SharedPdaSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.PDA { - public abstract class SharedPdaSystem : EntitySystem + public abstract partial class SharedPdaSystem : EntitySystem { - [Dependency] protected readonly ItemSlotsSystem ItemSlotsSystem = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedJobStatusSystem _jobStatus = default!; + [Dependency] protected ItemSlotsSystem ItemSlotsSystem = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedJobStatusSystem _jobStatus = default!; public override void Initialize() { diff --git a/Content.Shared/PDA/SharedRingerSystem.cs b/Content.Shared/PDA/SharedRingerSystem.cs index c96b69c31b1..5083857cd91 100644 --- a/Content.Shared/PDA/SharedRingerSystem.cs +++ b/Content.Shared/PDA/SharedRingerSystem.cs @@ -14,19 +14,19 @@ namespace Content.Shared.PDA; /// /// Handles the shared functionality for PDA ringtones. /// -public abstract class SharedRingerSystem : EntitySystem +public abstract partial class SharedRingerSystem : EntitySystem { public const int RingtoneLength = 6; public const int NoteTempo = 300; public const float NoteDelay = 60f / NoteTempo; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPdaSystem _pda = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPdaSystem _pda = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; /// public override void Initialize() diff --git a/Content.Shared/Paper/EnvelopeSystem.cs b/Content.Shared/Paper/EnvelopeSystem.cs index 1f3634948a9..de7e1a35ffc 100644 --- a/Content.Shared/Paper/EnvelopeSystem.cs +++ b/Content.Shared/Paper/EnvelopeSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.Paper; -public sealed class EnvelopeSystem : EntitySystem +public sealed partial class EnvelopeSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs index 52590bc7c72..35cea0fbe2e 100644 --- a/Content.Shared/Paper/PaperSystem.cs +++ b/Content.Shared/Paper/PaperSystem.cs @@ -18,18 +18,18 @@ namespace Content.Shared.Paper; -public sealed class PaperSystem : EntitySystem +public sealed partial class PaperSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private MetaDataSystem _metaSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; private static readonly ProtoId WriteIgnoreStampsTag = "WriteIgnoreStamps"; private static readonly ProtoId WriteTag = "Write"; diff --git a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs index 30a50182297..8f5fbe2a0ef 100644 --- a/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs +++ b/Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.Parallax.Biomes; -public abstract class SharedBiomeSystem : EntitySystem +public abstract partial class SharedBiomeSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager ProtoManager = default!; - [Dependency] private readonly ISerializationManager _serManager = default!; - [Dependency] protected readonly ITileDefinitionManager TileDefManager = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] protected IPrototypeManager ProtoManager = default!; + [Dependency] private ISerializationManager _serManager = default!; + [Dependency] protected ITileDefinitionManager TileDefManager = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private SharedMapSystem _map = default!; protected const byte ChunkSize = 8; diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs index d4beb3ef1ed..394e4d0cf11 100644 --- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs +++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.ParcelWrap.cs @@ -15,8 +15,8 @@ namespace Content.Shared.ParcelWrap.Systems; // This part handles Parcel Wrap. public sealed partial class ParcelWrappingSystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private INetManager _net = default!; private static ProtoId _fallbackParcelSize = "Ginormous"; diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs index 96919b0ae22..2cff05a0563 100644 --- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs +++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.WrappedParcel.cs @@ -14,7 +14,7 @@ namespace Content.Shared.ParcelWrap.Systems; // This part handles Wrapped Parcels public sealed partial class ParcelWrappingSystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; private void InitializeWrappedParcel() { diff --git a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs index 15d0074f966..84856ac73da 100644 --- a/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs +++ b/Content.Shared/ParcelWrap/Systems/ParcelWrappingSystem.cs @@ -17,15 +17,15 @@ namespace Content.Shared.ParcelWrap.Systems; /// public sealed partial class ParcelWrappingSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedChargesSystem _charges = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedChargesSystem _charges = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; /// public override void Initialize() diff --git a/Content.Shared/Payload/EntitySystems/ChemicalPayloadSystem.cs b/Content.Shared/Payload/EntitySystems/ChemicalPayloadSystem.cs index a06bb74a06c..8b22271e794 100644 --- a/Content.Shared/Payload/EntitySystems/ChemicalPayloadSystem.cs +++ b/Content.Shared/Payload/EntitySystems/ChemicalPayloadSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Payload.EntitySystems; -public sealed class ChemicalPayloadSystem : EntitySystem +public sealed partial class ChemicalPayloadSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Physics/Controllers/SharedConveyorController.cs b/Content.Shared/Physics/Controllers/SharedConveyorController.cs index 6ae2d3ac8bf..dbcb6f6de30 100644 --- a/Content.Shared/Physics/Controllers/SharedConveyorController.cs +++ b/Content.Shared/Physics/Controllers/SharedConveyorController.cs @@ -14,16 +14,16 @@ namespace Content.Shared.Physics.Controllers; -public abstract class SharedConveyorController : VirtualController +public abstract partial class SharedConveyorController : VirtualController { - [Dependency] protected readonly IMapManager MapManager = default!; - [Dependency] private readonly IParallelManager _parallel = default!; - [Dependency] private readonly CollisionWakeSystem _wake = default!; - [Dependency] protected readonly EntityLookupSystem Lookup = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; + [Dependency] protected IMapManager MapManager = default!; + [Dependency] private IParallelManager _parallel = default!; + [Dependency] private CollisionWakeSystem _wake = default!; + [Dependency] protected EntityLookupSystem Lookup = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedStackSystem _stack = default!; protected const string ConveyorFixture = "conveyor"; diff --git a/Content.Shared/Pinpointer/SharedNavMapSystem.cs b/Content.Shared/Pinpointer/SharedNavMapSystem.cs index 7ba36b41c4e..8afbad31580 100644 --- a/Content.Shared/Pinpointer/SharedNavMapSystem.cs +++ b/Content.Shared/Pinpointer/SharedNavMapSystem.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Pinpointer; -public abstract class SharedNavMapSystem : EntitySystem +public abstract partial class SharedNavMapSystem : EntitySystem { public const int Categories = 3; public const int Directions = 4; // Not directly tied to number of atmos directions @@ -23,8 +23,8 @@ public abstract class SharedNavMapSystem : EntitySystem public const int WallMask = AllDirMask << (int)NavMapChunkType.Wall; public const int FloorMask = AllDirMask << (int)NavMapChunkType.Floor; - [Robust.Shared.IoC.Dependency] private readonly TagSystem _tagSystem = default!; - [Robust.Shared.IoC.Dependency] private readonly INetManager _net = default!; + [Robust.Shared.IoC.Dependency] private TagSystem _tagSystem = default!; + [Robust.Shared.IoC.Dependency] private INetManager _net = default!; private static readonly ProtoId[] WallTags = { "Wall", "Window" }; private EntityQuery _doorQuery; diff --git a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs index 79fc820baf8..1ebe567aadf 100644 --- a/Content.Shared/Pinpointer/SharedPinpointerSystem.cs +++ b/Content.Shared/Pinpointer/SharedPinpointerSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Pinpointer; -public abstract class SharedPinpointerSystem : EntitySystem +public abstract partial class SharedPinpointerSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private EmagSystem _emag = default!; public override void Initialize() { diff --git a/Content.Shared/Placeable/ItemPlacerSystem.cs b/Content.Shared/Placeable/ItemPlacerSystem.cs index a36386116fd..7815506f3c5 100644 --- a/Content.Shared/Placeable/ItemPlacerSystem.cs +++ b/Content.Shared/Placeable/ItemPlacerSystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Placeable; /// Tracks placed entities /// Subscribe to or to do things when items or placed or removed. /// -public sealed class ItemPlacerSystem : EntitySystem +public sealed partial class ItemPlacerSystem : EntitySystem { - [Dependency] private readonly CollisionWakeSystem _wake = default!; - [Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private CollisionWakeSystem _wake = default!; + [Dependency] private PlaceableSurfaceSystem _placeableSurface = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs index 3c1060977f6..91dcf9c172e 100644 --- a/Content.Shared/Placeable/PlaceableSurfaceSystem.cs +++ b/Content.Shared/Placeable/PlaceableSurfaceSystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Placeable; -public sealed class PlaceableSurfaceSystem : EntitySystem +public sealed partial class PlaceableSurfaceSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Plunger/Systems/PlungerSystem.cs b/Content.Shared/Plunger/Systems/PlungerSystem.cs index 149a813af6a..222d9ed66e0 100644 --- a/Content.Shared/Plunger/Systems/PlungerSystem.cs +++ b/Content.Shared/Plunger/Systems/PlungerSystem.cs @@ -13,13 +13,13 @@ namespace Content.Shared.Plunger.Systems; /// /// Plungers can be used to unblock entities with PlungerUseComponent. /// -public sealed class PlungerSystem : EntitySystem +public sealed partial class PlungerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs b/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs index a14e3188e79..86d0bde4b24 100644 --- a/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs +++ b/Content.Shared/PneumaticCannon/SharedPneumaticCannonSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.PneumaticCannon; -public abstract class SharedPneumaticCannonSystem : EntitySystem +public abstract partial class SharedPneumaticCannonSystem : EntitySystem { - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] protected SharedPopupSystem Popup = default!; public override void Initialize() diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs index 223495ca414..d7e0b73eeca 100644 --- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs +++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs @@ -23,20 +23,20 @@ namespace Content.Shared.Polymorph.Systems; /// Handles disguise validation, disguising and revealing. /// Most appearance copying is done clientside. /// -public abstract class SharedChameleonProjectorSystem : EntitySystem +public abstract partial class SharedChameleonProjectorSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly ISerializationManager _serMan = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private ISerializationManager _serMan = default!; + [Dependency] private MetaDataSystem _meta = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Shared/Power/EntitySystems/ChargerSystem.cs b/Content.Shared/Power/EntitySystems/ChargerSystem.cs index 95f6fc55537..815e9a3d5eb 100644 --- a/Content.Shared/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Shared/Power/EntitySystems/ChargerSystem.cs @@ -10,15 +10,15 @@ namespace Content.Shared.Power.EntitySystems; -public sealed class ChargerSystem : EntitySystem +public sealed partial class ChargerSystem : EntitySystem { - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs b/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs index 3df8b91a985..3e48a997c25 100644 --- a/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs +++ b/Content.Shared/Power/EntitySystems/ItemSlotRequiresPowerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Power.EntitySystems; -public sealed class ItemSlotRequiresPowerSystem : EntitySystem +public sealed partial class ItemSlotRequiresPowerSystem : EntitySystem { - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; public override void Initialize() { diff --git a/Content.Shared/Power/EntitySystems/PowerStateSystem.cs b/Content.Shared/Power/EntitySystems/PowerStateSystem.cs index aba41e2432a..e25617db03d 100644 --- a/Content.Shared/Power/EntitySystems/PowerStateSystem.cs +++ b/Content.Shared/Power/EntitySystems/PowerStateSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Power.EntitySystems; /// Generic system that handles entities with . /// Used for simple machines that only need to switch between "idle" and "working" power states. /// -public abstract class SharedPowerStateSystem : EntitySystem +public abstract partial class SharedPowerStateSystem : EntitySystem { - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiverSystem = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiverSystem = default!; private EntityQuery _powerStateQuery; diff --git a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs index e150fd60d88..559c9e55e91 100644 --- a/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs +++ b/Content.Shared/Power/EntitySystems/SharedBatterySystem.cs @@ -12,8 +12,8 @@ namespace Content.Shared.Power.EntitySystems; /// public abstract partial class SharedBatterySystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Power/EntitySystems/SharedPowerNetSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerNetSystem.cs index 7611074d806..b684810641f 100644 --- a/Content.Shared/Power/EntitySystems/SharedPowerNetSystem.cs +++ b/Content.Shared/Power/EntitySystems/SharedPowerNetSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Power.EntitySystems; -public abstract class SharedPowerNetSystem : EntitySystem +public abstract partial class SharedPowerNetSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public abstract bool IsPoweredCalculate(SharedApcPowerReceiverComponent comp); diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs index 6c0a69f9674..efd520ddf71 100644 --- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs +++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Power.EntitySystems; -public abstract class SharedPowerReceiverSystem : EntitySystem +public abstract partial class SharedPowerReceiverSystem : EntitySystem { - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPowerNetSystem _net = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPowerNetSystem _net = default!; public abstract bool ResolveApc(EntityUid entity, [NotNullWhen(true)] ref SharedApcPowerReceiverComponent? component); diff --git a/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs b/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs index 6bd5af591ed..b8641c21e82 100644 --- a/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs +++ b/Content.Shared/Power/EntitySystems/UIPowerStateSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Power.EntitySystems; /// Entities with this component will increase their power usage to a working state /// when a UI on the entity is open. /// -public sealed class UIPowerStateSystem : EntitySystem +public sealed partial class UIPowerStateSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedPowerStateSystem _powerState = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedPowerStateSystem _powerState = default!; public override void Initialize() { diff --git a/Content.Shared/PowerCell/PowerCellSystem.cs b/Content.Shared/PowerCell/PowerCellSystem.cs index 9a84e6dd755..62f27226287 100644 --- a/Content.Shared/PowerCell/PowerCellSystem.cs +++ b/Content.Shared/PowerCell/PowerCellSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.PowerCell; public sealed partial class PowerCellSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/PowerCell/ToggleCellDrawSystem.cs b/Content.Shared/PowerCell/ToggleCellDrawSystem.cs index c4d78ff52e8..b9090e54e50 100644 --- a/Content.Shared/PowerCell/ToggleCellDrawSystem.cs +++ b/Content.Shared/PowerCell/ToggleCellDrawSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.PowerCell; /// /// Handles events to integrate PowerCellDraw with ItemToggle /// -public sealed class ToggleCellDrawSystem : EntitySystem +public sealed partial class ToggleCellDrawSystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private PowerCellSystem _cell = default!; public override void Initialize() { diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index be342912b6e..0a61dd1cfd3 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -20,11 +20,11 @@ public abstract partial class SharedProjectileSystem : EntitySystem { public const string ProjectileFixture = "projectile"; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs index eb011801ed4..02313b82b9c 100644 --- a/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs +++ b/Content.Shared/ProximityDetection/Systems/ProximityDetectionSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.ProximityDetection.Systems; /// /// Handles generic proximity detector logic. /// -public sealed class ProximityDetectionSystem : EntitySystem +public sealed partial class ProximityDetectionSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ItemToggleSystem _toggle = default!; private EntityQuery _xformQuery; diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs index c78f979383e..404cb2ad92a 100644 --- a/Content.Shared/Prying/Systems/PryingSystem.cs +++ b/Content.Shared/Prying/Systems/PryingSystem.cs @@ -17,13 +17,13 @@ namespace Content.Shared.Prying.Systems; /// /// Handles prying of entities (e.g. doors) /// -public sealed class PryingSystem : EntitySystem +public sealed partial class PryingSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private AlertsSystem _alerts = default!; public override void Initialize() { diff --git a/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs b/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs index 166e7b5fb84..4ab6f42eeeb 100644 --- a/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs +++ b/Content.Shared/Puppet/SharedVentriloquistPuppetSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Puppet; // TODO deduplicate with BlockMovementComponent -public abstract class SharedVentriloquistPuppetSystem : EntitySystem +public abstract partial class SharedVentriloquistPuppetSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _blocker = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; public override void Initialize() { diff --git a/Content.Shared/RCD/Systems/RCDAmmoSystem.cs b/Content.Shared/RCD/Systems/RCDAmmoSystem.cs index eb770f28985..7d9abed6982 100644 --- a/Content.Shared/RCD/Systems/RCDAmmoSystem.cs +++ b/Content.Shared/RCD/Systems/RCDAmmoSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.RCD.Systems; -public sealed class RCDAmmoSystem : EntitySystem +public sealed partial class RCDAmmoSystem : EntitySystem { - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/RCD/Systems/RCDSystem.cs b/Content.Shared/RCD/Systems/RCDSystem.cs index d88c144343b..dda6a5a5ebf 100644 --- a/Content.Shared/RCD/Systems/RCDSystem.cs +++ b/Content.Shared/RCD/Systems/RCDSystem.cs @@ -26,26 +26,26 @@ namespace Content.Shared.RCD.Systems; -public sealed class RCDSystem : EntitySystem +public sealed partial class RCDSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!; - [Dependency] private readonly FloorTileSystem _floors = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedChargesSystem _sharedCharges = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly TurfSystem _turf = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TagSystem _tags = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ITileDefinitionManager _tileDefMan = default!; + [Dependency] private FloorTileSystem _floors = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedChargesSystem _sharedCharges = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private TurfSystem _turf = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TagSystem _tags = default!; private readonly int _instantConstructionDelay = 0; private readonly EntProtoId _instantConstructionFx = "EffectRCDConstruct0"; diff --git a/Content.Shared/Radiation/Systems/RadiationPulseSystem.cs b/Content.Shared/Radiation/Systems/RadiationPulseSystem.cs index 9f280330257..e6f914ec01b 100644 --- a/Content.Shared/Radiation/Systems/RadiationPulseSystem.cs +++ b/Content.Shared/Radiation/Systems/RadiationPulseSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Radiation.Systems; -public sealed class RadiationPulseSystem : EntitySystem +public sealed partial class RadiationPulseSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs index bdaacfdf9eb..b4b0bed0e59 100644 --- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs +++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs @@ -21,13 +21,13 @@ namespace Content.Shared.Radio.EntitySystems; /// public sealed partial class EncryptionKeySystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedWiresSystem _wires = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedWiresSystem _wires = default!; public override void Initialize() { diff --git a/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs b/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs index a108d1b4186..c816704eba2 100644 --- a/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs +++ b/Content.Shared/Radio/EntitySystems/SharedJammerSystem.cs @@ -10,11 +10,11 @@ namespace Content.Shared.Radio.EntitySystems; -public abstract class SharedJammerSystem : EntitySystem +public abstract partial class SharedJammerSystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _itemToggle = default!; - [Dependency] private readonly SharedDeviceNetworkJammerSystem _jammer = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private ItemToggleSystem _itemToggle = default!; + [Dependency] private SharedDeviceNetworkJammerSystem _jammer = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Radio/EntitySystems/SharedRadioDeviceSystem.cs b/Content.Shared/Radio/EntitySystems/SharedRadioDeviceSystem.cs index 715310f55d1..bdeb453bc66 100644 --- a/Content.Shared/Radio/EntitySystems/SharedRadioDeviceSystem.cs +++ b/Content.Shared/Radio/EntitySystems/SharedRadioDeviceSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Radio.EntitySystems; -public abstract class SharedRadioDeviceSystem : EntitySystem +public abstract partial class SharedRadioDeviceSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; #region Toggling public void ToggleRadioMicrophone(EntityUid uid, EntityUid user, bool quiet = false, RadioMicrophoneComponent? component = null) diff --git a/Content.Shared/Random/RandomHelperSystem.cs b/Content.Shared/Random/RandomHelperSystem.cs index 9b35900ce5f..305e1897727 100644 --- a/Content.Shared/Random/RandomHelperSystem.cs +++ b/Content.Shared/Random/RandomHelperSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Random; /// /// System containing various content-related random helpers. /// -public sealed class RandomHelperSystem : EntitySystem +public sealed partial class RandomHelperSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; public void RandomOffset(EntityUid entity, float minX, float maxX, float minY, float maxY) { diff --git a/Content.Shared/RatKing/SharedRatKingSystem.cs b/Content.Shared/RatKing/SharedRatKingSystem.cs index 3f6c9bdc224..0464e2faf1b 100644 --- a/Content.Shared/RatKing/SharedRatKingSystem.cs +++ b/Content.Shared/RatKing/SharedRatKingSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.RatKing; -public abstract class SharedRatKingSystem : EntitySystem +public abstract partial class SharedRatKingSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly IRobustRandom Random = default!; - [Dependency] private readonly SharedActionsSystem _action = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected IRobustRandom Random = default!; + [Dependency] private SharedActionsSystem _action = default!; /// public override void Initialize() diff --git a/Content.Shared/RatKing/Systems/RummagerSystem.cs b/Content.Shared/RatKing/Systems/RummagerSystem.cs index e07d7f7a622..6421f450d80 100644 --- a/Content.Shared/RatKing/Systems/RummagerSystem.cs +++ b/Content.Shared/RatKing/Systems/RummagerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.RatKing.Systems; -public sealed class RummagerSystem : EntitySystem +public sealed partial class RummagerSystem : EntitySystem { - [Dependency] private readonly EntityTableSystem _entityTable = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private EntityTableSystem _entityTable = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; /// public override void Initialize() diff --git a/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs b/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs index 8561c7b12a1..ee8c65576ad 100644 --- a/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs +++ b/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.ReagentSpeed; -public sealed class ReagentSpeedSystem : EntitySystem +public sealed partial class ReagentSpeedSystem : EntitySystem { - [Dependency] private readonly SharedSolutionContainerSystem _solution = default!; + [Dependency] private SharedSolutionContainerSystem _solution = default!; /// /// Consumes reagents and modifies the duration. diff --git a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs index 48e1b7a11e5..21365e674ec 100644 --- a/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs +++ b/Content.Shared/Remotes/EntitySystems/SharedDoorRemoteSystem.cs @@ -16,18 +16,18 @@ namespace Content.Shared.Remotes.EntitySystems; -public abstract class SharedDoorRemoteSystem : EntitySystem +public abstract partial class SharedDoorRemoteSystem : EntitySystem { - [Dependency] private readonly SharedAirlockSystem _airlock = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoorSystem _doorSystem = default!; - [Dependency] private readonly SharedElectrocutionSystem _electrify = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] private SharedAirlockSystem _airlock = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoorSystem _doorSystem = default!; + [Dependency] private SharedElectrocutionSystem _electrify = default!; + [Dependency] private ExamineSystemShared _examine = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private TagSystem _tagSystem = default!; + [Dependency] protected IGameTiming Timing = default!; public override void Initialize() diff --git a/Content.Shared/Repairable/RepairableSystem.cs b/Content.Shared/Repairable/RepairableSystem.cs index 89fce2e0057..473ffaa54af 100644 --- a/Content.Shared/Repairable/RepairableSystem.cs +++ b/Content.Shared/Repairable/RepairableSystem.cs @@ -12,10 +12,10 @@ namespace Content.Shared.Repairable; public sealed partial class RepairableSystem : EntitySystem { - [Dependency] private readonly SharedToolSystem _toolSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Shared/RepulseAttract/RepulseAttractSystem.cs b/Content.Shared/RepulseAttract/RepulseAttractSystem.cs index cc007b99f07..be8affe62e4 100644 --- a/Content.Shared/RepulseAttract/RepulseAttractSystem.cs +++ b/Content.Shared/RepulseAttract/RepulseAttractSystem.cs @@ -12,13 +12,13 @@ namespace Content.Shared.RepulseAttract; -public sealed class RepulseAttractSystem : EntitySystem +public sealed partial class RepulseAttractSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly ThrowingSystem _throw = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedTransformSystem _xForm = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private ThrowingSystem _throw = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedTransformSystem _xForm = default!; + [Dependency] private UseDelaySystem _delay = default!; private EntityQuery _physicsQuery; private HashSet _entSet = new(); diff --git a/Content.Shared/Research/Systems/BlueprintSystem.cs b/Content.Shared/Research/Systems/BlueprintSystem.cs index 58d7c3a6305..eacddf99f9e 100644 --- a/Content.Shared/Research/Systems/BlueprintSystem.cs +++ b/Content.Shared/Research/Systems/BlueprintSystem.cs @@ -11,11 +11,11 @@ namespace Content.Shared.Research.Systems; -public sealed class BlueprintSystem : EntitySystem +public sealed partial class BlueprintSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private SharedPopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs b/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs index 070ff40b70d..3838f0e8859 100644 --- a/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs +++ b/Content.Shared/Research/Systems/SharedResearchStealerSystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Research.Systems; -public abstract class SharedResearchStealerSystem : EntitySystem +public abstract partial class SharedResearchStealerSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedNinjaGlovesSystem _gloves = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedNinjaGlovesSystem _gloves = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Research/Systems/SharedResearchSystem.cs b/Content.Shared/Research/Systems/SharedResearchSystem.cs index ee37e2a6597..b7c4c6a7a85 100644 --- a/Content.Shared/Research/Systems/SharedResearchSystem.cs +++ b/Content.Shared/Research/Systems/SharedResearchSystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.Research.Systems; -public abstract class SharedResearchSystem : EntitySystem +public abstract partial class SharedResearchSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedLatheSystem _lathe = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedLatheSystem _lathe = default!; public override void Initialize() { diff --git a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs index 8958f8b3ffd..811aee55362 100644 --- a/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs +++ b/Content.Shared/Research/TechnologyDisk/Systems/TechnologyDiskSystem.cs @@ -15,15 +15,15 @@ namespace Content.Shared.Research.TechnologyDisk.Systems; -public sealed class TechnologyDiskSystem : EntitySystem +public sealed partial class TechnologyDiskSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedResearchSystem _research = default!; - [Dependency] private readonly SharedLatheSystem _lathe = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly NameModifierSystem _nameModifier = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedResearchSystem _research = default!; + [Dependency] private SharedLatheSystem _lathe = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private NameModifierSystem _nameModifier = default!; public override void Initialize() { diff --git a/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs b/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs index 18205417466..9ca70790a6b 100644 --- a/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs +++ b/Content.Shared/RetractableItemAction/RetractableItemActionSystem.cs @@ -13,13 +13,13 @@ namespace Content.Shared.RetractableItemAction; /// /// System for handling retractable items, such as armblades. /// -public sealed class RetractableItemActionSystem : EntitySystem +public sealed partial class RetractableItemActionSystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedPopupSystem _popups = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedPopupSystem _popups = default!; public override void Initialize() { diff --git a/Content.Shared/Revenant/EntitySystems/SharedCorporealSystem.cs b/Content.Shared/Revenant/EntitySystems/SharedCorporealSystem.cs index bcf19d98208..9ae4fdec1ec 100644 --- a/Content.Shared/Revenant/EntitySystems/SharedCorporealSystem.cs +++ b/Content.Shared/Revenant/EntitySystems/SharedCorporealSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.Revenant.EntitySystems; /// Additionally applies a few visual effects. /// Used for status effect. /// -public abstract class SharedCorporealSystem : EntitySystem +public abstract partial class SharedCorporealSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movement = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private MovementSpeedModifierSystem _movement = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; public override void Initialize() { diff --git a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs index 4b281ea02d2..1916632803a 100644 --- a/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs +++ b/Content.Shared/Revolutionary/SharedRevolutionarySystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Revolutionary; -public abstract class SharedRevolutionarySystem : EntitySystem +public abstract partial class SharedRevolutionarySystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedStunSystem _sharedStun = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedStunSystem _sharedStun = default!; public override void Initialize() { diff --git a/Content.Shared/Roles/Jobs/SharedJobSystem.cs b/Content.Shared/Roles/Jobs/SharedJobSystem.cs index 9ca77ef5e3c..8635a8d8c87 100644 --- a/Content.Shared/Roles/Jobs/SharedJobSystem.cs +++ b/Content.Shared/Roles/Jobs/SharedJobSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.Roles.Jobs; /// /// Handles the job data on mind entities. /// -public abstract class SharedJobSystem : EntitySystem +public abstract partial class SharedJobSystem : EntitySystem { - [Dependency] private readonly SharedPlayerSystem _playerSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; + [Dependency] private SharedPlayerSystem _playerSystem = default!; + [Dependency] private IPrototypeManager _prototypes = default!; + [Dependency] private SharedRoleSystem _roles = default!; private readonly Dictionary _inverseTrackerLookup = new(); diff --git a/Content.Shared/Roles/SharedRoleSystem.cs b/Content.Shared/Roles/SharedRoleSystem.cs index 292110a4459..2c85fe5066d 100644 --- a/Content.Shared/Roles/SharedRoleSystem.cs +++ b/Content.Shared/Roles/SharedRoleSystem.cs @@ -17,15 +17,15 @@ namespace Content.Shared.Roles; -public abstract class SharedRoleSystem : EntitySystem +public abstract partial class SharedRoleSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] protected readonly ISharedPlayerManager Player = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedMindSystem _minds = default!; - [Dependency] private readonly IPrototypeManager _prototypes = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] protected ISharedPlayerManager Player = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedMindSystem _minds = default!; + [Dependency] private IPrototypeManager _prototypes = default!; private JobRequirementOverridePrototype? _requirementOverride; diff --git a/Content.Shared/Rootable/RootableSystem.cs b/Content.Shared/Rootable/RootableSystem.cs index 93fab750e9e..a1ecd599da2 100644 --- a/Content.Shared/Rootable/RootableSystem.cs +++ b/Content.Shared/Rootable/RootableSystem.cs @@ -30,19 +30,19 @@ namespace Content.Shared.Rootable; /// Adds an action to toggle rooting to the ground, primarily for the Diona species. /// Being rooted prevents weighlessness and slipping, but causes any floor contents to transfer its reagents to the bloodstream. /// -public sealed class RootableSystem : EntitySystem +public sealed partial class RootableSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ISharedAdminLogManager _logger = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly ReactiveSystem _reactive = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedBloodstreamSystem _blood = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ISharedAdminLogManager _logger = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private ReactiveSystem _reactive = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedBloodstreamSystem _blood = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; private EntityQuery _puddleQuery; private EntityQuery _physicsQuery; diff --git a/Content.Shared/Rotatable/RotatableSystem.cs b/Content.Shared/Rotatable/RotatableSystem.cs index 94d9206247a..a21a4995c00 100644 --- a/Content.Shared/Rotatable/RotatableSystem.cs +++ b/Content.Shared/Rotatable/RotatableSystem.cs @@ -15,12 +15,12 @@ namespace Content.Shared.Rotatable; /// /// Handles verbs for the and components. /// -public sealed class RotatableSystem : EntitySystem +public sealed partial class RotatableSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs index 14d71d90d97..6b3d4fe79bc 100644 --- a/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs +++ b/Content.Shared/SSDIndicator/SSDIndicatorSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.SSDIndicator; /// /// Handle changing player SSD indicator status /// -public sealed class SSDIndicatorSystem : EntitySystem +public sealed partial class SSDIndicatorSystem : EntitySystem { public static readonly EntProtoId StatusEffectSSDSleeping = "StatusEffectSSDSleeping"; - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; private bool _icSsdSleep; private float _icSsdSleepTime; diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs index 42bca24d885..e0240687e7f 100644 --- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs +++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs @@ -22,16 +22,16 @@ namespace Content.Shared.Salvage.Fulton; /// public abstract partial class SharedFultonSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly FoldableSystem _foldable = default!; - [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private FoldableSystem _foldable = default!; + [Dependency] protected SharedContainerSystem Container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public static readonly EntProtoId EffectProto = "FultonEffect"; protected static readonly Vector2 EffectOffset = Vector2.Zero; diff --git a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs index 2ecb40dd0a6..e45ab5d80b3 100644 --- a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs +++ b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs @@ -38,7 +38,8 @@ public abstract partial class SharedSalvageSystem public ISalvageMagnetOffering GetSalvageOffering(int seed) { - var rand = new System.Random(seed); + var rand = new RobustRandom(); + rand.SetSeed(seed); var id = rand.Pick(_debrisConfigs); return new DebrisOffering diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs index bc4871cce37..cd0541cc27c 100644 --- a/Content.Shared/Salvage/SharedSalvageSystem.cs +++ b/Content.Shared/Salvage/SharedSalvageSystem.cs @@ -17,8 +17,8 @@ namespace Content.Shared.Salvage; public abstract partial class SharedSalvageSystem : EntitySystem { - [Dependency] protected readonly IConfigurationManager CfgManager = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] protected IConfigurationManager CfgManager = default!; + [Dependency] private IPrototypeManager _proto = default!; /// /// Main loot table for salvage expeditions. diff --git a/Content.Shared/Sandbox/SharedSandboxSystem.cs b/Content.Shared/Sandbox/SharedSandboxSystem.cs index f65330b3cc6..2ba680d2159 100644 --- a/Content.Shared/Sandbox/SharedSandboxSystem.cs +++ b/Content.Shared/Sandbox/SharedSandboxSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Sandbox { - public abstract class SharedSandboxSystem : EntitySystem + public abstract partial class SharedSandboxSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; [Serializable, NetSerializable] protected sealed class MsgSandboxStatus : EntityEventArgs diff --git a/Content.Shared/SecretLocks/SharedVoiceTriggerLockSystem.cs b/Content.Shared/SecretLocks/SharedVoiceTriggerLockSystem.cs index 483b3ec2514..d154a9d18b5 100644 --- a/Content.Shared/SecretLocks/SharedVoiceTriggerLockSystem.cs +++ b/Content.Shared/SecretLocks/SharedVoiceTriggerLockSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.SecretLocks; public sealed partial class SharedVoiceTriggerLockSystem : EntitySystem { - [Dependency] private readonly ItemToggleSystem _toggle = default!; + [Dependency] private ItemToggleSystem _toggle = default!; public override void Initialize() { diff --git a/Content.Shared/Sectors/SharedSectorSystem.cs b/Content.Shared/Sectors/SharedSectorSystem.cs index b3d309267f1..91531307a7e 100644 --- a/Content.Shared/Sectors/SharedSectorSystem.cs +++ b/Content.Shared/Sectors/SharedSectorSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Sectors; /// /// Shared API for resolving named sectors from world positions and entities. /// -public sealed class SharedSectorSystem : EntitySystem +public sealed partial class SharedSectorSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private SharedTransformSystem _transform = default!; private float CenterRadius => _configuration.GetCVar(CCVars.SectorCenterRadius); diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs index bb0dd23628a..806be6d2685 100644 --- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs +++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs @@ -6,13 +6,13 @@ namespace Content.Shared.Security.Systems; -public sealed class DeployableBarrierSystem : EntitySystem +public sealed partial class DeployableBarrierSystem : EntitySystem { - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly SharedPointLightSystem _pointLight = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private SharedPointLightSystem _pointLight = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private PullingSystem _pulling = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/Security/Systems/SharedGenpopSystem.cs b/Content.Shared/Security/Systems/SharedGenpopSystem.cs index 410922747b9..2956e96d8a0 100644 --- a/Content.Shared/Security/Systems/SharedGenpopSystem.cs +++ b/Content.Shared/Security/Systems/SharedGenpopSystem.cs @@ -14,17 +14,17 @@ namespace Content.Shared.Security.Systems; -public abstract class SharedGenpopSystem : EntitySystem +public abstract partial class SharedGenpopSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfgManager = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly SharedEntityStorageSystem _entityStorage = default!; - [Dependency] protected readonly SharedIdCardSystem IdCard = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] protected readonly MetaDataSystem MetaDataSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private SharedEntityStorageSystem _entityStorage = default!; + [Dependency] protected SharedIdCardSystem IdCard = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] protected MetaDataSystem MetaDataSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; // CCvar. private int _maxIdJobLength; diff --git a/Content.Shared/SelectableComponentAdder/SelectableComponentAdderSystem.cs b/Content.Shared/SelectableComponentAdder/SelectableComponentAdderSystem.cs index 1bed1506455..8c933dce5d7 100644 --- a/Content.Shared/SelectableComponentAdder/SelectableComponentAdderSystem.cs +++ b/Content.Shared/SelectableComponentAdder/SelectableComponentAdderSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.SelectableComponentAdder; public sealed partial class SelectableComponentAdderSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Sericulture/SericultureSystem.cs b/Content.Shared/Sericulture/SericultureSystem.cs index 9d6d5643410..0c55869074b 100644 --- a/Content.Shared/Sericulture/SericultureSystem.cs +++ b/Content.Shared/Sericulture/SericultureSystem.cs @@ -16,14 +16,14 @@ namespace Content.Shared.Sericulture; public abstract partial class SharedSericultureSystem : EntitySystem { // Managers - [Dependency] private readonly INetManager _netManager = default!; + [Dependency] private INetManager _netManager = default!; // Systems - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly HungerSystem _hungerSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedStackSystem _stackSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private HungerSystem _hungerSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedStackSystem _stackSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs b/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs index 7bd91ad4839..60f05916b76 100644 --- a/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs +++ b/Content.Shared/Shuttles/Systems/SharedDockingSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Shuttles.Systems; -public abstract class SharedDockingSystem : EntitySystem +public abstract partial class SharedDockingSystem : EntitySystem { - [Dependency] protected readonly SharedTransformSystem XformSystem = default!; + [Dependency] protected SharedTransformSystem XformSystem = default!; public const float DockingHiglightRange = 4f; public const float DockRange = 1f + 0.2f; diff --git a/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs index 5f1477acc22..9665186f432 100644 --- a/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs +++ b/Content.Shared/Shuttles/Systems/SharedEmergencyShuttleSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Shuttles.Systems; -public abstract class SharedEmergencyShuttleSystem : EntitySystem +public abstract partial class SharedEmergencyShuttleSystem : EntitySystem { - [Dependency] protected readonly IConfigurationManager ConfigManager = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; + [Dependency] protected IConfigurationManager ConfigManager = default!; + [Dependency] protected SharedPopupSystem Popup = default!; private bool _emergencyEarlyLaunchAllowed; diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs index f6224a8af6b..4c1732a53bd 100644 --- a/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs +++ b/Content.Shared/Shuttles/Systems/SharedShuttleConsoleSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Shuttles.Systems { - public abstract class SharedShuttleConsoleSystem : EntitySystem + public abstract partial class SharedShuttleConsoleSystem : EntitySystem { - [Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!; + [Dependency] protected ActionBlockerSystem ActionBlockerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs index bcb12097f9f..1ebdaa781a4 100644 --- a/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs +++ b/Content.Shared/Shuttles/Systems/SharedShuttleSystem.cs @@ -13,13 +13,13 @@ namespace Content.Shared.Shuttles.Systems; public abstract partial class SharedShuttleSystem : EntitySystem { - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] protected readonly FixtureSystem Fixtures = default!; - [Dependency] protected readonly SharedMapSystem Maps = default!; - [Dependency] protected readonly SharedPhysicsSystem Physics = default!; - [Dependency] protected readonly SharedTransformSystem XformSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] protected FixtureSystem Fixtures = default!; + [Dependency] protected SharedMapSystem Maps = default!; + [Dependency] protected SharedPhysicsSystem Physics = default!; + [Dependency] protected SharedTransformSystem XformSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public const float FTLRange = 256f; public const float FTLBufferRange = 8f; diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs index fa6b809016b..0b2dc2a0d2b 100644 --- a/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs +++ b/Content.Shared/Silicons/Borgs/SharedBorgSwitchableTypeSystem.cs @@ -12,14 +12,14 @@ namespace Content.Shared.Silicons.Borgs; /// Implements borg type switching. /// /// -public abstract class SharedBorgSwitchableTypeSystem : EntitySystem +public abstract partial class SharedBorgSwitchableTypeSystem : EntitySystem { // TODO: Allow borgs to be reset to default configuration. - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; - [Dependency] protected readonly IPrototypeManager Prototypes = default!; - [Dependency] private readonly InteractionPopupSystem _interactionPopup = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; + [Dependency] protected IPrototypeManager Prototypes = default!; + [Dependency] private InteractionPopupSystem _interactionPopup = default!; public static readonly EntProtoId ActionId = "ActionSelectBorgType"; diff --git a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs index 121c687990e..2c16cbaa115 100644 --- a/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs +++ b/Content.Shared/Silicons/Borgs/SharedBorgSystem.cs @@ -40,29 +40,29 @@ namespace Content.Shared.Silicons.Borgs; /// public abstract partial class SharedBorgSystem : EntitySystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly ISharedPlayerManager _player = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IConfigurationManager _configuration = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedHandheldLightSystem _handheldLight = default!; - [Dependency] private readonly SharedAccessSystem _access = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedRoleSystem _roles = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private ISharedPlayerManager _player = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IConfigurationManager _configuration = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedHandheldLightSystem _handheldLight = default!; + [Dependency] private SharedAccessSystem _access = default!; + [Dependency] private SharedAudioSystem _audio = default!; /// public override void Initialize() diff --git a/Content.Shared/Silicons/Bots/MedibotSystem.cs b/Content.Shared/Silicons/Bots/MedibotSystem.cs index 90df06928b5..8a8e08ad71b 100644 --- a/Content.Shared/Silicons/Bots/MedibotSystem.cs +++ b/Content.Shared/Silicons/Bots/MedibotSystem.cs @@ -18,15 +18,15 @@ namespace Content.Shared.Silicons.Bots; /// /// Handles emagging medibots and provides api. /// -public sealed class MedibotSystem : EntitySystem +public sealed partial class MedibotSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private EmagSystem _emag = default!; [Dependency] private SharedInteractionSystem _interaction = default!; [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private SharedPopupSystem _popup = default!; [Dependency] private SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private DamageableSystem _damageable = default!; public override void Initialize() { diff --git a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs index 47e8a7c1893..bc0e00070f0 100644 --- a/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs +++ b/Content.Shared/Silicons/Bots/SharedHugBotSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Silicons.Bots; /// /// This system handles HugBots. /// -public abstract class SharedHugBotSystem : EntitySystem +public abstract partial class SharedHugBotSystem : EntitySystem { - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] private EmagSystem _emag = default!; public override void Initialize() { diff --git a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs index 0df3c0f980d..53ba00d25b6 100644 --- a/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs +++ b/Content.Shared/Silicons/Laws/SharedSiliconLawSystem.cs @@ -14,10 +14,10 @@ namespace Content.Shared.Silicons.Laws; /// public abstract partial class SharedSiliconLawSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStunSystem _stunSystem = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private SharedMindSystem _mind = default!; /// public override void Initialize() diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiFixerConsoleSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiFixerConsoleSystem.cs index 1abafd7cb27..fd7cb3996a3 100644 --- a/Content.Shared/Silicons/StationAi/SharedStationAiFixerConsoleSystem.cs +++ b/Content.Shared/Silicons/StationAi/SharedStationAiFixerConsoleSystem.cs @@ -19,13 +19,13 @@ namespace Content.Shared.Silicons.StationAi; /// public abstract partial class SharedStationAiFixerConsoleSystem : EntitySystem { - [Dependency] private readonly SharedUserInterfaceSystem _userInterface = default!; - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedUserInterfaceSystem _userInterface = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private MobStateSystem _mobState = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs index 2bec3a83f06..301904068e5 100644 --- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.Airlock.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Silicons.StationAi; // Handles airlock radial public abstract partial class SharedStationAiSystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; private void InitializeAirlock() { diff --git a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs index b6b46cf4e8c..7796f75f5a5 100644 --- a/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs +++ b/Content.Shared/Silicons/StationAi/SharedStationAiSystem.cs @@ -38,32 +38,32 @@ namespace Content.Shared.Silicons.StationAi; public abstract partial class SharedStationAiSystem : EntitySystem { - [Dependency] private readonly ISharedAdminManager _admin = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly ItemToggleSystem _toggles = default!; - [Dependency] private readonly AccessReaderSystem _access = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly SharedAirlockSystem _airlocks = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedDoorSystem _doors = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedElectrocutionSystem _electrify = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; - [Dependency] protected readonly SharedMapSystem Maps = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPowerReceiverSystem PowerReceiver = default!; - [Dependency] private readonly SharedTransformSystem _xforms = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly StationAiVisionSystem _vision = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private ISharedAdminManager _admin = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private ItemToggleSystem _toggles = default!; + [Dependency] private AccessReaderSystem _access = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private SharedAirlockSystem _airlocks = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedDoorSystem _doors = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedElectrocutionSystem _electrify = default!; + [Dependency] private SharedEyeSystem _eye = default!; + [Dependency] protected SharedMapSystem Maps = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedMoverController _mover = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPowerReceiverSystem PowerReceiver = default!; + [Dependency] private SharedTransformSystem _xforms = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private StationAiVisionSystem _vision = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private MobStateSystem _mobState = default!; // StationAiHeld is added to anything inside of an AI core. // StationAiHolder indicates it can hold an AI positronic brain (e.g. holocard / core). diff --git a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs index 7ae27da497e..30ea6015731 100644 --- a/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs +++ b/Content.Shared/Silicons/StationAi/StationAiVisionSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Silicons.StationAi; -public sealed class StationAiVisionSystem : EntitySystem +public sealed partial class StationAiVisionSystem : EntitySystem { /* * This class handles 2 things: @@ -14,11 +14,11 @@ public sealed class StationAiVisionSystem : EntitySystem * 2. It does single-tile lookups to tell if they're visible or not with support for a faster range-only path. */ - [Dependency] private readonly IParallelManager _parallel = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedTransformSystem _xforms = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; + [Dependency] private IParallelManager _parallel = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedTransformSystem _xforms = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; private SeedJob _seedJob; private ViewJob _job; diff --git a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs index 59aa21b3afe..c4cc9c62868 100644 --- a/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs +++ b/Content.Shared/Singularity/EntitySystems/SharedEmitterSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Singularity.EntitySystems; -public abstract class SharedEmitterSystem : EntitySystem +public abstract partial class SharedEmitterSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs index b782f4ef53a..dc9b21123f8 100644 --- a/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs +++ b/Content.Shared/Singularity/EntitySystems/SharedEventHorizonSystem.cs @@ -10,12 +10,12 @@ namespace Content.Shared.Singularity.EntitySystems; /// /// The entity system primarily responsible for managing s. /// -public abstract class SharedEventHorizonSystem : EntitySystem +public abstract partial class SharedEventHorizonSystem : EntitySystem { - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly IViewVariablesManager Vvm = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected IViewVariablesManager Vvm = default!; public override void Initialize() { diff --git a/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs b/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs index 331c1fa4ddb..79f590b849b 100644 --- a/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs +++ b/Content.Shared/Singularity/EntitySystems/SharedSingularityGeneratorSystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Singularity.EntitySystems; /// /// Shared part of SingularitySingularityGeneratorSystem /// -public abstract class SharedSingularityGeneratorSystem : EntitySystem +public abstract partial class SharedSingularityGeneratorSystem : EntitySystem { #region Dependencies - [Dependency] protected readonly SharedPopupSystem PopupSystem = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] protected SharedPopupSystem PopupSystem = default!; + [Dependency] private EmagSystem _emag = default!; #endregion Dependencies public override void Initialize() diff --git a/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs b/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs index 22c4a55a1f7..1ce14109dfa 100644 --- a/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs +++ b/Content.Shared/Singularity/EntitySystems/SharedSingularitySystem.cs @@ -12,14 +12,14 @@ namespace Content.Shared.Singularity.EntitySystems; /// /// The entity system primarily responsible for managing s. /// -public abstract class SharedSingularitySystem : EntitySystem +public abstract partial class SharedSingularitySystem : EntitySystem { #region Dependencies - [Dependency] private readonly SharedAppearanceSystem _visualizer = default!; - [Dependency] private readonly SharedContainerSystem _containers = default!; - [Dependency] private readonly SharedEventHorizonSystem _horizons = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly IViewVariablesManager Vvm = default!; + [Dependency] private SharedAppearanceSystem _visualizer = default!; + [Dependency] private SharedContainerSystem _containers = default!; + [Dependency] private SharedEventHorizonSystem _horizons = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected IViewVariablesManager Vvm = default!; #endregion Dependencies /// diff --git a/Content.Shared/Slippery/SlidingSystem.cs b/Content.Shared/Slippery/SlidingSystem.cs index e0084c11aba..fdbdcebbc20 100644 --- a/Content.Shared/Slippery/SlidingSystem.cs +++ b/Content.Shared/Slippery/SlidingSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Slippery; -public sealed class SlidingSystem : EntitySystem +public sealed partial class SlidingSystem : EntitySystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speedModifierSystem = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private MovementSpeedModifierSystem _speedModifierSystem = default!; private EntityQuery _slipperyQuery; diff --git a/Content.Shared/Slippery/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs index 061514bb294..6ea2b4eee24 100644 --- a/Content.Shared/Slippery/SlipperySystem.cs +++ b/Content.Shared/Slippery/SlipperySystem.cs @@ -19,17 +19,17 @@ namespace Content.Shared.Slippery; [UsedImplicitly] -public sealed class SlipperySystem : EntitySystem +public sealed partial class SlipperySystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly MovementModStatusSystem _movementMod = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SpeedModifierContactsSystem _speedModifier = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private MovementModStatusSystem _movementMod = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private StatusEffectsSystem _status = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SpeedModifierContactsSystem _speedModifier = default!; private EntityQuery _knockedDownQuery; private EntityQuery _physicsQuery; diff --git a/Content.Shared/SmartFridge/SharedSmartFridgeSystem.cs b/Content.Shared/SmartFridge/SharedSmartFridgeSystem.cs index 136d0b4e56a..957db6a1d15 100644 --- a/Content.Shared/SmartFridge/SharedSmartFridgeSystem.cs +++ b/Content.Shared/SmartFridge/SharedSmartFridgeSystem.cs @@ -15,15 +15,15 @@ namespace Content.Shared.SmartFridge; -public abstract class SharedSmartFridgeSystem : EntitySystem +public abstract partial class SharedSmartFridgeSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs index 953a868bc77..cdc141be859 100644 --- a/Content.Shared/Sound/SharedEmitSoundSystem.cs +++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs @@ -25,17 +25,17 @@ namespace Content.Shared.Sound; /// Will play a sound on various events if the affected entity has a component derived from BaseEmitSoundComponent /// [UsedImplicitly] -public abstract class SharedEmitSoundSystem : EntitySystem +public abstract partial class SharedEmitSoundSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] protected readonly IRobustRandom Random = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] protected IRobustRandom Random = default!; + [Dependency] private SharedAmbientSoundSystem _ambient = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private TurfSystem _turf = default!; public override void Initialize() { diff --git a/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs b/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs index ad44cba8a59..6cba8e5cfca 100644 --- a/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs +++ b/Content.Shared/Sound/SharedSpamEmitSoundRequirePowerSystem.cs @@ -2,5 +2,5 @@ namespace Content.Shared.Sound; public abstract partial class SharedSpamEmitSoundRequirePowerSystem : EntitySystem { - [Dependency] protected readonly SharedEmitSoundSystem EmitSound = default!; + [Dependency] protected SharedEmitSoundSystem EmitSound = default!; } diff --git a/Content.Shared/Species/Systems/GibActionSystem.cs b/Content.Shared/Species/Systems/GibActionSystem.cs index c048b948563..a9580e36f15 100644 --- a/Content.Shared/Species/Systems/GibActionSystem.cs +++ b/Content.Shared/Species/Systems/GibActionSystem.cs @@ -12,10 +12,10 @@ namespace Content.Shared.Species; public sealed partial class GibActionSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Systems/ReformSystem.cs index dff11cbeee9..0935b43956e 100644 --- a/Content.Shared/Species/Systems/ReformSystem.cs +++ b/Content.Shared/Species/Systems/ReformSystem.cs @@ -14,14 +14,14 @@ namespace Content.Shared.Species; public sealed partial class ReformSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedStunSystem _stunSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private SharedStunSystem _stunSystem = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedMindSystem _mindSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs index 90cd8bc4de9..12bbe867a50 100644 --- a/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs +++ b/Content.Shared/Speech/EntitySystems/SharedStutteringSystem.cs @@ -3,11 +3,11 @@ namespace Content.Shared.Speech.EntitySystems; -public abstract class SharedStutteringSystem : EntitySystem +public abstract partial class SharedStutteringSystem : EntitySystem { public static readonly EntProtoId Stuttering = "StatusEffectStutter"; - [Dependency] protected readonly StatusEffectsSystem Status = default!; + [Dependency] protected StatusEffectsSystem Status = default!; // For code in shared... I imagine we ain't getting accent prediction anytime soon so let's not bother. public virtual void DoStutter(EntityUid uid, TimeSpan time, bool refresh) diff --git a/Content.Shared/Spider/SharedSpiderSystem.cs b/Content.Shared/Spider/SharedSpiderSystem.cs index 47b0dff763b..66b73d7f6e0 100644 --- a/Content.Shared/Spider/SharedSpiderSystem.cs +++ b/Content.Shared/Spider/SharedSpiderSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.Spider; -public abstract class SharedSpiderSystem : EntitySystem +public abstract partial class SharedSpiderSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; + [Dependency] private SharedActionsSystem _action = default!; public override void Initialize() { diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs index aaaefff03d0..7687cbf3cef 100644 --- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs +++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs @@ -21,16 +21,16 @@ namespace Content.Shared.SprayPainter; /// System for painting paintable objects using a spray painter. /// Pipes are handled serverside since AtmosPipeColorSystem is server only. /// -public abstract class SharedSprayPainterSystem : EntitySystem +public abstract partial class SharedSprayPainterSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] protected readonly IPrototypeManager Proto = default!; - [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedChargesSystem Charges = default!; - [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] protected IPrototypeManager Proto = default!; + [Dependency] protected ISharedAdminLogManager AdminLogger = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedChargesSystem Charges = default!; + [Dependency] protected SharedDoAfterSystem DoAfter = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs b/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs index d43420efc52..0d1e4b249c7 100644 --- a/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs +++ b/Content.Shared/SprayPainter/SprayPainterAmmoSystem.cs @@ -10,10 +10,10 @@ namespace Content.Shared.SprayPainter; /// /// The system handles interactions with spray painter ammo. /// -public sealed class SprayPainterAmmoSystem : EntitySystem +public sealed partial class SprayPainterAmmoSystem : EntitySystem { - [Dependency] private readonly SharedChargesSystem _charges = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedChargesSystem _charges = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Sprite/SharedScaleVisualsSystem.cs b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs index 3da8955deae..63ebd7a3c79 100644 --- a/Content.Shared/Sprite/SharedScaleVisualsSystem.cs +++ b/Content.Shared/Sprite/SharedScaleVisualsSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Sprite; -public abstract class SharedScaleVisualsSystem : EntitySystem +public abstract partial class SharedScaleVisualsSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Stacks/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs index 9365f60f6b8..01959019835 100644 --- a/Content.Shared/Stacks/SharedStackSystem.cs +++ b/Content.Shared/Stacks/SharedStackSystem.cs @@ -20,15 +20,15 @@ namespace Content.Shared.Stacks; [UsedImplicitly] public abstract partial class SharedStackSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IViewVariablesManager _vvm = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedHandsSystem Hands = default!; - [Dependency] protected readonly SharedTransformSystem Xform = default!; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IViewVariablesManager _vvm = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedHandsSystem Hands = default!; + [Dependency] protected SharedTransformSystem Xform = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedStorageSystem _storage = default!; // TODO: These should be in the prototype. public static readonly int[] DefaultSplitAmounts = { 1, 5, 10, 20, 30, 50 }; diff --git a/Content.Shared/Standing/StandingStateSystem.cs b/Content.Shared/Standing/StandingStateSystem.cs index 340a638e017..18ef1eeabf1 100644 --- a/Content.Shared/Standing/StandingStateSystem.cs +++ b/Content.Shared/Standing/StandingStateSystem.cs @@ -11,11 +11,11 @@ namespace Content.Shared.Standing; -public sealed class StandingStateSystem : EntitySystem +public sealed partial class StandingStateSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; // If StandingCollisionLayer value is ever changed to more than one layer, the logic needs to be edited. public const int StandingCollisionLayer = (int)CollisionGroup.MidImpassable; diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index 541c7d1c295..c7321098f66 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -11,15 +11,15 @@ namespace Content.Shared.Station; -public abstract class SharedStationSpawningSystem : EntitySystem +public abstract partial class SharedStationSpawningSystem : EntitySystem { - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] protected readonly InventorySystem InventorySystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly SharedTransformSystem _xformSystem = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] protected InventorySystem InventorySystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] private SharedTransformSystem _xformSystem = default!; private EntityQuery _handsQuery; private EntityQuery _inventoryQuery; diff --git a/Content.Shared/Station/SharedStationSystem.cs b/Content.Shared/Station/SharedStationSystem.cs index 3ad25e6ac4d..dca9b07f5e0 100644 --- a/Content.Shared/Station/SharedStationSystem.cs +++ b/Content.Shared/Station/SharedStationSystem.cs @@ -12,8 +12,8 @@ namespace Content.Shared.Station; public abstract partial class SharedStationSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly MetaDataSystem _meta = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private MetaDataSystem _meta = default!; private EntityQuery _xformQuery; private EntityQuery _stationMemberQuery; diff --git a/Content.Shared/StationRecords/SharedStationRecordsSystem.cs b/Content.Shared/StationRecords/SharedStationRecordsSystem.cs index 3d4a52e9553..5828266ad0c 100644 --- a/Content.Shared/StationRecords/SharedStationRecordsSystem.cs +++ b/Content.Shared/StationRecords/SharedStationRecordsSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.StationRecords; -public abstract class SharedStationRecordsSystem : EntitySystem +public abstract partial class SharedStationRecordsSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; + [Dependency] protected IGameTiming Timing = default!; public StationRecordKey? Convert((NetEntity, uint)? input) { diff --git a/Content.Shared/StationRecords/StationRecordKeyStorageSystem.cs b/Content.Shared/StationRecords/StationRecordKeyStorageSystem.cs index e9d68721b63..68518662613 100644 --- a/Content.Shared/StationRecords/StationRecordKeyStorageSystem.cs +++ b/Content.Shared/StationRecords/StationRecordKeyStorageSystem.cs @@ -2,9 +2,9 @@ namespace Content.Shared.StationRecords; -public sealed class StationRecordKeyStorageSystem : EntitySystem +public sealed partial class StationRecordKeyStorageSystem : EntitySystem { - [Dependency] private readonly SharedStationRecordsSystem _records = default!; + [Dependency] private SharedStationRecordsSystem _records = default!; public override void Initialize() { diff --git a/Content.Shared/StatusEffect/StatusEffectsSystem.cs b/Content.Shared/StatusEffect/StatusEffectsSystem.cs index 32062feda27..4073b778ab8 100644 --- a/Content.Shared/StatusEffect/StatusEffectsSystem.cs +++ b/Content.Shared/StatusEffect/StatusEffectsSystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.StatusEffect { [Obsolete("Migration to Content.Shared.StatusEffectNew.StatusEffectsSystem is required")] - public sealed class StatusEffectsSystem : EntitySystem + public sealed partial class StatusEffectsSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly AlertsSystem _alertsSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; private List _toRemove = new(); public override void Initialize() diff --git a/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs index 1405a5fd624..b4781cc6abb 100644 --- a/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs +++ b/Content.Shared/StatusEffectNew/StatusEffectAlertSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.StatusEffectNew; /// /// Handles displaying status effects that should show an alert, optionally with a duration. /// -public sealed class StatusEffectAlertSystem : EntitySystem +public sealed partial class StatusEffectAlertSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private AlertsSystem _alerts = default!; private EntityQuery _effectQuery; diff --git a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs index 6ce193ba7ae..f66a3a9e0f5 100644 --- a/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs +++ b/Content.Shared/StatusEffectNew/StatusEffectsSystem.cs @@ -17,12 +17,12 @@ namespace Content.Shared.StatusEffectNew; /// public sealed partial class StatusEffectsSystem : EntitySystem { - [Dependency] private readonly IComponentFactory _factory = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly SharedJobNetSystem _jobNetSystem = default!; + [Dependency] private IComponentFactory _factory = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private SharedJobNetSystem _jobNetSystem = default!; private EntityQuery _containerQuery; private EntityQuery _effectQuery; diff --git a/Content.Shared/Stealth/SharedStealthSystem.cs b/Content.Shared/Stealth/SharedStealthSystem.cs index 4270814e78e..db3fe52399d 100644 --- a/Content.Shared/Stealth/SharedStealthSystem.cs +++ b/Content.Shared/Stealth/SharedStealthSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Stealth; -public abstract class SharedStealthSystem : EntitySystem +public abstract partial class SharedStealthSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs index 8580d0b6b1f..8081431ec03 100644 --- a/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs +++ b/Content.Shared/StepTrigger/Systems/StepTriggerImmuneSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.StepTrigger.Systems; -public sealed class StepTriggerImmuneSystem : EntitySystem +public sealed partial class StepTriggerImmuneSystem : EntitySystem { - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private InventorySystem _inventory = default!; /// public override void Initialize() diff --git a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs index f1d6a9c7ddd..cc39e166e57 100644 --- a/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs +++ b/Content.Shared/StepTrigger/Systems/StepTriggerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.StepTrigger.Systems; -public sealed class StepTriggerSystem : EntitySystem +public sealed partial class StepTriggerSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedGravitySystem _gravity = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Sticky/Systems/StickySystem.cs b/Content.Shared/Sticky/Systems/StickySystem.cs index d2d7633f046..f30f57469bd 100644 --- a/Content.Shared/Sticky/Systems/StickySystem.cs +++ b/Content.Shared/Sticky/Systems/StickySystem.cs @@ -9,15 +9,15 @@ namespace Content.Shared.Sticky.Systems; -public sealed class StickySystem : EntitySystem +public sealed partial class StickySystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedPopupSystem _popup = default!; private const string StickerSlotId = "stickers_container"; diff --git a/Content.Shared/Storage/EntitySystems/AnchoredStorageFilterSystem.cs b/Content.Shared/Storage/EntitySystems/AnchoredStorageFilterSystem.cs index ea98fc28525..26a14af0a23 100644 --- a/Content.Shared/Storage/EntitySystems/AnchoredStorageFilterSystem.cs +++ b/Content.Shared/Storage/EntitySystems/AnchoredStorageFilterSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Storage.EntitySystems; /// Ejects items that do not match a from a storage when it is anchored. /// /// -public sealed class AnchoredStorageFilterSystem : EntitySystem +public sealed partial class AnchoredStorageFilterSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private SharedContainerSystem _container = default!; /// public override void Initialize() diff --git a/Content.Shared/Storage/EntitySystems/BinSystem.cs b/Content.Shared/Storage/EntitySystems/BinSystem.cs index 56a00cf86b3..f53476a4106 100644 --- a/Content.Shared/Storage/EntitySystems/BinSystem.cs +++ b/Content.Shared/Storage/EntitySystems/BinSystem.cs @@ -16,13 +16,13 @@ namespace Content.Shared.Storage.EntitySystems; /// /// This handles /// -public sealed class BinSystem : EntitySystem +public sealed partial class BinSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly ISharedAdminLogManager _admin = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private ISharedAdminLogManager _admin = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; /// public override void Initialize() diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs index 10760aa8d85..970bf669f71 100644 --- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs +++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs @@ -12,14 +12,14 @@ namespace Content.Shared.Storage.EntitySystems; -public sealed class DumpableSystem : EntitySystem +public sealed partial class DumpableSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; private EntityQuery _itemQuery; diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs index 27a15c87a6a..1d35e42bef2 100644 --- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs +++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs @@ -9,14 +9,14 @@ namespace Content.Shared.Storage.EntitySystems; /// /// /// -public sealed class MagnetPickupSystem : EntitySystem +public sealed partial class MagnetPickupSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedStorageSystem _storage = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedStorageSystem _storage = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; private static readonly TimeSpan ScanDelay = TimeSpan.FromSeconds(1); diff --git a/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs b/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs index b356e444389..436753c56a8 100644 --- a/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs +++ b/Content.Shared/Storage/EntitySystems/PickRandomSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.Storage.EntitySystems; -public sealed class PickRandomSystem : EntitySystem +public sealed partial class PickRandomSystem : EntitySystem { - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedHandsSystem _hands = default!; public override void Initialize() { diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs index 5118c6ae0b2..0df6ed80e9b 100644 --- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs @@ -23,16 +23,16 @@ namespace Content.Shared.Storage.EntitySystems; /// /// Secret Stash allows an item to be hidden within. /// -public sealed class SecretStashSystem : EntitySystem +public sealed partial class SecretStashSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ToolOpenableSystem _toolOpenableSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedContainerSystem _containerSystem = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private ToolOpenableSystem _toolOpenableSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private DamageableSystem _damageableSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs index 5e0a29b4077..dd2c61c91f6 100644 --- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs @@ -27,22 +27,22 @@ namespace Content.Shared.Storage.EntitySystems; -public abstract class SharedEntityStorageSystem : EntitySystem +public abstract partial class SharedEntityStorageSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly WeldableSystem _weldable = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; + [Dependency] private SharedJointSystem _joints = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] private WeldableSystem _weldable = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; public const string ContainerName = "entity_storage"; diff --git a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs index 143a86cfcf8..c8cdd793375 100644 --- a/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedItemCounterSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Storage.EntitySystems { [UsedImplicitly] - public abstract class SharedItemCounterSystem : EntitySystem + public abstract partial class SharedItemCounterSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; /// public override void Initialize() diff --git a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs index c63b5c85a79..f09f0940ef9 100644 --- a/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedItemMapperSystem.cs @@ -12,11 +12,11 @@ namespace Content.Shared.Storage.EntitySystems; /// if its tags/component, and overall quantity match . /// [UsedImplicitly] -public abstract class SharedItemMapperSystem : EntitySystem +public abstract partial class SharedItemMapperSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; /// public override void Initialize() diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 398d5b507ac..7e66427a210 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -44,31 +44,31 @@ namespace Content.Shared.Storage.EntitySystems; -public abstract class SharedStorageSystem : EntitySystem +public abstract partial class SharedStorageSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] protected readonly IRobustRandom Random = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - - [Dependency] protected readonly ActionBlockerSystem ActionBlocker = default!; - [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] protected readonly SharedEntityStorageSystem EntityStorage = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] protected readonly SharedItemSystem ItemSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _sharedHandsSystem = default!; - [Dependency] private readonly SharedStackSystem _stack = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UI = default!; - [Dependency] private readonly TagSystem _tag = default!; - [Dependency] protected readonly UseDelaySystem UseDelay = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] protected IRobustRandom Random = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + + [Dependency] protected ActionBlockerSystem ActionBlocker = default!; + [Dependency] private EntityLookupSystem _entityLookupSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedContainerSystem ContainerSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] protected SharedEntityStorageSystem EntityStorage = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] protected SharedItemSystem ItemSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedHandsSystem _sharedHandsSystem = default!; + [Dependency] private SharedStackSystem _stack = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] protected SharedUserInterfaceSystem UI = default!; + [Dependency] private TagSystem _tag = default!; + [Dependency] protected UseDelaySystem UseDelay = default!; private EntityQuery _itemQuery; private EntityQuery _stackQuery; diff --git a/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs index eae97707bd1..eb28f28d1ea 100644 --- a/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs +++ b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Storage.EntitySystems; -public sealed class StoreAfterFailedInteractSystem : EntitySystem +public sealed partial class StoreAfterFailedInteractSystem : EntitySystem { - [Dependency] private readonly SharedStorageSystem _storage = default!; + [Dependency] private SharedStorageSystem _storage = default!; public override void Initialize() { diff --git a/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs b/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs index e7b48ae708c..9534a66fe6d 100644 --- a/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs +++ b/Content.Shared/Storage/EntitySystems/StoreOnCollideSystem.cs @@ -7,13 +7,13 @@ namespace Content.Shared.Storage.EntitySystems; -internal sealed class StoreOnCollideSystem : EntitySystem +internal sealed partial class StoreOnCollideSystem : EntitySystem { - [Dependency] private readonly SharedEntityStorageSystem _storage = default!; - [Dependency] private readonly LockSystem _lock = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private SharedEntityStorageSystem _storage = default!; + [Dependency] private LockSystem _lock = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Shared/StoryGen/EntitySystems/StoryGeneratorSystem.cs b/Content.Shared/StoryGen/EntitySystems/StoryGeneratorSystem.cs index 7b56b602832..feac0650446 100644 --- a/Content.Shared/StoryGen/EntitySystems/StoryGeneratorSystem.cs +++ b/Content.Shared/StoryGen/EntitySystems/StoryGeneratorSystem.cs @@ -10,8 +10,8 @@ namespace Content.Shared.StoryGen; /// public sealed partial class StoryGeneratorSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] private IRobustRandom _random = default!; /// /// Tries to generate a random story using the given template, picking a random word from the referenced diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs index a48a896e9ee..d4790bc7324 100644 --- a/Content.Shared/Strip/SharedStrippableSystem.cs +++ b/Content.Shared/Strip/SharedStrippableSystem.cs @@ -20,20 +20,20 @@ namespace Content.Shared.Strip; -public abstract class SharedStrippableSystem : EntitySystem +public abstract partial class SharedStrippableSystem : EntitySystem { - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private InventorySystem _inventorySystem = default!; - [Dependency] private readonly SharedCuffableSystem _cuffableSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedCuffableSystem _cuffableSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedHandsSystem _handsSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; public override void Initialize() { diff --git a/Content.Shared/Strip/ThievingSystem.cs b/Content.Shared/Strip/ThievingSystem.cs index 6d8a6b5df38..7af325d3b6a 100644 --- a/Content.Shared/Strip/ThievingSystem.cs +++ b/Content.Shared/Strip/ThievingSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.Strip; public sealed partial class ThievingSystem : EntitySystem { - [Dependency] private readonly AlertsSystem _alertsSystem = default!; + [Dependency] private AlertsSystem _alertsSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs index 58f38c9db85..f767e09808c 100644 --- a/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs +++ b/Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs @@ -31,12 +31,12 @@ public abstract partial class SharedStunSystem { private EntityQuery _crawlerQuery; - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly StandingStateSystem _standingState = default!; - [Dependency] private readonly IConfigurationManager _cfgManager = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private StandingStateSystem _standingState = default!; + [Dependency] private IConfigurationManager _cfgManager = default!; public static readonly ProtoId KnockdownAlert = "Knockdown"; diff --git a/Content.Shared/Stunnable/SharedStunSystem.cs b/Content.Shared/Stunnable/SharedStunSystem.cs index 02cb3b40752..3a717835ea5 100644 --- a/Content.Shared/Stunnable/SharedStunSystem.cs +++ b/Content.Shared/Stunnable/SharedStunSystem.cs @@ -27,17 +27,17 @@ public abstract partial class SharedStunSystem : EntitySystem { public static readonly EntProtoId StunId = "StatusEffectStunned"; - [Dependency] protected readonly IGameTiming GameTiming = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] protected readonly ActionBlockerSystem Blocker = default!; - [Dependency] protected readonly AlertsSystem Alerts = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!; - [Dependency] protected readonly SharedStaminaSystem Stamina = default!; - [Dependency] private readonly StatusEffectsSystem _status = default!; + [Dependency] protected IGameTiming GameTiming = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] protected ActionBlockerSystem Blocker = default!; + [Dependency] protected AlertsSystem Alerts = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedDoAfterSystem DoAfter = default!; + [Dependency] protected SharedStaminaSystem Stamina = default!; + [Dependency] private StatusEffectsSystem _status = default!; public override void Initialize() { diff --git a/Content.Shared/Stunnable/SharedStunbatonSystem.cs b/Content.Shared/Stunnable/SharedStunbatonSystem.cs index 97030f98b0a..df6941170c1 100644 --- a/Content.Shared/Stunnable/SharedStunbatonSystem.cs +++ b/Content.Shared/Stunnable/SharedStunbatonSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Stunnable; -public abstract class SharedStunbatonSystem : EntitySystem +public abstract partial class SharedStunbatonSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; public override void Initialize() { diff --git a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs index 935ebdc7ec5..d6721307995 100644 --- a/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs +++ b/Content.Shared/SubFloor/SharedSubFloorHideSystem.cs @@ -17,14 +17,14 @@ namespace Content.Shared.SubFloor /// Entity system backing . /// [UsedImplicitly] - public abstract class SharedSubFloorHideSystem : EntitySystem + public abstract partial class SharedSubFloorHideSystem : EntitySystem { - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly SharedAmbientSoundSystem _ambientSoundSystem = default!; - [Dependency] protected readonly SharedMapSystem Map = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] private readonly SharedVisibilitySystem _visibility = default!; - [Dependency] protected readonly SharedPopupSystem _popup = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private SharedAmbientSoundSystem _ambientSoundSystem = default!; + [Dependency] protected SharedMapSystem Map = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] private SharedVisibilitySystem _visibility = default!; + [Dependency] protected SharedPopupSystem _popup = default!; private EntityQuery _hideQuery; diff --git a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs index 9a7c829f142..c4c0cb91845 100644 --- a/Content.Shared/SubFloor/SharedTrayScannerSystem.cs +++ b/Content.Shared/SubFloor/SharedTrayScannerSystem.cs @@ -8,11 +8,11 @@ namespace Content.Shared.SubFloor; -public abstract class SharedTrayScannerSystem : EntitySystem +public abstract partial class SharedTrayScannerSystem : EntitySystem { - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedEyeSystem _eye = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedEyeSystem _eye = default!; public const float SubfloorRevealAlpha = 0.8f; diff --git a/Content.Shared/Tabletop/SharedTabletopSystem.cs b/Content.Shared/Tabletop/SharedTabletopSystem.cs index a62b4434b4b..aaa09608c9c 100644 --- a/Content.Shared/Tabletop/SharedTabletopSystem.cs +++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.Tabletop { - public abstract class SharedTabletopSystem : EntitySystem + public abstract partial class SharedTabletopSystem : EntitySystem { - [Dependency] protected readonly ActionBlockerSystem ActionBlockerSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] protected readonly SharedTransformSystem Transforms = default!; + [Dependency] protected ActionBlockerSystem ActionBlockerSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] protected SharedTransformSystem Transforms = default!; public override void Initialize() { diff --git a/Content.Shared/Tag/TagSystem.cs b/Content.Shared/Tag/TagSystem.cs index b75e2a4af10..46bd9fbcc0c 100644 --- a/Content.Shared/Tag/TagSystem.cs +++ b/Content.Shared/Tag/TagSystem.cs @@ -14,9 +14,9 @@ namespace Content.Shared.Tag; /// if you need to use them often, it's better to make a proper implementation, /// you can read more HERE. /// -public sealed class TagSystem : EntitySystem +public sealed partial class TagSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private IPrototypeManager _proto = default!; private EntityQuery _tagQuery; diff --git a/Content.Shared/Teleportation/Systems/LinkedEntitySystem.cs b/Content.Shared/Teleportation/Systems/LinkedEntitySystem.cs index 6d55e398f4b..4b0be59c7b9 100644 --- a/Content.Shared/Teleportation/Systems/LinkedEntitySystem.cs +++ b/Content.Shared/Teleportation/Systems/LinkedEntitySystem.cs @@ -9,9 +9,9 @@ namespace Content.Shared.Teleportation.Systems; /// This does not do anything on its own (outside of deleting entities that have 0 links, if that option is true) /// Systems can do whatever they please with the linked entities, such as . /// -public sealed class LinkedEntitySystem : EntitySystem +public sealed partial class LinkedEntitySystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; /// public override void Initialize() diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs index d12dfc78fe2..77723752e97 100644 --- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs @@ -24,16 +24,16 @@ namespace Content.Shared.Teleportation.Systems; /// Uses to get linked portals. /// /// -public abstract class SharedPortalSystem : EntitySystem +public abstract partial class SharedPortalSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private PullingSystem _pulling = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedJointSystem _joints = default!; private const string PortalFixture = "portalFixture"; private const string ProjectileFixture = "projectile"; diff --git a/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs b/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs index f3209bbc124..39364ab0229 100644 --- a/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs +++ b/Content.Shared/Teleportation/Systems/SharedTeleportLocationsSystem.cs @@ -10,10 +10,10 @@ namespace Content.Shared.Teleportation.Systems; /// public abstract partial class SharedTeleportLocationsSystem : EntitySystem { - [Dependency] protected readonly UseDelaySystem Delay = default!; + [Dependency] protected UseDelaySystem Delay = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedTransformSystem _xform = default!; protected const string TeleportDelay = "TeleportDelay"; diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs index 074471c08b6..da2681e0082 100644 --- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs +++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs @@ -18,16 +18,16 @@ namespace Content.Shared.Teleportation.Systems; /// /// This handles /// -public sealed class SwapTeleporterSystem : EntitySystem +public sealed partial class SwapTeleporterSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; private EntityQuery _xformQuery; diff --git a/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs b/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs index 887047bfa16..524877e9efd 100644 --- a/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs +++ b/Content.Shared/Temperature/Systems/SharedEntityHeaterSystem.cs @@ -13,10 +13,10 @@ namespace Content.Shared.Temperature.Systems; /// public abstract partial class SharedEntityHeaterSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; + [Dependency] private SharedAudioSystem _audio = default!; private readonly int _settingCount = Enum.GetValues().Length; diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs index 05cdd0f8dc8..bf9ad3cc0f9 100644 --- a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs +++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs @@ -11,10 +11,10 @@ namespace Content.Shared.Temperature.Systems; /// /// This handles predicting temperature based speedup. /// -public abstract class SharedTemperatureSystem : EntitySystem +public abstract partial class SharedTemperatureSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; protected EntityQuery TemperatureQuery; diff --git a/Content.Shared/Thief/Systems/ThiefBeaconSystem.cs b/Content.Shared/Thief/Systems/ThiefBeaconSystem.cs index a59fcc16af9..30f2e9a9fde 100644 --- a/Content.Shared/Thief/Systems/ThiefBeaconSystem.cs +++ b/Content.Shared/Thief/Systems/ThiefBeaconSystem.cs @@ -14,12 +14,12 @@ namespace Content.Shared.Thief.Systems; /// /// /// -public sealed class ThiefBeaconSystem : EntitySystem +public sealed partial class ThiefBeaconSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly SharedRoleSystem _roles = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private SharedRoleSystem _roles = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Shared/Throwing/CatchableSystem.cs b/Content.Shared/Throwing/CatchableSystem.cs index 02ce5631b0a..72b11ba6851 100644 --- a/Content.Shared/Throwing/CatchableSystem.cs +++ b/Content.Shared/Throwing/CatchableSystem.cs @@ -14,13 +14,13 @@ namespace Content.Shared.Throwing; public sealed partial class CatchableSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ThrownItemSystem _thrown = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ThrownItemSystem _thrown = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; private EntityQuery _handsQuery; private EntityQuery _combatModeQuery; diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs index 71b08af6da9..925ea56ca1a 100644 --- a/Content.Shared/Throwing/ThrowingSystem.cs +++ b/Content.Shared/Throwing/ThrowingSystem.cs @@ -15,7 +15,7 @@ namespace Content.Shared.Throwing; -public sealed class ThrowingSystem : EntitySystem +public sealed partial class ThrowingSystem : EntitySystem { public const float ThrowAngularImpulse = 5f; @@ -28,13 +28,13 @@ public sealed class ThrowingSystem : EntitySystem private float _frictionModifier; private float _airDamping; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly ThrownItemSystem _thrownSystem = default!; - [Dependency] private readonly SharedCameraRecoilSystem _recoil = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly IConfigurationManager _configManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private ThrownItemSystem _thrownSystem = default!; + [Dependency] private SharedCameraRecoilSystem _recoil = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private IConfigurationManager _configManager = default!; private EntityQuery _anchorableQuery; diff --git a/Content.Shared/Throwing/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs index 1fd46017956..965b2541416 100644 --- a/Content.Shared/Throwing/ThrownItemSystem.cs +++ b/Content.Shared/Throwing/ThrownItemSystem.cs @@ -16,15 +16,15 @@ namespace Content.Shared.Throwing /// /// Handles throwing landing and collisions. /// - public sealed class ThrownItemSystem : EntitySystem + public sealed partial class ThrownItemSystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly FixtureSystem _fixtures = default!; - [Dependency] private readonly SharedBroadphaseSystem _broadphase = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedGravitySystem _gravity = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private FixtureSystem _fixtures = default!; + [Dependency] private SharedBroadphaseSystem _broadphase = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedGravitySystem _gravity = default!; private const string ThrowingFixture = "throw-fixture"; diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs index 962f3198f53..71b37fba3b1 100644 --- a/Content.Shared/Tiles/FloorTileSystem.cs +++ b/Content.Shared/Tiles/FloorTileSystem.cs @@ -21,22 +21,22 @@ namespace Content.Shared.Tiles; -public sealed class FloorTileSystem : EntitySystem +public sealed partial class FloorTileSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedStackSystem _stackSystem = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly TileSystem _tile = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedMapSystem _map = default!; - [Dependency] private readonly TurfSystem _turf = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private ITileDefinitionManager _tileDefinitionManager = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedStackSystem _stackSystem = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private TileSystem _tile = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedMapSystem _map = default!; + [Dependency] private TurfSystem _turf = default!; private static readonly Vector2 CheckRange = new(1f, 1f); diff --git a/Content.Shared/Tiles/ProtectedGridSystem.cs b/Content.Shared/Tiles/ProtectedGridSystem.cs index 1cde57153b9..6a10bdbaa4c 100644 --- a/Content.Shared/Tiles/ProtectedGridSystem.cs +++ b/Content.Shared/Tiles/ProtectedGridSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Tiles; -public sealed class ProtectedGridSystem : EntitySystem +public sealed partial class ProtectedGridSystem : EntitySystem { - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private SharedMapSystem _map = default!; /// public override void Initialize() diff --git a/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs b/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs index 818991f823d..9340062e4f3 100644 --- a/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs +++ b/Content.Shared/Tiles/ReplaceFloorOnSpawnSystem.cs @@ -5,12 +5,12 @@ namespace Content.Shared.Tiles; -public sealed class ReplaceFloorOnSpawnSystem : EntitySystem +public sealed partial class ReplaceFloorOnSpawnSystem : EntitySystem { - [Dependency] private readonly ITileDefinitionManager _tile = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private ITileDefinitionManager _tile = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedMapSystem _map = default!; /// public override void Initialize() diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs index 4d09b6efeb3..69b38b42b56 100644 --- a/Content.Shared/Timing/UseDelaySystem.cs +++ b/Content.Shared/Timing/UseDelaySystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Timing; -public sealed class UseDelaySystem : EntitySystem +public sealed partial class UseDelaySystem : EntitySystem { - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private MetaDataSystem _metadata = default!; public const string DefaultId = "default"; diff --git a/Content.Shared/Toilet/Systems/ToiletSystem.cs b/Content.Shared/Toilet/Systems/ToiletSystem.cs index 08197a4f445..d061cb45531 100644 --- a/Content.Shared/Toilet/Systems/ToiletSystem.cs +++ b/Content.Shared/Toilet/Systems/ToiletSystem.cs @@ -13,11 +13,11 @@ namespace Content.Shared.Toilet.Systems; /// Handles sprite changes for both toilet seat up and down as well as for lid /// open and closed. /// -public sealed class ToiletSystem : EntitySystem +public sealed partial class ToiletSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs index 8bb7d5ed1b2..905cf8e4913 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.Tile.cs @@ -13,7 +13,7 @@ namespace Content.Shared.Tools.Systems; public abstract partial class SharedToolSystem { - [Dependency] private readonly INetManager _net = default!; + [Dependency] private INetManager _net = default!; public void InitializeTile() { diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs index 1507b1d6e86..18d0774105f 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs @@ -13,7 +13,7 @@ namespace Content.Shared.Tools.Systems; public abstract partial class SharedToolSystem { - [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private ActionBlockerSystem _actionBlocker = default!; public void InitializeWelder() { diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.cs b/Content.Shared/Tools/Systems/SharedToolSystem.cs index 94959dc34ab..e9d4e5c70a6 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.cs @@ -19,21 +19,21 @@ namespace Content.Shared.Tools.Systems; public abstract partial class SharedToolSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _protoMan = default!; - [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - [Dependency] private readonly SharedAudioSystem _audioSystem = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] protected readonly SharedInteractionSystem InteractionSystem = default!; - [Dependency] protected readonly ItemToggleSystem ItemToggle = default!; - [Dependency] private readonly SharedMapSystem _maps = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] protected readonly SharedSolutionContainerSystem SolutionContainerSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly TileSystem _tiles = default!; - [Dependency] private readonly TurfSystem _turfs = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _protoMan = default!; + [Dependency] protected ISharedAdminLogManager AdminLogger = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; + [Dependency] private SharedAudioSystem _audioSystem = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] protected SharedInteractionSystem InteractionSystem = default!; + [Dependency] protected ItemToggleSystem ItemToggle = default!; + [Dependency] private SharedMapSystem _maps = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] protected SharedSolutionContainerSystem SolutionContainerSystem = default!; + [Dependency] private SharedTransformSystem _transformSystem = default!; + [Dependency] private TileSystem _tiles = default!; + [Dependency] private TurfSystem _turfs = default!; public const string CutQuality = "Cutting"; public const string PulseQuality = "Pulsing"; diff --git a/Content.Shared/Tools/Systems/SimpleToolUsageSystem.cs b/Content.Shared/Tools/Systems/SimpleToolUsageSystem.cs index d28f999195d..369abb24919 100644 --- a/Content.Shared/Tools/Systems/SimpleToolUsageSystem.cs +++ b/Content.Shared/Tools/Systems/SimpleToolUsageSystem.cs @@ -7,8 +7,8 @@ namespace Content.Shared.Tools.Systems; public sealed partial class SimpleToolUsageSystem : EntitySystem { - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedToolSystem _tools = default!; + [Dependency] private SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private SharedToolSystem _tools = default!; public override void Initialize() { diff --git a/Content.Shared/Tools/Systems/ToolOpenableSystem.cs b/Content.Shared/Tools/Systems/ToolOpenableSystem.cs index a07ebc67579..73ef60c4115 100644 --- a/Content.Shared/Tools/Systems/ToolOpenableSystem.cs +++ b/Content.Shared/Tools/Systems/ToolOpenableSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Tools.EntitySystems; -public sealed class ToolOpenableSystem : EntitySystem +public sealed partial class ToolOpenableSystem : EntitySystem { - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedToolSystem _tool = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Tools/Systems/ToolRefinableSystem.cs b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs index e8ac4d492d7..d7f39df916e 100644 --- a/Content.Shared/Tools/Systems/ToolRefinableSystem.cs +++ b/Content.Shared/Tools/Systems/ToolRefinableSystem.cs @@ -7,11 +7,11 @@ namespace Content.Shared.Tools.Systems; -public sealed class ToolRefinablSystem : EntitySystem +public sealed partial class ToolRefinablSystem : EntitySystem { - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Tools/Systems/WeldableSystem.cs b/Content.Shared/Tools/Systems/WeldableSystem.cs index 258323f7ba8..ade23a0b163 100644 --- a/Content.Shared/Tools/Systems/WeldableSystem.cs +++ b/Content.Shared/Tools/Systems/WeldableSystem.cs @@ -9,12 +9,12 @@ namespace Content.Shared.Tools.Systems; -public sealed class WeldableSystem : EntitySystem +public sealed partial class WeldableSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; private EntityQuery _query; public override void Initialize() diff --git a/Content.Shared/Traits/Assorted/ImpairedMobilitySystem.cs b/Content.Shared/Traits/Assorted/ImpairedMobilitySystem.cs index cc84081d46e..699091c3415 100644 --- a/Content.Shared/Traits/Assorted/ImpairedMobilitySystem.cs +++ b/Content.Shared/Traits/Assorted/ImpairedMobilitySystem.cs @@ -9,10 +9,10 @@ namespace Content.Shared.Traits.Assorted; /// /// Handles /// -public sealed class ImpairedMobilitySystem : EntitySystem +public sealed partial class ImpairedMobilitySystem : EntitySystem { - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speedModifier = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private MovementSpeedModifierSystem _speedModifier = default!; public override void Initialize() { SubscribeLocalEvent(OnInit); diff --git a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs index 472cd72dd8b..952041a14c7 100644 --- a/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs +++ b/Content.Shared/Traits/Assorted/LegsParalyzedSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Traits.Assorted; -public sealed class LegsParalyzedSystem : EntitySystem +public sealed partial class LegsParalyzedSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; - [Dependency] private readonly StandingStateSystem _standingSystem = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifierSystem = default!; + [Dependency] private StandingStateSystem _standingSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Traits/Assorted/MobilityAidSystem.cs b/Content.Shared/Traits/Assorted/MobilityAidSystem.cs index 7df47ca7503..b0ec6fc94fd 100644 --- a/Content.Shared/Traits/Assorted/MobilityAidSystem.cs +++ b/Content.Shared/Traits/Assorted/MobilityAidSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Traits.Assorted; /// /// Handles /// -public sealed class MobilityAidSystem : EntitySystem +public sealed partial class MobilityAidSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; /// public override void Initialize() diff --git a/Content.Shared/Traits/Assorted/NarcolepsySystem.cs b/Content.Shared/Traits/Assorted/NarcolepsySystem.cs index bdc055c6799..2be99674a2b 100644 --- a/Content.Shared/Traits/Assorted/NarcolepsySystem.cs +++ b/Content.Shared/Traits/Assorted/NarcolepsySystem.cs @@ -9,11 +9,11 @@ namespace Content.Shared.Traits.Assorted; /// /// This handles narcolepsy, causing the affected to fall asleep uncontrollably at a random interval. /// -public sealed class NarcolepsySystem : EntitySystem +public sealed partial class NarcolepsySystem : EntitySystem { - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IGameTiming _timing = default!; /// public override void Initialize() diff --git a/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs b/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs index 688354c1611..d98ab7630a7 100644 --- a/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs +++ b/Content.Shared/Traits/Assorted/PainNumbnessSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Traits.Assorted; -public sealed class PainNumbnessSystem : EntitySystem +public sealed partial class PainNumbnessSystem : EntitySystem { - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private MobThresholdSystem _mobThresholdSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs index 9a9a269706e..2c42f160233 100644 --- a/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs +++ b/Content.Shared/Traits/Assorted/PermanentBlindnessSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Traits.Assorted; /// /// This handles permanent blindness, both the examine and the actual effect. /// -public sealed class PermanentBlindnessSystem : EntitySystem +public sealed partial class PermanentBlindnessSystem : EntitySystem { - [Dependency] private readonly BlindableSystem _blinding = default!; + [Dependency] private BlindableSystem _blinding = default!; /// public override void Initialize() diff --git a/Content.Shared/Trigger/SharedTriggerSystems.cs b/Content.Shared/Trigger/SharedTriggerSystems.cs index c300b77320a..cb2c6fe603a 100644 --- a/Content.Shared/Trigger/SharedTriggerSystems.cs +++ b/Content.Shared/Trigger/SharedTriggerSystems.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Trigger; /// /// This is a base Trigger system which handles all the boilerplate for triggers automagically! /// -public abstract class TriggerOnXSystem : EntitySystem +public abstract partial class TriggerOnXSystem : EntitySystem { - [Dependency] protected readonly TriggerSystem Trigger = default!; + [Dependency] protected TriggerSystem Trigger = default!; } /// diff --git a/Content.Shared/Trigger/Systems/AdminLogOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/AdminLogOnTriggerSystem.cs index 0adf483aedf..392c29cbcf5 100644 --- a/Content.Shared/Trigger/Systems/AdminLogOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/AdminLogOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class AdminLogOnTriggerSystem : XOnTriggerSystem +public sealed partial class AdminLogOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs index d021eed80d6..2a67718a7f1 100644 --- a/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/DamageOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class DamageOnTriggerSystem : XOnTriggerSystem +public sealed partial class DamageOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly Damage.Systems.DamageableSystem _damageableSystem = default!; + [Dependency] private Damage.Systems.DamageableSystem _damageableSystem = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs index e0b03bc199b..db291e2a4e0 100644 --- a/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/DnaScrambleOnTriggerSystem.cs @@ -10,15 +10,15 @@ namespace Content.Shared.Trigger.Systems; -public sealed class DnaScrambleOnTriggerSystem : XOnTriggerSystem +public sealed partial class DnaScrambleOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly MetaDataSystem _metaData = default!; - [Dependency] private readonly HumanoidProfileSystem _humanoidProfile = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly IdentitySystem _identity = default!; - [Dependency] private readonly SharedForensicsSystem _forensics = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private MetaDataSystem _metaData = default!; + [Dependency] private HumanoidProfileSystem _humanoidProfile = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private IdentitySystem _identity = default!; + [Dependency] private SharedForensicsSystem _forensics = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private INetManager _net = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs index b2ad01dd9ac..55ea59be187 100644 --- a/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/EmitSoundOnTriggerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class EmitSoundOnTriggerSystem : XOnTriggerSystem +public sealed partial class EmitSoundOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private SharedAudioSystem _audio = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs index a77cddd7388..653d9ee70d2 100644 --- a/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/EmpOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class EmpOnTriggerSystem : XOnTriggerSystem +public sealed partial class EmpOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedEmpSystem _emp = default!; + [Dependency] private SharedEmpSystem _emp = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/EmptyContainersOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EmptyContainersOnTriggerSystem.cs index dbe16010221..88bcafbde5d 100644 --- a/Content.Shared/Trigger/Systems/EmptyContainersOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/EmptyContainersOnTriggerSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Trigger.Systems; /// /// Empty containers trigger system. /// -public sealed class EmptyContainersOnTriggerSystem : XOnTriggerSystem +public sealed partial class EmptyContainersOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { @@ -44,9 +44,9 @@ protected override void OnTrigger(Entity ent, /// /// Empty containers and delete items trigger system. /// -public sealed class CleanContainersOnTriggerSystem : XOnTriggerSystem +public sealed partial class CleanContainersOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private SharedContainerSystem _container = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs index 294bf9660f1..a6c82ad23cd 100644 --- a/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/EntityEffectOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class EntityEffectOnTriggerSystem : XOnTriggerSystem +public sealed partial class EntityEffectOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedEntityEffectsSystem _effects = default!; + [Dependency] private SharedEntityEffectsSystem _effects = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs index 239d4908200..81d71a95433 100644 --- a/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/ExplodeOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class ExplodeOnTriggerSystem : XOnTriggerSystem +public sealed partial class ExplodeOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedExplosionSystem _explosion = default!; + [Dependency] private SharedExplosionSystem _explosion = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { @@ -14,9 +14,9 @@ protected override void OnTrigger(Entity ent, EntityU } } -public sealed class ExplosionOnTriggerSystem : XOnTriggerSystem +public sealed partial class ExplosionOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedExplosionSystem _explosion = default!; + [Dependency] private SharedExplosionSystem _explosion = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs index ca2dee62747..e52af429959 100644 --- a/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/FlashOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class FlashOnTriggerSystem : XOnTriggerSystem +public sealed partial class FlashOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedFlashSystem _flash = default!; + [Dependency] private SharedFlashSystem _flash = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs index 83b4790af9b..ab98f9c0ba9 100644 --- a/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/GibOnTriggerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class GibOnTriggerSystem : XOnTriggerSystem +public sealed partial class GibOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly GibbingSystem _gibbing = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private GibbingSystem _gibbing = default!; + [Dependency] private InventorySystem _inventory = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/JitterOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/JitterOnTriggerSystem.cs index 5a9e0463ed2..aa77cd7338f 100644 --- a/Content.Shared/Trigger/Systems/JitterOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/JitterOnTriggerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class JitterOnTriggerSystem : XOnTriggerSystem +public sealed partial class JitterOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedJitteringSystem _jittering = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedJitteringSystem _jittering = default!; + [Dependency] private INetManager _net = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/KnockdownOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/KnockdownOnTriggerSystem.cs index 815e00abc8d..8a3648f1e99 100644 --- a/Content.Shared/Trigger/Systems/KnockdownOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/KnockdownOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class KnockdownOnTriggerSystem : XOnTriggerSystem +public sealed partial class KnockdownOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private SharedStunSystem _stun = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs index 5d0db2d129c..c6aebc66388 100644 --- a/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/LaunchOnTriggerSystem.cs @@ -5,10 +5,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class LaunchOnTriggerSystem : XOnTriggerSystem +public sealed partial class LaunchOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs index 3bc8fecc1e5..7296052c246 100644 --- a/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/LockOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class LockOnTriggerSystem : XOnTriggerSystem +public sealed partial class LockOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly LockSystem _lock = default!; + [Dependency] private LockSystem _lock = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs index 7f118aab523..798f2662a1d 100644 --- a/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/PopupOnTriggerSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Trigger.Systems; /// /// This handles /// -public sealed class PopupOnTriggerSystem : XOnTriggerSystem +public sealed partial class PopupOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/RandomTriggerOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RandomTriggerOnTriggerSystem.cs index 5bd58e14c26..8a4b03181c8 100644 --- a/Content.Shared/Trigger/Systems/RandomTriggerOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/RandomTriggerOnTriggerSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.Trigger.Systems; -public sealed class RandomTriggerOnTriggerSystem : XOnTriggerSystem +public sealed partial class RandomTriggerOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly TriggerSystem _trigger = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private TriggerSystem _trigger = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IGameTiming _timing = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs index 9457c5e6eee..9f8411a9b8a 100644 --- a/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/RejuvenateOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class RejuvenateOnTriggerSystem : XOnTriggerSystem +public sealed partial class RejuvenateOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly RejuvenateSystem _rejuvenate = default!; + [Dependency] private RejuvenateSystem _rejuvenate = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs index 00d52a1b0b5..a480816332b 100644 --- a/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/RepulseAttractOnTriggerSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class RepulseAttractOnTriggerSystem : XOnTriggerSystem +public sealed partial class RepulseAttractOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly RepulseAttractSystem _repulse = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private RepulseAttractSystem _repulse = default!; + [Dependency] private SharedTransformSystem _transform = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs index 11e13338d81..8d77f5e108a 100644 --- a/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/ScramOnTriggerSystem.cs @@ -12,14 +12,14 @@ namespace Content.Shared.Trigger.Systems; -public sealed class ScramOnTriggerSystem : XOnTriggerSystem +public sealed partial class ScramOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly PullingSystem _pulling = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly TurfSystem _turfSystem = default!; + [Dependency] private PullingSystem _pulling = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private TurfSystem _turfSystem = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs index 977e68fed41..64c6d1b695c 100644 --- a/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/SharedReleaseGasOnTriggerSystem.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Trigger.Systems; /// Can also release gas over a set timespan to prevent trolling people /// with the instant-wall-of-pressure-inator. /// -public abstract class SharedReleaseGasOnTriggerSystem : EntitySystem +public abstract partial class SharedReleaseGasOnTriggerSystem : EntitySystem { - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs index 08c5da6ed32..bfd80872981 100644 --- a/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/ShockOnTriggerSystem.cs @@ -4,10 +4,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class ShockOnTriggerSystem : XOnTriggerSystem +public sealed partial class ShockOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedElectrocutionSystem _electrocution = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedElectrocutionSystem _electrocution = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs b/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs index 351aad0dad9..95452d40121 100644 --- a/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/SolutionTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class SolutionTriggerSystem : XOnTriggerSystem +public sealed partial class SolutionTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private SharedSolutionContainerSystem _solutionContainer = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs index 7d159925f95..b53ed8d1d63 100644 --- a/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class StaminaDamageOnTriggerSystem : XOnTriggerSystem +public sealed partial class StaminaDamageOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedStaminaSystem _stamina = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/StunOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/StunOnTriggerSystem.cs index ce86f971d36..be230a9bc89 100644 --- a/Content.Shared/Trigger/Systems/StunOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/StunOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class StunOnTriggerSystem : XOnTriggerSystem +public sealed partial class StunOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private SharedStunSystem _stun = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/SwapLocationOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/SwapLocationOnTriggerSystem.cs index 7b3004ad594..3e8bf7325c1 100644 --- a/Content.Shared/Trigger/Systems/SwapLocationOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/SwapLocationOnTriggerSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class SwapLocationOnTriggerSystem : EntitySystem +public sealed partial class SwapLocationOnTriggerSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly INetManager _net = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private INetManager _net = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/TagOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/TagOnTriggerSystem.cs index d636593d43c..069237737e6 100644 --- a/Content.Shared/Trigger/Systems/TagOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/TagOnTriggerSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class AddTagsOnTriggerSystem : XOnTriggerSystem +public sealed partial class AddTagsOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private TagSystem _tag = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { @@ -14,9 +14,9 @@ protected override void OnTrigger(Entity ent, EntityU } } -public sealed class RemoveTagsOnTriggerSystem : XOnTriggerSystem +public sealed partial class RemoveTagsOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private TagSystem _tag = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/TippyOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/TippyOnTriggerSystem.cs index 10c55490af8..7eccb4eb734 100644 --- a/Content.Shared/Trigger/Systems/TippyOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/TippyOnTriggerSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class TippyOnTriggerSystem : EntitySystem +public sealed partial class TippyOnTriggerSystem : EntitySystem { - [Dependency] private readonly SharedTipsSystem _tips = default!; + [Dependency] private SharedTipsSystem _tips = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs index 0d6ff4dbc65..7c628ebeb72 100644 --- a/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs +++ b/Content.Shared/Trigger/Systems/TriggerOnContainerInteractionSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Trigger.Systems; /// /// System for creating triggers when entities are inserted into or removed from containers. /// -public sealed class TriggerOnContainerInteractionSystem : TriggerOnXSystem +public sealed partial class TriggerOnContainerInteractionSystem : TriggerOnXSystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs index 2784b289503..e0fc3227898 100644 --- a/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs +++ b/Content.Shared/Trigger/Systems/TriggerOnEquipmentSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Trigger.Systems; /// /// System for creating triggers when entities are equipped or unequipped from inventory slots. /// -public sealed class TriggerOnEquipmentSystem : TriggerOnXSystem +public sealed partial class TriggerOnEquipmentSystem : TriggerOnXSystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs index 580d4990a88..d5a0f9b9722 100644 --- a/Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs +++ b/Content.Shared/Trigger/Systems/TriggerOnHandSystem.cs @@ -7,7 +7,7 @@ namespace Content.Shared.Trigger.Systems; public sealed partial class HandTriggerSystem : TriggerOnXSystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs index 4f7f288705a..d363ae71fb7 100644 --- a/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs +++ b/Content.Shared/Trigger/Systems/TriggerOnMobstateChangeSystem.cs @@ -8,7 +8,7 @@ namespace Content.Shared.Trigger.Systems; public sealed partial class TriggerOnMobstateChangeSystem : TriggerOnXSystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs index 2334c825fca..0452b53f3fd 100644 --- a/Content.Shared/Trigger/Systems/TriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs @@ -27,23 +27,23 @@ namespace Content.Shared.Trigger.Systems; /// public sealed partial class TriggerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly FixtureSystem _fixture = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; - [Dependency] private readonly ItemToggleSystem _itemToggle = default!; - [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!; - [Dependency] private readonly SharedRoleSystem _role = default!; - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly EntityTableSystem _entityTable = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private FixtureSystem _fixture = default!; + [Dependency] private INetManager _net = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private EntityWhitelistSystem _whitelist = default!; + [Dependency] private ItemToggleSystem _itemToggle = default!; + [Dependency] private SharedDeviceLinkSystem _deviceLink = default!; + [Dependency] private SharedRoleSystem _role = default!; + [Dependency] private SharedMindSystem _mind = default!; + [Dependency] private EntityTableSystem _entityTable = default!; public const string DefaultTriggerKey = "trigger"; diff --git a/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs index 2610818e28c..2f50cb51484 100644 --- a/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/TwoStageTriggerSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Trigger.Systems; -public sealed class TwoStageTriggerSystem : EntitySystem +public sealed partial class TwoStageTriggerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly TriggerSystem _triggerSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private TriggerSystem _triggerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs index ab012ecd901..9b7e46b33c6 100644 --- a/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/UncuffOnTriggerSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Trigger.Systems; -public sealed class UncuffOnTriggerSystem : XOnTriggerSystem +public sealed partial class UncuffOnTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly SharedCuffableSystem _cuffable = default!; + [Dependency] private SharedCuffableSystem _cuffable = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs b/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs index c9b7de87d0e..6c587bccaca 100644 --- a/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/WeatherTriggerSystem.cs @@ -5,11 +5,11 @@ namespace Content.Shared.Trigger.Systems; -public sealed class WeatherTriggerSystem : XOnTriggerSystem +public sealed partial class WeatherTriggerSystem : XOnTriggerSystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedWeatherSystem _weather = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedWeatherSystem _weather = default!; protected override void OnTrigger(Entity ent, EntityUid target, ref TriggerEvent args) { diff --git a/Content.Shared/TurretController/SharedDeployableTurretControllerSystem.cs b/Content.Shared/TurretController/SharedDeployableTurretControllerSystem.cs index 314a98071a9..6df0e5dc189 100644 --- a/Content.Shared/TurretController/SharedDeployableTurretControllerSystem.cs +++ b/Content.Shared/TurretController/SharedDeployableTurretControllerSystem.cs @@ -13,12 +13,12 @@ namespace Content.Shared.TurretController; /// public abstract partial class SharedDeployableTurretControllerSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessreader = default!; - [Dependency] private readonly TurretTargetSettingsSystem _turretTargetingSettings = default!; - [Dependency] private readonly SharedUserInterfaceSystem _userInterfaceSystem = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private AccessReaderSystem _accessreader = default!; + [Dependency] private TurretTargetSettingsSystem _turretTargetingSettings = default!; + [Dependency] private SharedUserInterfaceSystem _userInterfaceSystem = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; public override void Initialize() { diff --git a/Content.Shared/Turrets/SharedDeployableTurretSystem.cs b/Content.Shared/Turrets/SharedDeployableTurretSystem.cs index f252297c913..0bc0b79b5b7 100644 --- a/Content.Shared/Turrets/SharedDeployableTurretSystem.cs +++ b/Content.Shared/Turrets/SharedDeployableTurretSystem.cs @@ -18,14 +18,14 @@ namespace Content.Shared.Turrets; public abstract partial class SharedDeployableTurretSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedWiresSystem _wires = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedWiresSystem _wires = default!; + [Dependency] private IGameTiming _timing = default!; public override void Initialize() { diff --git a/Content.Shared/Turrets/TurretTargetSettingsSystem.cs b/Content.Shared/Turrets/TurretTargetSettingsSystem.cs index 3a8edc9955b..e0ebfac3a35 100644 --- a/Content.Shared/Turrets/TurretTargetSettingsSystem.cs +++ b/Content.Shared/Turrets/TurretTargetSettingsSystem.cs @@ -12,7 +12,7 @@ namespace Content.Shared.Turrets; /// public sealed partial class TurretTargetSettingsSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReader = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; private ProtoId _accessLevelBorg = "Borg"; private ProtoId _accessLevelBasicSilicon = "BasicSilicon"; diff --git a/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs b/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs index c9f4a0ce133..258afc491de 100644 --- a/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs +++ b/Content.Shared/UserInterface/ActivatableUIRequiresAnchorSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.UserInterface; /// /// /// -public sealed class ActivatableUIRequiresAnchorSystem : EntitySystem +public sealed partial class ActivatableUIRequiresAnchorSystem : EntitySystem { - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private SharedPopupSystem _popup = default!; public override void Initialize() { diff --git a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs index b8689694572..98cabe29e48 100644 --- a/Content.Shared/UserInterface/ActivatableUISystem.Power.cs +++ b/Content.Shared/UserInterface/ActivatableUISystem.Power.cs @@ -8,8 +8,8 @@ namespace Content.Shared.UserInterface; public sealed partial class ActivatableUISystem { - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly PowerCellSystem _cell = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private PowerCellSystem _cell = default!; private void InitializePower() { diff --git a/Content.Shared/UserInterface/ActivatableUISystem.cs b/Content.Shared/UserInterface/ActivatableUISystem.cs index 8b2299ccfc4..c6697fa70e2 100644 --- a/Content.Shared/UserInterface/ActivatableUISystem.cs +++ b/Content.Shared/UserInterface/ActivatableUISystem.cs @@ -15,12 +15,12 @@ namespace Content.Shared.UserInterface; public sealed partial class ActivatableUISystem : EntitySystem { - [Dependency] private readonly ISharedAdminManager _adminManager = default!; - [Dependency] private readonly ActionBlockerSystem _blockerSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private ISharedAdminManager _adminManager = default!; + [Dependency] private ActionBlockerSystem _blockerSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Shared/UserInterface/IntrinsicUISystem.cs b/Content.Shared/UserInterface/IntrinsicUISystem.cs index 4f086aed039..8d34d2f77dc 100644 --- a/Content.Shared/UserInterface/IntrinsicUISystem.cs +++ b/Content.Shared/UserInterface/IntrinsicUISystem.cs @@ -2,10 +2,10 @@ namespace Content.Shared.UserInterface; -public sealed class IntrinsicUISystem : EntitySystem +public sealed partial class IntrinsicUISystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private SharedActionsSystem _actionsSystem = default!; + [Dependency] private SharedUserInterfaceSystem _uiSystem = default!; public override void Initialize() { diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs index 16f4f60cfdd..7ff179afbcd 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.cs @@ -23,19 +23,19 @@ namespace Content.Shared.VendingMachines; public abstract partial class SharedVendingMachineSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] private readonly AccessReaderSystem _accessReader = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] protected readonly SharedPointLightSystem Light = default!; - [Dependency] private readonly SharedPowerReceiverSystem _receiver = default!; - [Dependency] protected readonly SharedPopupSystem Popup = default!; - [Dependency] private readonly SharedSpeakOnUIClosedSystem _speakOn = default!; - [Dependency] protected readonly SharedUserInterfaceSystem UISystem = default!; - [Dependency] protected readonly IRobustRandom Randomizer = default!; - [Dependency] private readonly EmagSystem _emag = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] private AccessReaderSystem _accessReader = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] protected SharedPointLightSystem Light = default!; + [Dependency] private SharedPowerReceiverSystem _receiver = default!; + [Dependency] protected SharedPopupSystem Popup = default!; + [Dependency] private SharedSpeakOnUIClosedSystem _speakOn = default!; + [Dependency] protected SharedUserInterfaceSystem UISystem = default!; + [Dependency] protected IRobustRandom Randomizer = default!; + [Dependency] private EmagSystem _emag = default!; public override void Initialize() { diff --git a/Content.Shared/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs index ee960feeb93..b603ede3dc4 100644 --- a/Content.Shared/Verbs/SharedVerbSystem.cs +++ b/Content.Shared/Verbs/SharedVerbSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.Verbs { - public abstract class SharedVerbSystem : EntitySystem + public abstract partial class SharedVerbSystem : EntitySystem { - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; + [Dependency] private SharedInteractionSystem _interactionSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] protected SharedContainerSystem ContainerSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs index 96b2ca979e7..aed956930e5 100644 --- a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs +++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicDamageSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Weapons.Hitscan.Systems; -public sealed class HitscanBasicDamageSystem : EntitySystem +public sealed partial class HitscanBasicDamageSystem : EntitySystem { - [Dependency] private readonly DamageableSystem _damage = default!; + [Dependency] private DamageableSystem _damage = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs index 496e97faebc..2eaaf2c8713 100644 --- a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs +++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicEffectsSystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Weapons.Hitscan.Systems; -public sealed class HitscanBasicEffectsSystem : EntitySystem +public sealed partial class HitscanBasicEffectsSystem : EntitySystem { - [Dependency] private readonly SharedColorFlashEffectSystem _color = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private SharedColorFlashEffectSystem _color = default!; + [Dependency] private SharedGunSystem _gun = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs index 716b4117a5f..01e515b25d8 100644 --- a/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs +++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanBasicRaycastSystem.cs @@ -14,12 +14,12 @@ namespace Content.Shared.Weapons.Hitscan.Systems; -public sealed class HitscanBasicRaycastSystem : EntitySystem +public sealed partial class HitscanBasicRaycastSystem : EntitySystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly ISharedAdminLogManager _log = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private ISharedAdminLogManager _log = default!; + [Dependency] private SharedTransformSystem _transform = default!; private EntityQuery _visualsQuery; diff --git a/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs b/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs index 8c1d1b45fbf..9c1f6d78719 100644 --- a/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs +++ b/Content.Shared/Weapons/Hitscan/Systems/HitscanStunSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Weapons.Hitscan.Systems; -public sealed class HitscanStunSystem : EntitySystem +public sealed partial class HitscanStunSystem : EntitySystem { - [Dependency] private readonly SharedStaminaSystem _stamina = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs index b236824815f..9bb3852e853 100644 --- a/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs +++ b/Content.Shared/Weapons/Marker/SharedDamageMarkerSystem.cs @@ -10,13 +10,13 @@ namespace Content.Shared.Weapons.Marker; -public abstract class SharedDamageMarkerSystem : EntitySystem +public abstract partial class SharedDamageMarkerSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Melee/EnergySword/EnergySwordSystem.cs b/Content.Shared/Weapons/Melee/EnergySword/EnergySwordSystem.cs index f89ca2a28bd..8fcb55a38ae 100644 --- a/Content.Shared/Weapons/Melee/EnergySword/EnergySwordSystem.cs +++ b/Content.Shared/Weapons/Melee/EnergySword/EnergySwordSystem.cs @@ -7,12 +7,12 @@ namespace Content.Shared.Weapons.Melee.EnergySword; -public sealed class EnergySwordSystem : EntitySystem +public sealed partial class EnergySwordSystem : EntitySystem { - [Dependency] private readonly SharedRgbLightControllerSystem _rgbSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedToolSystem _toolSystem = default!; + [Dependency] private SharedRgbLightControllerSystem _rgbSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedToolSystem _toolSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs index 6281d24d528..4b8ad6b64bc 100644 --- a/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs +++ b/Content.Shared/Weapons/Melee/MeleeSoundSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Weapons.Melee; /// /// This handles /// -public sealed class MeleeSoundSystem : EntitySystem +public sealed partial class MeleeSoundSystem : EntitySystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAudioSystem _audio = default!; public const float DamagePitchVariation = 0.05f; diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs index f1f9a19a75e..7cb9d259f10 100644 --- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs +++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs @@ -11,12 +11,12 @@ namespace Content.Shared.Weapons.Melee; /// /// This handles /// -public sealed class MeleeThrowOnHitSystem : EntitySystem +public sealed partial class MeleeThrowOnHitSystem : EntitySystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; - [Dependency] private readonly SharedStunSystem _stun = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private UseDelaySystem _delay = default!; + [Dependency] private SharedStunSystem _stun = default!; + [Dependency] private ThrowingSystem _throwing = default!; /// public override void Initialize() { diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 4c09db7512f..72548c01b88 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -44,28 +44,28 @@ namespace Content.Shared.Weapons.Melee; -public abstract class SharedMeleeWeaponSystem : EntitySystem +public abstract partial class SharedMeleeWeaponSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly IMapManager MapManager = default!; - [Dependency] private readonly INetManager _netMan = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!; - [Dependency] protected readonly ActionBlockerSystem Blocker = default!; - [Dependency] protected readonly DamageableSystem Damageable = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly InventorySystem _inventory = default!; - [Dependency] private readonly MeleeSoundSystem _meleeSound = default!; - [Dependency] protected readonly MobStateSystem MobState = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] protected readonly SharedCombatModeSystem CombatMode = default!; - [Dependency] protected readonly SharedInteractionSystem Interaction = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly SharedPopupSystem PopupSystem = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly SharedStaminaSystem _stamina = default!; - [Dependency] private readonly DamageExamineSystem _damageExamine = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected IMapManager MapManager = default!; + [Dependency] private INetManager _netMan = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] protected ISharedAdminLogManager AdminLogger = default!; + [Dependency] protected ActionBlockerSystem Blocker = default!; + [Dependency] protected DamageableSystem Damageable = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private InventorySystem _inventory = default!; + [Dependency] private MeleeSoundSystem _meleeSound = default!; + [Dependency] protected MobStateSystem MobState = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] protected SharedCombatModeSystem CombatMode = default!; + [Dependency] protected SharedInteractionSystem Interaction = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected SharedPopupSystem PopupSystem = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] private SharedStaminaSystem _stamina = default!; + [Dependency] private DamageExamineSystem _damageExamine = default!; private const int AttackMask = (int)(CollisionGroup.MobMask | CollisionGroup.Opaque); diff --git a/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs b/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs index e6327b32808..052229598bb 100644 --- a/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs +++ b/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Weapons.Melee; /// -public sealed class UseDelayOnMeleeHitSystem : EntitySystem +public sealed partial class UseDelayOnMeleeHitSystem : EntitySystem { - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private UseDelaySystem _delay = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs index fe6540191f3..4bae7f656b6 100644 --- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs @@ -20,19 +20,19 @@ namespace Content.Shared.Weapons.Misc; -public abstract class SharedGrapplingGunSystem : VirtualController +public abstract partial class SharedGrapplingGunSystem : VirtualController { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] private readonly IEntityManager _entities = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] private IEntityManager _entities = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedJointSystem _joints = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedContainerSystem _container = default!; public const string GrapplingJoint = "grappling"; diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs index 9e195d0b1dc..fc93afeae07 100644 --- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs @@ -20,18 +20,18 @@ namespace Content.Shared.Weapons.Misc; public abstract partial class SharedTetherGunSystem : EntitySystem { - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly ActionBlockerSystem _blocker = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly MobStateSystem _mob = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedJointSystem _joints = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] private readonly ThrowingSystem _throwing = default!; - [Dependency] private readonly ThrownItemSystem _thrown = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private ActionBlockerSystem _blocker = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private MobStateSystem _mob = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedJointSystem _joints = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] private ThrowingSystem _throwing = default!; + [Dependency] private ThrownItemSystem _thrown = default!; private const string TetherJoint = "tether"; diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs index b68d9d1d5de..bc2788b2191 100644 --- a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs @@ -3,10 +3,10 @@ namespace Content.Shared.Weapons.Ranged.Systems; -public sealed class ActionGunSystem : EntitySystem +public sealed partial class ActionGunSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedGunSystem _gun = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs index 29ba5c5ee29..3fac137ef1b 100644 --- a/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/BatteryWeaponFireModesSystem.cs @@ -9,13 +9,13 @@ namespace Content.Shared.Weapons.Ranged.Systems; -public sealed class BatteryWeaponFireModesSystem : EntitySystem +public sealed partial class BatteryWeaponFireModesSystem : EntitySystem { - [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private AccessReaderSystem _accessReaderSystem = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private SharedAppearanceSystem _appearanceSystem = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private SharedPopupSystem _popupSystem = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs index 5584c84bae5..edde783c8b1 100644 --- a/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs @@ -6,13 +6,13 @@ namespace Content.Shared.Weapons.Ranged.Systems; -public sealed class RechargeBasicEntityAmmoSystem : EntitySystem +public sealed partial class RechargeBasicEntityAmmoSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly MetaDataSystem _metadata = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private MetaDataSystem _metadata = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedGunSystem _gun = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs index 092d8e8d0fb..b1bf8c86b7d 100644 --- a/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/RechargeCycleAmmoSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Weapons.Ranged.Systems; /// /// Recharges ammo whenever the gun is cycled. /// -public sealed class RechargeCycleAmmoSystem : EntitySystem +public sealed partial class RechargeCycleAmmoSystem : EntitySystem { - [Dependency] private readonly SharedGunSystem _gun = default!; + [Dependency] private SharedGunSystem _gun = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs index be6e50f82f3..78d2992a568 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedFlyBySoundSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Weapons.Ranged.Systems; -public abstract class SharedFlyBySoundSystem : EntitySystem +public abstract partial class SharedFlyBySoundSystem : EntitySystem { - [Dependency] private readonly FixtureSystem _fixtures = default!; + [Dependency] private FixtureSystem _fixtures = default!; public const string FlyByFixture = "fly-by"; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index 831db83c3bf..667c3579efe 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -14,8 +14,8 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem { - [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private SharedDoAfterSystem _doAfter = default!; + [Dependency] private SharedInteractionSystem _interaction = default!; [MustCallBase] protected virtual void InitializeBallistic() diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs index 77f1e3c1039..c6146f0f0da 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Cartridges.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem { - [Dependency] private readonly DamageExamineSystem _damageExamine = default!; + [Dependency] private DamageExamineSystem _damageExamine = default!; // needed for server system protected virtual void InitializeCartridge() diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index 976d94e90bb..8194c483039 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -39,32 +39,32 @@ namespace Content.Shared.Weapons.Ranged.Systems; public abstract partial class SharedGunSystem : EntitySystem { - [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly ItemSlotsSystem _slots = default!; - [Dependency] private readonly RechargeBasicEntityAmmoSystem _recharge = default!; - [Dependency] private readonly SharedCombatModeSystem _combatMode = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] protected readonly DamageableSystem Damageable = default!; - [Dependency] protected readonly ExamineSystemShared Examine = default!; - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly IMapManager MapManager = default!; - [Dependency] protected readonly IPrototypeManager ProtoManager = default!; - [Dependency] protected readonly IRobustRandom Random = default!; - [Dependency] protected readonly ISharedAdminLogManager Logs = default!; - [Dependency] protected readonly SharedActionsSystem Actions = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedContainerSystem Containers = default!; - [Dependency] protected readonly SharedPhysicsSystem Physics = default!; - [Dependency] protected readonly SharedPointLightSystem Lights = default!; - [Dependency] protected readonly SharedPopupSystem PopupSystem = default!; - [Dependency] protected readonly SharedProjectileSystem Projectiles = default!; - [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; - [Dependency] protected readonly TagSystem TagSystem = default!; - [Dependency] protected readonly ThrowingSystem ThrowingSystem = default!; + [Dependency] private ActionBlockerSystem _actionBlockerSystem = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private ItemSlotsSystem _slots = default!; + [Dependency] private RechargeBasicEntityAmmoSystem _recharge = default!; + [Dependency] private SharedCombatModeSystem _combatMode = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] protected DamageableSystem Damageable = default!; + [Dependency] protected ExamineSystemShared Examine = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected IMapManager MapManager = default!; + [Dependency] protected IPrototypeManager ProtoManager = default!; + [Dependency] protected IRobustRandom Random = default!; + [Dependency] protected ISharedAdminLogManager Logs = default!; + [Dependency] protected SharedActionsSystem Actions = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedContainerSystem Containers = default!; + [Dependency] protected SharedPhysicsSystem Physics = default!; + [Dependency] protected SharedPointLightSystem Lights = default!; + [Dependency] protected SharedPopupSystem PopupSystem = default!; + [Dependency] protected SharedProjectileSystem Projectiles = default!; + [Dependency] protected SharedTransformSystem TransformSystem = default!; + [Dependency] protected TagSystem TagSystem = default!; + [Dependency] protected ThrowingSystem ThrowingSystem = default!; /// /// Default projectile speed diff --git a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs index f5013a3493d..c195b025588 100644 --- a/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/UseDelayOnShootSystem.cs @@ -3,9 +3,9 @@ namespace Content.Shared.Weapons.Ranged.Systems; -public sealed class UseDelayOnShootSystem : EntitySystem +public sealed partial class UseDelayOnShootSystem : EntitySystem { - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private UseDelaySystem _delay = default!; public override void Initialize() { diff --git a/Content.Shared/Weapons/Ranged/Upgrades/GunUpgradeSystem.cs b/Content.Shared/Weapons/Ranged/Upgrades/GunUpgradeSystem.cs index 5e851829463..9b37394e3ab 100644 --- a/Content.Shared/Weapons/Ranged/Upgrades/GunUpgradeSystem.cs +++ b/Content.Shared/Weapons/Ranged/Upgrades/GunUpgradeSystem.cs @@ -16,14 +16,14 @@ namespace Content.Shared.Weapons.Ranged.Upgrades; -public sealed class GunUpgradeSystem : EntitySystem +public sealed partial class GunUpgradeSystem : EntitySystem { - [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly EntityWhitelistSystem _entityWhitelist = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private ISharedAdminLogManager _adminLog = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private EntityWhitelistSystem _entityWhitelist = default!; + [Dependency] private SharedPopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs index eae0a4994f2..e877b1f0e47 100644 --- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs +++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs @@ -23,16 +23,16 @@ namespace Content.Shared.Weapons.Reflect; /// /// This handles reflecting projectiles and hitscan shots. /// -public sealed class ReflectSystem : EntitySystem +public sealed partial class ReflectSystem : EntitySystem { - [Dependency] private readonly INetManager _netManager = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly ItemToggleSystem _toggle = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private INetManager _netManager = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private ItemToggleSystem _toggle = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/Weather/SharedWeatherSystem.cs b/Content.Shared/Weather/SharedWeatherSystem.cs index 17cbaf27e67..08128d3bdf3 100644 --- a/Content.Shared/Weather/SharedWeatherSystem.cs +++ b/Content.Shared/Weather/SharedWeatherSystem.cs @@ -12,15 +12,15 @@ namespace Content.Shared.Weather; -public abstract class SharedWeatherSystem : EntitySystem +public abstract partial class SharedWeatherSystem : EntitySystem { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly IPrototypeManager ProtoMan = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!; - [Dependency] private readonly SharedMapSystem _mapSystem = default!; - [Dependency] private readonly SharedRoofSystem _roof = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected IPrototypeManager ProtoMan = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] private ITileDefinitionManager _tileDefManager = default!; + [Dependency] private SharedMapSystem _mapSystem = default!; + [Dependency] private SharedRoofSystem _roof = default!; + [Dependency] private StatusEffectsSystem _statusEffects = default!; private EntityQuery _blockQuery; private EntityQuery _weatherQuery; diff --git a/Content.Shared/Whistle/WhistleSystem.cs b/Content.Shared/Whistle/WhistleSystem.cs index 1fa9cfb1430..78da7edb66c 100644 --- a/Content.Shared/Whistle/WhistleSystem.cs +++ b/Content.Shared/Whistle/WhistleSystem.cs @@ -6,11 +6,11 @@ namespace Content.Shared.Whistle; -public sealed class WhistleSystem : EntitySystem +public sealed partial class WhistleSystem : EntitySystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedTransformSystem _transform = default!; public override void Initialize() { diff --git a/Content.Shared/Whitelist/EntityWhitelistSystem.cs b/Content.Shared/Whitelist/EntityWhitelistSystem.cs index 55a5e7be83d..025e3c726fe 100644 --- a/Content.Shared/Whitelist/EntityWhitelistSystem.cs +++ b/Content.Shared/Whitelist/EntityWhitelistSystem.cs @@ -4,9 +4,9 @@ namespace Content.Shared.Whitelist; -public sealed class EntityWhitelistSystem : EntitySystem +public sealed partial class EntityWhitelistSystem : EntitySystem { - [Dependency] private readonly TagSystem _tag = default!; + [Dependency] private TagSystem _tag = default!; private EntityQuery _itemQuery; diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs index abe1c9dd5e5..f209216352a 100644 --- a/Content.Shared/Wieldable/SharedWieldableSystem.cs +++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs @@ -26,18 +26,18 @@ namespace Content.Shared.Wieldable; -public abstract class SharedWieldableSystem : EntitySystem +public abstract partial class SharedWieldableSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedGunSystem _gun = default!; - [Dependency] private readonly SharedHandsSystem _hands = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedVirtualItemSystem _virtualItem = default!; - [Dependency] private readonly UseDelaySystem _delay = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private SharedAudioSystem _audio = default!; + [Dependency] private SharedGunSystem _gun = default!; + [Dependency] private SharedHandsSystem _hands = default!; + [Dependency] private SharedItemSystem _item = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedVirtualItemSystem _virtualItem = default!; + [Dependency] private UseDelaySystem _delay = default!; public override void Initialize() { diff --git a/Content.Shared/Wires/SharedWiresSystem.cs b/Content.Shared/Wires/SharedWiresSystem.cs index b7f2f7838b3..19ff03e77f6 100644 --- a/Content.Shared/Wires/SharedWiresSystem.cs +++ b/Content.Shared/Wires/SharedWiresSystem.cs @@ -8,13 +8,13 @@ namespace Content.Shared.Wires; -public abstract class SharedWiresSystem : EntitySystem +public abstract partial class SharedWiresSystem : EntitySystem { - [Dependency] protected readonly ISharedAdminLogManager AdminLogger = default!; - [Dependency] private readonly ActivatableUISystem _activatableUI = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; - [Dependency] protected readonly SharedAudioSystem Audio = default!; - [Dependency] protected readonly SharedToolSystem Tool = default!; + [Dependency] protected ISharedAdminLogManager AdminLogger = default!; + [Dependency] private ActivatableUISystem _activatableUI = default!; + [Dependency] protected SharedAppearanceSystem Appearance = default!; + [Dependency] protected SharedAudioSystem Audio = default!; + [Dependency] protected SharedToolSystem Tool = default!; public override void Initialize() { diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs index 590b317745c..9bcae081afd 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Node.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Xenoarchaeology.Artifact; public abstract partial class SharedXenoArtifactSystem { - [Dependency] private readonly EntityTableSystem _entityTable = default!; + [Dependency] private EntityTableSystem _entityTable = default!; private EntityQuery _xenoArtifactQuery; private EntityQuery _nodeQuery; diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs index 6ac49f0ce28..a09445123c1 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.Unlock.cs @@ -10,7 +10,7 @@ namespace Content.Shared.Xenoarchaeology.Artifact; public abstract partial class SharedXenoArtifactSystem { - [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private SharedAudioSystem _audio = default!; private EntityQuery _unlockingQuery; diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs index 12a1f5be0e7..94ea88b8781 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.XAE.cs @@ -11,10 +11,10 @@ namespace Content.Shared.Xenoarchaeology.Artifact; public abstract partial class SharedXenoArtifactSystem { - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly SharedMapSystem _map = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private ISharedAdminLogManager _adminLogger = default!; + [Dependency] private SharedTransformSystem _transform = default!; + [Dependency] private SharedMapSystem _map = default!; private void InitializeXAE() { diff --git a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.cs index a4a4cfc45a8..751eb839e24 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/SharedXenoArtifactSystem.cs @@ -14,13 +14,13 @@ namespace Content.Shared.Xenoarchaeology.Artifact; /// public abstract partial class SharedXenoArtifactSystem : EntitySystem { - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly INetManager _net = default!; - [Dependency] protected readonly IPrototypeManager PrototypeManager = default!; - [Dependency] protected readonly IRobustRandom RobustRandom = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private INetManager _net = default!; + [Dependency] protected IPrototypeManager PrototypeManager = default!; + [Dependency] protected IRobustRandom RobustRandom = default!; + [Dependency] private SharedActionsSystem _actions = default!; + [Dependency] private SharedContainerSystem _container = default!; + [Dependency] private SharedPopupSystem _popup = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs index e36729851f0..90cc7bd64fb 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEApplyComponentsSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAE; /// /// System for applying component-registry when artifact effect is activated. /// -public sealed class XAEApplyComponentsSystem : BaseXAESystem +public sealed partial class XAEApplyComponentsSystem : BaseXAESystem { - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IGameTiming _timing = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs index 90040d0e604..3c8106c7340 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEDamageInAreaSystem.cs @@ -9,13 +9,13 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that damages entities from whitelist in area. /// -public sealed class XAEDamageInAreaSystem : BaseXAESystem +public sealed partial class XAEDamageInAreaSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private IGameTiming _timing = default!; /// Pre-allocated and re-used collection. private readonly HashSet _entitiesInRange = new(); diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEKnockSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEKnockSystem.cs index 716ef6c660d..99543a278dc 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEKnockSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEKnockSystem.cs @@ -6,9 +6,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that opens doors in some area around. /// -public sealed class XAEKnockSystem : BaseXAESystem +public sealed partial class XAEKnockSystem : BaseXAESystem { - [Dependency] private readonly SharedMagicSystem _magic = default!; + [Dependency] private SharedMagicSystem _magic = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) { diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs index 8a2f68027a4..1d860783f24 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERandomTeleportInvokerSystem.cs @@ -6,13 +6,13 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAE; -public sealed class XAERandomTeleportInvokerSystem : BaseXAESystem +public sealed partial class XAERandomTeleportInvokerSystem : BaseXAESystem { - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedJointSystem _jointSystem = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedJointSystem _jointSystem = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs index f0474160765..c4234400aed 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAERemoveCollisionSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAE; /// /// System for xeno artifact effect that make artifact pass through other objects. /// -public sealed class XAERemoveCollisionSystem : BaseXAESystem +public sealed partial class XAERemoveCollisionSystem : BaseXAESystem { - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private SharedPhysicsSystem _physics = default!; /// protected override void OnActivated(Entity ent, ref XenoArtifactNodeActivatedEvent args) diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEShuffleSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEShuffleSystem.cs index b59282deb57..30576a08c1f 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEShuffleSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAE/XAEShuffleSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAE; /// /// System that handles mob entities spacial shuffling effect. /// -public sealed class XAEShuffleSystem : BaseXAESystem +public sealed partial class XAEShuffleSystem : BaseXAESystem { - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _xform = default!; - [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private EntityLookupSystem _lookup = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private SharedTransformSystem _xform = default!; + [Dependency] private IGameTiming _timing = default!; private EntityQuery _mobState; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseXATSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseXATSystem.cs index d995a12d6a8..28958e08039 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseXATSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/BaseXATSystem.cs @@ -7,10 +7,10 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAT; /// Base type for xeno artifact trigger systems. Each system should work with 1 trigger mechanics. /// /// Type of XAT component that system will work with. -public abstract class BaseXATSystem : EntitySystem where T : Component +public abstract partial class BaseXATSystem : EntitySystem where T : Component { - [Dependency] protected readonly IGameTiming Timing = default!; - [Dependency] protected readonly SharedXenoArtifactSystem XenoArtifact = default!; + [Dependency] protected IGameTiming Timing = default!; + [Dependency] protected SharedXenoArtifactSystem XenoArtifact = default!; private EntityQuery _unlockingQuery; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATCompNearbySystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATCompNearbySystem.cs index 8036ec054fe..ede3e0663bf 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATCompNearbySystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATCompNearbySystem.cs @@ -6,10 +6,10 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAT; /// /// System for xeno artifact trigger that requires some entity/entities with certain component on them nearby. /// -public sealed class XATCompNearbySystem : BaseQueryUpdateXATSystem +public sealed partial class XATCompNearbySystem : BaseQueryUpdateXATSystem { - [Dependency] private readonly EntityLookupSystem _entityLookup = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private EntityLookupSystem _entityLookup = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// Pre-allocated and re-used collection. private readonly HashSet> _entities = new(); diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs index 4a9f166dfa4..f6458472375 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDamageThresholdReachedSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAT; /// /// System for xeno artifact trigger that requires certain damage to be applied to artifact within a timeframe. /// -public sealed class XATDamageThresholdReachedSystem : BaseXATSystem +public sealed partial class XATDamageThresholdReachedSystem : BaseXATSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs index 50a7b0200e0..fdf5b993330 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATDeathSystem.cs @@ -7,9 +7,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAT; /// /// System for xeno artifact trigger that requires death of some mob near artifact. /// -public sealed class XATDeathSystem : BaseXATSystem +public sealed partial class XATDeathSystem : BaseXATSystem { - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedTransformSystem _transform = default!; private EntityQuery _xenoArtifactQuery; diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATTimerSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATTimerSystem.cs index 4f7ffdbe9d9..008b01cf6aa 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATTimerSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATTimerSystem.cs @@ -8,9 +8,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAT; /// /// System for xeno artifact trigger that activates from time to time on schedule. /// -public sealed class XATTimerSystem : BaseQueryUpdateXATSystem +public sealed partial class XATTimerSystem : BaseQueryUpdateXATSystem { - [Dependency] private readonly IRobustRandom _robustRandom = default!; + [Dependency] private IRobustRandom _robustRandom = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATToolUseSystem.cs b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATToolUseSystem.cs index ca2692af462..0ad1a7c3d6f 100644 --- a/Content.Shared/Xenoarchaeology/Artifact/XAT/XATToolUseSystem.cs +++ b/Content.Shared/Xenoarchaeology/Artifact/XAT/XATToolUseSystem.cs @@ -9,9 +9,9 @@ namespace Content.Shared.Xenoarchaeology.Artifact.XAT; /// /// This handles /// -public sealed class XATToolUseSystem : BaseXATSystem +public sealed partial class XATToolUseSystem : BaseXATSystem { - [Dependency] private readonly SharedToolSystem _tool = default!; + [Dependency] private SharedToolSystem _tool = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs index 977f04886b7..5990ef9ed30 100644 --- a/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs +++ b/Content.Shared/Xenoarchaeology/Equipment/NodeScannerSystem.cs @@ -8,12 +8,12 @@ namespace Content.Shared.Xenoarchaeology.Equipment; /// Controls behaviour of artifact node scanner device. -public sealed class NodeScannerSystem : EntitySystem +public sealed partial class NodeScannerSystem : EntitySystem { - [Dependency] private readonly UseDelaySystem _useDelay = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private UseDelaySystem _useDelay = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedTransformSystem _transform = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs index e61ad02bc07..014be648d22 100644 --- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs +++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactAnalyzerSystem.cs @@ -12,10 +12,10 @@ namespace Content.Shared.Xenoarchaeology.Equipment; /// This system is used for managing the artifact analyzer as well as the analysis console. /// It also handles scanning and ui updates for both systems. /// -public abstract class SharedArtifactAnalyzerSystem : EntitySystem +public abstract partial class SharedArtifactAnalyzerSystem : EntitySystem { - [Dependency] private readonly SharedPowerReceiverSystem _powerReceiver = default!; - [Dependency] private readonly SharedDeviceLinkSystem _deviceLink = default!; + [Dependency] private SharedPowerReceiverSystem _powerReceiver = default!; + [Dependency] private SharedDeviceLinkSystem _deviceLink = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs index 5051f1e4ff4..60155698cd5 100644 --- a/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs +++ b/Content.Shared/Xenoarchaeology/Equipment/SharedArtifactCrusherSystem.cs @@ -17,16 +17,16 @@ namespace Content.Shared.Xenoarchaeology.Equipment; /// /// This handles logic relating to /// -public abstract class SharedArtifactCrusherSystem : EntitySystem +public abstract partial class SharedArtifactCrusherSystem : EntitySystem { - [Dependency] protected readonly SharedAudioSystem AudioSystem = default!; - [Dependency] protected readonly SharedContainerSystem ContainerSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly EmagSystem _emag = default!; - [Dependency] private readonly SharedPowerReceiverSystem _power = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] protected SharedAudioSystem AudioSystem = default!; + [Dependency] protected SharedContainerSystem ContainerSystem = default!; + [Dependency] private SharedAppearanceSystem _appearance = default!; + [Dependency] private EmagSystem _emag = default!; + [Dependency] private SharedPowerReceiverSystem _power = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private DamageableSystem _damageable = default!; /// public override void Initialize() diff --git a/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs b/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs index d2de0c0168f..1844e360c7b 100644 --- a/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs +++ b/Content.Shared/Xenoarchaeology/Equipment/SuppressArtifactContainerSystem.cs @@ -5,9 +5,9 @@ namespace Content.Shared.Xenoarchaeology.Equipment; -public sealed class SuppressArtifactContainerSystem : EntitySystem +public sealed partial class SuppressArtifactContainerSystem : EntitySystem { - [Dependency] private readonly SharedXenoArtifactSystem _xenoArtifact = default!; + [Dependency] private SharedXenoArtifactSystem _xenoArtifact = default!; public override void Initialize() { diff --git a/Content.Shared/_NF/Bank/SharedBankSystem.cs b/Content.Shared/_NF/Bank/SharedBankSystem.cs index 5d2f0bbc244..0106ff0ceb6 100644 --- a/Content.Shared/_NF/Bank/SharedBankSystem.cs +++ b/Content.Shared/_NF/Bank/SharedBankSystem.cs @@ -13,7 +13,7 @@ public enum BankATMMenuUiKey : byte public abstract partial class SharedBankSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; + [Dependency] private ItemSlotsSystem _itemSlotsSystem = default!; public override void Initialize() {