diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 19b86e628450..f7fb693b1f75 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -27,6 +27,7 @@ using Content.Shared.Players; using Content.Shared.Players.RateLimiting; using Content.Shared.Radio; +using Content.Shared.Silicons.Borgs.Components; using Content.Shared.SS220.Telepathy; using Content.Shared.Whitelist; using Robust.Server.Player; @@ -968,6 +969,10 @@ public string BuildGibberishString(IReadOnlyList charOptions, int length) //ss220 add identity concealment for chat and radio messages start public string GetRadioName(EntityUid entity) { + // for borgs(chassis) and ai(brain) + if (HasComp(entity) || HasComp(entity)) + return Name(entity); + return GetIdCardName(entity) ?? Loc.GetString("comp-pda-ui-unknown"); }