From 705999f77994cedb1ee5a070a774659b4c712f27 Mon Sep 17 00:00:00 2001 From: Rane <60792108+Elijahrane@users.noreply.github.com> Date: Tue, 22 Feb 2022 00:18:07 -0500 Subject: [PATCH] More feedback for emag recharging (#6835) --- Content.Shared/Emag/Systems/SharedEmagSystem.cs | 7 +++++++ Resources/Locale/en-US/emag/emag.ftl | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Emag/Systems/SharedEmagSystem.cs b/Content.Shared/Emag/Systems/SharedEmagSystem.cs index 2714210fa2..70fad6f08f 100644 --- a/Content.Shared/Emag/Systems/SharedEmagSystem.cs +++ b/Content.Shared/Emag/Systems/SharedEmagSystem.cs @@ -27,7 +27,14 @@ namespace Content.Shared.Emag.Systems private void OnExamine(EntityUid uid, EmagComponent component, ExaminedEvent args) { + float timeRemaining = component.RechargeTime - component.Accumulator; args.PushMarkup(Loc.GetString("emag-charges-remaining", ("charges", component.Charges))); + if (component.Charges == component.MaxCharges) + { + args.PushMarkup(Loc.GetString("emag-max-charges")); + return; + } + args.PushMarkup(Loc.GetString("emag-recharging", ("seconds", Math.Round(timeRemaining)))); } private void OnAfterInteract(EntityUid uid, EmagComponent component, AfterInteractEvent args) diff --git a/Resources/Locale/en-US/emag/emag.ftl b/Resources/Locale/en-US/emag/emag.ftl index dbefd57c88..0f4648be5e 100644 --- a/Resources/Locale/en-US/emag/emag.ftl +++ b/Resources/Locale/en-US/emag/emag.ftl @@ -1,3 +1,5 @@ emag-success = The card zaps something in {THE($target)}. emag-no-charges = No charges left! -emag-charges-remaining = It has {$charges} charges remaining. +emag-charges-remaining = It has [color=fuchsia]{$charges}[/color] charges remaining. +emag-max-charges = It's at [color=green]maximum[/color] charges. +emag-recharging = There are [color=yellow]{$seconds}[/color] seconds left until the next charge.