upstream codefix

kek
2026-02-14 19:30:01 +01:00 · 2026-01-08 13:36:45 +07:00
parent 6187a5a7bd
commit 1a9a79cbba
19 changed files with 70 additions and 53 deletions
--- 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)
--- 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;
--- 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<string> GetLibraryNames(string library) => deps.Libraries[library].GetDllNames();
--- 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()
--- 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;
--- 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<VoiceMaskComponent> 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

--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -14,6 +14,7 @@

  <ItemGroup>
    <ProjectReference Include="..\Content.Shared.Database\Content.Shared.Database.csproj" />
+    <ProjectReference Include="..\Corvax\Content.Corvax.Interfaces.Shared\Content.Corvax.Interfaces.Shared.csproj" />
  </ItemGroup>

  <Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
--- 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;
 /// </summary>
 [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;

    /// <summary>
    /// Whether the species is available "at round start" (In the character editor)
    /// </summary>
    [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;
 }
--- 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;
--- 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
  </PropertyGroup>
--- 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
  </PropertyGroup>
--- 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>enable</Nullable>
  </PropertyGroup>
--- 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
--- 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
--- 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
--- 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
--- a/SpaceStation14.slnx
+++ b/SpaceStation14.slnx
@@ -13,6 +13,20 @@
  <Folder Name="/Build/">
    <File Path="Tools/generate_hashes.ps1" />
  </Folder>
+  <Folder Name="/Corvax Interfaces/">
+    <Project Path="Corvax/Content.Corvax.Interfaces.Client/Content.Corvax.Interfaces.Client.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Debug" />
+    </Project>
+    <Project Path="Corvax/Content.Corvax.Interfaces.Server/Content.Corvax.Interfaces.Server.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Debug" />
+    </Project>
+    <Project Path="Corvax/Content.Corvax.Interfaces.Shared/Content.Corvax.Interfaces.Shared.csproj">
+      <BuildType Solution="DebugOpt|*" Project="Debug" />
+      <BuildType Solution="Tools|*" Project="Debug" />
+    </Project>
+  </Folder>
  <Folder Name="/MSBuild/">
    <File Path="MSBuild/Content.props" />
  </Folder>
@@ -23,24 +37,7 @@
    <File Path="Directory.Packages.props" />
    <File Path="README.md" />
  </Folder>
-  <Project Path="Content.Benchmarks/Content.Benchmarks.csproj" />
-  <Project Path="Content.Client/Content.Client.csproj" />
-  <Project Path="Content.IntegrationTests/Content.IntegrationTests.csproj" />
-  <Project Path="Content.MapRenderer/Content.MapRenderer.csproj" />
-  <Project Path="Content.Packaging/Content.Packaging.csproj" />
-  <Project Path="Content.PatreonParser/Content.PatreonParser.csproj">
-    <BuildType Solution="DebugOpt|*" Project="Debug" />
-    <BuildType Solution="Tools|*" Project="Debug" />
-  </Project>
-  <Project Path="Content.Replay/Content.Replay.csproj" />
-  <Project Path="Content.Server.Database/Content.Server.Database.csproj" />
-  <Project Path="Content.Server/Content.Server.csproj" />
-  <Project Path="Content.Shared.Database/Content.Shared.Database.csproj" />
-  <Project Path="Content.Shared/Content.Shared.csproj" />
-  <Project Path="Content.Tests/Content.Tests.csproj" />
-  <Project Path="Content.Tools/Content.Tools.csproj" />
-  <Project Path="Content.YAMLLinter/Content.YAMLLinter.csproj" />
-  <Project Path="Pow3r/Pow3r.csproj" />
+  <Folder Name="/RobustToolbox/.github/" />
  <Folder Name="/RobustToolbox/.github/workflows/">
    <File Path="RobustToolbox/.github/workflows/benchmarks.yml" />
    <File Path="RobustToolbox/.github/workflows/build-all-configurations.yml" />
@@ -132,6 +129,7 @@
    </Project>
  </Folder>
  <Folder Name="/RobustToolbox/">
+    <File Path="RobustToolbox/RobustToolbox.slnx" />
    <Project Path="RobustToolbox/Avalonia.Base/Avalonia.Base.csproj">
      <BuildType Solution="DebugOpt|*" Project="Debug" />
      <BuildType Solution="Tools|*" Project="Release" />
@@ -163,6 +161,23 @@
      <BuildType Solution="DebugOpt|*" Project="Debug" />
      <BuildType Solution="Tools|*" Project="Release" />
    </Project>
-    <File Path="RobustToolbox/RobustToolbox.slnx" />
  </Folder>
+  <Project Path="Content.Benchmarks/Content.Benchmarks.csproj" />
+  <Project Path="Content.Client/Content.Client.csproj" />
+  <Project Path="Content.IntegrationTests/Content.IntegrationTests.csproj" />
+  <Project Path="Content.MapRenderer/Content.MapRenderer.csproj" />
+  <Project Path="Content.Packaging/Content.Packaging.csproj" />
+  <Project Path="Content.PatreonParser/Content.PatreonParser.csproj">
+    <BuildType Solution="DebugOpt|*" Project="Debug" />
+    <BuildType Solution="Tools|*" Project="Debug" />
+  </Project>
+  <Project Path="Content.Replay/Content.Replay.csproj" />
+  <Project Path="Content.Server.Database/Content.Server.Database.csproj" />
+  <Project Path="Content.Server/Content.Server.csproj" />
+  <Project Path="Content.Shared.Database/Content.Shared.Database.csproj" />
+  <Project Path="Content.Shared/Content.Shared.csproj" />
+  <Project Path="Content.Tests/Content.Tests.csproj" />
+  <Project Path="Content.Tools/Content.Tools.csproj" />
+  <Project Path="Content.YAMLLinter/Content.YAMLLinter.csproj" />
+  <Project Path="Pow3r/Pow3r.csproj" />
 </Solution>
--- 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):
--- 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):