From 1f50a508eb7bfc2e356b264dcd9cdd98141305c9 Mon Sep 17 00:00:00 2001 From: Miauw Date: Wed, 25 Sep 2013 17:45:51 +0200 Subject: [PATCH] Alien *roar and *deathgasp sounds are no longer spammable. --- code/modules/mob/living/carbon/alien/humanoid/emote.dm | 6 ++++-- code/modules/mob/living/carbon/alien/humanoid/life.dm | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index b085b222fb9..25402f282fe 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -72,10 +72,12 @@ if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") - if (act == "roar") + if (act == "roar" && xeno_emote_counter <= 0) playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) - if (act == "deathgasp") + xeno_emote_counter = 4 + if (act == "deathgasp" && xeno_emote_counter <= 0) 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 97e09c42c18..e36a5962bed 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -6,12 +6,15 @@ fire_alert = 0 var/temperature_alert = 0 + var/xeno_emote_counter = 0 //See Life() /mob/living/carbon/alien/humanoid/Life() set invisibility = 0 set background = 1 + xeno_emote_counter -= 1 //Hack to stop *deathgasp and *roar spam for xenos. + if (monkeyizing) return