tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chat fixes (#10051)

Browse Source
This commit is contained in:
Kara
2022-07-26 16:49:23 -07:00
committed by GitHub
parent 2ca8f8ac80
commit 7e57dd987e
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Content.Server/Chat/Systems/ChatSystem.cs
View File

@@ -1,5 +1,6 @@
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using Content.Server.Administration.Logs;
using Content.Server.Administration.Managers;
using Content.Server.Chat.Managers;
@@ -244,17 +245,22 @@ public sealed partial class ChatSystem : SharedChatSystem
private void SendEntitySpeak(EntityUid source, string originalMessage, bool hideChat = false)
{
if (!_actionBlocker.CanSpeak(source)) return;
if (!_actionBlocker.CanSpeak(source))
return;
var (message, channel) = GetRadioPrefix(source, originalMessage);
if (channel != null)
{
_listener.PingListeners(source, message, channel);
SendEntityWhisper(source, message, hideChat);
return;
}
message = TransformSpeech(source, message);
if (message.Length == 0)
return;
if (channel != null)
_listener.PingListeners(source, message, channel);
var messageWrap = Loc.GetString("chat-manager-entity-say-wrap-message",
("entityName", Name(source)));
@@ -271,7 +277,8 @@ public sealed partial class ChatSystem : SharedChatSystem
private void SendEntityWhisper(EntityUid source, string originalMessage, bool hideChat = false)
{
if (!_actionBlocker.CanSpeak(source)) return;
if (!_actionBlocker.CanSpeak(source))
return;
var message = TransformSpeech(source, originalMessage);
if (message.Length == 0)