From d887d8ae417f026e3ba09376b0fc36bb183f2dde Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Tue, 22 May 2012 13:13:01 +0200
Subject: [PATCH] Fixed a few issues with the meme admin stuff.

---
 code/modules/admin/admin.dm              | 11 ++++++++---
 code/modules/mob/living/parasite/meme.dm |  6 ++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 3d3ab39da8b..b0ee1ca92df 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -144,14 +144,19 @@ var/global/BSACooldown = 0
 					found = 1
 					newmeme.enter_host(H)
 
-					log_admin("[H] has become [newmeme.key]'s host")
+					message_admins("[H] has become [newmeme.key]'s host")
 
 					break
 
 				// if there was no host, abort
 				if(!found)
 					newmeme.mind.transfer_to(M)
-					log_admin("Failed to find host for meme [M.key]. Aborting.")
+					message_admins("Failed to find host for meme [M.key]. Aborting.")
+
+
+				if(delmob)
+					del(M)
+
 
 
 
@@ -2454,7 +2459,7 @@ var/global/BSACooldown = 0
 			body += "\[ Construct: <A href='?src=\ref[src];simplemake=constructarmoured;mob=\ref[M]'>Armoured</A> , "
 			body += "<A href='?src=\ref[src];simplemake=constructbuilder;mob=\ref[M]'>Builder</A> , "
 			body += "<A href='?src=\ref[src];simplemake=constructwraith;mob=\ref[M]'>Wraith</A> \] "
-			body += "<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A>"
+			body += "<A href='?src=\ref[src];simplemake=shade;mob=\ref[M]'>Shade</A> "
 			body += "<A href='?src=\ref[src];simplemake=meme;mob=\ref[M]'>Meme</A>"
 			body += "<br>"
 
diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm
index 61989ce78b0..2c1d30b18d6 100644
--- a/code/modules/mob/living/parasite/meme.dm
+++ b/code/modules/mob/living/parasite/meme.dm
@@ -391,6 +391,7 @@ mob/living/parasite/meme/verb/SubtleJump(mob/living/carbon/human/target as mob i
 
 	usr << "<b>You successfully jumped to [target]."
 	log_admin("[src.key] has jumped to [target]")
+	message_admins("[src.key] has jumped to [target]")
 
 // Jump to a distant target through a shout
 mob/living/parasite/meme/verb/ObviousJump(mob/living/carbon/human/target as mob in world)
@@ -429,6 +430,7 @@ mob/living/parasite/meme/verb/ObviousJump(mob/living/carbon/human/target as mob
 
 	usr << "<b>You successfully jumped to [target]."
 	log_admin("[src.key] has jumped to [target]")
+	message_admins("[src.key] has jumped to [target]")
 
 // Jump to an attuned mob for free
 mob/living/parasite/meme/verb/AttunedJump(mob/living/carbon/human/target as mob in world)
@@ -452,6 +454,7 @@ mob/living/parasite/meme/verb/AttunedJump(mob/living/carbon/human/target as mob
 	usr << "<b>You successfully jumped to [target]."
 
 	log_admin("[src.key] has jumped to [target]")
+	message_admins("[src.key] has jumped to [target]")
 
 // ATTUNE a mob, adding it to the indoctrinated list
 mob/living/parasite/meme/verb/Attune()
@@ -472,6 +475,7 @@ mob/living/parasite/meme/verb/Attune()
 	host << "\red Your head feels a bit roomier.."
 
 	log_admin("[src.key] has attuned [host]")
+	message_admins("[src.key] has attuned [host]")
 
 // Enables the mob to take a lot more damage
 mob/living/parasite/meme/verb/Analgesic()
@@ -526,10 +530,12 @@ mob/living/parasite/meme/verb/Possession()
 		host.update_clothing()
 
 		log_admin("[meme_mind.key] has taken possession of [host]([host_mind.key])")
+		message_admins("[meme_mind.key] has taken possession of [host]([host_mind.key])")
 
 		sleep(600)
 
 		log_admin("[meme_mind.key] has lost possession of [host]([host_mind.key])")
+		message_admins("[meme_mind.key] has lost possession of [host]([host_mind.key])")
 
 		meme_mind.transfer_to(src)
 		host_mind.transfer_to(host)