Skip to content

Commit e7ca55b

Browse files
authored
bufix: nutcracker now respects shields and martial arts (#6646)
* Update weaponry.dm * упс.
1 parent 01509c0 commit e7ca55b

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

code/game/objects/items/weapons/weaponry.dm

+10-2
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,17 @@
472472
victim.Stun(3 SECONDS)
473473

474474
if(ishuman(victim))
475-
victim.apply_damage(stamina_damage, STAMINA, blocked = victim.getarmor(user.zone_selected, MELEE))
475+
var/mob/living/carbon/human/human_victim = target
476+
477+
if(human_victim.check_shields(src, 25))
478+
return
479+
480+
if(check_martial_counter(human_victim, user))
481+
return
482+
483+
human_victim.apply_damage(stamina_damage, STAMINA, blocked = victim.getarmor(user.zone_selected, MELEE))
476484
if(prob(30))
477-
victim.Knockdown(3 SECONDS)
485+
human_victim.Knockdown(3 SECONDS)
478486

479487
/obj/item/melee/ghostface_knife
480488
name = "Knife"

0 commit comments

Comments
 (0)