Skip to content

Commit

Permalink
Revert "Добавил "Can Refuse in LOOC" и "Watch the OOC-notes" в Нон-Кон."
Browse files Browse the repository at this point in the history
This reverts commit 8875022.
  • Loading branch information
Kush1Push1 committed Nov 28, 2023
1 parent 47a7097 commit d43ae43
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 12 deletions.
3 changes: 1 addition & 2 deletions code/__SANDCODE/DEFINES/lewd.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/
GLOBAL_LIST_INIT(lewd_prefs_choices, list(
"Yes",
"Can Refuse in LOOC",
"Watch the OOC-notes",
"Ask",
"No"
))

Expand Down
8 changes: 3 additions & 5 deletions code/modules/client/preferences.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions modular_citadel/code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit d43ae43

Please sign in to comment.