diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm index cce6649c855..4ad30a42d7d 100644 --- a/code/modules/organs/pain.dm +++ b/code/modules/organs/pain.dm @@ -79,7 +79,7 @@ msg = "[burning ? species.organ_low_burn_message : species.organ_low_pain_message]" if(11 to 60) msg = "[burning ? species.organ_med_burn_message : species.organ_med_pain_message]" - if(70 to 10000) + if(61 to INFINITY) msg = "[burning ? species.organ_high_burn_message : species.organ_high_pain_message]" msg = replacetext(msg, "%PARTNAME%", damaged_organ.name) custom_pain(msg, maxdam, prob(30), damaged_organ, TRUE) diff --git a/html/changelogs/llywelwyn-painmsg.yml b/html/changelogs/llywelwyn-painmsg.yml new file mode 100644 index 00000000000..bf5aad7a0a9 --- /dev/null +++ b/html/changelogs/llywelwyn-painmsg.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: Llywelwyn + +# 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 missing organ pain messages at 61-69 damage."