From dc08268e67473b07e6496529b5491e23cce386d2 Mon Sep 17 00:00:00 2001 From: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:37:58 -0400 Subject: [PATCH] Fixes Gloves of the North Star exploit. (#15762) * Fixes Gloves of the North Star exploit. * Update miscellaneous.dm * Update miscellaneous.dm * Create miscellaneous.dm * Update code/modules/clothing/gloves/miscellaneous.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * Update code/modules/clothing/gloves/miscellaneous.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- code/modules/clothing/gloves/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 9292bd85292..a6ece08feee 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -166,7 +166,7 @@ var/mob/living/M = loc if(M.a_intent in accepted_intents) - if(istype(M.mind.martial_art, /datum/martial_art/cqc)) + 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)