Merge remote-tracking branch 'WD-core/master' into upstream-core

Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs

@@ -49,7 +49,7 @@ namespace Content.IntegrationTests.Tests.Preferences
                 "Silicon",
                 "The biggest boy around.",
                 "Human",
-                "Eugene",
+                "Nord",
                 21,
                 Sex.Male,
                 Gender.Epicene,

Content.Server/Administration/Commands/ReadyAll.cs

@@ -11,27 +11,28 @@ namespace Content.Server.Administration.Commands
         [Dependency] private readonly IEntityManager _e = default!;
 
         public string Command => "readyall";
-        public string Description => "Readies up all players in the lobby, except for observers.";
+        public string Description => "WD Disabled. Readies up all players in the lobby, except for observers.";
         public string Help => $"{Command} | ̣{Command} <ready>";
         public void Execute(IConsoleShell shell, string argStr, string[] args)
         {
-            var ready = true;
+            // WD Disabled
+            // var ready = true;
 
-            if (args.Length > 0)
+            // if (args.Length > 0)
-            {
+            // {
-                ready = bool.Parse(args[0]);
+            //     ready = bool.Parse(args[0]);
-            }
+            // }
 
-            var gameTicker = _e.System<GameTicker>();
+            // var gameTicker = _e.System<GameTicker>();
 
 
-            if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby)
+            // if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby)
-            {
+            // {
-                shell.WriteLine("This command can only be ran while in the lobby!");
+            //     shell.WriteLine("This command can only be ran while in the lobby!");
-                return;
+            //     return;
-            }
+            // }
 
-            gameTicker.ToggleReadyAll(ready);
+            // gameTicker.ToggleReadyAll(ready);
         }
     }
 }

Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

@@ -36,13 +36,13 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     public const string DefaultBodyType = "HumanNormal";
 
     [ValidatePrototypeId<TTSVoicePrototype>]
-    public const string DefaultVoice = "Eugene";
+    public const string DefaultVoice = "Nord";
 
     public static readonly Dictionary<Sex, ProtoId<TTSVoicePrototype>> DefaultSexVoice = new()
     {
-        { Sex.Male, "Eugene" },
+        { Sex.Male, "Nord" },
-        { Sex.Female, "Kseniya" },
+        { Sex.Female, "Amina" },
-        { Sex.Unsexed, "Xenia" },
+        { Sex.Unsexed, "Alyx" },
     };
 
     public override void Initialize()

Content.Shared/_White/TTS/SharedTTSComponent.cs

@@ -14,5 +14,5 @@ public sealed partial class SharedTTSComponent : Component
     /// Prototype of used voice for TTS.
     /// </summary>
     [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField]
-    public ProtoId<TTSVoicePrototype> VoicePrototypeId { get; set; } = "Eugene";
+    public ProtoId<TTSVoicePrototype> VoicePrototypeId { get; set; } = "Nord";
 }

Resources/Changelog/ChangelogWhite.yml

@@ -1,13 +1,4 @@
 Entries:
-- author: ThereDrD
-  changes:
-  - message: "\u0424\u0438\u043A\u0441 \u0432\u0430\u0439\u0442\u043B\u0438\u0441\u0442\
-      \u0430 \u0440\u043E\u043B\u0435\u0439 \u0443 \u0441\u0435\u043D\u044C\u043E\u0440\
-      -\u0434\u043E\u043B\u0436\u043D\u043E\u0441\u0442\u0435\u0439"
-    type: Fix
-  id: 164
-  time: '2024-02-28T14:33:53.0000000+00:00'
-  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/139
 - author: Aviu
   changes:
   - message: "\u0421\u043A\u0440\u0435\u043B\u043B\u044B."
@@ -8957,3 +8948,12 @@
   id: 663
   time: '2025-02-09T19:40:49.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/897
+- author: keslik
+  changes:
+  - message: "\u0423\u0431\u0440\u0430\u043D\u044B \u043D\u0435\u043F\u043E\u0434\u0434\
+      \u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043C\u044B\u0435 \u0433\u043E\u043B\
+      \u043E\u0441\u0430 \u0422\u0422\u0421"
+    type: Remove
+  id: 664
+  time: '2025-02-25T20:43:43.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/905

Resources/Prototypes/_White/tts-voices.yml

@@ -1,33 +1,3 @@
-- type: ttsVoice
-  id: Aidar
-  name: tts-voice-name-aidar
-  sex: Male
-  speaker: aidar
-
-- type: ttsVoice
-  id: Eugene
-  name: tts-voice-name-eugene
-  sex: Male
-  speaker: eugene
-
-- type: ttsVoice
-  id: Baya
-  name: tts-voice-name-baya
-  sex: Female
-  speaker: baya
-
-- type: ttsVoice
-  id: Kseniya
-  name: tts-voice-name-kseniya
-  sex: Female
-  speaker: kseniya
-
-- type: ttsVoice
-  id: Xenia
-  name: tts-voice-name-xenia
-  sex: Female
-  speaker: xenia
-
 - type: ttsVoice
   id: Charlotte
   name: tts-voice-name-charlotte