]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
fix stop bleeding popup (#34729)
authorlzk <124214523+lzk228@users.noreply.github.com>
Wed, 29 Jan 2025 13:13:50 +0000 (14:13 +0100)
committerGitHub <noreply@github.com>
Wed, 29 Jan 2025 13:13:50 +0000 (14:13 +0100)
* fix stop bleeding popup

* add identity

Content.Server/Medical/HealingSystem.cs
Resources/Locale/en-US/medical/components/healing-component.ftl

index cf5869d1cbb72d2737ea044cf2c56c9021b017a7..74bce0eee6ae30c96b971f60acb299f14f926b12 100644 (file)
@@ -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);
             }
         }
 
index 1deb39db091a08498bf7e39d3541352fa9515667..20ad23dcb214757ba1b55b3668f3d52948008bc2 100644 (file)
@@ -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}!