From 253035f935393443e11de15fa39153bdf96d0fca Mon Sep 17 00:00:00 2001 From: d3athrow Date: Fri, 24 Jan 2014 23:59:24 -0600 Subject: [PATCH] Fixes #452, people who are silenced for whatever reason or miming can't use the megaphone --- code/game/objects/items/devices/megaphone.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 9fcc90b7e63..981ee9ac0ac 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -19,8 +19,8 @@ if(!ishuman(user)) user << "\red You don't know how to use this!" return - if(user.mind.assigned_role == "Mime") - user << "\red Being a mime, you really shouldn't use this." + if(user.miming || user.silent) + user << "\red You find yourself unable to speak at all." return if(spamcheck) user << "\red \The [src] needs to recharge!"