From ab9871968fddfe552c37c1d1e21f4d7504da5534 Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Fri, 13 May 2016 00:37:00 +0100
Subject: [PATCH 1/3] Fixes ignored preferences not being saved between rounds

---
 polaris.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/polaris.dme b/polaris.dme
index 8412712f648..11d173eaa44 100644
--- a/polaris.dme
+++ b/polaris.dme
@@ -998,6 +998,7 @@
 #include "code\modules\client\preference_setup\global\02_settings.dm"
 #include "code\modules\client\preference_setup\global\03_pai.dm"
 #include "code\modules\client\preference_setup\global\04_communicators.dm"
+#include "code\modules\client\preference_setup\global\05_ooc.dm"
 #include "code\modules\client\preference_setup\global\setting_datums.dm"
 #include "code\modules\client\preference_setup\loadout\gear_tweaks.dm"
 #include "code\modules\client\preference_setup\loadout\loadout.dm"

From 3e184d7982728cac35f884ba9b68494e0cbbb82c Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Fri, 13 May 2016 01:04:56 +0100
Subject: [PATCH 2/3] Removes ability to ignore yourself

---
 code/modules/client/preference_setup/global/05_ooc.dm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/code/modules/client/preference_setup/global/05_ooc.dm b/code/modules/client/preference_setup/global/05_ooc.dm
index 08aa97836a9..9a25cd64f15 100644
--- a/code/modules/client/preference_setup/global/05_ooc.dm
+++ b/code/modules/client/preference_setup/global/05_ooc.dm
@@ -32,6 +32,9 @@
 			var/player_to_ignore = input(user, "Who do you want to ignore?","Ignore") as null|text
 			if(player_to_ignore)
 				player_to_ignore = sanitize(ckey(player_to_ignore))
+				if(player_to_ignore == user.ckey)
+					user <<"<span class='notice'>You can't ignore yourself.</span>"
+					return TOPIC_REFRESH
 				pref.ignored_players |= player_to_ignore
 			return TOPIC_REFRESH
 

From 75b1f53141f9e0d245704b4956bc8dfe140229fc Mon Sep 17 00:00:00 2001
From: Yoshax <yoshax23@gmail.com>
Date: Fri, 13 May 2016 01:16:44 +0100
Subject: [PATCH 3/3] Comments out ignore and unignoring in character setup,
 properly removes ability to ignore yourself

---
 code/game/verbs/ignore.dm                             | 4 ++++
 code/modules/client/preference_setup/global/05_ooc.dm | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/code/game/verbs/ignore.dm b/code/game/verbs/ignore.dm
index b772bd4e813..c1546280872 100644
--- a/code/game/verbs/ignore.dm
+++ b/code/game/verbs/ignore.dm
@@ -10,6 +10,10 @@
 		if(key_to_ignore in prefs.ignored_players)
 			usr << "<span class='warning'>[key_to_ignore] is already being ignored.</span>"
 			return
+		if(key_to_ignore == usr.ckey)
+			usr <<"<span class='notice'>You can't ignore yourself.</span>"
+			return
+
 		prefs.ignored_players |= key_to_ignore
 		prefs.save_preferences()
 		usr << "<span class='notice'>Now ignoring <b>[key_to_ignore]</b>.</span>"
diff --git a/code/modules/client/preference_setup/global/05_ooc.dm b/code/modules/client/preference_setup/global/05_ooc.dm
index 9a25cd64f15..1b9d45dc893 100644
--- a/code/modules/client/preference_setup/global/05_ooc.dm
+++ b/code/modules/client/preference_setup/global/05_ooc.dm
@@ -9,7 +9,7 @@
 /datum/category_item/player_setup_item/player_global/ooc/save_preferences(var/savefile/S)
 	S["ignored_players"]	<< pref.ignored_players
 
-
+/*
 /datum/category_item/player_setup_item/player_global/ooc/sanitize_preferences()
 	if(isnull(pref.ignored_players))
 		pref.ignored_players = list()
@@ -39,3 +39,4 @@
 			return TOPIC_REFRESH
 
 	return ..()
+*/
\ No newline at end of file