diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm index bfafb660ef5..1478918c646 100644 --- a/code/modules/mob/living/carbon/human/human_emote.dm +++ b/code/modules/mob/living/carbon/human/human_emote.dm @@ -268,7 +268,11 @@ . = ..() if(!.) return FALSE - var/obj/item/slapper/N = new(user) + var/obj/item/slapper/N + if(user.mind && user.mind.martial_art?.name == "CQC") + N = new /obj/item/slapper/cqc(user) + else + N = new /obj/item/slapper(user) if(user.put_in_hands(N)) to_chat(user, "You ready your slapping hand.") else