tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add popup for healing target (#29804)

Browse Source 
* Add popup for healing target

* hop

* huh

* fix one

* fix showing popup to all
This commit is contained in:
lzk
2024-07-09 10:41:47 +02:00
committed by GitHub
parent 9bf3c33cca
commit 74d9ac7241
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Medical/HealingSystem.cs
View File

@@ -10,12 +10,14 @@ using Content.Shared.Damage;
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.DoAfter; using Content.Shared.DoAfter;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.IdentityManagement;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Interaction.Events; using Content.Shared.Interaction.Events;
using Content.Shared.Medical; using Content.Shared.Medical;
using Content.Shared.Mobs; using Content.Shared.Mobs;
using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
using Content.Shared.Popups;
using Content.Shared.Stacks; using Content.Shared.Stacks;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Random; using Robust.Shared.Random;
@@ -188,6 +190,12 @@ public sealed class HealingSystem : EntitySystem
var isNotSelf = user != target; 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 var delay = isNotSelf
? component.Delay ? component.Delay
: component.Delay * GetScaledHealingPenalty(user, component); : component.Delay * GetScaledHealingPenalty(user, component);

1
Resources/Locale/en-US/medical/components/healing-component.ftl
View File

@@ -1,3 +1,4 @@
medical-item-finished-using = You have finished healing with the {$item} 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-cant-use = There is no damage you can heal with the {$item}
medical-item-stop-bleeding = They have stopped bleeding medical-item-stop-bleeding = They have stopped bleeding
medical-item-popup-target = {CAPITALIZE(THE($user))} is trying to heal you with the {$item}!