From 5084665643e12fc09253aa6edecd8e487b4f7e21 Mon Sep 17 00:00:00 2001 From: Jackson <8786660+jacksonzck@users.noreply.github.com> Date: Thu, 28 Jul 2022 23:05:01 -0500 Subject: [PATCH] Salvage magnet accuracy fix (#10124) --- Content.Server/Salvage/SalvageSystem.cs | 2 +- Resources/Locale/en-US/salvage/salvage-system.ftl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.Server/Salvage/SalvageSystem.cs b/Content.Server/Salvage/SalvageSystem.cs index de82e89088..ffbd630daf 100644 --- a/Content.Server/Salvage/SalvageSystem.cs +++ b/Content.Server/Salvage/SalvageSystem.cs @@ -133,7 +133,7 @@ namespace Content.Server.Salvage if (_salvageGridStates.TryGetValue(magnetTranform.GridID, out var salvageGridState)) { var remainingTime = component.MagnetState.Until - salvageGridState.CurrentTime; - args.PushMarkup(Loc.GetString("salvage-system-magnet-examined-active", ("timeLeft", remainingTime.TotalSeconds))); + args.PushMarkup(Loc.GetString("salvage-system-magnet-examined-active", ("timeLeft", Math.Ceiling(remainingTime.TotalSeconds)))); } else { diff --git a/Resources/Locale/en-US/salvage/salvage-system.ftl b/Resources/Locale/en-US/salvage/salvage-system.ftl index ba7de639ee..91363d56bb 100644 --- a/Resources/Locale/en-US/salvage/salvage-system.ftl +++ b/Resources/Locale/en-US/salvage/salvage-system.ftl @@ -13,6 +13,9 @@ salvage-system-report-activate-success = The salvage magnet is pulling in a piec salvage-system-magnet-examined-inactive = The salvage magnet is inactive. salvage-system-magnet-examined-pulling-in = The salvage magnet is attempting to pull in salvage. -salvage-system-magnet-examined-active = The salvage magnet is holding salvage in place. Can hold for {$timeLeft} seconds. +salvage-system-magnet-examined-active = The salvage magnet is holding salvage in place. Can hold for { $timeLeft -> + [1] one second. + *[other] { $timeLeft } seconds. +} salvage-system-magnet-examined-releasing = The salvage magnet is releasing the salvage. salvage-system-magnet-examined-cooling-down = The salvage magnet is cooling down.