cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing fulton pack not working (#26153)

Browse Source 
* 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>
This commit is contained in:
HMBGERDO
2024-07-07 05:48:08 +00:00
committed by GitHub
co-authored by 1080pCat
parent d075a682a0
commit 67353fd62a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+3 -3
View File
@@ -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, "<span class='warning'>Your armour has protected your [hit_area].</span>", "<span class='warning'>Your armour has softened hit to your [hit_area].</span>", 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)