Merge pull request #15059 from timothyteakettle/language-fixies

fixes losing your additional language upon changing species
This commit is contained in:
Lin
2021-09-02 16:37:43 -05:00
committed by GitHub
3 changed files with 11 additions and 0 deletions

View File

@@ -386,6 +386,14 @@
qdel(language_holder)
var/species_holder = initial(mrace.species_language_holder)
language_holder = new species_holder(src)
var/mob/living/carbon/human/H = src
//provide the user's additional language to the new language holder even if they change species
if(H.additional_language && H.additional_language != "None")
var/language_entry = GLOB.roundstart_languages[H.additional_language]
if(language_entry)
grant_language(language_entry, TRUE, TRUE)
update_atom_languages()
/mob/living/carbon/human/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE)

View File

@@ -3080,6 +3080,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(additional_language && additional_language != "None")
var/language_entry = GLOB.roundstart_languages[additional_language]
if(language_entry)
character.additional_language = language_entry
character.grant_language(language_entry, TRUE, TRUE)
//limb stuff, only done when initially spawning in

View File

@@ -81,6 +81,8 @@
tooltips = TRUE
var/additional_language //the additional language this human can speak from their preference selection
/// Unarmed parry data for human
/datum/block_parry_data/unarmed/human
parry_respect_clickdelay = TRUE