From 8d99c8c689bfacea4b891cdd0ae7989a28efb9ab Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Wed, 30 Sep 2015 03:04:15 +0200
Subject: [PATCH] Add cooldown to chirp emote

---
 code/modules/mob/living/carbon/human/emote.dm       |  3 ---
 .../mob/living/simple_animal/friendly/diona.dm      | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 95e60ade252..7c313c92057 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -17,8 +17,6 @@
 		if (I.implanted)
 			I.trigger(act, src)
 
-
-
 	//Emote Cooldown System (it's so simple!)
 	// proc/handle_emote_CD() located in [code\modules\mob\emote.dm]
 	var/on_CD = 0
@@ -42,7 +40,6 @@
 
 	if(on_CD == 1)		// Check if we need to suppress the emote attempt.
 		return			// Suppress emote, you're still cooling off.
-	//--FalseIncarnate
 
 	switch(act)
 		if("me")									//OKAY SO RANT TIME, THIS FUCKING HAS TO BE HERE OR A SHITLOAD OF THINGS BREAK
diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm
index f4d1dc0ffc2..95caf726186 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona.dm
@@ -249,7 +249,18 @@
 	return
 
 /mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null)
-	if(stat)	return
+	if(stat)	
+		return
+		
+	var/on_CD = 0
+	switch(act)
+		if("chirp")
+			on_CD = handle_emote_CD()			
+		else
+			on_CD = 0	
+
+	if(on_CD == 1)
+		return			
 
 	switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain.
 		if("chirp")