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();