From 2ba621a7cbbc829314c6ad00f17986dc8f472b01 Mon Sep 17 00:00:00 2001
From: Matt Atlas <mattiathebest2000@hotmail.it>
Date: Sun, 7 Jan 2024 01:51:39 +0100
Subject: [PATCH] Fixed a rogue square bracket and a BPM repetition in the
 health analyzer scan results. (#18156)

* fix rogue bracket

* Fixes some health analyzer scan errors.

---------

Co-authored-by: Matt Atlas <liermattia@gmail.com>
---
 code/game/objects/items/devices/scanners.dm   |  7 ++--
 .../mattatlas-healthanalyzerfix.yml           | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/mattatlas-healthanalyzerfix.yml

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index d74c79e4513..fb8f24ade50 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -166,15 +166,16 @@ BREATH ANALYZER
 			pulse_result = "<span class='danger'>0</span>"
 		else
 			pulse_result = H.get_pulse(GETPULSE_TOOL)
-		pulse_result = "<span class='scan_green'>[pulse_result] BPM</span>"
 		if(H.pulse() == PULSE_NONE)
 			pulse_result = "<span class='scan_danger'>[pulse_result] BPM</span>"
 		else if(H.pulse() < PULSE_NORM)
 			pulse_result = "<span class='scan_notice'>[pulse_result] BPM</span>"
 		else if(H.pulse() > PULSE_NORM)
 			pulse_result = "<span class='scan_warning'>[pulse_result] BPM</span>"
+		else
+			pulse_result = "<span class='scan_green'>[pulse_result] BPM</span>"
 	else
-		pulse_result = "<span class='scan_danger'>0 BPM</span>"
+		pulse_result = "<span class='scan_danger'>0</span>"
 	dat += "Pulse rate: [pulse_result]"
 
 	// Body temperature. Rounds to one digit after decimal.
@@ -208,7 +209,7 @@ BREATH ANALYZER
 				blood_volume_string = "<span class='scan_danger'>\<[BLOOD_VOLUME_SURVIVE]%</span>"
 
 		var/oxygenation = H.get_blood_oxygenation()
-		var/oxygenation_string = "<span class='scan_green'>[oxygenation]]%</span>"
+		var/oxygenation_string = "<span class='scan_green'>[oxygenation]%</span>"
 		switch(oxygenation)
 			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 				oxygenation_string = "<span class='scan_notice'>[oxygenation]%</span>"
diff --git a/html/changelogs/mattatlas-healthanalyzerfix.yml b/html/changelogs/mattatlas-healthanalyzerfix.yml
new file mode 100644
index 00000000000..f9207eaddd4
--- /dev/null
+++ b/html/changelogs/mattatlas-healthanalyzerfix.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixed a rogue square bracket and a BPM repetition in the health analyzer scan results."