From 3a562c3e9c5b5870c7e68bd9d89ceeb8a0b59991 Mon Sep 17 00:00:00 2001
From: Garen Crownguard <22408776+Garen7@users.noreply.github.com>
Date: Wed, 5 Jun 2019 01:41:39 -0500
Subject: [PATCH] No more cross map punches (#44305)

* *me no longer a valid warcry

* whoops
---
 code/modules/clothing/gloves/miscellaneous.dm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 3b11613f580..0c723e3c385 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -75,5 +75,7 @@
 
 /obj/item/clothing/gloves/rapid/attack_self(mob/user)
 	var/input = stripped_input(user,"What do you want your battlecry to be? Max length of 6 characters.", ,"", 7)
-	if(input)
+	if(input == "*me") //If they try to do a *me emote it will stop the attack to prompt them for an emote then they can walk away and enter the emote for a punch from far away
+		to_chat(user, "Invalid battlecry, please use another.")
+	else if(input)
 		warcry = input