[MODULARIZING] Removes Foreigner and Adds Quirk Sanitization (#16836)

* Go away, I'm done with your code.

* Haha copypaste go brrrr

* Remove this dead code

* This annoys me too much after looking over my diff

* Tired of waiting, let's get this bread.

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
This commit is contained in:
RimiNosha
2022-10-26 18:11:43 -04:00
committed by GitHub
co-authored by GoldenAlpharex
parent df4cdc3c29
commit 6e9caab6df
8 changed files with 27 additions and 30 deletions
+2 -1
View File
@@ -113,8 +113,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/loaded_preferences_successfully = load_preferences()
if(loaded_preferences_successfully)
if(load_character())
// SKYRAT EDIT START - Sanitizing languages
// SKYRAT EDIT START - Sanitizing preferences
sanitize_languages()
sanitize_quirks()
// SKYRAT EDIT END
return // SKYRAT EDIT - Don't remove this. Just don't. Nothing is worth forced random characters.
//we couldn't load character data so just randomize the character appearance + name
@@ -76,15 +76,6 @@
/datum/preference_middleware/quirks/proc/remove_quirk(list/params, mob/user)
var/quirk_name = params["quirk"]
// SKYRAT EDIT ADDITION
var/list/quirks = SSquirks.get_quirks()
var/datum/quirk/quirk = quirks[quirk_name]
if(quirk == /datum/quirk/foreigner)
preferences.languages = new /list()
for(var/language in preferences.get_adjusted_language_holder())
preferences.languages[language] = LANGUAGE_SPOKEN
// SKYRAT EDIT END
var/list/new_quirks = preferences.all_quirks - quirk_name
if ( \
!(quirk_name in preferences.all_quirks) \