diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index 4eda532385..497c9a1fe4 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Chat; using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.Hands.Components; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction.Events; using Content.Shared.Item; using Content.Shared.Mind; @@ -149,7 +150,7 @@ public sealed class SuicideSystem : EntitySystem if (args.Handled) return; - var othersMessage = Loc.GetString("suicide-command-default-text-others", ("name", victim)); + var othersMessage = Loc.GetString("suicide-command-default-text-others", ("name", Identity.Entity(victim, EntityManager))); _popup.PopupEntity(othersMessage, victim, Filter.PvsExcept(victim), true); var selfMessage = Loc.GetString("suicide-command-default-text-self"); diff --git a/Resources/Locale/en-US/chat/commands/suicide-command.ftl b/Resources/Locale/en-US/chat/commands/suicide-command.ftl index 36e861169b..4b2fb5c00e 100644 --- a/Resources/Locale/en-US/chat/commands/suicide-command.ftl +++ b/Resources/Locale/en-US/chat/commands/suicide-command.ftl @@ -3,7 +3,7 @@ suicide-command-help-text = The suicide command gives you a quick way out of a r The method varies, first it will attempt to use the held item in your active hand. If that fails, it will attempt to use an object in the environment. Finally, if neither of the above worked, you will die by biting your tongue. -suicide-command-default-text-others = {$name} is attempting to bite their own tongue! +suicide-command-default-text-others = {CAPITALIZE(THE($name))} is attempting to bite {POSS-ADJ($name)} own tongue! suicide-command-default-text-self = You attempt to bite your own tongue! suicide-command-already-dead = You can't suicide. You're dead. suicide-command-no-mind = You have no mind!