From 0a945a6803474e86343f3b0b4ce7b60087176ab2 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 18 Aug 2023 06:40:10 +1000 Subject: [PATCH] Merge pull request #19254 * Fix emote chirps * named args time --- Content.Server/Chat/Systems/ChatSystem.Emote.cs | 4 ++-- Content.Server/Chat/Systems/ChatSystem.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Chat/Systems/ChatSystem.Emote.cs b/Content.Server/Chat/Systems/ChatSystem.Emote.cs index 459fcd20ae..89fe35f56b 100644 --- a/Content.Server/Chat/Systems/ChatSystem.Emote.cs +++ b/Content.Server/Chat/Systems/ChatSystem.Emote.cs @@ -66,7 +66,7 @@ public partial class ChatSystem { if (!_prototypeManager.TryIndex(emoteId, out var proto)) return; - TryEmoteWithChat(source, proto, range, hideLog, nameOverride, ignoreActionBlocker); + TryEmoteWithChat(source, proto, range, hideLog: hideLog, nameOverride, ignoreActionBlocker: ignoreActionBlocker); } /// @@ -92,7 +92,7 @@ public partial class ChatSystem { // not all emotes are loc'd, but for the ones that are we pass in entity var action = Loc.GetString(_random.Pick(emote.ChatMessages), ("entity", source)); - SendEntityEmote(source, action, range, nameOverride, false, hideLog, ignoreActionBlocker); + SendEntityEmote(source, action, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker); } // do the rest of emote event logic here diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 1c545bc24c..09064bd634 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -232,7 +232,7 @@ public sealed partial class ChatSystem : SharedChatSystem SendEntityWhisper(source, message, range, null, nameOverride, hideLog, ignoreActionBlocker); break; case InGameICChatType.Emote: - SendEntityEmote(source, message, range, nameOverride, hideLog, ignoreActionBlocker); + SendEntityEmote(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker); break; } }