From 67bee9ad5f5a9beee223d4ffbcad16a4a06a4c2c Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 9 May 2016 03:10:40 -0400
Subject: [PATCH] missing ones

---
 code/modules/mob/living/simple_animal/bot/emote.dm    |  1 +
 .../mob/living/simple_animal/friendly/diona.dm        | 11 ++++++-----
 .../modules/mob/living/simple_animal/simple_animal.dm |  5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/bot/emote.dm b/code/modules/mob/living/simple_animal/bot/emote.dm
index 4054e520ecf..0c8b591f069 100644
--- a/code/modules/mob/living/simple_animal/bot/emote.dm
+++ b/code/modules/mob/living/simple_animal/bot/emote.dm
@@ -11,6 +11,7 @@
 	//Emote Cooldown System (it's so simple!)
 	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
 	var/on_CD = 0
+	act = lowertext(act)
 	switch(act)
 		//Cooldown-inducing emotes
 		if("scream", "screams")
diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm
index 4606558d271..f62176ee926 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona.dm
@@ -250,18 +250,19 @@
 	return
 
 /mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null)
-	if(stat)	
+	if(stat)
 		return
-		
+
 	var/on_CD = 0
+	act = lowertext(act)
 	switch(act)
 		if("chirp")
-			on_CD = handle_emote_CD()			
+			on_CD = handle_emote_CD()
 		else
-			on_CD = 0	
+			on_CD = 0
 
 	if(on_CD == 1)
-		return			
+		return
 
 	switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain.
 		if("chirp")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 23477c2fc18..1a1cb2b9972 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -269,8 +269,9 @@
 	return
 
 /mob/living/simple_animal/emote(var/act, var/m_type=1, var/message = null)
-	if(stat)	return
-
+	if(stat)
+		return
+	act = lowertext(act)
 	switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain.
 		if("scream")
 			message = "<B>\The [src]</B> whimpers."