diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index fcc51e9f13d..0892d7ea1a4 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -6,6 +6,8 @@
 	src.stat = 2
 	src.dizziness = 0
 	src.jitteriness = 0
+	src.sleeping = 0
+	src.sleeping_willingly = 0
 
 	tension_master.death(src)
 
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 4be5616d753..960de60b470 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -74,7 +74,14 @@
 			if(!(message))
 				return
 			else
-				message = "<B>[src]</B> [message]"
+				if(cmptext(copytext(message, 1, 3), "v "))
+					message = "<B>[src]</B> [copytext(message, 3)]"
+					m_type = 1
+				else if(cmptext(copytext(message, 1, 3), "h "))
+					message = "<B>[src]</B> [copytext(message, 3)]"
+					m_type = 2
+				else
+					message = "<B>[src]</B> [message]"
 
 		if ("salute")
 			if (!src.buckled)
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index fb07c374e72..7d6740e9136 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -100,6 +100,7 @@
 				message = "<B>[src]</B> glares at [param]."
 			else
 				message = "<B>[src]</B> glares."
+			m_type = 1
 
 		if ("stare")
 			var/M = null
@@ -115,6 +116,7 @@
 				message = "<B>[src]</B> stares at [param]."
 			else
 				message = "<B>[src]</B> stares."
+			m_type = 1
 
 		if ("look")
 			var/M = null
@@ -132,6 +134,7 @@
 			else
 				message = "<B>[src]</B> looks."
 			m_type = 1
+
 		if("beep")
 			var/M = null
 			if(param)
@@ -147,7 +150,8 @@
 			else
 				message = "<B>[src]</B> beeps."
 			playsound(src.loc, 'twobeep.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
 		if("ping")
 			var/M = null
 			if(param)
@@ -163,7 +167,8 @@
 			else
 				message = "<B>[src]</B> pings."
 			playsound(src.loc, 'ping.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
 		if("buzz")
 			var/M = null
 			if(param)
@@ -179,7 +184,11 @@
 			else
 				message = "<B>[src]</B> buzzes."
 			playsound(src.loc, 'buzz-sigh.ogg', 50, 0)
-			m_type = 1
+			m_type = 2
+
+		if("help")
+			src << "beep-(none)/mob, ping-(none)/mob, buzz-(none)/mob, look-(none)/mob, stare-(none)/mob, glare-(none)/mob, twitch, twitch_s"
+
 		else
 			src << text("Invalid Emote: []", act)
 	if ((message && src.stat == 0))