Initial muzzle and emote changes

code/modules/mob/emote.dm

@@ -31,8 +31,13 @@
 			to_chat(usr, "You are unable to emote.")
 		return
 
-	var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle)
-	if(m_type == 2 && muzzled) return
+	var/muzzled = is_muzzled()
+	if(muzzled)
+		var/obj/item/clothing/mask/muzzle/M = wear_mask
+		if(M.mute)
+			return //Not all muzzles block sound
+	if(m_type == 2 && !can_speak())
+		return
 
 	var/input
 	if(!message)

code/modules/mob/living/carbon/human/emote.dm

@@ -10,6 +10,10 @@
 		act = copytext(act, 1, t1)
 
 	var/muzzled = is_muzzled()
+	if(muzzled)
+		var/obj/item/clothing/mask/muzzle/M = wear_mask
+		if(!M.mute)
+			muzzled = 0 //Not all muzzles block sound
 	if(!can_speak())
 		muzzled = 1
 	//var/m_type = 1

code/modules/mob/living/update_status.dm

@@ -49,7 +49,7 @@
 
 // Whether the mob is capable of talking
 /mob/living/can_speak()
-	return !(silent || (disabilities & MUTE) || is_muzzled())
+	return !(silent || (disabilities & MUTE))
 
 // Whether the mob is capable of standing or not
 /mob/living/proc/can_stand()