From 5b0f085b70163e918cc1c3eb4d34c2568b830ca2 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 May 2017 19:58:35 +0100 Subject: [PATCH 1/5] Adds karma reminder while shuttle in flight --- code/modules/shuttle/emergency.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 116ac637ac5..bdea1d28919 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -262,6 +262,9 @@ mode = SHUTTLE_ESCAPE 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) + if(SHUTTLE_ESCAPE) if(time_left <= 0) //move each escape pod to its corresponding escape dock From 27f5455a3245cdb0e2b22f56570b2fb057691c54 Mon Sep 17 00:00:00 2001 From: Sam Date: Sun, 7 May 2017 19:58:58 +0100 Subject: [PATCH 2/5] ...adds the message. --- code/modules/shuttle/emergency.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index bdea1d28919..89a3dc4e658 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -264,6 +264,7 @@ 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(SHUTTLE_ESCAPE) if(time_left <= 0) From fd850a6e1ea74575f1b246ae28fd60fda1f1147c Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 8 May 2017 13:15:28 +0100 Subject: [PATCH 3/5] 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) From 039a2d07acc1cdb6fb1e24683535436354851320 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 17 May 2017 23:51:08 +0100 Subject: [PATCH 4/5] Revert "Adds a preference option" This reverts commit fd850a6e1ea74575f1b246ae28fd60fda1f1147c. --- code/__DEFINES/preferences.dm | 1 - code/modules/client/preference/preferences_toggles.dm | 9 --------- code/modules/shuttle/emergency.dm | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 293efd4b4b8..05200eea7dd 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -25,7 +25,6 @@ #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 db51bc38adb..b922706fd61 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -87,15 +87,6 @@ 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 635fd458c56..89a3dc4e658 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 && !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(!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(SHUTTLE_ESCAPE) if(time_left <= 0) From b7c87c041b0343e1c9fcfe718fafe93924e9c954 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 18 May 2017 01:27:10 +0100 Subject: [PATCH 5/5] Removes roundend karma reminder --- code/game/gamemodes/gameticker.dm | 13 ------------- code/modules/shuttle/emergency.dm | 4 ++-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 006c0642202..f3191491c88 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -406,18 +406,6 @@ var/round_start_time = 0 if(F.name == name) return F -/datum/controller/gameticker/proc/karmareminder() - for(var/mob/living/player in player_list) - - if(player.client) - if(player.client.karma_spent == 0) - if(!player.get_preference(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
- your reward? Look under 'OOC' 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() nologevent = 1 //end of round murder and shenanigans are legal; there's no need to jam up attack logs past this point. @@ -472,7 +460,6 @@ var/round_start_time = 0 call(mode, handler)() scoreboard() - karmareminder() // Declare the completion of the station goals mode.declare_station_goal_completion() diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 89a3dc4e658..5903035903b 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_REMINDER)) + to_chat(M, "You have not yet spent your karma for the round; was there a player worthy of receiving your reward? Look under OOC tab, Award Karma.") if(SHUTTLE_ESCAPE) if(time_left <= 0)