From 37b964af162cfb4798a15dc511872db418f3ea5d Mon Sep 17 00:00:00 2001
From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Date: Thu, 16 Mar 2023 23:20:35 -0400
Subject: [PATCH] slap emote also works

---
 code/modules/mob/living/carbon/human/human_emote.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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, "<span class='notice'>You ready your slapping hand.</span>")
 	else