From 93e37a6a0cc012c1e6bf0084eb3761475e975b26 Mon Sep 17 00:00:00 2001 From: Spamcat Date: Tue, 2 Apr 2013 23:25:34 +0400 Subject: [PATCH] Fix for mouse emotes, courtesy of nan0desu. #2613 --- code/modules/mob/living/simple_animal/simple_animal.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 131711916b8..bc25116ae52 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -224,9 +224,11 @@ return "[emote], \"[text]\"" return "says, \"[text]\""; -/mob/living/simple_animal/emote(var/act) +/mob/living/simple_animal/emote(var/act, var/type, var/desc) if(act) if(act == "scream") act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P + if(act == "me") //Allow me-emotes. + act = desc if( findtext(act,".",lentext(act)) == 0 && findtext(act,"!",lentext(act)) == 0 && findtext(act,"?",lentext(act)) == 0 ) act = addtext(act,".") //Makes sure all emotes end with a period. for (var/mob/O in viewers(src, null))