From 67353fd62acbb05460152a624cd507fd74e44384 Mon Sep 17 00:00:00 2001
From: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Date: Sun, 7 Jul 2024 07:48:08 +0200
Subject: [PATCH] Fixing fulton pack not working (#26153)
* if the item has no damage, it is not autoblocked.
* armor check first
* Update code/modules/mob/living/carbon/human/human_defense.dm
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
---------
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
---
code/modules/mob/living/carbon/human/human_defense.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 9c8cfd9577a..c545b75d7c6 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -498,13 +498,13 @@ emp_act
send_item_attack_message(I, user, hit_area)
- if(!I.force)
- return FALSE //item force is zero
-
var/armor = run_armor_check(affecting, MELEE, "Your armour has protected your [hit_area].", "Your armour has softened hit to your [hit_area].", armour_penetration_flat = I.armour_penetration_flat, armour_penetration_percentage = I.armour_penetration_percentage)
if(armor == INFINITY)
return FALSE
+ if(!I.force)
+ return TRUE // item force is zero, it deals no damage, we do not apply damage
+
var/weapon_sharp = I.sharp
// do not roll for random blunt if the target mob is dead for the ease of decaps
if(stat != DEAD)