From d5cd28c65a4e09bea132970bd7ce987e7b36a6ec Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 11 Feb 2026 19:55:41 -0600 Subject: [PATCH 1/4] Fixes + Polishing for character slot load menu --- code/modules/client/preferences.dm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index b1d85cb9e10..0b30a87b464 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2867,17 +2867,22 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr if("changeslot") var/list/choices = list() + var/choices_default if(path) var/savefile/S = new /savefile(path) if(S) for(var/i=1, i<=max_save_slots, i++) var/name S.cd = "/character[i]" - S["real_name"] >> name + S["nickname"] >> name if(!name) - name = "Slot[i]" + name = "[i] - \[EMPTY SLOT\]" + else + name = "[i] - [name]" + if(loaded_slot == i) + choices_default = name choices[name] = i - var/choice = tgui_input_list(user, "CHOOSE A HERO","ROGUETOWN", choices) + var/choice = tgui_input_list(user, "CHOOSE A HERO","AZURE PEAK", choices, choices_default) if(choice) choice = choices[choice] if(!load_character(choice)) From 57e27431eca1c9bbb4499286e55c168ee429355f Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 11 Feb 2026 20:01:58 -0600 Subject: [PATCH 2/4] ALMOST forgot the edit marker --- code/modules/client/preferences.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 0b30a87b464..74638edadfb 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2866,6 +2866,7 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr load_character() if("changeslot") + // Caustic Edit - Fixes duplicate slot names not showing up + different slot name presentation var/list/choices = list() var/choices_default if(path) @@ -2883,6 +2884,7 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr choices_default = name choices[name] = i var/choice = tgui_input_list(user, "CHOOSE A HERO","AZURE PEAK", choices, choices_default) + // Caustic Edit End if(choice) choice = choices[choice] if(!load_character(choice)) From ae02811db0bae64d173c92dc869f222acdbec6bd Mon Sep 17 00:00:00 2001 From: Jenny Date: Thu, 12 Feb 2026 18:32:23 -0600 Subject: [PATCH 3/4] Accounts for character slots with no nickname set yet --- code/modules/client/preferences.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 74638edadfb..92edf3de492 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2875,11 +2875,12 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr for(var/i=1, i<=max_save_slots, i++) var/name S.cd = "/character[i]" - S["nickname"] >> name - if(!name) + var/nickname = S["nickname"] + var/realname = S["real_name"] + if(!realname) name = "[i] - \[EMPTY SLOT\]" else - name = "[i] - [name]" + name = "[i] - [nickname ? nickname : realname]" if(loaded_slot == i) choices_default = name choices[name] = i From 8bffe9048d94a83d63f67f9d624389dea52b4ad4 Mon Sep 17 00:00:00 2001 From: Jenny Date: Thu, 12 Feb 2026 21:19:28 -0600 Subject: [PATCH 4/4] Changes name display to show real anme and nickname in parentheses --- code/modules/client/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 92edf3de492..c546c2070a6 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -2880,7 +2880,7 @@ Slots: [job.spawn_positions] [job.round_contrib_points ? "RCP: +[job.round_contr if(!realname) name = "[i] - \[EMPTY SLOT\]" else - name = "[i] - [nickname ? nickname : realname]" + name = "[i] - [realname][nickname ? " ([nickname])" : ""]" if(loaded_slot == i) choices_default = name choices[name] = i