From 93c5e868579c0bd1baec8c6d023d98f530b63c44 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Sun, 5 May 2024 19:32:43 -0400 Subject: [PATCH] Add solution temperature to chemical analysis goggles (#27693) yes --- .../EntitySystems/SharedSolutionContainerSystem.cs | 7 +++++-- .../chemistry/components/solution-scanner-component.ftl | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs index e74c146380..4b91007085 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs @@ -733,7 +733,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem return; } - if (!CanSeeHiddenSolution(entity,args.Examiner)) + if (!CanSeeHiddenSolution(entity, args.Examiner)) return; var primaryReagent = solution.GetPrimaryReagentId(); @@ -832,7 +832,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem return; } - if (!CanSeeHiddenSolution(entity,args.User)) + if (!CanSeeHiddenSolution(entity, args.User)) return; var target = args.Target; @@ -881,6 +881,9 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem , ("amount", quantity))); } + msg.PushNewline(); + msg.AddMarkup(Loc.GetString("scannable-solution-temperature", ("temperature", Math.Round(solution.Temperature)))); + return msg; } diff --git a/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl b/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl index 8dbbaf3edd..51a049aab1 100644 --- a/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl +++ b/Resources/Locale/en-US/chemistry/components/solution-scanner-component.ftl @@ -3,3 +3,4 @@ scannable-solution-verb-message = Examine the chemical composition. scannable-solution-main-text = It contains the following chemicals: scannable-solution-empty-container = It contains no chemicals. scannable-solution-chemical = - {$amount}u [color={$color}]{$type}[/color] +scannable-solution-temperature = Solution temperature: {$temperature}K \ No newline at end of file -- 2.52.0