From 1a9a79cbba45411806d52242a195c8962cc48a23 Mon Sep 17 00:00:00 2001 From: Dmitry <57028746+DIMMoon1@users.noreply.github.com> Date: Thu, 8 Jan 2026 13:36:45 +0700 Subject: [PATCH] upstream codefix kek --- .../VoiceMask/VoiceMaskBoundUserInterface.cs | 3 +- .../VoiceMaskNameChangeWindow.xaml.cs | 2 +- Content.Packaging/ServerPackaging.cs | 10 ++++ Content.Server/Corvax/Ipc/IpcSystem.cs | 2 +- .../StationGoal/StationGoalPrototype.cs | 4 +- Content.Server/VoiceMask/VoiceMaskSystem.cs | 3 +- Content.Shared/Content.Shared.csproj | 1 + .../Corvax/TTS/TTSVoicePrototype.cs | 16 +++--- .../VoiceMask/SharedVoiceMaskSystem.cs | 3 +- .../Content.Corvax.Interfaces.Client.csproj | 2 +- .../Content.Corvax.Interfaces.Server.csproj | 2 +- .../Content.Corvax.Interfaces.Shared.csproj | 2 +- Resources/Maps/Corvax/corvax_astra.yml | 2 +- Resources/Maps/Corvax/corvax_glacier.yml | 2 +- Resources/Maps/Corvax/corvax_outpost.yml | 2 +- .../Objects/Specific/Medical/hypospray.yml | 8 +-- SpaceStation14.slnx | 53 ++++++++++++------- Tools/ss14_ru/clean_duplicates.py | 4 +- Tools/ss14_ru/clean_empty.py | 2 +- 19 files changed, 70 insertions(+), 53 deletions(-) diff --git a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs index 2cdeb5b961..2f148d512d 100644 --- a/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs +++ b/Content.Client/VoiceMask/VoiceMaskBoundUserInterface.cs @@ -53,8 +53,7 @@ public sealed class VoiceMaskBoundUserInterface : BoundUserInterface return; } - _window.UpdateState(cast.Name, cast.Verb, cast.Active, cast.AccentHide); - _window.UpdateState(cast.Name, cast.Voice, cast.Verb); // Corvax-TTS + _window.UpdateState(cast.Name, cast.Verb, cast.Active, cast.AccentHide, cast.Voice);//cast.Voice Corvax-TTS } protected override void Dispose(bool disposing) diff --git a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs index f78da5f55a..f3bcb912dc 100644 --- a/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs +++ b/Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs @@ -105,7 +105,7 @@ public sealed partial class VoiceMaskNameChangeWindow : FancyWindow } // Corvax-TTS-End - public void UpdateState(string name, string voice, string? verb) // Corvax-TTS + public void UpdateState(string name, string? verb, bool active, bool accentHide, string voice) // Corvax-TTS { NameSelector.Text = name; _verb = verb; diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs index 20b89899c0..93279e27f9 100644 --- a/Content.Packaging/ServerPackaging.cs +++ b/Content.Packaging/ServerPackaging.cs @@ -237,6 +237,16 @@ public static class ServerPackaging // Remove .dll suffix and apply filtering. var names = depsContentExclusive.Select(p => p[..^4]).Where(p => !ServerNotExtraAssemblies.Any(p.StartsWith)); + // Corvax-Secrets-Start + names.Append("Content.Corvax.Interfaces.Shared"); + names.Append("Content.Corvax.Interfaces.Server"); + if (UseSecrets) + { + names.Append("Content.Corvax.Shared"); + names.Append("Content.Corvax.Server"); + } + // Corvax-Secrets-End + return names; IEnumerable GetLibraryNames(string library) => deps.Libraries[library].GetDllNames(); diff --git a/Content.Server/Corvax/Ipc/IpcSystem.cs b/Content.Server/Corvax/Ipc/IpcSystem.cs index 9d66b03d93..6ce2b62daa 100644 --- a/Content.Server/Corvax/Ipc/IpcSystem.cs +++ b/Content.Server/Corvax/Ipc/IpcSystem.cs @@ -33,7 +33,7 @@ public sealed partial class IpcSystem : EntitySystem [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; - [Dependency] private readonly PredictedBatterySystem _battery = default!; + [Dependency] private readonly SharedBatterySystem _battery = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!; [Dependency] private readonly MarkingManager _markingManager = default!; public override void Initialize() diff --git a/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs b/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs index f35eb4976e..271205361e 100644 --- a/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs +++ b/Content.Server/Corvax/StationGoal/StationGoalPrototype.cs @@ -3,10 +3,10 @@ using Robust.Shared.Prototypes; namespace Content.Server.Corvax.StationGoal { [Serializable, Prototype("stationGoal")] - public sealed class StationGoalPrototype : IPrototype + public sealed partial class StationGoalPrototype : IPrototype { [IdDataFieldAttribute] - public string ID { get; } = default!; + public string ID { get; private set; } = default!; [DataField] public string Text { get; set; } = string.Empty; diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs index 6e944f4bdb..9299e68f14 100644 --- a/Content.Server/VoiceMask/VoiceMaskSystem.cs +++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs @@ -192,8 +192,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem private void UpdateUI(Entity entity) { if (_uiSystem.HasUi(entity, VoiceMaskUIKey.Key)) - _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb, entity.Comp.Active, entity.Comp.AccentHide)); - _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceId, entity.Comp.VoiceMaskSpeechVerb)); + _uiSystem.SetUiState(entity.Owner, VoiceMaskUIKey.Key, new VoiceMaskBuiState(GetCurrentVoiceName(entity), entity.Comp.VoiceMaskSpeechVerb, entity.Comp.Active, entity.Comp.AccentHide, entity.Comp.VoiceId)); //entity.Comp.VoiceId Corvax-TTS } #endregion diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj index e0cd38a9bf..943560feba 100644 --- a/Content.Shared/Content.Shared.csproj +++ b/Content.Shared/Content.Shared.csproj @@ -14,6 +14,7 @@ + diff --git a/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs b/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs index ed746c3d50..768cc0ff64 100644 --- a/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs +++ b/Content.Shared/Corvax/TTS/TTSVoicePrototype.cs @@ -1,4 +1,4 @@ -using Content.Shared.Humanoid; +using Content.Shared.Humanoid; using Robust.Shared.Prototypes; namespace Content.Shared.Corvax.TTS; @@ -8,27 +8,27 @@ namespace Content.Shared.Corvax.TTS; /// [Prototype("ttsVoice")] // ReSharper disable once InconsistentNaming -public sealed class TTSVoicePrototype : IPrototype +public sealed partial class TTSVoicePrototype : IPrototype { [IdDataField] - public string ID { get; } = default!; + public string ID { get; private set; } = default!; [DataField("name")] - public string Name { get; } = string.Empty; + public string Name { get; private set; } = string.Empty; [DataField("sex", required: true)] - public Sex Sex { get; } = default!; + public Sex Sex { get; private set; } = default!; [ViewVariables(VVAccess.ReadWrite)] [DataField("speaker", required: true)] - public string Speaker { get; } = string.Empty; + public string Speaker { get; private set; } = string.Empty; /// /// Whether the species is available "at round start" (In the character editor) /// [DataField("roundStart")] - public bool RoundStart { get; } = true; + public bool RoundStart { get; private set; } = true; [DataField("sponsorOnly")] - public bool SponsorOnly { get; } = false; + public bool SponsorOnly { get; private set; } = false; } diff --git a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs index b424d012e6..876c8f3016 100644 --- a/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs +++ b/Content.Shared/VoiceMask/SharedVoiceMaskSystem.cs @@ -17,8 +17,7 @@ public sealed class VoiceMaskBuiState : BoundUserInterfaceState public readonly bool AccentHide; public readonly string Voice; // Corvax-TTS - public VoiceMaskBuiState(string name, string? verb, bool active, bool accentHide) - public VoiceMaskBuiState(string name, string voice, string? verb) + public VoiceMaskBuiState(string name, string? verb, bool active, bool accentHide, string voice) // Corvax-TTS { Name = name; Verb = verb; diff --git a/Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj b/Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj index aeed896036..41bf44994e 100644 --- a/Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj +++ b/Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable enable diff --git a/Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj b/Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj index 16e42494f6..b9c638ce4d 100644 --- a/Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj +++ b/Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable enable diff --git a/Corvax/Content.Corvax.Interfaces.Shared/Content.Corvax.Interfaces.Shared.csproj b/Corvax/Content.Corvax.Interfaces.Shared/Content.Corvax.Interfaces.Shared.csproj index e9826af093..9b2b648828 100644 --- a/Corvax/Content.Corvax.Interfaces.Shared/Content.Corvax.Interfaces.Shared.csproj +++ b/Corvax/Content.Corvax.Interfaces.Shared/Content.Corvax.Interfaces.Shared.csproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 enable enable diff --git a/Resources/Maps/Corvax/corvax_astra.yml b/Resources/Maps/Corvax/corvax_astra.yml index 3725086029..c3e912111c 100644 --- a/Resources/Maps/Corvax/corvax_astra.yml +++ b/Resources/Maps/Corvax/corvax_astra.yml @@ -272841,7 +272841,7 @@ entities: - type: Transform pos: -0.45866632,-43.426468 parent: 2 - - type: PredictedBattery + - type: Battery startingCharge: 400 maxCharge: 400 - proto: WeaponTurretSyndicateBroken diff --git a/Resources/Maps/Corvax/corvax_glacier.yml b/Resources/Maps/Corvax/corvax_glacier.yml index e925c25053..4fc35aaf91 100644 --- a/Resources/Maps/Corvax/corvax_glacier.yml +++ b/Resources/Maps/Corvax/corvax_glacier.yml @@ -342527,7 +342527,7 @@ entities: parent: 41871 - type: Gun fireRate: 2.5 - - type: PredictedBattery + - type: Battery startingCharge: 2000 maxCharge: 2000 - proto: WeaponLaserCarbine diff --git a/Resources/Maps/Corvax/corvax_outpost.yml b/Resources/Maps/Corvax/corvax_outpost.yml index c046fbb8e9..37bdb4b2d8 100644 --- a/Resources/Maps/Corvax/corvax_outpost.yml +++ b/Resources/Maps/Corvax/corvax_outpost.yml @@ -126748,7 +126748,7 @@ entities: - type: Gun angleDecay: 0.6981317007977318 rad burstFireRate: 1 - - type: PredictedBattery + - type: Battery startingCharge: 1 maxCharge: 1 - proto: WeaponTurretSyndicateBroken diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Corvax/Entities/Objects/Specific/Medical/hypospray.yml index a9cf86885f..e4de7ffce6 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Specific/Medical/hypospray.yml @@ -1,6 +1,6 @@ - type: entity name: hypospray brigmedic - parent: BaseItem + parent: BaseHypospray description: Sterile injector for rapid administration of medications to prisoners and security personnel. id: HyposprayBrigmedic components: @@ -13,12 +13,6 @@ solutions: hypospray: maxVol: 5 - - type: RefillableSolution - solution: hypospray - - type: ExaminableSolution - solution: hypospray - - type: Hypospray - onlyAffectsMobs: false - type: UseDelay delay: 2.5 - type: StaticPrice diff --git a/SpaceStation14.slnx b/SpaceStation14.slnx index 5fdcaafd73..6b9e31caea 100644 --- a/SpaceStation14.slnx +++ b/SpaceStation14.slnx @@ -13,6 +13,20 @@ + + + + + + + + + + + + + + @@ -23,24 +37,7 @@ - - - - - - - - - - - - - - - - - - + @@ -132,6 +129,7 @@ + @@ -163,6 +161,23 @@ - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Tools/ss14_ru/clean_duplicates.py b/Tools/ss14_ru/clean_duplicates.py index 87d7ab74b2..a27a172a44 100644 --- a/Tools/ss14_ru/clean_duplicates.py +++ b/Tools/ss14_ru/clean_duplicates.py @@ -6,7 +6,7 @@ import chardet from datetime import datetime def find_top_level_dir(start_dir): - marker_file = 'SpaceStation14.sln' + marker_file = 'SpaceStation14.slnx' current_dir = start_dir while True: if marker_file in os.listdir(current_dir): @@ -16,7 +16,7 @@ def find_top_level_dir(start_dir): print(f"Не удалось найти {marker_file} начиная с {start_dir}") exit(-1) current_dir = parent_dir - + def find_ftl_files(root_dir): ftl_files = [] for root, dirs, files in os.walk(root_dir): diff --git a/Tools/ss14_ru/clean_empty.py b/Tools/ss14_ru/clean_empty.py index 294008d0f5..858cfdb059 100644 --- a/Tools/ss14_ru/clean_empty.py +++ b/Tools/ss14_ru/clean_empty.py @@ -5,7 +5,7 @@ import logging from datetime import datetime def find_top_level_dir(start_dir): - marker_file = 'SpaceStation14.sln' + marker_file = 'SpaceStation14.slnx' current_dir = start_dir while True: if marker_file in os.listdir(current_dir):