From da3532432abe235cbb8f32c87b3e63b9cd1f9abb Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sat, 6 Aug 2022 03:57:22 +0200 Subject: [PATCH] Health analyzers now properly read values with decimals. (#14457) Co-authored-by: Matt Atlas --- code/modules/mob/living/carbon/human/human.dm | 10 ++--- html/changelogs/mattatlas-pulsefix.yml | 41 +++++++++++++++++++ 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/mattatlas-pulsefix.yml diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 57c65413b06..ba6ff9812d6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1839,15 +1839,15 @@ switch(pulse()) if(PULSE_NONE) return 0 - if(PULSE_SLOW) + if(PULSE_SLOW to (PULSE_NORM - 0.1)) return rand(species.low_pulse, species.norm_pulse) - if(PULSE_NORM) + if(PULSE_NORM to (PULSE_FAST - 0.1)) return rand(species.norm_pulse, species.fast_pulse) - if(PULSE_FAST) + if(PULSE_FAST to (PULSE_2FAST - 0.1)) return rand(species.fast_pulse, species.v_fast_pulse) - if(PULSE_2FAST) + if(PULSE_2FAST to (PULSE_THREADY - 0.1)) return rand(species.v_fast_pulse, species.max_pulse) - if(PULSE_THREADY) + if(PULSE_THREADY to INFINITY) return PULSE_MAX_BPM return 0 diff --git a/html/changelogs/mattatlas-pulsefix.yml b/html/changelogs/mattatlas-pulsefix.yml new file mode 100644 index 00000000000..543111fc0e9 --- /dev/null +++ b/html/changelogs/mattatlas-pulsefix.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: "Health analyzers can now correctly read values with decimals instead of reporting 0bpm."