From 56c1f8164289cf19bd8b1afcef435e4aeb48f204 Mon Sep 17 00:00:00 2001 From: Farie82 Date: Fri, 1 Oct 2021 22:52:28 +0200 Subject: [PATCH] Makes disabled martial arts not block north-star (#16838) --- code/modules/clothing/gloves/miscellaneous.dm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index ac6477a81e5..bf52be51cdb 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -165,12 +165,10 @@ /obj/item/clothing/gloves/fingerless/rapid/Touch(mob/living/target, proximity = TRUE) var/mob/living/M = loc - if(M.a_intent in accepted_intents) - if(M.mind.martial_art || HAS_TRAIT(M, TRAIT_HULK)) - M.changeNext_move(CLICK_CD_MELEE)//normal attack speed for hulk, CQC and Carp. - else - M.changeNext_move(click_speed_modifier) - .= FALSE + if((M.a_intent in accepted_intents) && !M.mind.martial_art?.can_use(M) && !HAS_TRAIT(M, TRAIT_HULK)) + M.changeNext_move(click_speed_modifier) + + return FALSE /obj/item/clothing/gloves/fingerless/rapid/admin name = "advanced interactive gloves"