diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index db35ca2009..a8f875bf4a 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -307,9 +307,21 @@ public sealed partial class ChatSystem : SharedChatSystem return; if (originalMessage == message) - _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user}: {originalMessage}."); + { + if (name != Name(source)) + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Say from {ToPrettyString(source):user} as {name}: {originalMessage}."); + else + _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}."); + { + if (name != Name(source)) + _adminLogger.Add(LogType.Chat, LogImpact.Low, + $"Say from {ToPrettyString(source):user} as {name}, original: {originalMessage}, transformed: {message}."); + else + _adminLogger.Add(LogType.Chat, LogImpact.Low, + $"Say from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}."); + } } private void SendEntityWhisper(EntityUid source, string originalMessage, bool hideChat, bool hideGlobalGhostChat, RadioChannelPrototype? channel, string? nameOverride) @@ -366,9 +378,21 @@ public sealed partial class ChatSystem : SharedChatSystem RaiseLocalEvent(source, ev, true); if (originalMessage == message) - _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}: {originalMessage}."); + { + if (name != Name(source)) + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user} as {name}: {originalMessage}."); + else + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}: {originalMessage}."); + } else - _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Whisper from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}."); + { + if (name != Name(source)) + _adminLogger.Add(LogType.Chat, LogImpact.Low, + $"Whisper from {ToPrettyString(source):user} as {name}, original: {originalMessage}, transformed: {message}."); + else + _adminLogger.Add(LogType.Chat, LogImpact.Low, + $"Whisper from {ToPrettyString(source):user}, original: {originalMessage}, transformed: {message}."); + } } private void SendEntityEmote(EntityUid source, string action, bool hideChat, @@ -387,7 +411,11 @@ public sealed partial class ChatSystem : SharedChatSystem if (checkEmote) TryEmoteChatInput(source, action); SendInVoiceRange(ChatChannel.Emotes, action, wrappedMessage, source, hideChat, hideGlobalGhostChat); - _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user}: {action}"); + + if (name != Name(source)) + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user} as {name}: {action}"); + else + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Emote from {ToPrettyString(source):user}: {action}"); } // ReSharper disable once InconsistentNaming diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs index f3e2a8d59e..de6131bb9d 100644 --- a/Content.Server/Radio/EntitySystems/RadioSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs @@ -86,7 +86,10 @@ public sealed class RadioSystem : EntitySystem RaiseLocalEvent(radio.Owner, ev); } - _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(source):sender} on {channel.LocalizedName}: {message}"); + if (name != Name(source)) + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(source):user} as {name} on {channel.LocalizedName}: {message}"); + else + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Radio message from {ToPrettyString(source):user} on {channel.LocalizedName}: {message}"); _replay.QueueReplayMessage(chat); _messages.Remove(message); diff --git a/Content.Server/VoiceMask/VoiceMaskSystem.cs b/Content.Server/VoiceMask/VoiceMaskSystem.cs index c738ad5c99..43b627c6a0 100644 --- a/Content.Server/VoiceMask/VoiceMaskSystem.cs +++ b/Content.Server/VoiceMask/VoiceMaskSystem.cs @@ -1,6 +1,8 @@ +using Content.Server.Administration.Logs; using Content.Server.Chat.Systems; using Content.Server.Popups; using Content.Shared.Actions; +using Content.Shared.Database; using Content.Shared.Inventory.Events; using Content.Shared.Preferences; using Content.Shared.Verbs; @@ -14,6 +16,7 @@ public sealed partial class VoiceMaskSystem : EntitySystem { [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly IAdminLogManager _adminLogger = default!; public override void Initialize() { @@ -39,6 +42,10 @@ public sealed partial class VoiceMaskSystem : EntitySystem } component.VoiceName = message.Name; + if (message.Session.AttachedEntity != null) + _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(message.Session.AttachedEntity.Value):player} set voice of {ToPrettyString(uid):mask}: {component.VoiceName}"); + else + _adminLogger.Add(LogType.Action, LogImpact.Medium, $"Voice of {ToPrettyString(uid):mask} set: {component.VoiceName}"); _popupSystem.PopupCursor(Loc.GetString("voice-mask-popup-success"), message.Session);