From 4b2c013a88e6bb9ccfecbc5bb713f43d54a66f57 Mon Sep 17 00:00:00 2001 From: Dmitry <57028746+DIMMoon1@users.noreply.github.com> Date: Mon, 25 May 2026 06:05:16 +0700 Subject: [PATCH] RA0051 --- .../Corvax/Events/ShowEventIconSystem.cs | 4 +-- .../EntityScreenshotGenerator.cs | 28 +++++++++---------- .../EntityScreenshotRenderService.cs | 24 ++++++++-------- .../Guidebook/Controls/FTLTextpart.xaml.cs | 6 ++-- Content.Client/Corvax/Ipc/IpcFaceMenu.cs | 11 ++------ Content.Client/Corvax/Ipc/IpcSystem.cs | 12 ++++---- Content.Client/Corvax/Markup/TooltipTag.cs | 4 +-- .../Overlays/ShowSquadIconsSystem.cs | 4 +-- Content.Client/Corvax/TTS/TTSTab.xaml.cs | 2 +- .../Commands/PanicBunkerCommand.cs | 6 ++-- .../Commands/PlayLocalSoundCommand.cs | 8 +++--- .../Corvax/Documents/DocumentPrinterSystem.cs | 9 +++--- Content.Server/Corvax/Ipc/IpcSystem.cs | 20 ++++++------- .../PeacefulRoundEndSystem.cs | 8 +++--- .../Corvax/SecApartment/SecApartmentSystem.cs | 17 ++++++----- .../Commands/FTLTravelTimeSetCommand.cs | 17 +++++------ .../EntitySystems/GrowlingAccentSystem.cs | 4 +-- .../Corvax/StationGoal/StationGoalCommand.cs | 6 ++-- .../StationGoal/StationGoalPaperSystem.cs | 16 +++++------ Content.Server/Corvax/TTS/TTSManager.cs | 6 ++-- .../Corvax/TTS/TTSSystem.RateLimit.cs | 6 ++-- Content.Server/Corvax/TTS/TTSSystem.cs | 10 +++---- .../Speech/EntitySystems/FrontalLispSystem.cs | 4 +-- .../EntitySystems/LizardAccentSystem.cs | 4 +-- .../Speech/EntitySystems/MothAccentSystem.cs | 4 +-- 25 files changed, 115 insertions(+), 125 deletions(-) diff --git a/Content.Client/Corvax/Events/ShowEventIconSystem.cs b/Content.Client/Corvax/Events/ShowEventIconSystem.cs index 7ad86a2d16..b6d169761b 100644 --- a/Content.Client/Corvax/Events/ShowEventIconSystem.cs +++ b/Content.Client/Corvax/Events/ShowEventIconSystem.cs @@ -4,9 +4,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Corvax.Events { - public sealed class ShowEventIconSystem : EntitySystem + public sealed partial class ShowEventIconSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs b/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs index de427a1e43..dc5933b3c9 100644 --- a/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs +++ b/Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs @@ -22,21 +22,21 @@ using Robust.Shared.Utility; namespace Content.Client.Corvax.ExportSprites; -public sealed class EntityScreenshotGenerator +public sealed partial class EntityScreenshotGenerator { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IBaseClient _baseClient = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; - [Dependency] private readonly EntityScreenshotRenderService _renderService = default!; - [Dependency] private readonly IGameController _gameController = default!; - [Dependency] private readonly IClientGameTiming _gameTiming = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IMapManager _mapManager = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly ISerializationManager _serialization = default!; - [Dependency] private readonly IStateManager _stateManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IBaseClient _baseClient = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; + [Dependency] private EntityScreenshotRenderService _renderService = default!; + [Dependency] private IGameController _gameController = default!; + [Dependency] private IClientGameTiming _gameTiming = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IMapManager _mapManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private ISerializationManager _serialization = default!; + [Dependency] private IStateManager _stateManager = default!; private ISawmill _sawmill = default!; private bool _started; diff --git a/Content.Client/Corvax/ExportSprites/EntityScreenshotRenderService.cs b/Content.Client/Corvax/ExportSprites/EntityScreenshotRenderService.cs index cd05548469..a32ae5645a 100644 --- a/Content.Client/Corvax/ExportSprites/EntityScreenshotRenderService.cs +++ b/Content.Client/Corvax/ExportSprites/EntityScreenshotRenderService.cs @@ -14,15 +14,15 @@ using Color = Robust.Shared.Maths.Color; namespace Content.Client.Corvax.ExportSprites; -public sealed class EntityScreenshotRenderService +public sealed partial class EntityScreenshotRenderService { - [Dependency] private readonly IClyde _clyde = default!; - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; - [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IUserInterfaceManager _ui = default!; + [Dependency] private IClyde _clyde = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private IEntitySystemManager _entitySystemManager = default!; + [Dependency] private IResourceManager _resourceManager = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IUserInterfaceManager _ui = default!; private EntityScreenshotRenderControl? _control; private bool _initialized; @@ -609,13 +609,13 @@ public sealed class EntityScreenshotRenderService private readonly record struct PixelRect(int Left, int Top, int Width, int Height); - private sealed class EntityScreenshotRenderControl : Control + private sealed partial class EntityScreenshotRenderControl : Control { private static readonly Color ExportBackgroundColor = new(128, 128, 128, 0); - [Dependency] private readonly IEntityManager _entityManager = default!; - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly IResourceManager _resourceManager = default!; + [Dependency] private IEntityManager _entityManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private IResourceManager _resourceManager = default!; internal readonly Queue<( IRenderTexture Texture, diff --git a/Content.Client/Corvax/Guidebook/Controls/FTLTextpart.xaml.cs b/Content.Client/Corvax/Guidebook/Controls/FTLTextpart.xaml.cs index 447da5e1fb..0fe91ec012 100644 --- a/Content.Client/Corvax/Guidebook/Controls/FTLTextpart.xaml.cs +++ b/Content.Client/Corvax/Guidebook/Controls/FTLTextpart.xaml.cs @@ -14,9 +14,9 @@ namespace Content.Client.Corvax.Guidebook.Controls; [GenerateTypedNameReferences] public sealed partial class FTLTextpart : RichTextLabel, IDocumentTag { - [Dependency] private readonly ILogManager _logManager = default!; - [Dependency] private readonly ILocalizationManager _loc = default!; - [Dependency] private readonly DocumentParsingManager _documentParsingManager = default!; + [Dependency] private ILogManager _logManager = default!; + [Dependency] private ILocalizationManager _loc = default!; + [Dependency] private DocumentParsingManager _documentParsingManager = default!; private readonly ISawmill _sawmill; diff --git a/Content.Client/Corvax/Ipc/IpcFaceMenu.cs b/Content.Client/Corvax/Ipc/IpcFaceMenu.cs index 9f55e9915c..43d217be36 100644 --- a/Content.Client/Corvax/Ipc/IpcFaceMenu.cs +++ b/Content.Client/Corvax/Ipc/IpcFaceMenu.cs @@ -1,23 +1,18 @@ -using System; using System.Numerics; using Content.Shared.Corvax.Ipc; using Content.Shared.Humanoid.Markings; using Content.Client.UserInterface.Controls; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Prototypes; using Robust.Shared.Utility; namespace Content.Client.Corvax.Ipc; -public sealed class IpcFaceMenu : FancyWindow +public sealed partial class IpcFaceMenu : FancyWindow { - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IEntityManager _entMan = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IEntityManager _entMan = default!; private readonly SpriteSystem _sprite; private readonly ItemList _list; diff --git a/Content.Client/Corvax/Ipc/IpcSystem.cs b/Content.Client/Corvax/Ipc/IpcSystem.cs index d443d14cac..e4e26ed471 100644 --- a/Content.Client/Corvax/Ipc/IpcSystem.cs +++ b/Content.Client/Corvax/Ipc/IpcSystem.cs @@ -7,13 +7,13 @@ using Robust.Shared.Player; using Robust.Shared.Timing; namespace Content.Client.Corvax.Ipc; -public sealed class IpcSystem : EntitySystem +public sealed partial class IpcSystem : EntitySystem { - [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 PowerCellSystem _powerCell = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private AlertsSystem _alerts = default!; + [Dependency] private IGameTiming _timing = default!; + [Dependency] private IPlayerManager _player = default!; private static readonly TimeSpan AlertUpdateDelay = TimeSpan.FromSeconds(0.5f); private TimeSpan _nextAlertUpdate = TimeSpan.Zero; private EntityQuery _ipcQuery; diff --git a/Content.Client/Corvax/Markup/TooltipTag.cs b/Content.Client/Corvax/Markup/TooltipTag.cs index ee41c177c9..7080b86af5 100644 --- a/Content.Client/Corvax/Markup/TooltipTag.cs +++ b/Content.Client/Corvax/Markup/TooltipTag.cs @@ -7,11 +7,11 @@ using Robust.Shared.Utility; namespace Content.Client.Corvax.Markup; -public sealed class TooltipTag : IMarkupTagHandler +public sealed partial class TooltipTag : IMarkupTagHandler { private const float TooltipMaxWidth = 500f; - [Dependency] private readonly ILocalizationManager _loc = default!; + [Dependency] private ILocalizationManager _loc = default!; public string Name => "tooltip"; diff --git a/Content.Client/Corvax/SecApartment/Overlays/ShowSquadIconsSystem.cs b/Content.Client/Corvax/SecApartment/Overlays/ShowSquadIconsSystem.cs index f3beff4210..411e3d4242 100644 --- a/Content.Client/Corvax/SecApartment/Overlays/ShowSquadIconsSystem.cs +++ b/Content.Client/Corvax/SecApartment/Overlays/ShowSquadIconsSystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.Prototypes; namespace Content.Client.Overlays; -public sealed class ShowSquadIconsSystem : EquipmentHudSystem +public sealed partial class ShowSquadIconsSystem : EquipmentHudSystem { - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { diff --git a/Content.Client/Corvax/TTS/TTSTab.xaml.cs b/Content.Client/Corvax/TTS/TTSTab.xaml.cs index ffa4a00375..54404c4a9c 100644 --- a/Content.Client/Corvax/TTS/TTSTab.xaml.cs +++ b/Content.Client/Corvax/TTS/TTSTab.xaml.cs @@ -16,7 +16,7 @@ namespace Content.Client.Corvax.TTS; [GenerateTypedNameReferences] public sealed partial class TTSTab : Control { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; public event Action? OnVoiceSelected; public event Action? OnPreviewRequested; diff --git a/Content.Server/Corvax/Administration/Commands/PanicBunkerCommand.cs b/Content.Server/Corvax/Administration/Commands/PanicBunkerCommand.cs index 1db98128a1..83df271083 100644 --- a/Content.Server/Corvax/Administration/Commands/PanicBunkerCommand.cs +++ b/Content.Server/Corvax/Administration/Commands/PanicBunkerCommand.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration; +using Content.Server.Administration; using Content.Shared.Administration; using Content.Shared.Corvax.CCCVars; using Robust.Shared.Configuration; @@ -7,9 +7,9 @@ using Robust.Shared.Console; namespace Content.Server.Corvax.Administration.Commands; [AdminCommand(AdminFlags.Server)] -public sealed class PanicBunkerDenyVpnCommand : LocalizedCommands +public sealed partial class PanicBunkerDenyVpnCommand : LocalizedCommands { - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override string Command => "panicbunker_deny_vpn"; diff --git a/Content.Server/Corvax/Administration/Commands/PlayLocalSoundCommand.cs b/Content.Server/Corvax/Administration/Commands/PlayLocalSoundCommand.cs index fd39ebd88b..36e7222d1d 100644 --- a/Content.Server/Corvax/Administration/Commands/PlayLocalSoundCommand.cs +++ b/Content.Server/Corvax/Administration/Commands/PlayLocalSoundCommand.cs @@ -11,11 +11,11 @@ using Robust.Shared.Prototypes; namespace Content.Server.Corvax.Administration.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class PlayLocalSoundCommand : IConsoleCommand +public sealed partial class PlayLocalSoundCommand : IConsoleCommand { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly IResourceManager _res = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IPrototypeManager _protoManager = default!; + [Dependency] private IResourceManager _res = default!; public string Command => "playlocalsound"; public string Description => Loc.GetString("play-local-sound-command-description"); diff --git a/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs b/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs index 7b358c1dc1..77346b8945 100644 --- a/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs +++ b/Content.Server/Corvax/Documents/DocumentPrinterSystem.cs @@ -5,16 +5,15 @@ using Content.Shared.GameTicking; using Content.Shared.Lathe; using Content.Shared.Paper; using Content.Shared.Station; -using Robust.Shared.Timing; namespace Content.Server.Corvax.Documents; public sealed partial class DocumentPrinterSystem : EntitySystem { - [Dependency] private readonly ItemSlotsSystem _itemSlots = default!; - [Dependency] private readonly PaperSystem _paper = default!; - [Dependency] private readonly SharedStationSystem _station = default!; - [Dependency] private readonly SharedGameTicker _gameTicker = default!; + [Dependency] private ItemSlotsSystem _itemSlots = default!; + [Dependency] private PaperSystem _paper = default!; + [Dependency] private SharedStationSystem _station = default!; + [Dependency] private SharedGameTicker _gameTicker = default!; public override void Initialize() { diff --git a/Content.Server/Corvax/Ipc/IpcSystem.cs b/Content.Server/Corvax/Ipc/IpcSystem.cs index f64daf069a..72b614eeb0 100644 --- a/Content.Server/Corvax/Ipc/IpcSystem.cs +++ b/Content.Server/Corvax/Ipc/IpcSystem.cs @@ -22,16 +22,16 @@ namespace Content.Server.Corvax.Ipc; public sealed partial class IpcSystem : EntitySystem { - [Dependency] private readonly SharedActionsSystem _action = default!; - [Dependency] private readonly SharedBatteryDrainerSystem _batteryDrainer = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly PowerCellSystem _powerCell = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly SharedBatterySystem _battery = default!; - [Dependency] private readonly SharedVisualBodySystem _visualBody = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; + [Dependency] private SharedActionsSystem _action = default!; + [Dependency] private SharedBatteryDrainerSystem _batteryDrainer = default!; + [Dependency] private SharedPopupSystem _popup = default!; + [Dependency] private PowerCellSystem _powerCell = default!; + [Dependency] private DamageableSystem _damageable = default!; + [Dependency] private MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] private SharedUserInterfaceSystem _ui = default!; + [Dependency] private SharedBatterySystem _battery = default!; + [Dependency] private SharedVisualBodySystem _visualBody = default!; + [Dependency] private IPrototypeManager _prototype = default!; public override void Initialize() { base.Initialize(); diff --git a/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs b/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs index 489541a90a..fcda99d053 100644 --- a/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs +++ b/Content.Server/Corvax/PeacefulRoundEnd/PeacefulRoundEndSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.GameTicking; +using Content.Server.GameTicking; using Content.Shared.CombatMode.Pacification; using Content.Shared.Corvax.CCCVars; using Content.Shared.Mindshield.Components; @@ -8,10 +8,10 @@ using Robust.Shared.Configuration; namespace Content.Server.Corvax.PeacefulRoundEnd; -public sealed class PeacefulRoundEndSystem : EntitySystem +public sealed partial class PeacefulRoundEndSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPlayerManager _playerManager = default!; private bool _isEnabled = false; diff --git a/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs b/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs index 30dc2a1a1c..524122cef2 100644 --- a/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs +++ b/Content.Server/Corvax/SecApartment/SecApartmentSystem.cs @@ -6,7 +6,6 @@ using Content.Shared.CrewManifest; using Content.Shared.Medical.SuitSensor; using Content.Shared.Roles; using Content.Shared.SecApartment; -using Content.Shared.Security.Components; using Content.Shared.Station; using Content.Shared.UserInterface; using Robust.Server.GameObjects; @@ -22,14 +21,14 @@ namespace Content.Server.Corvax.SecApartment; public sealed partial class SecApartmentSystem : EntitySystem { - [Dependency] private readonly SharedStationSystem _station = default!; - [Dependency] private readonly CrewManifestSystem _crewManifest = default!; - [Dependency] private readonly UserInterfaceSystem _ui = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly IPrototypeManager _prototype = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly NavMapSystem _navMap = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private SharedStationSystem _station = default!; + [Dependency] private CrewManifestSystem _crewManifest = default!; + [Dependency] private UserInterfaceSystem _ui = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private IPrototypeManager _prototype = default!; + [Dependency] private IGameTiming _gameTiming = default!; + [Dependency] private NavMapSystem _navMap = default!; + [Dependency] private SharedTransformSystem _transform = default!; private readonly Dictionary _stationData = new(); private readonly Dictionary _finishedTimers = new(); diff --git a/Content.Server/Corvax/Shuttle/Commands/FTLTravelTimeSetCommand.cs b/Content.Server/Corvax/Shuttle/Commands/FTLTravelTimeSetCommand.cs index 877ee10205..8b5b93ff39 100644 --- a/Content.Server/Corvax/Shuttle/Commands/FTLTravelTimeSetCommand.cs +++ b/Content.Server/Corvax/Shuttle/Commands/FTLTravelTimeSetCommand.cs @@ -3,32 +3,29 @@ using Content.Shared.Administration; using Content.Shared.Shuttles.Components; using Content.Shared.Shuttles.Systems; using Content.Server.Shuttles.Components; -using Content.Server.Shuttles.Systems; using Content.Shared.Timing; -using Content.Shared.Examine; using Robust.Shared.Console; using Robust.Shared.Timing; -using System; namespace Content.Server.Corvax.Shuttle.Commands; [AdminCommand(AdminFlags.Fun)] -public sealed class FTLTravelTimeSetCommand : LocalizedCommands +public sealed partial class FTLTravelTimeSetCommand : LocalizedCommands { - [Dependency] private readonly IEntityManager _entManager = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private IEntityManager _entManager = default!; + [Dependency] private IGameTiming _gameTiming = default!; public override string Command => "ftltraveltimeset"; public override void Execute(IConsoleShell shell, string argStr, string[] args) { if (args.Length != 2) - { - shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific", + { + shell.WriteLine(Loc.GetString($"shell-wrong-arguments-number-need-specific", ("properAmount", 2), ("currentAmount", args.Length))); - return; - } + return; + } if (!NetEntity.TryParse(args[0], out var netEnt) || !_entManager.TryGetEntity(netEnt, out var uid)) { diff --git a/Content.Server/Corvax/Speech/EntitySystems/GrowlingAccentSystem.cs b/Content.Server/Corvax/Speech/EntitySystems/GrowlingAccentSystem.cs index 37e03566a5..f5b69ef75c 100644 --- a/Content.Server/Corvax/Speech/EntitySystems/GrowlingAccentSystem.cs +++ b/Content.Server/Corvax/Speech/EntitySystems/GrowlingAccentSystem.cs @@ -5,9 +5,9 @@ using Robust.Shared.Random; namespace Content.Server.Corvax.Speech.EntitySystems; -public sealed class GrowlingAccentSystem : EntitySystem +public sealed partial class GrowlingAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private IRobustRandom _random = default!; private static readonly Regex _regexLowerR = new Regex("r+"); private static readonly Regex _regexUpperR = new Regex("R+"); diff --git a/Content.Server/Corvax/StationGoal/StationGoalCommand.cs b/Content.Server/Corvax/StationGoal/StationGoalCommand.cs index 6b7fe70ee9..d7fa40ef43 100644 --- a/Content.Server/Corvax/StationGoal/StationGoalCommand.cs +++ b/Content.Server/Corvax/StationGoal/StationGoalCommand.cs @@ -8,10 +8,10 @@ using Robust.Shared.Prototypes; namespace Content.Server.Corvax.StationGoal { [AdminCommand(AdminFlags.Fun)] - public sealed class StationGoalCommand : IConsoleCommand + public sealed partial class StationGoalCommand : 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 => "sendstationgoal"; public string Description => Loc.GetString("send-station-goal-command-description"); diff --git a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs index 52eec9d74f..fa90217bd6 100644 --- a/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs +++ b/Content.Server/Corvax/StationGoal/StationGoalPaperSystem.cs @@ -14,15 +14,15 @@ namespace Content.Server.Corvax.StationGoal /// /// System to spawn paper with station goal. /// - public sealed class StationGoalPaperSystem : EntitySystem + public sealed partial class StationGoalPaperSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _proto = default!; - [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly FaxSystem _fax = default!; - [Dependency] private readonly NewsSystem _news = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly StationSystem _station = default!; - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _proto = default!; + [Dependency] private IRobustRandom _random = default!; + [Dependency] private FaxSystem _fax = default!; + [Dependency] private NewsSystem _news = default!; + [Dependency] private IPlayerManager _playerManager = default!; + [Dependency] private StationSystem _station = default!; + [Dependency] private IConfigurationManager _cfg = default!; public override void Initialize() { diff --git a/Content.Server/Corvax/TTS/TTSManager.cs b/Content.Server/Corvax/TTS/TTSManager.cs index fd1fbd8fba..fbaadd4ef7 100644 --- a/Content.Server/Corvax/TTS/TTSManager.cs +++ b/Content.Server/Corvax/TTS/TTSManager.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using System.Net; using System.Net.Http; using System.Net.Http.Json; @@ -13,7 +13,7 @@ using Robust.Shared.Configuration; namespace Content.Server.Corvax.TTS; // ReSharper disable once InconsistentNaming -public sealed class TTSManager +public sealed partial class TTSManager { private static readonly Histogram RequestTimings = Metrics.CreateHistogram( "tts_req_timings", @@ -32,7 +32,7 @@ public sealed class TTSManager "tts_reused_count", "Amount of reused TTS audio from cache."); - [Dependency] private readonly IConfigurationManager _cfg = default!; + [Dependency] private IConfigurationManager _cfg = default!; private readonly HttpClient _httpClient = new(); diff --git a/Content.Server/Corvax/TTS/TTSSystem.RateLimit.cs b/Content.Server/Corvax/TTS/TTSSystem.RateLimit.cs index 0f06f0d243..e097618d9d 100644 --- a/Content.Server/Corvax/TTS/TTSSystem.RateLimit.cs +++ b/Content.Server/Corvax/TTS/TTSSystem.RateLimit.cs @@ -1,4 +1,4 @@ -using Content.Server.Chat.Managers; +using Content.Server.Chat.Managers; using Content.Server.Players.RateLimiting; using Content.Shared.Corvax.CCCVars; using Content.Shared.Players.RateLimiting; @@ -8,8 +8,8 @@ namespace Content.Server.Corvax.TTS; public sealed partial class TTSSystem { - [Dependency] private readonly PlayerRateLimitManager _rateLimitManager = default!; - [Dependency] private readonly IChatManager _chat = default!; + [Dependency] private PlayerRateLimitManager _rateLimitManager = default!; + [Dependency] private IChatManager _chat = default!; private const string RateLimitKey = "TTS"; diff --git a/Content.Server/Corvax/TTS/TTSSystem.cs b/Content.Server/Corvax/TTS/TTSSystem.cs index 9b37c09209..df1aa60e9d 100644 --- a/Content.Server/Corvax/TTS/TTSSystem.cs +++ b/Content.Server/Corvax/TTS/TTSSystem.cs @@ -15,11 +15,11 @@ namespace Content.Server.Corvax.TTS; // ReSharper disable once InconsistentNaming public sealed partial class TTSSystem : EntitySystem { - [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly TTSManager _ttsManager = default!; - [Dependency] private readonly SharedTransformSystem _xforms = default!; - [Dependency] private readonly IRobustRandom _rng = default!; + [Dependency] private IConfigurationManager _cfg = default!; + [Dependency] private IPrototypeManager _prototypeManager = default!; + [Dependency] private TTSManager _ttsManager = default!; + [Dependency] private SharedTransformSystem _xforms = default!; + [Dependency] private IRobustRandom _rng = default!; private readonly List _sampleText = new() diff --git a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs index 4bcc487773..4b0c954ef6 100644 --- a/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrontalLispSystem.cs @@ -5,7 +5,7 @@ using Robust.Shared.Random; // Corvax-Localization namespace Content.Server.Speech.EntitySystems; -public sealed class FrontalLispSystem : EntitySystem +public sealed partial class FrontalLispSystem : EntitySystem { // @formatter:off private static readonly Regex RegexUpperTh = new(@"[T]+[Ss]+|[S]+[Cc]+(?=[IiEeYy]+)|[C]+(?=[IiEeYy]+)|[P][Ss]+|([S]+[Tt]+|[T]+)(?=[Ii]+[Oo]+[Uu]*[Nn]*)|[C]+[Hh]+(?=[Ii]*[Ee]*)|[Z]+|[S]+|[X]+(?=[Ee]+)"); @@ -27,7 +27,7 @@ public sealed class FrontalLispSystem : EntitySystem private static readonly Regex _regexUpperZ = new Regex("З");// для "З" на "Ж"/"З" // Corvax-Localization End - [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization + [Dependency] private IRobustRandom _random = default!; // Corvax-Localization public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs index 8f154d3d03..c6692a33df 100644 --- a/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/LizardAccentSystem.cs @@ -5,7 +5,7 @@ using Content.Shared.Speech; namespace Content.Server.Speech.EntitySystems; -public sealed class LizardAccentSystem : EntitySystem +public sealed partial class LizardAccentSystem : EntitySystem { private static readonly Regex RegexLowerS = new("s+"); private static readonly Regex RegexUpperS = new("S+"); @@ -30,7 +30,7 @@ public sealed class LizardAccentSystem : EntitySystem private static readonly List _replacementsChUpper = new List { "ЩЩ", "ЩЩЩ" }; // Corvax-Localization-End - [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization + [Dependency] private IRobustRandom _random = default!; // Corvax-Localization public override void Initialize() { diff --git a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs index 96a806bd08..b38550cada 100644 --- a/Content.Server/Speech/EntitySystems/MothAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/MothAccentSystem.cs @@ -5,9 +5,9 @@ using Content.Shared.Speech; namespace Content.Server.Speech.EntitySystems; -public sealed class MothAccentSystem : EntitySystem +public sealed partial class MothAccentSystem : EntitySystem { - [Dependency] private readonly IRobustRandom _random = default!; // Corvax-Localization + [Dependency] private IRobustRandom _random = default!; // Corvax-Localization private static readonly Regex RegexLowerBuzz = new Regex("z{1,3}"); private static readonly Regex RegexUpperBuzz = new Regex("Z{1,3}");