From add4c8c672a1ef45a143d6044e9daaf342bf53c9 Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 17 Sep 2011 15:54:34 +0000
Subject: [PATCH] You can now emote using the 'me' command as a simple animal.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2213 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/mob/simple_animal/life.dm | 2 +-
 code/modules/mob/say.dm                | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/defines/mob/simple_animal/life.dm b/code/defines/mob/simple_animal/life.dm
index 87eee5a5626..6fc32533200 100644
--- a/code/defines/mob/simple_animal/life.dm
+++ b/code/defines/mob/simple_animal/life.dm
@@ -139,7 +139,7 @@
 					movement_target.attack_animal(src)
 				else if(ishuman(movement_target.loc) )
 					if(prob(20))
-						emote("stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")
+						emote("", 0, "stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")
 
 /mob/living/simple_animal/New()
 	..()
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 19ae89db22e..4710ec76ea1 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -14,8 +14,13 @@
 /mob/verb/me_verb(message as text)
 	set name = "Me"
 	set category = "IC"
+
 	message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
-	usr.emote("me",1,message)
+
+	if(ishuman(src))
+		usr.emote("me",1,message)
+	else
+		usr.emote(message)
 
 /mob/proc/say_dead(var/message)
 	var/name = src.real_name