diff --git a/Content.Server/Communications/CommunicationsConsoleSystem.cs b/Content.Server/Communications/CommunicationsConsoleSystem.cs index 7502c889e1..e616949d7a 100644 --- a/Content.Server/Communications/CommunicationsConsoleSystem.cs +++ b/Content.Server/Communications/CommunicationsConsoleSystem.cs @@ -22,6 +22,7 @@ using Content.Shared.Database; using Content.Shared.DeviceNetwork; using Content.Shared.Emag.Components; using Content.Shared.Popups; +using Content.Shared.Silicons.Borgs.Components; using Robust.Server.GameObjects; using Robust.Shared.Configuration; @@ -255,10 +256,17 @@ namespace Content.Server.Communications return; } + // User has an id if (_idCardSystem.TryFindIdCard(mob, out var id)) { author = $"{id.Comp.FullName} ({CultureInfo.CurrentCulture.TextInfo.ToTitleCase(id.Comp.JobTitle ?? string.Empty)})".Trim(); } + + // User does not have an id and is a borg, so use the borg's name + if (HasComp(mob)) + { + author = Name(mob).Trim(); + } } comp.AnnouncementCooldownRemaining = comp.Delay;