From 924d47c5041055b371609f83f5ce4a55bec56690 Mon Sep 17 00:00:00 2001 From: Kashargul Date: Thu, 26 Sep 2024 18:22:47 +0200 Subject: [PATCH] fully deref --- .../client/preference_setup/general/03_body.dm | 11 ++++++++++- .../client/preference_setup/general/04_equipment.dm | 2 +- .../client/preference_setup/loadout/loadout.dm | 9 ++------- .../modules/client/preference_setup/vore/07_traits.dm | 6 +++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index bb685f62fac..a71049c51ee 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -116,6 +116,10 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O pref.organ_data = check_list_copy(save_data["organ_data"]) pref.rlimb_data = check_list_copy(save_data["rlimb_data"]) pref.body_markings = check_list_copy(save_data["body_markings"]) + for(var/i in pref.body_markings) + pref.body_markings[i] = check_list_copy(pref.body_markings[i]) + for(var/j in pref.body_markings[i]) + pref.body_markings[i][j] = check_list_copy(pref.body_markings[i][j]) pref.synth_color = save_data["synth_color"] pref.r_synth = save_data["synth_red"] pref.g_synth = save_data["synth_green"] @@ -180,7 +184,12 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O save_data["disabilities"] = pref.disabilities save_data["organ_data"] = check_list_copy(pref.organ_data) save_data["rlimb_data"] = check_list_copy(pref.rlimb_data) - save_data["body_markings"] = check_list_copy(pref.body_markings) + var/list/body_markings = check_list_copy(pref.body_markings) + for(var/i in pref.body_markings) + body_markings[i] = check_list_copy(body_markings[i]) + for(var/j in body_markings[i]) + body_markings[i][j] = check_list_copy(body_markings[i][j]) + save_data["body_markings"] = body_markings save_data["synth_color"] = pref.synth_color save_data["synth_red"] = pref.r_synth save_data["synth_green"] = pref.g_synth diff --git a/code/modules/client/preference_setup/general/04_equipment.dm b/code/modules/client/preference_setup/general/04_equipment.dm index c27aa654907..554885046cb 100644 --- a/code/modules/client/preference_setup/general/04_equipment.dm +++ b/code/modules/client/preference_setup/general/04_equipment.dm @@ -10,7 +10,7 @@ pref.all_underwear = check_list_copy(save_data["all_underwear"]) pref.all_underwear_metadata = check_list_copy(save_data["all_underwear_metadata"]) for(var/i in pref.all_underwear_metadata) - pref.all_underwear_metadata[i] = check_list_copy(path2text_list(pref.all_underwear_metadata[i])) + pref.all_underwear_metadata[i] = path2text_list(pref.all_underwear_metadata[i]) pref.backbag = save_data["backbag"] pref.pdachoice = save_data["pdachoice"] pref.communicator_visibility = save_data["communicator_visibility"] diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 8793eb2d355..71b42bcf97e 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -50,14 +50,9 @@ var/list/gear_datums = list() var/all_gear = check_list_copy(save_data["gear_list"]) for(var/i in all_gear) var/list/entries = check_list_copy(all_gear["[i]"]) - if(!length(entries)) - entries = check_list_copy(all_gear[i]) for(var/j in entries) - entries["[j]"] = check_list_copy(path2text_list(entries["[j]"])) - var/index = i - if(!isnum(i)) - index = text2num(i) - pref.gear_list["[index]"] = entries + entries["[j]"] = path2text_list(entries["[j]"]) + pref.gear_list["[i]"] = entries pref.gear_slot = save_data["gear_slot"] if(pref.gear_list!=null && pref.gear_slot!=null) pref.gear = pref.gear_list["[pref.gear_slot]"] diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 5714c6eee4d..b759c87b6ba 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -110,9 +110,9 @@ var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","s /datum/category_item/player_setup_item/vore/traits/load_character(list/save_data) pref.custom_species = save_data["custom_species"] pref.custom_base = save_data["custom_base"] - pref.pos_traits = text2path_list(check_list_copy(save_data["pos_traits"])) - pref.neu_traits = text2path_list(check_list_copy(save_data["neu_traits"])) - pref.neg_traits = text2path_list(check_list_copy(save_data["neg_traits"])) + pref.pos_traits = text2path_list(save_data["pos_traits"]) + pref.neu_traits = text2path_list(save_data["neu_traits"]) + pref.neg_traits = text2path_list(save_data["neg_traits"]) pref.blood_color = save_data["blood_color"] pref.blood_reagents = save_data["blood_reagents"]