From 7a0a978f9ee50ec2090f0a1485c960f25dab5dc6 Mon Sep 17 00:00:00 2001 From: Zack Backmen Date: Sun, 18 Feb 2024 00:02:21 +0300 Subject: [PATCH] fix --- Content.Client/Corvax/TTS/TTSSystem.cs | 5 +++-- Content.Client/Entry/EntryPoint.cs | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Content.Client/Corvax/TTS/TTSSystem.cs b/Content.Client/Corvax/TTS/TTSSystem.cs index df43f910414..458b0b59739 100644 --- a/Content.Client/Corvax/TTS/TTSSystem.cs +++ b/Content.Client/Corvax/TTS/TTSSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.Chat; using Content.Shared.Corvax.CCCVars; using Content.Shared.Corvax.TTS; +using Content.Shared.GameTicking; using Robust.Client.Audio; using Robust.Client.ResourceManagement; using Robust.Shared.Audio; @@ -79,7 +80,7 @@ private void OnPlayTTS(PlayTTSEvent ev) _contentRoot.AddOrUpdateFile(filePath, ev.Data); var audioResource = new AudioResource(); - audioResource.Load(IoCManager.Instance!, Prefix / filePath); + audioResource.Load(IoCManager.Instance!, _prefix / filePath); var audioParams = AudioParams.Default .WithVolume(AdjustVolume(ev.IsWhisper)) @@ -88,7 +89,7 @@ private void OnPlayTTS(PlayTTSEvent ev) if (ev.SourceUid != null) { var sourceUid = GetEntity(ev.SourceUid.Value); - if(sourceUid.IsValid) + if(sourceUid.IsValid()) _audio.PlayEntity(audioResource.AudioStream, sourceUid, audioParams); } else diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 3c43540a4fd..24d3d108171 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -135,6 +135,7 @@ public override void Init() _prototypeManager.RegisterIgnore("npcConversationTree"); _prototypeManager.RegisterIgnore("shipwreckDestination"); _prototypeManager.RegisterIgnore("shipwreckFaction"); + _prototypeManager.RegisterIgnore("loadout"); // End Backmen. _componentFactory.GenerateNetIds();