diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 86843d497a8..d002866ce85 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -48,7 +48,7 @@ src.victim = src.table.victim var/brain_result = victim.get_brain_status() if(victim.isFBP()) - brain_result = "normal" + brain_result = "N/A" dat += {" Patient Information:
Brain Activity: [brain_result]
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 4419bba4c21..6b1922a9fc9 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -113,7 +113,7 @@ BREATH ANALYZER pulse_result = 0 else pulse_result = H.get_pulse(GETPULSE_TOOL) - pulse_result = "[pulse_result]bpm" + pulse_result = "[pulse_result]" if(H.pulse() == PULSE_NONE) pulse_result = "[pulse_result]" else if(H.pulse() < PULSE_NORM) @@ -121,11 +121,8 @@ BREATH ANALYZER else if(H.pulse() > PULSE_NORM) pulse_result = "[pulse_result]" else - if(H.isFBP()) - pulse_result = "[rand(70, 85)]bpm" - else - pulse_result = "ERROR - Nonstandard biology" - dat += "Pulse rate: [pulse_result]." + pulse_result = "0" + dat += "Pulse rate: [pulse_result]bpm." // Blood pressure. Based on the idea of a normal blood pressure being 120 over 80. if(H.should_have_organ(BP_HEART)) @@ -152,10 +149,7 @@ BREATH ANALYZER blood_pressure_string = "[H.get_blood_pressure()]" dat += "[b]Blood pressure:[endb] [blood_pressure_string] ([oxygenation_string])" else - if(H.isFBP()) - dat += "[b]Blood pressure:[endb] [rand(118, 125)]/[rand(77, 85)] (100%)" - else - dat += "[b]Blood pressure:[endb] N/A" + dat += "[b]Blood pressure:[endb] N/A" // Body temperature. var/temperature_string diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 1a7c50f6329..ab6133d7b6a 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1160,8 +1160,6 @@ holder.icon_state = "0" // X_X else if(is_asystole()) holder.icon_state = "flatline" - else if(isFBP(src)) - holder.icon_state = "2" else holder.icon_state = "[pulse()]" hud_list[HEALTH_HUD] = holder diff --git a/html/changelogs/mattatlas-shellbadshell.yml b/html/changelogs/mattatlas-shellbadshell.yml new file mode 100644 index 00000000000..033f7b91bf4 --- /dev/null +++ b/html/changelogs/mattatlas-shellbadshell.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: + - rscdel: "Shells no longer fake a pulse on the medhud. In addition, they no longer fake a pulse or blood oxygenation on health analyzers."