diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index ee1954217e..257a520af8 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/tip_delay = 500 //tip delay in milliseconds //Antag preferences - var/list/be_special = list(ROLE_SYNDICATE) //Special role selection. ROLE_SYNDICATE being missing means they will never be antag! + var/list/be_special = list() //Special role selection. ROLE_SYNDICATE being missing means they will never be antag! var/tmp/old_be_special = 0 //Bitflag version of be_special, used to update old savefiles and nothing more //If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were, //autocorrected this round, not that you'd need to check that. @@ -851,8 +851,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) for (var/i in GLOB.special_roles) - if(i == ROLE_SYNDICATE) - dat += "DISABLE ALL ANTAGONISM [!(i in be_special) ? "Enabled" : "Disabled"]
" + if(i == ROLE_NO_ANTAGONISM) + dat += "DISABLE ALL ANTAGONISM [(i in be_special) ? "YES" : "NO"]
" continue if(jobban_isbanned(user, i)) dat += "Be [capitalize(i)]: BANNED
" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 492e1eff88..b8959d93aa 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -5,7 +5,7 @@ // You do not need to raise this if you are adding new values that have sane defaults. // Only raise this value when changing the meaning/format/name/layout of an existing value // where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 49 +#define SAVEFILE_VERSION_MAX 50 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn @@ -288,6 +288,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(current_version < 48) //unlockable loadout items but we need to clear bad data from a mistake S["unlockable_loadout"] = list() + if(current_version < 50) + var/list/L + S["be_special"] >> L + if(islist(L)) + L -= ROLE_SYNDICATE + S["be_special"] << L + /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) return