Merge pull request #6342 from uraniummeltdown/clingmemory

Changeling Absorb Memory Fix
This commit is contained in:
Fox McCloud
2017-02-07 09:21:32 -05:00
committed by GitHub
4 changed files with 40 additions and 14 deletions
+3 -1
View File
@@ -52,5 +52,7 @@
var/list/surgeries = list() //a list of surgery datums. generally empty, they're added when the player wants them.
var/gene_stability = DEFAULT_GENE_STABILITY
var/obj/effect/proc_holder/ranged_ability //Any ranged ability the mob has, as a click override
var/list/say_log = list() //a log of what we've said, plain text, no spans or junk, essentially just each individual "message"
+4 -1
View File
@@ -149,7 +149,7 @@ proc/get_radio_key_from_channel(var/channel)
if(speaking && (speaking.flags & HIVEMIND))
speaking.broadcast(src,trim(message))
return 1
if(message_mode == "cords")
if(iscarbon(src))
var/mob/living/carbon/C = src
@@ -282,6 +282,9 @@ proc/get_radio_key_from_channel(var/channel)
if(O) //It's possible that it could be deleted in the meantime.
O.hear_talk(src, message, verb, speaking)
//Log of what we've said, plain message, no spans or junk
say_log += message
log_say("[name]/[key] : [message]")
return 1