From 467b68690b5ceca6882119fdc20b4558518b1fdf Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 29 Jan 2025 14:13:50 +0100 Subject: [PATCH] fix stop bleeding popup (#34729) * fix stop bleeding popup * add identity --- Content.Server/Medical/HealingSystem.cs | 5 ++++- .../Locale/en-US/medical/components/healing-component.ftl | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index cf5869d1cb..74bce0eee6 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -72,7 +72,10 @@ public sealed class HealingSystem : EntitySystem _bloodstreamSystem.TryModifyBleedAmount(entity.Owner, healing.BloodlossModifier); if (isBleeding != bloodstream.BleedAmount > 0) { - _popupSystem.PopupEntity(Loc.GetString("medical-item-stop-bleeding"), entity, args.User); + var popup = (args.User == entity.Owner) + ? Loc.GetString("medical-item-stop-bleeding-self") + : Loc.GetString("medical-item-stop-bleeding", ("target", Identity.Entity(entity.Owner, EntityManager))); + _popupSystem.PopupEntity(popup, entity, args.User); } } diff --git a/Resources/Locale/en-US/medical/components/healing-component.ftl b/Resources/Locale/en-US/medical/components/healing-component.ftl index 1deb39db09..20ad23dcb2 100644 --- a/Resources/Locale/en-US/medical/components/healing-component.ftl +++ b/Resources/Locale/en-US/medical/components/healing-component.ftl @@ -1,4 +1,5 @@ medical-item-finished-using = You have finished healing with the {$item} medical-item-cant-use = There is no damage you can heal with the {$item} -medical-item-stop-bleeding = They have stopped bleeding +medical-item-stop-bleeding = {CAPITALIZE($target)} has stopped bleeding +medical-item-stop-bleeding-self = You have stopped bleeding medical-item-popup-target = {CAPITALIZE(THE($user))} is trying to heal you with the {$item}! -- 2.51.2