From fda676435ec2a15e158b352fa741828fa05d4ea3 Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Tue, 22 May 2012 13:55:00 +0200
Subject: [PATCH] Added a specific sleep message, memes now see their points on
 the status screen, admin-adding a meme now adds them to the meme list.

---
 code/modules/admin/admin.dm                  |  1 +
 code/modules/mob/living/carbon/human/life.dm |  4 ++++
 code/modules/mob/living/parasite/meme.dm     | 13 +++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index b0ee1ca92d..d25124a0a9 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -153,6 +153,7 @@ var/global/BSACooldown = 0
 					newmeme.mind.transfer_to(M)
 					message_admins("Failed to find host for meme [M.key]. Aborting.")
 
+				memes += newmeme
 
 				if(delmob)
 					del(M)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index cc7ba1b686..8a0a6dd628 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -998,6 +998,10 @@
 						stat = 1
 
 					if (sleeping > 0)
+						if(stat == 0)
+							// show them a message so they know what's going on
+							src << "\blue You feel very drowsy.. Your eyelids become heavy..."
+
 						handle_dreams()
 						adjustHalLoss(-5)
 						blinded = 1
diff --git a/code/modules/mob/living/parasite/meme.dm b/code/modules/mob/living/parasite/meme.dm
index 2c1d30b18d..e3d7b53d46 100644
--- a/code/modules/mob/living/parasite/meme.dm
+++ b/code/modules/mob/living/parasite/meme.dm
@@ -529,6 +529,8 @@ mob/living/parasite/meme/verb/Possession()
 		host_mind.current.clearHUD()
 		host.update_clothing()
 
+		dummy << "\blue You feel very drowsy.. Your eyelids become heavy..."
+
 		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])")
 
@@ -570,6 +572,17 @@ mob/living/parasite/meme/verb/Show_Points()
 
 	usr << "<b>Meme Points: [src.meme_points]/[MAXIMUM_MEME_POINTS]</b>"
 
+// Stat panel to show meme points, copypasted from alien
+/mob/living/parasite/meme/Stat()
+	..()
+
+	statpanel("Status")
+	if (client && client.holder)
+		stat(null, "([x], [y], [z])")
+
+	if (client && client.statpanel == "Status")
+		stat(null, "Meme Points: [src.meme_points]")
+
 // Game mode helpers, used for theft objectives
 // --------------------------------------------
 mob/living/parasite/check_contents_for(t)