From 6bcca7057c659ac28d493492ac6efd2fdb3a759d Mon Sep 17 00:00:00 2001 From: Anonus Date: Wed, 24 Jul 2013 12:04:18 -0400 Subject: [PATCH] Monkeys can now giggle Now you can giggle as a monkey. Immursions! Fixes #934 --- code/modules/mob/living/carbon/monkey/emote.dm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/emote.dm b/code/modules/mob/living/carbon/monkey/emote.dm index eccb365a6f2..3e43ea81e58 100644 --- a/code/modules/mob/living/carbon/monkey/emote.dm +++ b/code/modules/mob/living/carbon/monkey/emote.dm @@ -96,8 +96,12 @@ if("deathgasp") message = "The [src.name] lets out a faint chimper as it collapses and stops moving..." m_type = 1 + if("giggle") + if (!muzzled) + message = "The [src.name] giggles happily." + m_type = 2 if("help") - src << "choke, collapse, dance, deathgasp, drool, gasp, shiver, gnarl, jump, paw, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper" + src << "choke, collapse, dance, deathgasp, drool, gasp, shiver, gnarl, giggle, jump, paw, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper" else src << text("Invalid Emote: []", act) if ((message && src.stat == 0)) @@ -111,4 +115,4 @@ for(var/mob/O in hearers(src, null)) O.show_message(message, m_type) //Foreach goto(746) - return \ No newline at end of file + return