diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 3b307fc00cf..5733659855e 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -27,7 +27,7 @@ return var/message = copytext(sanitize(input(user, "Shout a message?", "Megaphone", null) as text),1,MAX_MESSAGE_LEN) - if(!message) + if(!message || message == "") return message = capitalize(message) diff --git a/code/modules/mob/living/carbon/human/whisper.dm b/code/modules/mob/living/carbon/human/whisper.dm index 23bb31ead56..45cccc91331 100644 --- a/code/modules/mob/living/carbon/human/whisper.dm +++ b/code/modules/mob/living/carbon/human/whisper.dm @@ -1,6 +1,8 @@ /mob/living/carbon/human/whisper(message as text) if(!IsVocal()) return + if(!message || message == "") + return if(say_disabled) //This is here to try to identify lag problems usr << "Speech is currently admin-disabled." diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f3fbffe7d22..967ed133fc6 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -162,9 +162,6 @@ var/list/department_radio_keys = list( return 1 /mob/living/proc/can_speak_basic(message) //Check BEFORE handling of xeno and ling channels - if(!message || message == "") - return 0 - if(client) if(client.prefs.muted & MUTE_IC) src << "You cannot speak in IC (muted)."