shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

also makes martial artists spend stamina on disarm aaah

Browse Source
This commit is contained in:
necromanceranne
2020-04-15 20:07:01 +10:00
parent 4d1abaad3a
commit 61df831216
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species.dm
+5 -3
View File
@@ -1615,8 +1615,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
"You hear a slap." "You hear a slap."
) )
return FALSE return FALSE
else if(attacker_style && attacker_style.disarm_act(user,target))
return 1
else else
user.do_attack_animation(target, ATTACK_EFFECT_DISARM) user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
@@ -1624,7 +1623,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
user.adjustStaminaLossBuffered(1) user.adjustStaminaLossBuffered(1)
else else
user.adjustStaminaLossBuffered(3) user.adjustStaminaLossBuffered(3)
if(attacker_style && attacker_style.disarm_act(user,target))
return TRUE
if(target.w_uniform) if(target.w_uniform)
target.w_uniform.add_fingerprint(user) target.w_uniform.add_fingerprint(user)
//var/randomized_zone = ran_zone(user.zone_selected) CIT CHANGE - comments out to prevent compiling errors //var/randomized_zone = ran_zone(user.zone_selected) CIT CHANGE - comments out to prevent compiling errors