From 94af89d0a28979ce7998d740805646fa12c0dc2d Mon Sep 17 00:00:00 2001
From: Mloc-Argent <colmohici@gmail.com>
Date: Sat, 6 Jul 2013 22:16:01 +0100
Subject: [PATCH 1/2] Fixes #2091 Adds missing topic() code for page selection
 on player notes, properly alphabeticalizes.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
---
 code/modules/admin/admin.dm | 4 ++--
 code/modules/admin/topic.dm | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 4292c9a14fa..9219b847414 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -186,7 +186,7 @@ var/global/floorIsLava = 0
 		dat += "No notes found."
 	else
 		dat += "<table>"
-		sortList(note_keys)
+		note_keys = sortList(note_keys)
 
 		// Display the notes on the current page
 		var/number_pages = note_keys.len / PLAYER_NOTES_ENTRIES_PER_PAGE
@@ -210,7 +210,7 @@ var/global/floorIsLava = 0
 		for(var/index = 1, index <= number_pages, index++)
 			if(index == page)
 				dat += "<b>"
-			dat += "<a href='?src=\ref[src];notes=list;index='[index]'>[index]</a> "
+			dat += "<a href='?src=\ref[src];notes=list;index=[index]'>[index]</a> "
 			if(index == page)
 				dat += "</b>"
 
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 5e7a2493bdc..2164b02d165 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2464,4 +2464,6 @@
 		switch(href_list["notes"])
 			if("show")
 				show_player_info(ckey)
+			if("list")
+				PlayerNotesPage(text2num(href_list["index"]))
 		return

From 3ce4e2ad17eb0c8689a1dbccfc403540d56ef6c7 Mon Sep 17 00:00:00 2001
From: Mloc-Argent <colmohici@gmail.com>
Date: Sat, 6 Jul 2013 22:20:13 +0100
Subject: [PATCH 2/2] Fixes #2559 Changes Add-Note and Notes verb to be under
 the IC category, instead of OOC.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
---
 code/modules/mob/mob.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index bd1258cd942..b52f73f8668 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -298,7 +298,7 @@ var/list/slot_equipment_priority = list( \
 
 /mob/verb/memory()
 	set name = "Notes"
-	set category = "OOC"
+	set category = "IC"
 	if(mind)
 		mind.show_memory(src)
 	else
@@ -306,7 +306,7 @@ var/list/slot_equipment_priority = list( \
 
 /mob/verb/add_memory(msg as message)
 	set name = "Add Note"
-	set category = "OOC"
+	set category = "IC"
 
 	msg = copytext(msg, 1, MAX_MESSAGE_LEN)
 	msg = sanitize(msg)