diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/ChatManager.cs index 2d5b7f749a..4723bb12f8 100644 --- a/Content.Client/Chat/ChatManager.cs +++ b/Content.Client/Chat/ChatManager.cs @@ -355,7 +355,7 @@ namespace Content.Client.Chat } var color = Color.DarkGray; - var messageText = message.Message; + var messageText = FormattedMessage.EscapeText(message.Message); if (!string.IsNullOrEmpty(message.MessageWrap)) { messageText = string.Format(message.MessageWrap, messageText); diff --git a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs b/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs index 7b4505e897..1c1c65cdc8 100644 --- a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs +++ b/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs @@ -67,7 +67,7 @@ namespace Content.Server.GameObjects.Components.Headset msg.Channel = ChatChannel.Radio; msg.Message = message; //Square brackets are added here to avoid issues with escaping - msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"[{channel}]"), ("name", source.Name)); + msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", $"\\[{channel}\\]"), ("name", source.Name)); _netManager.ServerSendMessage(msg, playerChannel); } } diff --git a/Resources/Changelog/Parts/radio.yml b/Resources/Changelog/Parts/radio.yml new file mode 100644 index 0000000000..e005357bbc --- /dev/null +++ b/Resources/Changelog/Parts/radio.yml @@ -0,0 +1,4 @@ +author: Zumorica +changes: + - type: Fix + message: Fixes radio messages not sending.