diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs index 0aa2462ecdf..16f430f96b0 100644 --- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs +++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs @@ -170,17 +170,19 @@ private void TryEmoteChatInput(EntityUid uid, string textInput) if (!_wordEmoteDict.TryGetValue(actionTrimmedLower, out var emotes)) // DeltaV, renames to emotes return; - foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger + bool validEmote = false; // DeltaV - Multiple emotes for the same trigger + foreach (var emote in emotes) { if (!AllowedToUseEmote(uid, emote)) - return; - } + continue; - foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger - { InvokeEmoteEvent(uid, emote); + validEmote = true; // DeltaV } + if (!validEmote) // DeltaV + return; + static string TrimPunctuation(string textInput) { var trimEnd = textInput.Length;