From aca4555b821452bb69a13dd8ae4ff9ea5c1ee11e Mon Sep 17 00:00:00 2001
From: BIGZi0348 <118811750+BIGZi0348@users.noreply.github.com>
Date: Mon, 11 Nov 2024 09:59:00 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B8=D0=BA=D0=B8=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=82=20=D1=81=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=85=D1=83=D1=80=D0=BE=D1=87=D0=BD=D0=BE=20(#781)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs   | 7 +++++--
 .../_White/Medical/BodyScanner/BodyScannerConsoleSystem.cs | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs
index c2aea122f8..4e2d19f8bd 100644
--- a/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs
+++ b/Content.Client/_White/Medical/BodyScanner/BodyScannerConsoleWindow.xaml.cs
@@ -93,12 +93,12 @@ namespace Content.Client._White.Medical.BodyScanner
             CurrentThirst.Text = Loc.GetString("body-scanner-console-window-thirst-current-thirst-text",
                 ("amount", $"{state.CurrentThirst:f1}"));
             CurrentThirstStatus.Text = Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-text",
-                ("status", Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-" + state.CurrentThirstThreshold)));
+                ("status", Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-" + state.CurrentThirstThreshold)));
 
             CurrentHunger.Text = Loc.GetString("body-scanner-console-window-hunger-current-hunger-text",
                 ("amount", $"{state.CurrentHunger:f1}"));
             CurrentHungerStatus.Text = Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-text",
-                ("status", Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-" + state.CurrentHungerThreshold)));
+                ("status", Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-" + state.CurrentHungerThreshold)));
 
             BloodSolutionVolume.Text = Loc.GetString("body-scanner-console-window-blood-solutions-volume-group-text",
                 ("amount", $"{state.BloodSolution.Volume.Float():f1}"),
@@ -127,6 +127,9 @@ namespace Content.Client._White.Medical.BodyScanner
             });
 
             // Third column.
+            if (state.DeadThreshold == FixedPoint2.Zero)
+                state.DeadThreshold = 0.01;
+
             HealthBar.Value = 1 - (state.TotalDamage / state.DeadThreshold).Float();
 
             HealthBar.ForegroundStyleBoxOverride = new StyleBoxFlat()
diff --git a/Content.Server/_White/Medical/BodyScanner/BodyScannerConsoleSystem.cs b/Content.Server/_White/Medical/BodyScanner/BodyScannerConsoleSystem.cs
index ea6dd1e500..ec00437c3f 100644
--- a/Content.Server/_White/Medical/BodyScanner/BodyScannerConsoleSystem.cs
+++ b/Content.Server/_White/Medical/BodyScanner/BodyScannerConsoleSystem.cs
@@ -354,7 +354,7 @@ namespace Content.Server._White.Medical.BodyScanner
                 ("amount", $"{state.CurrentThirst:f1}")));
             text.AppendLine(Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-text",
                 ("status",
-                    Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-" +
+                    Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-" +
                                   state.CurrentThirstThreshold))));
             text.AppendLine();
 
@@ -363,7 +363,7 @@ namespace Content.Server._White.Medical.BodyScanner
                 ("amount", $"{state.CurrentHunger:f1}")));
             text.AppendLine(Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-text",
                 ("status",
-                    Loc.GetString("body-scanner-console-window-thirst-current-thirst-status-" +
+                    Loc.GetString("body-scanner-console-window-hunger-current-hunger-status-" +
                                   state.CurrentHungerThreshold))));
             text.AppendLine();