From 3d0653ac30df2dea534065f4fd7c17c7ed850ea4 Mon Sep 17 00:00:00 2001 From: Miauw Date: Sun, 29 Sep 2013 15:57:30 +0200 Subject: [PATCH] Removed xeno emote limiter --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 9 +++++---- code/modules/mob/living/carbon/alien/humanoid/life.dm | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index 25402f282fe..55dd20c836d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,5 +1,6 @@ /mob/living/carbon/alien/humanoid/emote(var/act) + var/cooldown = 0 //Used to limit *roar and *deathgasp spam. var/param = null if (findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -72,12 +73,12 @@ if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") - if (act == "roar" && xeno_emote_counter <= 0) + if (act == "roar") playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) - xeno_emote_counter = 4 - if (act == "deathgasp" && xeno_emote_counter <= 0) + + if (act == "deathgasp") playsound(src.loc, 'sound/voice/hiss6.ogg', 80, 1, 1) - xeno_emote_counter = 4 + if (m_type & 1) for(var/mob/O in viewers(src, null)) O.show_message(message, m_type) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index e36a5962bed..993f6d2e65f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -13,8 +13,6 @@ set invisibility = 0 set background = 1 - xeno_emote_counter -= 1 //Hack to stop *deathgasp and *roar spam for xenos. - if (monkeyizing) return