From 61df8312162aef8ee8bcdac8d4c8ebc4101b1df3 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Wed, 15 Apr 2020 20:07:01 +1000 Subject: [PATCH] also makes martial artists spend stamina on disarm aaah --- code/modules/mob/living/carbon/human/species.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 0d42bd036f..e37b7b0e35 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1615,8 +1615,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) "You hear a slap." ) return FALSE - else if(attacker_style && attacker_style.disarm_act(user,target)) - return 1 + else user.do_attack_animation(target, ATTACK_EFFECT_DISARM) @@ -1624,7 +1623,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) user.adjustStaminaLossBuffered(1) else user.adjustStaminaLossBuffered(3) - + + if(attacker_style && attacker_style.disarm_act(user,target)) + return TRUE + if(target.w_uniform) target.w_uniform.add_fingerprint(user) //var/randomized_zone = ran_zone(user.zone_selected) CIT CHANGE - comments out to prevent compiling errors