From f8436c3f29fb7f524f90824221fdf94fad177b04 Mon Sep 17 00:00:00 2001 From: Archie Date: Fri, 29 Oct 2021 15:06:29 -0300 Subject: [PATCH] Reverts 1019 --- code/__DEFINES/preferences.dm | 3 +- code/modules/client/preferences.dm | 32 --------------------- code/modules/client/preferences_savefile.dm | 6 ++-- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 1f0e0152b..e26291e03 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -15,7 +15,6 @@ #define DISABLE_DEATHRATTLE (1<<12) #define DISABLE_ARRIVALRATTLE (1<<13) #define COMBOHUD_LIGHTING (1<<14) -#define ANTAG_SYNC_WITH_CHARS (1<<15) #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS) @@ -71,4 +70,4 @@ //Flags in the players table in the db #define DB_FLAG_EXEMPT 1 -#define DEFAULT_CYBORG_NAME "Default Cyborg Name" \ No newline at end of file +#define DEFAULT_CYBORG_NAME "Default Cyborg Name" diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 3c4c0d5dd..5a0999a73 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1157,7 +1157,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "" if(4) //Antag Preferences - dat += "
" dat += "

Special Role Settings

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

You are banned from antagonist roles.

" @@ -1178,13 +1177,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) else dat += "Be [capitalize(i)]: [(i in be_special) ? "Enabled" : "Disabled"]
" dat += "Midround Antagonist: [(toggles & MIDROUND_ANTAG) ? "Enabled" : "Disabled"]
" - dat += "		" - dat += "

Sync Settings

" - dat += "Sync antag prefs. with all characters: [(toggles & ANTAG_SYNC_WITH_CHARS) ? "Yes" : "No"]
" - dat += "Copy and save antag prefs. to all characters: Copy
" - dat += "Reset antag prefs. for this character: Reset
" - dat += "
" - dat += "
" @@ -2672,30 +2664,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) if("allow_midround_antag") toggles ^= MIDROUND_ANTAG - if("sync_antag_with_chars") - toggles ^= ANTAG_SYNC_WITH_CHARS - if(!(toggles & ANTAG_SYNC_WITH_CHARS) && path) - var/savefile/S = new /savefile(path) - if(S) - S["special_roles"] >> be_special - - if("copy_antag_to_chars") - if(path) - var/savefile/S = new /savefile(path) - if(S) - var/initial_cd = S.cd - for(var/i=1, i<=max_save_slots, i++) - S.cd = "/character[i]" - if(S["real_name"]) - WRITE_FILE(S["special_roles"], be_special) - S.cd = initial_cd - to_chat(parent, "Successfully copied antagonist preferences to all characters.") - else - to_chat(parent, "Could not write to file.") - - if("reset_antag") - be_special = list() - if("parallaxup") parallax = WRAP(parallax + 1, PARALLAX_INSANE, PARALLAX_DISABLE + 1) if (parent && parent.mob && parent.mob.hud_used) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index ef5cf18e7..5f547d035 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -378,8 +378,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["job_engsec_low"] >> job_engsec_low //Antags - if(!(toggles & ANTAG_SYNC_WITH_CHARS)) - S["special_roles"] >> be_special + S["special_roles"] >> be_special //Quirks S["all_quirks"] >> all_quirks @@ -638,8 +637,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["medical_records"] , medical_records) //Misc. - if(!(toggles & ANTAG_SYNC_WITH_CHARS)) - WRITE_FILE(S["special_roles"] , be_special) //Preferences don't load every character change + WRITE_FILE(S["special_roles"] , be_special) //Preferences don't load every character change WRITE_FILE(S["hide_ckey"] , hide_ckey) WRITE_FILE(S["all_quirks"] , all_quirks)