Merge pull request #4199 from Citadel-Station-13/upstream-merge-33013

[MIRROR] Datumizes saymodes
This commit is contained in:
deathride58
2017-12-04 21:19:53 +00:00
committed by GitHub
15 changed files with 237 additions and 199 deletions
@@ -56,13 +56,6 @@
return 1
return ..()
/mob/living/simple_animal/hostile/blob/handle_inherent_channels(message, message_mode)
if(message_mode == MODE_BINARY)
blob_chat(message)
return 1
else
..()
/mob/living/simple_animal/hostile/blob/proc/blob_chat(msg)
var/spanned_message = say_quote(msg, get_spans())
var/rendered = "<font color=\"#EE4000\"><b>\[Blob Telepathy\] [real_name]</b> [spanned_message]</font>"
@@ -50,7 +50,7 @@
to_chat(target, "<span class='userdanger'>A migraine throbs behind your eyes, you hear yourself screaming - but your mouth has not opened!</span>")
for(var/mi in GLOB.mob_list)
var/mob/M = mi
if(M.lingcheck() == 2)
if(M.lingcheck() == LINGHIVE_LING)
to_chat(M, "<i><font color=#800080>We can sense a foreign presence in the hivemind...</font></i>")
target.mind.linglink = 1
target.say(":g AAAAARRRRGGGGGHHHHH!!")
@@ -121,13 +121,6 @@
if(statpanel("Status"))
stat("Resources:",resources)
/mob/living/simple_animal/hostile/swarmer/handle_inherent_channels(message, message_mode)
if(message_mode == MODE_BINARY)
swarmer_chat(message)
return ITALICS | REDUCE_RANGE
else
. = ..()
/mob/living/simple_animal/hostile/swarmer/get_spans()
return ..() | SPAN_ROBOT