From 63da5d4064a6bc0e82318a8b05dfc5d03fff0f21 Mon Sep 17 00:00:00 2001 From: Jabak <163307958+Jabaks@users.noreply.github.com> Date: Mon, 8 Jul 2024 21:24:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=81=D0=BF=D0=BB=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D1=8E=D1=89=D0=B5=D0=B5=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D0=B8=D1=81=D1=86=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=86=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Medical/HealingSystem.cs | 10 ++++++++++ .../ru-RU/medical/components/healing-component.ftl | 2 ++ 2 files changed, 12 insertions(+) diff --git a/Content.Server/Medical/HealingSystem.cs b/Content.Server/Medical/HealingSystem.cs index fb6883dfd1..e12113d629 100644 --- a/Content.Server/Medical/HealingSystem.cs +++ b/Content.Server/Medical/HealingSystem.cs @@ -10,12 +10,14 @@ using Content.Shared.Damage; 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; @@ -189,6 +191,14 @@ public sealed class HealingSystem : EntitySystem var isNotSelf = user != target; + //Amour + if (isNotSelf) + { + var msg = Loc.GetString("medical-item-popup-target", ("user", Identity.Entity(user, EntityManager)), ("item", uid)); + _popupSystem.PopupEntity(msg, target, target, PopupType.Medium); + } + //Amour + var delay = isNotSelf ? component.Delay : component.Delay * GetScaledHealingPenalty(user, component); diff --git a/Resources/Locale/ru-RU/medical/components/healing-component.ftl b/Resources/Locale/ru-RU/medical/components/healing-component.ftl index 2336039081..be8739e51c 100644 --- a/Resources/Locale/ru-RU/medical/components/healing-component.ftl +++ b/Resources/Locale/ru-RU/medical/components/healing-component.ftl @@ -1,3 +1,5 @@ medical-item-finished-using = Вы закончили исцеление с помощью { $item } medical-item-cant-use = Нет никаких повреждений, которые вы могли бы залечить с помощью { $item } medical-item-stop-bleeding = Оно перестало кровоточить +#Amour +medical-item-popup-target = {CAPITALIZE(THE($user))} пытается исцелить тебя с помощью {$item}!