diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 4ea37560a7f..3feb4e33336 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -20,8 +20,10 @@ #define CHAT_LOOC 256 #define CHAT_GHOSTRADIO 512 #define SHOW_TYPING 1024 +#define DISPLAY_SCOREBOARD 2048 +#define KARMA_REMINDER 4096 -#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC) +#define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|DISPLAY_SCOREBOARD|KARMA_REMINDER) #define BE_TRAITOR 1 #define BE_OPERATIVE 2 diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 2fb4d7745a1..774e61a3953 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -454,11 +454,12 @@ var/global/datum/controller/gameticker/ticker if(player.client) if(player.client.karma_spent == 0) - 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
- your reward? Look under 'Special Verbs' for the 'Award Karma' button, and use it once a round for best results!"} - player << browse(dat, "window=karmareminder;size=400x300") + if(player.client.prefs && (player.client.prefs.toggles & 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
+ your reward? Look under 'Special Verbs' for the 'Award Karma' button, and use it once a round for best results!"} + player << browse(dat, "window=karmareminder;size=400x300") /datum/controller/gameticker/proc/declare_completion() diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index acf8c879c3e..4fab12c7177 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -211,7 +211,9 @@ world << "The crew's final score is:" world << "[score_crewscore]" for(var/mob/E in player_list) - if(E.client) E.scorestats() + if(E.client) + if(E.client.prefs && (E.client.prefs.toggles & DISPLAY_SCOREBOARD)) + E.scorestats() return diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 2831d63a652..4955e30e0a3 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -69,6 +69,24 @@ src << "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat." feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! +/client/verb/togglescoreboard() + set name = "Hide/Display End Round Scoreboard" + set category = "Preferences" + set desc = "Toggles displaying end of round scoreboard" + prefs.toggles ^= DISPLAY_SCOREBOARD + prefs.save_preferences(src) + src << "You will [(prefs.toggles & DISPLAY_SCOREBOARD) ? "now" : "no longer"] 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.save_preferences(src) + src << "You will [(prefs.toggles & KARMA_REMINDER) ? "now" : "no longer"] 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() set name = "Hear/Silence LobbyMusic" set category = "Preferences"