From 01b603b73c6cfe4558fd2ad5be755894e55acb98 Mon Sep 17 00:00:00 2001
From: CosmicScientist <brettdavies1995@gmail.com>
Date: Fri, 9 Oct 2015 21:21:16 +0100
Subject: [PATCH 1/2] Adds me to larva

---
 .../modules/mob/living/carbon/alien/larva/emote.dm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
index 286ee10a07d..95e3e7506e4 100644
--- a/code/modules/mob/living/carbon/alien/larva/emote.dm
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -1,4 +1,4 @@
-/mob/living/carbon/alien/larva/emote(var/act)
+/mob/living/carbon/alien/larva/emote(act,m_type=1,message = null)
 
 	var/param = null
 	if (findtext(act, "-", 1, null))
@@ -7,8 +7,6 @@
 		act = copytext(act, 1, t1)
 
 	var/muzzled = is_muzzled()
-	var/m_type = 1
-	var/message
 
 	switch(act) //Alphabetically sorted please.
 		if ("burp","burps")
@@ -26,6 +24,9 @@
 			if (!src.restrained())
 				message = "<span class='name'>[src]</span> dances around happily."
 				m_type = 1
+		if ("deathgasp","deathgasps")
+			message = "<span class='name'>[src]</span> lets out a sickly hiss of air and falls limply to the floor..."
+			m_type = 2
 		if ("drool","drools")
 			message = "<span class='name'>[src]</span> drools."
 			m_type = 1
@@ -42,6 +43,9 @@
 		if ("jump","jumps")
 			message = "<span class='name'>[src]</span> jumps!"
 			m_type = 1
+		if ("me")
+			..()
+			return
 		if ("moan","moans")
 			message = "<span class='name'>[src]</span> moans!"
 			m_type = 2
@@ -95,10 +99,10 @@
 				m_type = 2
 
 		if ("help") //"The exception"
-			src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, drool, gasp, gnarl, hiss, jump, moan, nod, roll, roar, scratch, screech, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
+			src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, deathgasp, drool, gasp, gnarl, hiss, jump, me, moan, nod, roll, roar, scratch, screech, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
 
 		else
-			src << "<span class='info'>Unusable emote '[act]'. Say *help for a list.</span>"
+			..(act)
 
 	if ((message && src.stat == 0))
 		log_emote("[name]/[key] : [message]")

From 582a3b0e1cdfd72130aa269bc158acc2dac4f031 Mon Sep 17 00:00:00 2001
From: CosmicScientist <CosmicScientist@users.noreply.github.com>
Date: Mon, 12 Oct 2015 13:30:27 +0100
Subject: [PATCH 2/2] Reverts line 105

Would cause more emotes than intended.
---
 code/modules/mob/living/carbon/alien/larva/emote.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm
index 95e3e7506e4..e7f9fc57901 100644
--- a/code/modules/mob/living/carbon/alien/larva/emote.dm
+++ b/code/modules/mob/living/carbon/alien/larva/emote.dm
@@ -102,7 +102,7 @@
 			src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, deathgasp, drool, gasp, gnarl, hiss, jump, me, moan, nod, roll, roar, scratch, screech, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"
 
 		else
-			..(act)
+			src << "<span class='info'>Unusable emote '[act]'. Say *help for a list.</span>"
 
 	if ((message && src.stat == 0))
 		log_emote("[name]/[key] : [message]")
@@ -110,4 +110,4 @@
 			visible_message(message)
 		else
 			audible_message(message)
-	return
\ No newline at end of file
+	return