From 7dc065cd59de8a28a1220eeaaf1325dfe0179c87 Mon Sep 17 00:00:00 2001
From: Dvir <39403717+dvir001@users.noreply.github.com>
Date: Sat, 1 Feb 2025 21:50:53 +0200
Subject: [PATCH] Fix Harpy chat emotes (#2832)

* Fix Harpy (Whatstone)

https://github.com/new-frontiers-14/frontier-station-14/pull/2785

* Cleanup

* Update ChatSystem.Emote.cs
---
 Content.Server/Chat/Systems/ChatSystem.Emote.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

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;