From 5e41a1e1d12cf813721518a150f6e37ad53d3941 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Mon, 15 Nov 2021 06:38:09 -0500 Subject: [PATCH] Ensure Alt Title Sanity (#17104) --- code/modules/client/preference/character.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference/character.dm b/code/modules/client/preference/character.dm index 2f22075d938..ec0fa2ee469 100644 --- a/code/modules/client/preference/character.dm +++ b/code/modules/client/preference/character.dm @@ -1661,9 +1661,10 @@ popup.open(0) /datum/character_save/proc/GetPlayerAltTitle(datum/job/job) - return player_alt_titles.Find(job.title) > 0 \ - ? player_alt_titles[job.title] \ - : job.title + if(player_alt_titles.Find(job.title) > 0) // Does it exist in the list + if(player_alt_titles[job.title] in job.alt_titles) // Is it valid + return player_alt_titles[job.title] + return job.title // Use default /datum/character_save/proc/SetPlayerAltTitle(datum/job/job, new_title) // remove existing entry