From d91d2bcbf47d4958e03db4800c946f8046a85c6e Mon Sep 17 00:00:00 2001 From: VisVirific Date: Tue, 31 May 2022 12:07:49 -0300 Subject: [PATCH] Damage Readout Tweak (#14121) --- code/game/machinery/body_scanner.dm | 2 +- code/game/machinery/computer/Operating.dm | 2 +- code/game/objects/items/devices/scanners.dm | 4 ++++ html/changelogs/more_damage_readouts.yml | 7 +++++++ 4 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/more_damage_readouts.yml diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index 72eb334e274..c7e19a37574 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -751,7 +751,7 @@ if(!AN && !open && !infected && !imp) AN = "None:" if(!e.is_stump()) - dat += "[e.name][e.burn_dam][get_severity(e.brute_dam, TRUE)][robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]" + dat += "[e.name][get_severity(e.burn_dam, TRUE)][get_severity(e.brute_dam, TRUE)][robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]" else dat += "[e.name]--Not [e.is_stump() ? "Found" : "Attached Completely"]" dat += "" diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 7d1bb94a5a5..4cd275c436d 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -317,7 +317,7 @@ if(!AN && !open && !infected && !imp) AN = "None:" if(!e.is_stump()) - dat += "[e.name][e.burn_dam][get_severity(e.brute_dam, TRUE)][robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]" + dat += "[e.name][get_severity(e.burn_dam, TRUE)][get_severity(e.brute_dam, TRUE)][robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]" else dat += "[e.name]--Not [e.is_stump() ? "Found" : "Attached Completely"]" dat += "" diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 77802b569ce..67308889c2f 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -53,6 +53,10 @@ BREATH ANALYZER var/output = "none" if(!amount) output = "none" + else if(amount > 100) + output = "fatal" + else if(amount > 75) + output = "critical" else if(amount > 50) output = "severe" else if(amount > 25) diff --git a/html/changelogs/more_damage_readouts.yml b/html/changelogs/more_damage_readouts.yml new file mode 100644 index 00000000000..038c66467a7 --- /dev/null +++ b/html/changelogs/more_damage_readouts.yml @@ -0,0 +1,7 @@ +author: Vrow + +delete-after: True + +changes: + - rscadd: "Added two more reading outputs for damage. The cap for damage readout now is Fatal (over 100 damage), in contrast to Severe (over 50 damage)." + - bugfix: "Fixed the Burn Severity reading from being hard numbers to the minor/moderate/significant/severe/critical/fatal."