Merge pull request #21614 from Cruix/not_ling_chat_fix

[s] Fixed being able to speak while unconscious using alien or changeling channels
This commit is contained in:
oranges
2016-11-20 14:52:28 +13:00
committed by GitHub
4 changed files with 5 additions and 7 deletions
+1 -1
View File
@@ -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
..()
+2 -4
View File
@@ -220,7 +220,6 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
if(1)
if(prob(40))
M << "<i><font color=#800080>We can faintly sense an outsider trying to communicate through the hivemind...</font></i>"
return 1
if(2)
var/msg = "<i><font color=#800080><b>[mind.changeling.changelingID]:</b> [message]</font></i>"
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 << "<i><font color=#800080>We can faintly sense another of our kind trying to communicate through the hivemind...</font></i>"
return 1
if(1)
src << "<i><font color=#800080>Our senses have not evolved enough to be able to communicate this way...</font></i>"
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)
+1 -1
View File
@@ -65,5 +65,5 @@
if(message_mode == MODE_BINARY)
if(binarycheck())
robot_talk(message)
return 1
return 1
return 0
@@ -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
..()