From a33a7ed2497153bc2efccc57ba0c82c0abc5ddab Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Wed, 1 Sep 2021 17:54:14 +0100
Subject: [PATCH 1/2] fix

---
 code/datums/dna.dm                                    | 7 +++++++
 code/modules/client/preferences.dm                    | 1 +
 code/modules/mob/living/carbon/human/human_defines.dm | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index a2982a3caf..63ea4acf56 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -386,6 +386,13 @@
 			qdel(language_holder)
 			var/species_holder = initial(mrace.species_language_holder)
 			language_holder = new species_holder(src)
+
+			//provide the user's additional language to the new language holder even if they change species
+			if(additional_language && additional_language != "None")
+				var/language_entry = GLOB.roundstart_languages[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)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 5bc0440b77..02762b27ea 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -3070,6 +3070,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
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index de934318b3..e15f5b8be0 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -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

From f827d3349704303d52ac7a81318970ee5b667307 Mon Sep 17 00:00:00 2001
From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Wed, 1 Sep 2021 18:19:37 +0100
Subject: [PATCH 2/2] Update dna.dm

---
 code/datums/dna.dm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/code/datums/dna.dm b/code/datums/dna.dm
index 63ea4acf56..43dad6cef8 100644
--- a/code/datums/dna.dm
+++ b/code/datums/dna.dm
@@ -387,9 +387,10 @@
 			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(additional_language && additional_language != "None")
-				var/language_entry = GLOB.roundstart_languages[additional_language]
+			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)