cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Damage Readout Tweak (#14121)

Browse Source
This commit is contained in:
VisVirific
2022-05-31 12:07:49 -03:00
committed by GitHub
parent 105c83b555
commit d91d2bcbf4
4 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/body_scanner.dm
View File

@@ -751,7 +751,7 @@
if(!AN && !open && !infected && !imp) if(!AN && !open && !infected && !imp)
AN = "None:" AN = "None:"
if(!e.is_stump()) if(!e.is_stump())
dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[get_severity(e.brute_dam, TRUE)]</td><td>[robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]</td>" dat += "<td>[e.name]</td><td>[get_severity(e.burn_dam, TRUE)]</td><td>[get_severity(e.brute_dam, TRUE)]</td><td>[robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]</td>"
else else
dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not [e.is_stump() ? "Found" : "Attached Completely"]</td>" dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not [e.is_stump() ? "Found" : "Attached Completely"]</td>"
dat += "</tr>" dat += "</tr>"

2
code/game/machinery/computer/Operating.dm
View File

@@ -317,7 +317,7 @@
if(!AN && !open && !infected && !imp) if(!AN && !open && !infected && !imp)
AN = "None:" AN = "None:"
if(!e.is_stump()) if(!e.is_stump())
dat += "<td>[e.name]</td><td>[e.burn_dam]</td><td>[get_severity(e.brute_dam, TRUE)]</td><td>[robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]</td>" dat += "<td>[e.name]</td><td>[get_severity(e.burn_dam, TRUE)]</td><td>[get_severity(e.brute_dam, TRUE)]</td><td>[robot][bled][AN][splint][open][infected][imp][dislocated][internal_bleeding][severed_tendon][lung_ruptured]</td>"
else else
dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not [e.is_stump() ? "Found" : "Attached Completely"]</td>" dat += "<td>[e.name]</td><td>-</td><td>-</td><td>Not [e.is_stump() ? "Found" : "Attached Completely"]</td>"
dat += "</tr>" dat += "</tr>"

4
code/game/objects/items/devices/scanners.dm
View File

@@ -53,6 +53,10 @@ BREATH ANALYZER
var/output = "none" var/output = "none"
if(!amount) if(!amount)
output = "none" output = "none"
else if(amount > 100)
output = "fatal"
else if(amount > 75)
output = "critical"
else if(amount > 50) else if(amount > 50)
output = "severe" output = "severe"
else if(amount > 25) else if(amount > 25)

7
html/changelogs/more_damage_readouts.yml Normal file
View File

@@ -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."