From d94957f57d97516c4e38c208b29afd509a6eed94 Mon Sep 17 00:00:00 2001 From: Alffd Date: Tue, 14 Aug 2018 00:40:28 -0400 Subject: [PATCH] Even more fixes --- code/modules/mob/emote.dm | 2 +- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/update_status.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 080796a81bc..ebe9dbc0dc9 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -34,7 +34,7 @@ var/muzzled = is_muzzled() if(muzzled) var/obj/item/clothing/mask/muzzle/M = wear_mask - if(m_type == EMOTE_SOUND && M.mute) + if(m_type == EMOTE_SOUND && M.mute & EMOTE_SOUND) return //Not all muzzles block sound if(!can_speak()) return diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 793896ac9a2..0c00a918a5e 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -12,7 +12,7 @@ var/muzzled = is_muzzled() if(muzzled) var/obj/item/clothing/mask/muzzle/M = wear_mask - if(!(M.mute & EMOTE_SOUND)) + if(M.mute == MUTE_NONE) muzzled = 0 //Not all muzzles block sound if(!can_speak()) muzzled = 1 diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index 138f813d54d..004aae6b3e7 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -52,7 +52,7 @@ if(!(silent || (disabilities & MUTE))) if(is_muzzled()) var/obj/item/clothing/mask/muzzle/M = wear_mask - if(M.mute & EMOTE_SOUND) + if(M.mute >= MUTE_MUFFLE) return FALSE return TRUE else