From df92fcce9542e00de05349527501a1ed3d62f7b6 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sat, 10 Jun 2023 14:44:18 +0100 Subject: [PATCH 1/3] obfuscate job toggle --- code/modules/client/preference_setup/global/01_ui.dm | 8 ++++++++ code/modules/client/preferences.dm | 1 + code/modules/mob/new_player/new_player.dm | 2 ++ 3 files changed, 11 insertions(+) diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index c700e2ba93..8f1c274af1 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -17,6 +17,7 @@ S["tgui_input_lock"] >> pref.tgui_input_lock S["tgui_large_buttons"] >> pref.tgui_large_buttons S["tgui_swapped_buttons"] >> pref.tgui_swapped_buttons + S["obfuscate_job"] >> pref.obfuscate_job /datum/category_item/player_setup_item/player_global/ui/save_preferences(var/savefile/S) S["UI_style"] << pref.UI_style @@ -33,6 +34,7 @@ S["tgui_input_lock"] << pref.tgui_input_lock S["tgui_large_buttons"] << pref.tgui_large_buttons S["tgui_swapped_buttons"] << pref.tgui_swapped_buttons + S["obfuscate_job"] << pref.obfuscate_job /datum/category_item/player_setup_item/player_global/ui/sanitize_preferences() pref.UI_style = sanitize_inlist(pref.UI_style, all_ui_styles, initial(pref.UI_style)) @@ -49,6 +51,7 @@ pref.tgui_input_lock = sanitize_integer(pref.tgui_input_lock, 0, 1, initial(pref.tgui_input_lock)) pref.tgui_large_buttons = sanitize_integer(pref.tgui_large_buttons, 0, 1, initial(pref.tgui_large_buttons)) pref.tgui_swapped_buttons = sanitize_integer(pref.tgui_swapped_buttons, 0, 1, initial(pref.tgui_swapped_buttons)) + pref.obfuscate_job = sanitize_integer(pref.obfuscate_job, 0, 1, initial(pref.obfuscate_job)) /datum/category_item/player_setup_item/player_global/ui/content(var/mob/user) . = "UI Style: [pref.UI_style]
" @@ -65,6 +68,7 @@ . += "TGUI Input Lock: [(pref.tgui_input_lock) ? "Enabled" : "Disabled (default)"]
" . += "TGUI Large Buttons: [(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]
" . += "TGUI Swapped Buttons: [(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]
" + . += "Obfuscate Job: [(pref.obfuscate_job) ? "Enabled" : "Disabled (default)"]
" if(can_select_ooc_color(user)) . += "OOC Color:" if(pref.ooccolor == initial(pref.ooccolor)) @@ -150,6 +154,10 @@ pref.tgui_swapped_buttons = !pref.tgui_swapped_buttons return TOPIC_REFRESH + else if(href_list["obfuscate_job"]) + pref.obfuscate_job = !pref.obfuscate_job + return TOPIC_REFRESH + else if(href_list["reset"]) switch(href_list["reset"]) if("ui") diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index db1e8fda21..45c8000328 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -32,6 +32,7 @@ var/list/preferences_datums = list() var/tgui_input_lock = FALSE var/tgui_large_buttons = TRUE var/tgui_swapped_buttons = FALSE + var/obfuscate_job = FALSE //character preferences var/real_name //our character's name diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 9c04c08717..e7d0cf50dd 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -115,6 +115,8 @@ var/datum/job/refJob = null for(var/mob/new_player/player in player_list) refJob = player.client.prefs.get_highest_job() + if(player.client.prefs.obfuscate_job) + refJob.title = "REDACTED" stat("[player.key]", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null)) totalPlayers++ if(player.ready)totalPlayersReady++ From 04b628250e406b9e937f446411058ccc14adf67a Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:09:15 +0000 Subject: [PATCH 2/3] Update new_player.dm --- code/modules/mob/new_player/new_player.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 58983d9439..4ba8510cda 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -118,8 +118,9 @@ for(var/mob/new_player/player in player_list) refJob = player.client.prefs.get_highest_job() if(player.client.prefs.obfuscate_job) - refJob.title = "REDACTED" - stat("[player.key]", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null)) + stat("[player.key]", (player.ready)?("Ready!"):(null)) + else + stat("[player.key]", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null)) totalPlayers++ if(player.ready)totalPlayersReady++ From 1fbd1edf88ec5ee3d7dfb24ee2d0452d41554f69 Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Fri, 17 Nov 2023 20:36:01 +0000 Subject: [PATCH 3/3] jobfuscate, director's cut --- code/modules/client/preference_setup/global/01_ui.dm | 10 +++++++++- code/modules/client/preferences.dm | 1 + code/modules/mob/new_player/new_player.dm | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/code/modules/client/preference_setup/global/01_ui.dm b/code/modules/client/preference_setup/global/01_ui.dm index f33242a64e..7f96fca3d0 100644 --- a/code/modules/client/preference_setup/global/01_ui.dm +++ b/code/modules/client/preference_setup/global/01_ui.dm @@ -17,6 +17,7 @@ S["tgui_input_lock"] >> pref.tgui_input_lock S["tgui_large_buttons"] >> pref.tgui_large_buttons S["tgui_swapped_buttons"] >> pref.tgui_swapped_buttons + S["obfuscate_key"] >> pref.obfuscate_key S["obfuscate_job"] >> pref.obfuscate_job S["chat_timestamp"] >> pref.chat_timestamp S["throwmode_loud"] >> pref.throwmode_loud @@ -36,6 +37,7 @@ S["tgui_input_lock"] << pref.tgui_input_lock S["tgui_large_buttons"] << pref.tgui_large_buttons S["tgui_swapped_buttons"] << pref.tgui_swapped_buttons + S["obfuscate_key"] << pref.obfuscate_key S["obfuscate_job"] << pref.obfuscate_job S["chat_timestamp"] << pref.chat_timestamp S["throwmode_loud"] << pref.throwmode_loud @@ -55,6 +57,7 @@ pref.tgui_input_lock = sanitize_integer(pref.tgui_input_lock, 0, 1, initial(pref.tgui_input_lock)) pref.tgui_large_buttons = sanitize_integer(pref.tgui_large_buttons, 0, 1, initial(pref.tgui_large_buttons)) pref.tgui_swapped_buttons = sanitize_integer(pref.tgui_swapped_buttons, 0, 1, initial(pref.tgui_swapped_buttons)) + pref.obfuscate_key = sanitize_integer(pref.obfuscate_key, 0, 1, initial(pref.obfuscate_key)) pref.obfuscate_job = sanitize_integer(pref.obfuscate_job, 0, 1, initial(pref.obfuscate_job)) pref.chat_timestamp = sanitize_integer(pref.chat_timestamp, 0, 1, initial(pref.chat_timestamp)) pref.throwmode_loud = sanitize_integer(pref.throwmode_loud, 0, 1, initial(pref.throwmode_loud)) @@ -74,6 +77,7 @@ . += "TGUI Input Lock: [(pref.tgui_input_lock) ? "Enabled" : "Disabled (default)"]
" . += "TGUI Large Buttons: [(pref.tgui_large_buttons) ? "Enabled (default)" : "Disabled"]
" . += "TGUI Swapped Buttons: [(pref.tgui_swapped_buttons) ? "Enabled" : "Disabled (default)"]
" + . += "Obfuscate Ckey: [(pref.obfuscate_key) ? "Enabled" : "Disabled (default)"]
" . += "Obfuscate Job: [(pref.obfuscate_job) ? "Enabled" : "Disabled (default)"]
" . += "Chat Timestamps: [(pref.chat_timestamp) ? "Enabled" : "Disabled (default)"]
" . += "Throw Mode Messages: [(pref.throwmode_loud) ? "Loud" : "Quiet (default)"]
" @@ -162,10 +166,14 @@ pref.tgui_swapped_buttons = !pref.tgui_swapped_buttons return TOPIC_REFRESH + else if(href_list["obfuscate_key"]) + pref.obfuscate_key = !pref.obfuscate_key + return TOPIC_REFRESH + else if(href_list["obfuscate_job"]) pref.obfuscate_job = !pref.obfuscate_job return TOPIC_REFRESH - + else if(href_list["chat_timestamps"]) pref.chat_timestamp = !pref.chat_timestamp return TOPIC_REFRESH diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 2c42e59ae8..96e092b81a 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -32,6 +32,7 @@ var/list/preferences_datums = list() var/tgui_input_lock = FALSE var/tgui_large_buttons = TRUE var/tgui_swapped_buttons = FALSE + var/obfuscate_key = FALSE var/obfuscate_job = FALSE var/chat_timestamp = FALSE var/throwmode_loud = FALSE diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 4ba8510cda..36192f74c6 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -117,7 +117,11 @@ var/datum/job/refJob = null for(var/mob/new_player/player in player_list) refJob = player.client.prefs.get_highest_job() - if(player.client.prefs.obfuscate_job) + if(player.client.prefs.obfuscate_key && player.client.prefs.obfuscate_job) + stat("Anonymous User", (player.ready)?("Ready!"):(null)) + else if(player.client.prefs.obfuscate_key) + stat("Anonymous User", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null)) + else if(player.client.prefs.obfuscate_job) stat("[player.key]", (player.ready)?("Ready!"):(null)) else stat("[player.key]", (player.ready)?("(Playing as: [(refJob)?(refJob.title):("Unknown")])"):(null))