From 47633e184ef9ccf2f69e7bc9924cfc86ed9178cf Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 16 Dec 2019 20:14:30 +0100 Subject: [PATCH] Nerfs adrenaline (#7668) Currently adrenaline allows you to keep standing after quite a lot of inflicted pain. That's because, for some reason, it's equal to tramadol in low dosage. That's a big no-no. --- .../Chemistry-Reagents-Medicine.dm | 7 ++-- html/changelogs/mattatlas-adrenalinefix.yml | 41 +++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/mattatlas-adrenalinefix.yml diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 08739d9df8b..4adbe2151d2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1471,10 +1471,11 @@ if(alien == IS_DIONA) return if(dose < 1) //not that effective after initial rush - M.add_chemical_effect(CE_PAINKILLER, min(20*volume, 80)) + M.add_chemical_effect(CE_PAINKILLER, min(15*volume, 35)) M.add_chemical_effect(CE_PULSE, 1) - M.add_chemical_effect(CE_PAINKILLER, min(10*volume, 20)) - M.add_chemical_effect(CE_PULSE, 2) + else + M.add_chemical_effect(CE_PAINKILLER, min(10*volume, 15)) + M.add_chemical_effect(CE_PULSE, 2) if(dose > 5) M.make_jittery(5) if(volume >= 5 && M.is_asystole()) diff --git a/html/changelogs/mattatlas-adrenalinefix.yml b/html/changelogs/mattatlas-adrenalinefix.yml new file mode 100644 index 00000000000..53764075378 --- /dev/null +++ b/html/changelogs/mattatlas-adrenalinefix.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: + - tweak: "Adrenaline has been nerfed."