From 3bf3669ffbd023b1f8f051ad87aebb022350b17e Mon Sep 17 00:00:00 2001 From: cib Date: Fri, 18 May 2012 18:54:26 +0200 Subject: [PATCH] This should enable pAIs and parasites to see emotes. --- code/modules/mob/living/carbon/human/emote.dm | 4 ++-- code/modules/mob/living/parasite/meme.dm | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index fcdc76a3bbd..0e45f878857 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -537,8 +537,8 @@ if (m_type & 1) - for (var/mob/O in viewers(src, null)) + for (var/mob/O in world) if(O.client && (O.client.eye in viewers(src.loc))) O.show_message(message, m_type) else if (m_type & 2) - for (var/mob/O in hearers(src.loc, null)) + for (var/mob/O in world) if(O.client && (O.client.eye in hearers(src.loc))) O.show_message(message, m_type) diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm index 19ac6cbeb8d..3bb642cd325 100644 --- a/code/modules/mob/living/parasite/meme.dm +++ b/code/modules/mob/living/parasite/meme.dm @@ -429,16 +429,16 @@ mob/living/parasite/meme/verb/Possession() spawn var/mob/dummy = new - var/client/host_client = host.client - var/client/meme_client = src.client + var/client/host_key = host.key + var/client/meme_key = src.key - if(host_client) host_client.mob = dummy - meme_client.mob = host + if(host_client) dummy.key = host_key + host.key = meme_key sleep(600) - if(host_client) host_client.mob = host - if(meme_client) meme_client.mob = src + host.key = host_key + src.key = meme_key src << "\red You lose control.." del dummy