Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX: Name cyborg's in radio #2627

Merged
merged 2 commits into from
Feb 23, 2025
Merged

FIX: Name cyborg's in radio #2627

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6461aba
FIX: Name cyborg's in radio
ReeZer2 Feb 23, 2025
32fe61f
gigigigigigi
ReeZer2 Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Content.Server/Chat/Systems/ChatSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -968,6 +969,10 @@ public string BuildGibberishString(IReadOnlyList<char> 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<BorgChassisComponent>(entity) || HasComp<BorgBrainComponent>(entity))
return Name(entity);

return GetIdCardName(entity) ?? Loc.GetString("comp-pda-ui-unknown");
}

Expand Down
Loading