diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 60b5c8b3..3a8ef87b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -302,26 +302,26 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" - switch(current_tab) - if (0) // Character Settings# - if(path) - var/savefile/S = new /savefile(path) - if(S) - dat += "
" - var/name - var/unspaced_slots = 0 - for(var/i=1, i<=max_save_slots, i++) - unspaced_slots++ - if(unspaced_slots > 4) - dat += "
" - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "+" - dat += "[name] " - dat += "
" + if(path) + var/savefile/S = new /savefile(path) + if(S) + dat += "
" + var/name + var/unspaced_slots = 0 + for(var/i=1, i<=max_save_slots, i++) + unspaced_slots++ + if(unspaced_slots > 4) + dat += "
" + unspaced_slots = 0 + S.cd = "/character[i]" + S["real_name"] >> name + if(!name) + name = "+" + dat += "[name] " + dat += "
" + switch(current_tab) + if (0) // Character Settings dat += "

Occupation Choices

" dat += "Set Occupation Preferences
" if(CONFIG_GET(flag/roundstart_traits)) @@ -380,24 +380,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) //Character Appearance if(2) - if(path) - var/savefile/S = new /savefile(path) - if(S) - dat += "
" - var/name - var/unspaced_slots = 0 - for(var/i=1, i<=max_save_slots, i++) - unspaced_slots++ - if(unspaced_slots > 4) - dat += "
" - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "+" - dat += "[name] " - dat += "
" - update_preview_icon() dat += "
" dat += "

Flavor Text

" @@ -914,24 +896,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" if (1) // Game Preferences - if(path) - var/savefile/S = new /savefile(path) - if(S) - dat += "
" - var/name - var/unspaced_slots = 0 - for(var/i=1, i<=max_save_slots, i++) - unspaced_slots++ - if(unspaced_slots > 4) - dat += "
" - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "+" - dat += "[name] " - dat += "
" - dat += "
" dat += "

General Settings

" dat += "UI Style: [UI_style]
" @@ -1082,24 +1046,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" if(3) //Item Loadout - if(path) - var/savefile/S = new /savefile(path) - if(S) - dat += "
" - var/name - var/unspaced_slots = 0 - for(var/i=1, i<=max_save_slots, i++) - unspaced_slots++ - if(unspaced_slots > 4) - dat += "
" - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "+" - dat += "[name] " - dat += "
" - if(!gear_tab) gear_tab = GLOB.loadout_items[1] dat += "" @@ -1156,24 +1102,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" if(4) //Antag Preferences - if(path) - var/savefile/S = new /savefile(path) - if(S) - dat += "
" - var/name - var/unspaced_slots = 0 - for(var/i=1, i<=max_save_slots, i++) - unspaced_slots++ - if(unspaced_slots > 4) - dat += "
" - unspaced_slots = 0 - S.cd = "/character[i]" - S["real_name"] >> name - if(!name) - name = "+" - dat += "[name] " - dat += "
" - dat += "" dat += "

Special Role Settings

" if(jobban_isbanned(user, ROLE_SYNDICATE)) dat += "

You are banned from antagonist roles.

" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 07847b1a..fb1d677c 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -47,7 +47,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(current_version < 23) S["be_special"] >> be_special WRITE_FILE(S["be_special"], null) - WRITE_FILE(S["special_roles"], be_special) return /datum/preferences/proc/update_character(current_version, savefile/S) @@ -60,6 +59,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car features["balls_fluid"] = /datum/reagent/consumable/semen if(features["breasts_fluid"]) features["breasts_fluid"] = /datum/reagent/consumable/milk + if(current_version < 23) + if(be_special) + WRITE_FILE(S["special_roles"], be_special) /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey)