From aec243d06c0a9680785307aa8b96ce9a855c029d Mon Sep 17 00:00:00 2001 From: RimiNosha <106692773+RimiNosha@users.noreply.github.com> Date: Thu, 4 Aug 2022 17:15:09 +0100 Subject: [PATCH] [MODULAR] Actually Fix Invisible Selected Languages (#15259) * AAAAAAAAA * Oops! Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- code/modules/client/preferences.dm | 6 +++++- .../modules/client/preferences/middleware/languages.dm | 8 -------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index acd83e54467..8df3b1d6df3 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -113,7 +113,11 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/loaded_preferences_successfully = load_preferences() if(loaded_preferences_successfully) if(load_character()) - return + // SKYRAT EDIT START - Sanitizing languages + for(var/datum/language/lang_path as anything in languages) + if(initial(lang_path.secret)) + languages.Remove(lang_path) + // SKYRAT EDIT END //we couldn't load character data so just randomize the character appearance + name randomise_appearance_prefs() //let's create a random character then - rather than a fat, bald and naked man. if(C) diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm index 4d7869bf6a2..240d34ee360 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm @@ -36,14 +36,6 @@ ) var/list/name_to_language -/datum/preference_middleware/languages/New(datum/preferences) - . = ..() - // Sanitize languages. "src." is required because of typing, and creating a new variable when one exists makes no sense. - if(src.preferences?.languages) - for(var/datum/language/lang_path as anything in src.preferences.languages) - if(initial(lang_path.secret)) - src.preferences.languages.Remove(lang_path) - /datum/preference_middleware/languages/apply_to_human(mob/living/carbon/human/target, datum/preferences/preferences) // SKYRAT EDIT CHANGE target.language_holder.understood_languages.Cut() target.language_holder.spoken_languages.Cut()