From 397605fe26835cda115b82c7cdde809c3aa25db3 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 27 Feb 2021 15:01:40 +0200 Subject: [PATCH] Chemical Burn Damage Cap Tweak (#11251) --- code/modules/reagents/Chemistry-Holder.dm | 4 ++-- html/changelogs/geeves-no_hand_cannon.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/geeves-no_hand_cannon.yml diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 52435010051..dcdeff4c8ad 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -349,11 +349,11 @@ return var/temperature = src.get_temperature() if(temperature >= REAGENTS_BURNING_TEMP_HIGH) - var/burn_damage = Clamp(total_volume*(temperature - REAGENTS_BURNING_TEMP_HIGH)*REAGENTS_BURNING_TEMP_HIGH_DAMAGE,0,REAGENTS_BURNING_TEMP_HIGH_DAMAGE_CAP) + var/burn_damage = Clamp(total_volume*(temperature - REAGENTS_BURNING_TEMP_HIGH)*REAGENTS_BURNING_TEMP_HIGH_DAMAGE,0,min(total_volume*2,REAGENTS_BURNING_TEMP_HIGH_DAMAGE_CAP)) target.adjustFireLoss(burn_damage) target.visible_message(SPAN_DANGER("The hot liquid burns [target]!")) else if(temperature <= REAGENTS_BURNING_TEMP_LOW) - var/burn_damage = Clamp(total_volume*(REAGENTS_BURNING_TEMP_LOW - temperature)*REAGENTS_BURNING_TEMP_LOW_DAMAGE,0,REAGENTS_BURNING_TEMP_LOW_DAMAGE_CAP) + var/burn_damage = Clamp(total_volume*(REAGENTS_BURNING_TEMP_LOW - temperature)*REAGENTS_BURNING_TEMP_LOW_DAMAGE,0,min(total_volume*2,REAGENTS_BURNING_TEMP_LOW_DAMAGE_CAP)) target.adjustFireLoss(burn_damage) target.visible_message(SPAN_DANGER("The freezing liquid burns [target]!")) diff --git a/html/changelogs/geeves-no_hand_cannon.yml b/html/changelogs/geeves-no_hand_cannon.yml new file mode 100644 index 00000000000..77d17dab825 --- /dev/null +++ b/html/changelogs/geeves-no_hand_cannon.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Superheated or supercooled chemical damage caps are now also calculated by total volume, so spritzing someone doesn't do 40 damage a pop." \ No newline at end of file