Merge pull request #1934 from Spacemanspark/master

Fixes *halt spam.

code/modules/mob/living/silicon/robot/emote.dm

@@ -13,7 +13,7 @@
 	var/on_CD = 0
 	switch(act)
 		//Cooldown-inducing emotes
-		if("ping","buzz","beep","law","flip")		//halt is exempt because it's used to stop criminal scum
+		if("ping","buzz","beep","law","flip","halt")		//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
 			on_CD = handle_emote_CD()			//proc located in code\modules\mob\emote.dm
 		//Everything else, including typos of the above emotes
 		else
@@ -237,4 +237,4 @@
 		else
 			for(var/mob/O in hearers(src, null))
 				O.show_message(message, m_type)
-	return
+	return