From 555e54f6b18a98e56bb20a4cee4b3d9c60515299 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 17 Nov 2016 21:51:14 -0600 Subject: [PATCH] Fixed being able to speak while unconscious using alien or changeling channels without the ability to speak on them. --- code/game/gamemodes/blob/blobs/blob_mobs.dm | 2 +- code/modules/mob/living/say.dm | 6 ++---- code/modules/mob/living/silicon/say.dm | 2 +- code/modules/mob/living/simple_animal/friendly/drone/say.dm | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 160b4e8ce20..1dcb464035e 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -59,7 +59,7 @@ /mob/living/simple_animal/hostile/blob/handle_inherent_channels(message, message_mode) if(message_mode == MODE_BINARY) blob_chat(message) - return ITALICS | REDUCE_RANGE + return 1 else ..() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index a9ada9e2f5f..fe0328d11a1 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -220,7 +220,6 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN) if(1) if(prob(40)) M << "We can faintly sense an outsider trying to communicate through the hivemind..." - return 1 if(2) var/msg = "[mind.changeling.changelingID]: [message]" log_say("[mind.changeling.changelingID]/[src.key] : [message]") @@ -237,14 +236,13 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN) if(1) if(prob(40)) M << "We can faintly sense another of our kind trying to communicate through the hivemind..." - return 1 if(1) src << "Our senses have not evolved enough to be able to communicate this way..." - return 1 + return 1 if(message_mode == MODE_ALIEN) if(hivecheck()) alien_talk(message) - return 1 + return 1 return 0 /mob/living/proc/treat_message(message) diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 67872852f92..f1cd5033a39 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -65,5 +65,5 @@ if(message_mode == MODE_BINARY) if(binarycheck()) robot_talk(message) - return 1 + return 1 return 0 diff --git a/code/modules/mob/living/simple_animal/friendly/drone/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/say.dm index 2d082fc4645..4210947ef35 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/say.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/say.dm @@ -6,7 +6,7 @@ /mob/living/simple_animal/drone/handle_inherent_channels(message, message_mode) if(message_mode == MODE_BINARY) drone_chat(message) - return ITALICS | REDUCE_RANGE + return 1 else ..()