Emote fix

new-frontiers-14 · Jan 31, 2025 · 4d9107b · 4d9107b
1 parent db21645
commit 4d9107b
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs
@@ -170,17 +170,32 @@ 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
+        // Frontier: return first usable emote
+        bool validEmote = false;
+        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;
         }
 
+        if (!validEmote)
+            return;
+        // End Frontier
+
+        // foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger
+        // {
+        //     if (!AllowedToUseEmote(uid, emote))
+        //         return;
+        // }
+
+        // foreach (var emote in emotes) // DeltaV - Multiple emotes for the same trigger
+        // {
+        //     InvokeEmoteEvent(uid, emote);
+        // }
+
         static string TrimPunctuation(string textInput)
         {
             var trimEnd = textInput.Length;