diff --git a/Content.Shared/Corvax/TTS/TTSComponent.cs b/Content.Shared/Corvax/TTS/TTSComponent.cs index cd6cb25d9e6..7dda57020f9 100644 --- a/Content.Shared/Corvax/TTS/TTSComponent.cs +++ b/Content.Shared/Corvax/TTS/TTSComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Humanoid; using Robust.Shared.GameStates; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; @@ -15,5 +16,5 @@ public sealed partial class TTSComponent : Component /// [ViewVariables(VVAccess.ReadWrite)] [DataField("voice", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? VoicePrototypeId { get; set; } = "Geralt"; + public string? VoicePrototypeId { get; set; } = HumanoidProfileSystem.DefaultVoice; } diff --git a/Content.Shared/Humanoid/HumanoidProfileSystem.cs b/Content.Shared/Humanoid/HumanoidProfileSystem.cs index 9a3d2fa0a33..e2cfbf8fc25 100644 --- a/Content.Shared/Humanoid/HumanoidProfileSystem.cs +++ b/Content.Shared/Humanoid/HumanoidProfileSystem.cs @@ -54,10 +54,8 @@ public void ApplyProfileTo(Entity ent, HumanoidCharac ent.Comp.Sex = profile.Sex; // Corvax-TTS-start ent.Comp.Voice = profile.Voice; - if (TryComp(ent, out var _TTSComponent) && _TTSComponent.VoicePrototypeId == "Taskmaster") - { - _TTSComponent.VoicePrototypeId = profile.Voice; - } + if (TryComp(ent, out var tts)) + tts.VoicePrototypeId = profile.Voice; // Corvax-TTS-end Dirty(ent);