diff --git a/code/__DEFINES/sandcode/misc.dm b/code/__DEFINES/sandcode/misc.dm
index 15b91b14f3..1e02212de8 100644
--- a/code/__DEFINES/sandcode/misc.dm
+++ b/code/__DEFINES/sandcode/misc.dm
@@ -1 +1,7 @@
#define UTF8HEADER "" //I WOULD LOVE TO DEFINE THIS IN MODULAR_SAND BUT FREAKING CODE DOESN'T GET IT THEN
+
+GLOBAL_LIST_INIT(lewd_prefs_choices, list(
+ "Yes",
+ "Ask",
+ "No"
+ ))
diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm
index 2416afe657..5c2137c76c 100644
--- a/modular_citadel/code/modules/client/preferences_savefile.dm
+++ b/modular_citadel/code/modules/client/preferences_savefile.dm
@@ -14,7 +14,7 @@
features["mcolor2"] = sanitize_hexcolor(features["mcolor2"], 6, FALSE)
features["mcolor3"] = sanitize_hexcolor(features["mcolor3"], 6, FALSE)
- // SKYRAT CHANGE START
+ // Sandstorm changes
S["enable_personal_chat_color"] >> enable_personal_chat_color
S["personal_chat_color"] >> personal_chat_color
@@ -26,19 +26,13 @@
if(!(alt_titles_preferences[job.title] in job.alt_titles))
alt_titles_preferences.Remove(job.title)
- erppref = sanitize_text(S["erp_pref"], "Ask")
- if(!length(erppref)) erppref = "Ask"
- nonconpref = sanitize_text(S["noncon_pref"], "Ask")
- if(!length(nonconpref)) nonconpref = "Ask"
- vorepref = sanitize_text(S["vore_pref"], "Ask")
- if(!length(vorepref)) vorepref = "Ask"
- unholypref = sanitize_text(S["unholypref"], "No") //I AM MENTAL I AM MAD I AM INSANE
- if(!length(unholypref)) unholypref = "No"
- extremepref = sanitize_text(S["extremepref"], "No") //god has forsaken me
- if(!length(extremepref))
- extremepref = "No"
- extremeharm = sanitize_text(S["extremeharm"], "No")
- if(!length(extremeharm) || (extremepref = "No"))
+ 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")
+ 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 - "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))
personal_chat_color = sanitize_hexcolor(personal_chat_color, 6, 1, "#FFFFFF")