From a14698561a88b1bf48861e41e1f90647a72dde9a Mon Sep 17 00:00:00 2001 From: Chompstation Bot Date: Wed, 27 Oct 2021 15:23:46 +0000 Subject: [PATCH 1/2] Fixes the language reset bug --- .../client/preference_setup/general/02_language.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index b216ec4dec..5f8a4d3fe4 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -33,7 +33,15 @@ // Sanitize illegal languages for(var/language in pref.alternate_languages) var/datum/language/L = GLOB.all_languages[language] +<<<<<<< HEAD if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L))) +||||||| parent of c1ab2b86de... Merge pull request #11643 from Verkister/patch-87 + if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && !is_lang_whitelisted(pref.client, L))) + testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks") +======= + if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L))) + testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks") +>>>>>>> c1ab2b86de... Merge pull request #11643 from Verkister/patch-87 pref.alternate_languages -= language if(isnull(pref.language_prefixes) || !pref.language_prefixes.len) From 4da0341c9bdec9e92f40021fd16e8abc9cb0cb4c Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Wed, 27 Oct 2021 18:28:54 -0400 Subject: [PATCH 2/2] powder that makes you say yes --- .../modules/client/preference_setup/general/02_language.dm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/code/modules/client/preference_setup/general/02_language.dm b/code/modules/client/preference_setup/general/02_language.dm index 5f8a4d3fe4..730c05649f 100644 --- a/code/modules/client/preference_setup/general/02_language.dm +++ b/code/modules/client/preference_setup/general/02_language.dm @@ -33,15 +33,8 @@ // Sanitize illegal languages for(var/language in pref.alternate_languages) var/datum/language/L = GLOB.all_languages[language] -<<<<<<< HEAD - if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L))) -||||||| parent of c1ab2b86de... Merge pull request #11643 from Verkister/patch-87 - if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && !is_lang_whitelisted(pref.client, L))) - testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks") -======= if(!istype(L) || (L.flags & RESTRICTED) || (!(language in S.secondary_langs) && pref.client && !is_lang_whitelisted(pref.client, L))) testing("LANGSANI: Removed [L?.name || "lang not found"] from [pref.client]'s character [pref.real_name || "-name not yet loaded-"] because it failed allowed checks") ->>>>>>> c1ab2b86de... Merge pull request #11643 from Verkister/patch-87 pref.alternate_languages -= language if(isnull(pref.language_prefixes) || !pref.language_prefixes.len)