From bf5c3131d847372b9ec0d2d5c8add093ff7b5874 Mon Sep 17 00:00:00 2001 From: farie82 Date: Sat, 19 Sep 2020 00:52:06 +0200 Subject: [PATCH] Unusable martial arts now doesn't block normal behaviour (#14377) --- code/modules/mob/living/carbon/human/species/_species.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 1ba796c0435..69518e96cf7 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -371,7 +371,7 @@ return /datum/species/proc/help(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style) - if(attacker_style && attacker_style.help_act(user, target))//adminfu only... + if(attacker_style && attacker_style.help_act(user, target) == TRUE)//adminfu only... return TRUE if(target.health >= HEALTH_THRESHOLD_CRIT && !(target.status_flags & FAKEDEATH)) target.help_shake_act(user) @@ -383,7 +383,7 @@ if(target.check_block()) target.visible_message("[target] blocks [user]'s grab attempt!") return FALSE - if(attacker_style && attacker_style.grab_act(user, target)) + if(attacker_style && attacker_style.grab_act(user, target) == TRUE) return TRUE else target.grabbedby(user) @@ -412,7 +412,7 @@ if(target.check_block()) target.visible_message("[target] blocks [user]'s attack!") return FALSE - if(attacker_style && attacker_style.harm_act(user, target)) + if(attacker_style && attacker_style.harm_act(user, target) == TRUE) return TRUE else var/datum/unarmed_attack/attack = user.dna.species.unarmed @@ -460,7 +460,7 @@ if(target.check_block()) target.visible_message("[target] blocks [user]'s disarm attempt!") return FALSE - if(attacker_style && attacker_style.disarm_act(user, target)) + if(attacker_style && attacker_style.disarm_act(user, target) == TRUE) return TRUE else add_attack_logs(user, target, "Disarmed", ATKLOG_ALL)