From d43ae438be3047b49c8dbeaf81713ee98a68ae29 Mon Sep 17 00:00:00 2001 From: Kush1Push1 Date: Tue, 28 Nov 2023 21:46:42 +0700 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20"Can=20Refuse=20in=20LOOC"=20=D0=B8=20"Watch=20the=20O?= =?UTF-8?q?OC-notes"=20=D0=B2=20=D0=9D=D0=BE=D0=BD-=D0=9A=D0=BE=D0=BD."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8875022a60c22ac7dbbed29603a6cee581b0e08c. --- code/__SANDCODE/DEFINES/lewd.dm | 3 +-- code/modules/client/preferences.dm | 8 +++----- .../code/modules/client/preferences_savefile.dm | 10 +++++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/code/__SANDCODE/DEFINES/lewd.dm b/code/__SANDCODE/DEFINES/lewd.dm index 8c462a0da2bc..80c235b6143c 100644 --- a/code/__SANDCODE/DEFINES/lewd.dm +++ b/code/__SANDCODE/DEFINES/lewd.dm @@ -6,8 +6,7 @@ */ GLOBAL_LIST_INIT(lewd_prefs_choices, list( "Yes", - "Can Refuse in LOOC", - "Watch the OOC-notes", + "Ask", "No" )) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ea48db8dc1a2..db6a0e24605d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -122,7 +122,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/age = 30 //age of character //Sandstorm CHANGES BEGIN var/erppref = "Ask" - var/nonconpref = "Can Refuse in LOOC" + var/nonconpref = "Ask" var/vorepref = "Ask" var/mobsexpref = "No" //Added by Gardelin0 - Sex(mostly non-con) with hostile mobs(tentacles) var/extremepref = "No" //This is for extreme shit, maybe even literal shit, better to keep it on no by default @@ -3664,10 +3664,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("noncon_pref") switch(nonconpref) if("Yes") - nonconpref = "Can Refuse in LOOC" - if("Can Refuse in LOOC") - nonconpref = "Watch the OOC-notes" - if("Watch the OOC-notes") + nonconpref = "Ask" + if("Ask") nonconpref = "No" if("No") nonconpref = "Yes" diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index ce0465d476b0..b2bec711d757 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -28,13 +28,13 @@ if(!(alt_titles_preferences[job.title] in job.alt_titles)) alt_titles_preferences.Remove(job.title) - erppref = sanitize_inlist(S["erp_pref"], GLOB.lewd_prefs_choices, "Can Refuse in LOOC") - nonconpref = sanitize_inlist(S["noncon_pref"], GLOB.lewd_prefs_choices, "Can Refuse in LOOC") - vorepref = sanitize_inlist(S["vore_pref"], GLOB.lewd_prefs_choices, "Can Refuse in LOOC") + erppref = sanitize_inlist(S["erp_pref"], GLOB.lewd_prefs_choices, "Ask") + nonconpref = sanitize_inlist(S["noncon_pref"], GLOB.lewd_prefs_choices, "Ask") + vorepref = sanitize_inlist(S["vore_pref"], GLOB.lewd_prefs_choices, "Ask") mobsexpref = sanitize_inlist(S["mobsex_pref"], GLOB.lewd_prefs_choices, "No") //Hentai - unholypref = sanitize_inlist(S["unholypref"], GLOB.lewd_prefs_choices, "Can Refuse in LOOC") //I AM MENTAL I AM MAD I AM INSANE + unholypref = sanitize_inlist(S["unholypref"], GLOB.lewd_prefs_choices, "Ask") //I AM MENTAL I AM MAD I AM INSANE extremepref = sanitize_inlist(S["extreme_pref"], GLOB.lewd_prefs_choices, "No") //god has forsaken me - extremeharm = sanitize_inlist(S["extreme_harm"], (GLOB.lewd_prefs_choices - "Can Refuse in LOOC"), "No") //hacky for not saving "Ask" + extremeharm = sanitize_inlist(S["extreme_harm"], (GLOB.lewd_prefs_choices - "Ask"), "No") //hacky for not saving "Ask" if(extremepref == "No") extremeharm = "No" enable_personal_chat_color = sanitize_integer(enable_personal_chat_color, 0, 1, initial(enable_personal_chat_color))