cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-21 05:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] copy slot needs to override (#12543)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-03-17 12:46:41 -07:00
committed by GitHub
parent 7774d50086
commit 16bca9fbcc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+1 -1
View File
@@ -400,7 +400,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()
code/modules/client/preferences_savefile.dm
+3 -3
View File
@@ -300,7 +300,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
@@ -313,10 +313,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