Need to rebase it seems

This commit is contained in:
Alffd
2018-08-14 00:52:11 -04:00
parent d94957f57d
commit f48b9bc5be
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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 & EMOTE_SOUND)
if(m_type == EMOTE_SOUND && M.mute >= MUZZLE_MUTE_MUFFLE)
return //Not all muzzles block sound
if(!can_speak())
return
@@ -12,7 +12,7 @@
var/muzzled = is_muzzled()
if(muzzled)
var/obj/item/clothing/mask/muzzle/M = wear_mask
if(M.mute == MUTE_NONE)
if(M.mute == MUZZLE_MUTE_NONE)
muzzled = 0 //Not all muzzles block sound
if(!can_speak())
muzzled = 1
+1 -1
View File
@@ -52,7 +52,7 @@
if(!(silent || (disabilities & MUTE)))
if(is_muzzled())
var/obj/item/clothing/mask/muzzle/M = wear_mask
if(M.mute >= MUTE_MUFFLE)
if(M.mute >= MUZZLE_MUTE_MUFFLE)
return FALSE
return TRUE
else