From fe6b2f60682b6db18d21fbc9b5923ea4f54fd566 Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Sat, 3 Jul 2021 00:01:17 +0200 Subject: [PATCH] Fixes mech immortality (#12137) Co-authored-by: TheGreyWolf --- code/modules/heavy_vehicle/mech_damage.dm | 4 ++-- html/changelogs/MechFix.yml | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/MechFix.yml diff --git a/code/modules/heavy_vehicle/mech_damage.dm b/code/modules/heavy_vehicle/mech_damage.dm index 007d1e61600..6d50bf2d6cd 100644 --- a/code/modules/heavy_vehicle/mech_damage.dm +++ b/code/modules/heavy_vehicle/mech_damage.dm @@ -88,9 +88,9 @@ //Only 2 types of damage concern mechs and vehicles switch(damagetype) if(BRUTE) - adjustBruteLoss(damage * BLOCKED_MULT(blocked), target) + adjustBruteLoss(damage, target) if(BURN) - adjustFireLoss(damage * BLOCKED_MULT(blocked), target) + adjustFireLoss(damage, target) if((damagetype == BRUTE || damagetype == BURN) && prob(25+(damage*2))) spark(src, 3) diff --git a/html/changelogs/MechFix.yml b/html/changelogs/MechFix.yml new file mode 100644 index 00000000000..08635b145be --- /dev/null +++ b/html/changelogs/MechFix.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Mechs are no longer immortal."