From 5be382a59cd63479176b4a12067922aefaf7d138 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 25 Sep 2016 23:19:05 -0500 Subject: [PATCH] Lessens the amount of pain from burns --- code/modules/mob/living/carbon/shock.dm | 2 +- html/changelogs/Anewbe - BurnCrit.yml | 36 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Anewbe - BurnCrit.yml diff --git a/code/modules/mob/living/carbon/shock.dm b/code/modules/mob/living/carbon/shock.dm index 370d3f89d2..16085b05af 100644 --- a/code/modules/mob/living/carbon/shock.dm +++ b/code/modules/mob/living/carbon/shock.dm @@ -10,7 +10,7 @@ src.traumatic_shock = \ 1 * src.getOxyLoss() + \ 0.7 * src.getToxLoss() + \ - 1.5 * src.getFireLoss() + \ + 1.2 * src.getFireLoss() + \ 1.2 * src.getBruteLoss() + \ 1.7 * src.getCloneLoss() + \ 2 * src.halloss + \ diff --git a/html/changelogs/Anewbe - BurnCrit.yml b/html/changelogs/Anewbe - BurnCrit.yml new file mode 100644 index 0000000000..9f470b34f1 --- /dev/null +++ b/html/changelogs/Anewbe - BurnCrit.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: Anewbe + +# 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: + - tweak: "Pain from burn damage is now equal to that of brute damage." \ No newline at end of file