From 9a4e5a2c81087e0afe445e40f8ad219ae0ae084b Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 18 Nov 2021 12:48:17 +0000
Subject: [PATCH] [MIRROR] the ultimate hulk nerf [MDB IGNORE] (#9540)

* the ultimate hulk nerf (#62891)

* the ultimate hulk nerf

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
---
 code/modules/mob/living/carbon/human/human_defense.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 7e2db58a2c7..24249aa80bc 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -198,7 +198,9 @@
 	if(!.)
 		return
 	var/hulk_verb = pick("smash","pummel")
-	if(check_shields(user, 15, "the [hulk_verb]ing"))
+	if(check_shields(user, 15, "the [hulk_verb]ing", attack_type = UNARMED_ATTACK))
+		return
+	if(check_block()) //everybody is kung fu fighting
 		return
 	playsound(loc, user.dna.species.attack_sound, 25, TRUE, -1)
 	visible_message(span_danger("[user] [hulk_verb]ed [src]!"), \