Fixes and Updates CQC

This commit is contained in:
Fox McCloud
2018-11-24 00:31:23 -05:00
parent df0e50261e
commit 4969a03e94
10 changed files with 79 additions and 64 deletions
+1 -8
View File
@@ -562,11 +562,4 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
return TRUE
/obj/item/attack_hulk(mob/living/carbon/human/user)
return FALSE
/obj/item/proc/check_martial_counter(mob/living/carbon/human/target, mob/living/carbon/human/user) //handles block for CQC
if(target.check_block())
target.visible_message("<span class='danger'>[target.name] blocks [src] and twists [user]'s arm behind [user.p_their()] back!</span>",
"<span class='userdanger'>You block the attack!</span>")
user.Stun(2)
return TRUE
return FALSE