Skip to content

Commit

Permalink
Fix Harpy chat emotes (#2832)
Browse files Browse the repository at this point in the history
* Fix Harpy (Whatstone)

new-frontiers-14/frontier-station-14#2785

* Cleanup

* Update ChatSystem.Emote.cs
  • Loading branch information
dvir001 authored Feb 1, 2025
1 parent 791eed9 commit 7dc065c
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions Content.Server/Chat/Systems/ChatSystem.Emote.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7dc065c

Please sign in to comment.