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