From ea57368e9109d99a8aa637d52a501e7dd3389fe6 Mon Sep 17 00:00:00 2001 From: bgobandit Date: Thu, 23 Jul 2015 08:39:25 -0400 Subject: [PATCH] Non-mutant humans can no longer wag their tails. --- code/modules/mob/living/carbon/human/emote.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 5fc5e054f69..2b5a09b4c72 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -309,14 +309,18 @@ m_type = 2 if("wag") - if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || ("tail_human" in dna.species.mutant_bodyparts))) + if(dna && dna.species && (("tail_lizard" in dna.species.mutant_bodyparts) || (features["tail_human"] != "None"))) message = "[src] wags \his tail." startTailWag() + else + src << "Unusable emote '[act]'. Say *help for a list." if("stopwag") if(dna && dna.species && (("waggingtail_lizard" in dna.species.mutant_bodyparts) || ("waggingtail_human" in dna.species.mutant_bodyparts))) message = "[src] stops wagging \his tail." endTailWag() + else + src << "Unusable emote '[act]'. Say *help for a list." if ("help") //This can stay at the bottom. src << "Help for human emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, dance, dap, deathgasp, drool, eyebrow, faint, flap, frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, jump, laugh, look-(none)/mob, me, moan, mumble, nod, pale, point-(atom), raise, salute, scream, shake, shiver, shrug, sigh, signal-#1-10, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, stopwag, tremble, twitch, twitch_s, wave, whimper, wink, wag, yawn"