From 07a35e83636479d7b37817fd2440065302311270 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 27 Jun 2022 15:56:38 +1200
Subject: [PATCH] Stop radio channels from being malformed. (#9210)

---
 Content.Server/Chat/Systems/ChatSystem.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index 648bfcf40f..62407598f3 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -224,12 +224,13 @@ public sealed partial class ChatSystem : SharedChatSystem
 
     #region Private API
 
-    private void SendEntitySpeak(EntityUid source, string message, bool hideChat = false)
+    private void SendEntitySpeak(EntityUid source, string originalMessage, bool hideChat = false)
     {
         if (!_actionBlocker.CanSpeak(source)) return;
-        message = TransformSpeech(source, message);
 
-        (message, var channel) = GetRadioPrefix(source, message);
+        var (message, channel) = GetRadioPrefix(source, originalMessage);
+
+        message = TransformSpeech(source, message);
 
         if (channel != null)
             _listener.PingListeners(source, message, channel);
@@ -241,7 +242,11 @@ public sealed partial class ChatSystem : SharedChatSystem
 
         var ev = new EntitySpokeEvent(message);
         RaiseLocalEvent(source, ev);
-        _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}: {message}");
+
+        if (originalMessage == message)
+            _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}: {originalMessage}.");
+        else
+            _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}.");
     }
 
     private void SendEntityWhisper(EntityUid source, string message, bool hideChat = false)