cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-27 14:46:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
BongaTheProto
2022-02-16 18:10:40 -05:00
parent 93016e7568 65face48e9
commit 281eafdcdd
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/client/preferences_savefile.dm
+8 -14
View File
@@ -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")