Fix sloshing electricity & enable SpeechVerb masking (#24238)
* Implemented electricity speech verb masking * Handle speech verb override elsewhere in the system, even though we're not using it * Fix that protoId business * No nullable component fields * Use ProtoId, and try going back to a nullable. Specifiy DataFields on VoiceMaskComponent.
This commit is contained in:
@@ -7,6 +7,7 @@ using Content.Shared.Chat;
|
||||
using Content.Shared.Database;
|
||||
using Content.Shared.Radio;
|
||||
using Content.Shared.Radio.Components;
|
||||
using Content.Shared.Speech;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Network;
|
||||
using Robust.Shared.Player;
|
||||
@@ -79,7 +80,17 @@ public sealed class RadioSystem : EntitySystem
|
||||
|
||||
name = FormattedMessage.EscapeText(name);
|
||||
|
||||
var speech = _chat.GetSpeechVerb(messageSource, message);
|
||||
SpeechVerbPrototype speech;
|
||||
if (mask != null
|
||||
&& mask.Enabled
|
||||
&& mask.SpeechVerb != null
|
||||
&& _prototype.TryIndex<SpeechVerbPrototype>(mask.SpeechVerb, out var proto))
|
||||
{
|
||||
speech = proto;
|
||||
}
|
||||
else
|
||||
speech = _chat.GetSpeechVerb(messageSource, message);
|
||||
|
||||
var content = escapeMarkup
|
||||
? FormattedMessage.EscapeText(message)
|
||||
: message;
|
||||
|
||||
Reference in New Issue
Block a user