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

Identity fixes (#9701)

Browse Source
This commit is contained in:
Kara
2022-07-13 22:23:55 -07:00
committed by GitHub
parent 130a4cdd6a
commit a0c531d08b
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,7 @@ using Content.Shared.ActionBlocker;
using Content.Shared.CCVar;
using Content.Shared.Chat;
using Content.Shared.Database;
using Content.Shared.IdentityManagement;
using Content.Shared.Inventory;
using Robust.Server.Player;
using Robust.Shared.Audio;
@@ -301,8 +302,9 @@ public sealed partial class ChatSystem : SharedChatSystem
{
if (!_actionBlocker.CanEmote(source)) return;
// Emotes use Identity.Name, since it doesn't actually involve your voice at all.
var messageWrap = Loc.GetString("chat-manager-entity-me-wrap-message",
("entityName", Name(source)));
("entityName", Identity.Name(source, EntityManager)));
SendInVoiceRange(ChatChannel.Emotes, action, messageWrap, source, hideChat);
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user}: {action}");
@@ -317,7 +319,7 @@ public sealed partial class ChatSystem : SharedChatSystem
}
else if (!_loocEnabled) return;
var messageWrap = Loc.GetString("chat-manager-entity-looc-wrap-message",
("entityName", Name(source)));
("entityName", Identity.Name(source, EntityManager)));
SendInVoiceRange(ChatChannel.LOOC, message, messageWrap, source, hideChat);
_adminLogger.Add(LogType.Chat, LogImpact.Low, $"LOOC from {player:Player}: {message}");