[feat] TTS
# Conflicts: # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Server/Database/ServerDbBase.cs # Content.Server/Entry/EntryPoint.cs # Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Server/VoiceMask/VoiceMaskSystem.cs # Resources/Prototypes/Entities/Mobs/Species/base.yml
This commit is contained in:
@@ -418,7 +418,7 @@ public sealed partial class ChatSystem : SharedChatSystem
|
||||
|
||||
SendInVoiceRange(ChatChannel.Local, message, wrappedMessage, source, range);
|
||||
|
||||
var ev = new EntitySpokeEvent(source, message, null, null);
|
||||
var ev = new EntitySpokeEvent(source, message, originalMessage, null, null);
|
||||
RaiseLocalEvent(source, ev, true);
|
||||
|
||||
// To avoid logging any messages sent by entities that are not players, like vendors, cloning, etc.
|
||||
@@ -515,7 +515,7 @@ public sealed partial class ChatSystem : SharedChatSystem
|
||||
|
||||
_replay.RecordServerMessage(new ChatMessage(ChatChannel.Whisper, message, wrappedMessage, GetNetEntity(source), null, MessageRangeHideChatForReplay(range)));
|
||||
|
||||
var ev = new EntitySpokeEvent(source, message, channel, obfuscatedMessage);
|
||||
var ev = new EntitySpokeEvent(source, message, originalMessage, channel, obfuscatedMessage);
|
||||
RaiseLocalEvent(source, ev, true);
|
||||
if (hideLog)
|
||||
return;
|
||||
@@ -940,6 +940,7 @@ public sealed class EntitySpokeEvent : EntityEventArgs
|
||||
{
|
||||
public readonly EntityUid Source;
|
||||
public readonly string Message;
|
||||
public readonly string OriginalMessage;
|
||||
public readonly string? ObfuscatedMessage; // not null if this was a whisper
|
||||
|
||||
/// <summary>
|
||||
@@ -948,10 +949,11 @@ public sealed class EntitySpokeEvent : EntityEventArgs
|
||||
/// </summary>
|
||||
public RadioChannelPrototype? Channel;
|
||||
|
||||
public EntitySpokeEvent(EntityUid source, string message, RadioChannelPrototype? channel, string? obfuscatedMessage)
|
||||
public EntitySpokeEvent(EntityUid source, string message, string originalMessage, RadioChannelPrototype? channel, string? obfuscatedMessage)
|
||||
{
|
||||
Source = source;
|
||||
Message = message;
|
||||
OriginalMessage = originalMessage;
|
||||
Channel = channel;
|
||||
ObfuscatedMessage = obfuscatedMessage;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user