From 146462cbc6f17e44effd4661a4b871c7ffe3a26e Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Sat, 22 Jun 2013 21:55:22 -0700
Subject: [PATCH] Fixes #2740

---
 .../modules/mob/living/silicon/robot/emote.dm | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 4fa8a543b9..6b94c52c6d 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -10,7 +10,18 @@
 
 	switch(act)
 		if ("me")
-			return custom_emote(m_type, message)
+			if (src.client)
+				if(client.prefs.muted & MUTE_IC)
+					src << "You cannot send IC messages (muted)."
+					return
+				if (src.client.handle_spam_prevention(message,MUTE_IC))
+					return
+			if (stat)
+				return
+			if(!(message))
+				return
+			else
+				return custom_emote(m_type, message)
 
 		if ("custom")
 			return custom_emote(m_type, message)
@@ -62,20 +73,6 @@
 				message = "<B>[src]</B> flaps his wings ANGRILY!"
 				m_type = 2
 
-		if ("me")
-			if (src.client)
-				if(client.prefs.muted & MUTE_IC)
-					src << "You cannot send IC messages (muted)."
-					return
-				if (src.client.handle_spam_prevention(message,MUTE_IC))
-					return
-			if (stat)
-				return
-			if(!(message))
-				return
-			else
-				message = "<B>[src]</B> [message]"
-
 		if ("twitch")
 			message = "<B>[src]</B> twitches violently."
 			m_type = 1
@@ -207,8 +204,12 @@
 				m_type = 2
 			else
 				src << "You are not security."
+
+		if ("help")
+			src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt"
 		else
-			src << text("Invalid Emote: []", act)
+			src << "\blue Unusable emote '[act]'. Say *help for a list."
+
 	if ((message && src.stat == 0))
 		if (m_type & 1)
 			for(var/mob/O in viewers(src, null))