diff --git a/Content.Server/Chat/ChatSystem.cs b/Content.Server/Chat/ChatSystem.cs index 36a60b8a17..77242b9928 100644 --- a/Content.Server/Chat/ChatSystem.cs +++ b/Content.Server/Chat/ChatSystem.cs @@ -82,22 +82,21 @@ public sealed class ChatSystem : EntitySystem return; } + // Sus + if (player?.AttachedEntity is { Valid: true } entity && source != entity) + { + return; + } + if (!CanSendInGame(message, shell, player)) return; message = SanitizeInGameICMessage(source, message, out var emoteStr); - // Is this -actually- an emote, and is a player sending it? + // Was there an emote in the message? If so, send it. if (player != null && emoteStr != message && emoteStr != null) { SendEntityEmote(source, emoteStr, hideChat); - return; - } - - // Sus - if (player?.AttachedEntity is { Valid: true } entity && source != entity) - { - return; } // Otherwise, send whatever type.