From 79e2cdef862dee42595c410f6e0b08a49d88a5fe Mon Sep 17 00:00:00 2001
From: cib <blub@blub-Latitude-D430.(none)>
Date: Tue, 22 May 2012 14:29:01 +0200
Subject: [PATCH] Updated changelog. Added some bug info to places in the code.

---
 code/modules/admin/admin.dm                  | 2 +-
 code/modules/admin/player_panel.dm           | 2 ++
 code/modules/mob/living/carbon/human/life.dm | 3 +++
 html/changelog.html                          | 8 ++++++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d25124a0a9a..f38a9d2790b 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -153,7 +153,7 @@ var/global/BSACooldown = 0
 					newmeme.mind.transfer_to(M)
 					message_admins("Failed to find host for meme [M.key]. Aborting.")
 
-				memes += newmeme
+				ticker.mode.memes += newmeme
 
 				if(delmob)
 					del(M)
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index c497f3d023e..2c87cf9410a 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -255,6 +255,8 @@
 		if(ticker.mode.memes.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Memes</B></td><td></td><td></td></tr>"
 			for(var/datum/mind/meme in ticker.mode.memes)
+				// BUG: For some reason, the memes themselves aren't showing up, even though the list isn't empty
+				// and the "Meme" header is displayed
 				var/mob/living/parasite/meme/M = meme.current
 				if(M)
 					dat += "<tr><td><a href='?src=\ref[src];adminplayeropts=\ref[M]'>[M.key]</a>[M.client ? "" : " <i>(logged out)</i>"][M.stat == 2 ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 8a0a6dd6285..9fba5563c1f 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -999,6 +999,9 @@
 
 					if (sleeping > 0)
 						if(stat == 0)
+							// BUG: this doesn't seem to happen ever.. probably when you hit sleep willingly,
+							// it automatically adjusts your stat without calling this proc
+
 							// show them a message so they know what's going on
 							src << "\blue You feel very drowsy.. Your eyelids become heavy..."
 
diff --git a/html/changelog.html b/html/changelog.html
index fe188a03dac..80ab0646ff6 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,6 +47,14 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">22 May 2012</h2>
+	<h3 class="author">cib updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="rscadd">Worked out a few problems with meme. They now can see, even if their mob is sleeping. Their actions are properly tracked in admin logs. Their points recharge slightly faster, and can now be seen in the Status tab.</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">19 May 2012</h2>
 	<h3 class="author">cib updated:</h3>