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 << "[key_to_ignore] is already being ignored."
return
+ if(key_to_ignore == usr.ckey)
+ usr <<"You can't ignore yourself."
+ return
+
prefs.ignored_players |= key_to_ignore
prefs.save_preferences()
usr << "Now ignoring [key_to_ignore]."
diff --git a/code/modules/client/preference_setup/global/05_ooc.dm b/code/modules/client/preference_setup/global/05_ooc.dm
index 08aa97836a9..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()
@@ -32,7 +32,11 @@
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 <<"You can't ignore yourself."
+ return TOPIC_REFRESH
pref.ignored_players |= player_to_ignore
return TOPIC_REFRESH
return ..()
+*/
\ No newline at end of file
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"