From 95b2451b648db83a7843c050e8ac67ced5c93800 Mon Sep 17 00:00:00 2001 From: keslik Date: Tue, 25 Feb 2025 16:49:22 +0300 Subject: [PATCH 1/4] Remove voices --- .../Tests/Preferences/ServerDbSqliteTests.cs | 2 +- .../SharedHumanoidAppearanceSystem.cs | 8 ++--- .../_White/TTS/SharedTTSComponent.cs | 2 +- Resources/Prototypes/_White/tts-voices.yml | 30 ------------------- 4 files changed, 6 insertions(+), 36 deletions(-) diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs index 5c7783d8dd..08d1df62e7 100644 --- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs +++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs @@ -46,7 +46,7 @@ namespace Content.IntegrationTests.Tests.Preferences "Silicon", "The biggest boy around.", "Human", - "Eugene", + "Mykyta", 21, Sex.Male, Gender.Epicene, diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs index ad3e4079cf..86a5f3c3d0 100644 --- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs +++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs @@ -33,13 +33,13 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem public const string DefaultBodyType = "HumanNormal"; [ValidatePrototypeId] - public const string DefaultVoice = "Eugene"; + public const string DefaultVoice = "Mykyta"; public static readonly Dictionary> DefaultSexVoice = new() { - { Sex.Male, "Eugene" }, - { Sex.Female, "Kseniya" }, - { Sex.Unsexed, "Xenia" }, + { Sex.Male, "Mykyta" }, + { Sex.Female, "Charlotte" }, + { Sex.Unsexed, "Glados" }, }; public override void Initialize() diff --git a/Content.Shared/_White/TTS/SharedTTSComponent.cs b/Content.Shared/_White/TTS/SharedTTSComponent.cs index 1b1990777c..055c6f7de5 100644 --- a/Content.Shared/_White/TTS/SharedTTSComponent.cs +++ b/Content.Shared/_White/TTS/SharedTTSComponent.cs @@ -14,5 +14,5 @@ public sealed partial class SharedTTSComponent : Component /// Prototype of used voice for TTS. /// [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] - public ProtoId VoicePrototypeId { get; set; } = "Eugene"; + public ProtoId VoicePrototypeId { get; set; } = "Mykyta"; } diff --git a/Resources/Prototypes/_White/tts-voices.yml b/Resources/Prototypes/_White/tts-voices.yml index b12087e600..b74e61c816 100644 --- a/Resources/Prototypes/_White/tts-voices.yml +++ b/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 From 9dc4bf983e5ccd2f49a998403b87c2af5a98e5f6 Mon Sep 17 00:00:00 2001 From: keslik Date: Tue, 25 Feb 2025 21:14:58 +0300 Subject: [PATCH 2/4] replace --- .../Tests/Preferences/ServerDbSqliteTests.cs | 2 +- Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs | 8 ++++---- Content.Shared/_White/TTS/SharedTTSComponent.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs index 08d1df62e7..e81e649320 100644 --- a/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs +++ b/Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs @@ -46,7 +46,7 @@ namespace Content.IntegrationTests.Tests.Preferences "Silicon", "The biggest boy around.", "Human", - "Mykyta", + "Nord", 21, Sex.Male, Gender.Epicene, diff --git a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs index 86a5f3c3d0..c0346114dd 100644 --- a/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs +++ b/Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs @@ -33,13 +33,13 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem public const string DefaultBodyType = "HumanNormal"; [ValidatePrototypeId] - public const string DefaultVoice = "Mykyta"; + public const string DefaultVoice = "Nord"; public static readonly Dictionary> DefaultSexVoice = new() { - { Sex.Male, "Mykyta" }, - { Sex.Female, "Charlotte" }, - { Sex.Unsexed, "Glados" }, + { Sex.Male, "Nord" }, + { Sex.Female, "Amina" }, + { Sex.Unsexed, "Alyx" }, }; public override void Initialize() diff --git a/Content.Shared/_White/TTS/SharedTTSComponent.cs b/Content.Shared/_White/TTS/SharedTTSComponent.cs index 055c6f7de5..3a1eb25248 100644 --- a/Content.Shared/_White/TTS/SharedTTSComponent.cs +++ b/Content.Shared/_White/TTS/SharedTTSComponent.cs @@ -14,5 +14,5 @@ public sealed partial class SharedTTSComponent : Component /// Prototype of used voice for TTS. /// [ViewVariables(VVAccess.ReadWrite), DataField, AutoNetworkedField] - public ProtoId VoicePrototypeId { get; set; } = "Mykyta"; + public ProtoId VoicePrototypeId { get; set; } = "Nord"; } From 1c2a9b1c268016b7d70a1d80b04af241cdb9cc07 Mon Sep 17 00:00:00 2001 From: RavmorganButOnCocaine Date: Tue, 25 Feb 2025 20:44:47 +0000 Subject: [PATCH 3/4] Automatic changelog update --- Resources/Changelog/ChangelogWhite.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml index 78dcd3b9ce..c0e54b4fcd 100644 --- a/Resources/Changelog/ChangelogWhite.yml +++ b/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 From 68f38a82697c7e067aee8dd1328fff87cc6e53e7 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 1 Mar 2025 00:08:55 +0300 Subject: [PATCH 4/4] easy --- .../Administration/Commands/ReadyAll.cs | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Content.Server/Administration/Commands/ReadyAll.cs b/Content.Server/Administration/Commands/ReadyAll.cs index 530ba0e89c..4eddfc46b5 100644 --- a/Content.Server/Administration/Commands/ReadyAll.cs +++ b/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} "; public void Execute(IConsoleShell shell, string argStr, string[] args) { - var ready = true; + // WD Disabled + // var ready = true; - if (args.Length > 0) - { - ready = bool.Parse(args[0]); - } + // if (args.Length > 0) + // { + // ready = bool.Parse(args[0]); + // } - var gameTicker = _e.System(); + // var gameTicker = _e.System(); - if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby) - { - shell.WriteLine("This command can only be ran while in the lobby!"); - return; - } + // if (gameTicker.RunLevel != GameRunLevel.PreRoundLobby) + // { + // shell.WriteLine("This command can only be ran while in the lobby!"); + // return; + // } - gameTicker.ToggleReadyAll(ready); + // gameTicker.ToggleReadyAll(ready); } } }