From 9307b005130ec09ff6d09af5cd89082417823670 Mon Sep 17 00:00:00 2001
From: Cael_Aislinn <cael_aislinn@yahoo.com.au>
Date: Thu, 9 Aug 2012 04:42:44 +1000
Subject: [PATCH] tweaks to simple_animal emotes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
---
 code/modules/mob/simple_animal/carp.dm               | 2 +-
 code/modules/mob/simple_animal/cat.dm                | 7 ++++++-
 code/modules/mob/simple_animal/simple_animal_misc.dm | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/modules/mob/simple_animal/carp.dm b/code/modules/mob/simple_animal/carp.dm
index a114a9582f7..127ddbf8ce6 100644
--- a/code/modules/mob/simple_animal/carp.dm
+++ b/code/modules/mob/simple_animal/carp.dm
@@ -152,7 +152,7 @@
 						//fire laser eyes
 						firing = 1
 						if(prob(40))
-							emote("auto",1,"[pick("makes an ominous whining noise!","makes a low humming noise!","begins charging up something!")]")
+							emote("[pick("makes an ominous whining noise!","makes a low humming noise!","begins charging up something!")]")
 
 						spawn(40)
 							if(!target_mob)
diff --git a/code/modules/mob/simple_animal/cat.dm b/code/modules/mob/simple_animal/cat.dm
index 9d63f2e465f..780c8041690 100644
--- a/code/modules/mob/simple_animal/cat.dm
+++ b/code/modules/mob/simple_animal/cat.dm
@@ -26,13 +26,18 @@
 			for(var/mob/living/simple_animal/mouse/M in view(1,src))
 				if(!M.stat)
 					M.splat()
-					emote("splats \the [M]")
+					emote(pick("\red splats the [M]!","\red toys with the [M]","worries the [M]"))
 					movement_target = null
 					stop_automated_movement = 0
 					break
 
 	..()
 
+	for(var/mob/living/simple_animal/mouse/snack in oview(src, 3))
+		if(prob(15))
+			emote(pick("hisses and spits!","mrowls fiercely!","eyes [snack] hungrily."))
+		break
+
 	if(!stat && !resting && !buckled)
 		turns_since_scan++
 		if(turns_since_scan > 5)
diff --git a/code/modules/mob/simple_animal/simple_animal_misc.dm b/code/modules/mob/simple_animal/simple_animal_misc.dm
index 7f96519708b..4fa50f03bab 100644
--- a/code/modules/mob/simple_animal/simple_animal_misc.dm
+++ b/code/modules/mob/simple_animal/simple_animal_misc.dm
@@ -41,7 +41,7 @@
 	for(var/mob/M in view(src,7))
 		M << "<b>[src]</b> [pick(speak_emote)], \"[message]\""
 
-/mob/living/simple_animal/emote(var/act,var/m_type=1,var/message = null)
+/mob/living/simple_animal/emote(var/message = null, var/m_type=1, var/act = "auto")
 	switch(act)
 		if ("scream")
 			message = "<B>[src]</B> makes a loud and pained whimper"