diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 3feb4e33336..94c476cb367 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -20,10 +20,10 @@ #define CHAT_LOOC 256 #define CHAT_GHOSTRADIO 512 #define SHOW_TYPING 1024 -#define DISPLAY_SCOREBOARD 2048 -#define KARMA_REMINDER 4096 +#define DISABLE_SCOREBOARD 2048 +#define DISABLE_KARMA_REMINDER 4096 -#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|DISPLAY_SCOREBOARD|KARMA_REMINDER) +#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) #define BE_TRAITOR 1 #define BE_OPERATIVE 2 diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index fc9018489c4..a56351e2e94 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -453,7 +453,7 @@ var/global/datum/controller/gameticker/ticker if(player.client) if(player.client.karma_spent == 0) - if(player.client.prefs && (player.client.prefs.toggles & KARMA_REMINDER)) + if(player.client.prefs && !(player.client.prefs.toggles & DISABLE_KARMA_REMINDER)) var/dat dat += {"Karma Reminder

Karma Reminder


You have not yet spent your karma for the round, surely there is a player who was worthy of receiving
diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 4fab12c7177..04d4021f9d2 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -212,7 +212,7 @@ world << "[score_crewscore]" for(var/mob/E in player_list) if(E.client) - if(E.client.prefs && (E.client.prefs.toggles & DISPLAY_SCOREBOARD)) + if(E.client.prefs && !(E.client.prefs.toggles & DISABLE_SCOREBOARD)) E.scorestats() return diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 4955e30e0a3..b407b153374 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -73,18 +73,18 @@ set name = "Hide/Display End Round Scoreboard" set category = "Preferences" set desc = "Toggles displaying end of round scoreboard" - prefs.toggles ^= DISPLAY_SCOREBOARD + prefs.toggles ^= DISABLE_SCOREBOARD prefs.save_preferences(src) - src << "You will [(prefs.toggles & DISPLAY_SCOREBOARD) ? "now" : "no longer"] see the end of round scoreboard." + src << "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard." feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglekarmareminder() set name = "Hide/Display End Round Karma Reminder" set category = "Preferences" set desc = "Toggles displaying end of round karma reminder" - prefs.toggles ^= KARMA_REMINDER + prefs.toggles ^= DISABLE_KARMA_REMINDER prefs.save_preferences(src) - src << "You will [(prefs.toggles & KARMA_REMINDER) ? "now" : "no longer"] see the end of round karma reminder." + src << "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder." feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggletitlemusic()