From 4d99fe70276fce25265e89058bc2ef90f383817c Mon Sep 17 00:00:00 2001 From: Kashargul <144968721+Kashargul@users.noreply.github.com> Date: Tue, 17 Mar 2026 20:07:51 +0100 Subject: [PATCH] copy slot needs to override (#19299) * copy slot needs to override * space * Delete code/__defines/js_snippets.dm --- code/modules/client/preferences.dm | 2 +- code/modules/client/preferences_savefile.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index dbae462d39..45f31866ed 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -399,7 +399,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(tgui_alert(user, "Are you sure you want to override slot [slotnum], [choice]'s savedata?", "Confirm Override", list("No", "Yes")) == "Yes") overwrite_character(slotnum) - save_character() + save_character(TRUE) save_preferences() load_preferences(TRUE) load_character() diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 37534d4dc0..966e26ebe0 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -297,7 +297,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car clear_character_previews() return TRUE -/datum/preferences/proc/save_character() +/datum/preferences/proc/save_character(override) SHOULD_NOT_SLEEP(TRUE) if(!savefile) return FALSE @@ -310,10 +310,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car var/save_data = savefile.get_entry(tree_key) for(var/datum/preference/preference as anything in get_preferences_in_priority_order()) - if(preference.savefile_identifier != PREFERENCE_CHARACTER && !first_save) + if(preference.savefile_identifier != PREFERENCE_CHARACTER && !first_save && !override) continue - if(!(preference.type in recently_updated_keys) && !first_save) + if(!(preference.type in recently_updated_keys) && !first_save && !override) continue recently_updated_keys -= preference.type