From fd850a6e1ea74575f1b246ae28fd60fda1f1147c Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 8 May 2017 13:15:28 +0100 Subject: [PATCH] Adds a preference option --- code/__DEFINES/preferences.dm | 1 + code/modules/client/preference/preferences_toggles.dm | 9 +++++++++ code/modules/shuttle/emergency.dm | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 05200eea7dd..293efd4b4b8 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -25,6 +25,7 @@ #define MEMBER_PUBLIC 8192 #define CHAT_NO_ADMINLOGS 16384 #define DONATOR_PUBLIC 32768 +#define DISABLE_KARMA_TEXT_REMINDER 65536 #define TOGGLES_DEFAULT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_ATTACKLOGS|CHAT_LOOC|MEMBER_PUBLIC|DONATOR_PUBLIC) diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index b922706fd61..db51bc38adb 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -87,6 +87,15 @@ to_chat(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/togglekarmatextreminder() + set name = "Hide/Display Shuttle Karma Reminder" + set category = "Preferences" + set desc = "Toggles displaying shuttle karma reminder" + prefs.toggles ^= DISABLE_KARMA_TEXT_REMINDER + prefs.save_preferences(src) + to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_TEXT_REMINDER) ? "no longer" : "now"] see the shuttle karma reminder.") + feedback_add_details("admin_verb","TShuttlekarma") //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" diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 89a3dc4e658..635fd458c56 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -263,8 +263,8 @@ timer = world.time priority_announcement.Announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.") for(var/mob/M in player_list) - if(!isnewplayer(M) && !M.client.karma_spent) - to_chat(M, "You have not yet spent your karma for the round, was there a player who was worthy of receiving your reward?") + if(!isnewplayer(M) && !M.client.karma_spent && !M.get_preference(DISABLE_KARMA_TEXT_REMINDER)) + to_chat(M, "You have not yet spent your karma for the round; was there a player who was worthy of receiving your reward?") if(SHUTTLE_ESCAPE) if(time_left <= 0)