cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-27 18:28:54 -04:00
committed by GitHub
parent a14698561a
commit 4da0341c9b
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/client/preference_setup/general/02_language.dm
View File

@@ -33,15 +33,8 @@
// Sanitize illegal languages // Sanitize illegal languages
for(var/language in pref.alternate_languages) for(var/language in pref.alternate_languages)
var/datum/language/L = GLOB.all_languages[language] 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))) 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") 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 pref.alternate_languages -= language
if(isnull(pref.language_prefixes) || !pref.language_prefixes.len) if(isnull(pref.language_prefixes) || !pref.language_prefixes.len)