From 74d9ac7241486b6da96d5ea5ca11239fea4b601f Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:41:47 +0200 Subject: [PATCH] Add popup for healing target (#29804) * Add popup for healing target * hop * huh * fix one * fix showing popup to all --- Content.Server/Medical/HealingSystem.cs | 8 ++++++++ .../Locale/en-US/medical/components/healing-component.ftl | 1 + 2 files changed, 9 insertions(+) diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index ed33e60dac4806..52d6a3fafa7619 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -10,12 +10,14 @@ using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Medical; using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; +using Content.Shared.Popups; using Content.Shared.Stacks; using Robust.Shared.Audio.Systems; using Robust.Shared.Random; @@ -188,6 +190,12 @@ targetDamage.DamageContainerID is not null && var isNotSelf = user != target; + if (isNotSelf) + { + var msg = Loc.GetString("medical-item-popup-target", ("user", Identity.Entity(user, EntityManager)), ("item", uid)); + _popupSystem.PopupEntity(msg, target, target, PopupType.Medium); + } + var delay = isNotSelf ? component.Delay : component.Delay * GetScaledHealingPenalty(user, component); diff --git a/Resources/Locale/en-US/medical/components/healing-component.ftl b/Resources/Locale/en-US/medical/components/healing-component.ftl index 5c2aaaabd9bcf8..1deb39db091a08 100644 --- a/Resources/Locale/en-US/medical/components/healing-component.ftl +++ b/Resources/Locale/en-US/medical/components/healing-component.ftl @@ -1,3 +1,4 @@ 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-popup-target = {CAPITALIZE(THE($user))} is trying to heal you with the {$item}!