Porting "Refactors language holder"

2020-05-08 22:44:02 +02:00
parent 602154abe8
commit 2858ddd90b
62 changed files with 592 additions and 388 deletions
@@ -25,10 +25,3 @@
 /mob/living/brain/treat_message(message)
 	message = capitalize(message)
 	return message
-
-/mob/living/brain/could_speak_in_language(datum/language/dt)
-	if(istype(container, /obj/item/mmi/posibrain/soul_vessel))
-		// soul vessels can only speak ratvarian.
-		. = ispath(dt, /datum/language/ratvar)
-	else
-		. = ..()
@@ -49,6 +49,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/blacklisted = 0 //Flag to exclude from green slime core species.
 	var/dangerous_existence //A flag for transformation spells that tells them "hey if you turn a person into one of these without preperation, they'll probably die!"
 	var/say_mod = "says"	// affects the speech message
+	var/species_language_holder = /datum/language_holder
 	var/list/mutant_bodyparts = list() 	// Visible CURRENT bodyparts that are unique to a species. Changes to this list for non-species specific bodyparts (ie cat ears and tails) should be assigned at organ level if possible. Layer hiding is handled by handle_mutant_bodyparts() below.
 	var/list/mutant_organs = list()		//Internal organs that are unique to this race.
 	var/speedmod = 0	// this affects the race's speed. positive numbers make it move slower, negative numbers make it move faster
@@ -9,6 +9,7 @@
 	gib_types = /obj/effect/gibspawner/robot
 	damage_overlay_type = "synth"
 	mutanttongue = /obj/item/organ/tongue/robot
+	species_language_holder = /datum/language_holder/synthetic
 	limbs_id = "synth"

 /datum/species/android/on_species_gain(mob/living/carbon/C)
@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	disliked_food = JUNKFOOD | FRIED //Dwarves hate foods that have no nutrition other than alcohol.
 	mutant_organs = list(/obj/item/organ/dwarfgland) //Dwarven alcohol gland, literal gland warrior
 	mutantliver = /obj/item/organ/liver/dwarf //Dwarven super liver (Otherwise they r doomed)
+	species_language_holder = /datum/language_holder/dwarf

 /mob/living/carbon/human/species/dwarf //species admin spawn path
 	race = /datum/species/dwarf //and the race the path is set to.
@@ -30,7 +31,6 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	. = ..()
 	var/dwarf_hair = pick("Beard (Dwarf)", "Beard (Very Long)", "Beard (Long)") //beard roullette
 	var/mob/living/carbon/human/H = C
-	H.grant_language(/datum/language/dwarf)
 	H.facial_hair_style = dwarf_hair
 	H.update_hair()
 	H.transform = H.transform.Scale(1, 0.8) //We use scale, and yeah. Dwarves can become gnomes with DWARFISM.
@@ -40,7 +40,6 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	. = ..()
 	H.transform = H.transform.Scale(1, 1.25) //And we undo it.
 	UnregisterSignal(H, COMSIG_MOB_SAY) //We register handle_speech is not being used.
-	H.remove_language(/datum/language/dwarf)

 //Dwarf Name stuff
 /proc/dwarf_name() //hello caller: my name is urist mcuristurister
@@ -21,20 +21,19 @@
 	coldmod = 6   // = 3x cold damage
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage
+	species_language_holder = /datum/language_holder/jelly

 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
 	if(regenerate_limbs)
 		regenerate_limbs.Remove(C)
 	if(slime_change)	//CIT CHANGE
 		slime_change.Remove(C)	//CIT CHANGE
-	C.remove_language(/datum/language/slime)
 	C.faction -= "slime"
 	..()
 	C.faction -= "slime"

 /datum/species/jelly/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	..()
-	C.grant_language(/datum/language/slime)
 	if(ishuman(C))
 		regenerate_limbs = new
 		regenerate_limbs.Grant(C)
@@ -24,9 +24,7 @@
 	disliked_food = GRAIN | DAIRY
 	liked_food = GROSS | MEAT
 	inert_mutation = FIREBREATH
-
-/datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H)
-	H.grant_language(/datum/language/draconic)
+	species_language_holder = /datum/language_holder/lizard

 /datum/species/lizard/random_name(gender,unique,lastname)
 	if(unique)
@@ -86,6 +84,7 @@
 	mutantlungs = /obj/item/organ/lungs/ashwalker
 	burnmod = 0.9
 	brutemod = 0.9
+	species_language_holder = /datum/language_holder/lizard/ash

 /datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
 	if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail_lizard"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
@@ -23,9 +23,7 @@

 	mutanteyes = /obj/item/organ/eyes/night_vision/mushroom
 	var/datum/martial_art/mushpunch/mush
-
-/datum/species/mush/after_equip_job(datum/job/J, mob/living/carbon/human/H)
-	H.grant_language(/datum/language/mushroom) //pomf pomf
+	species_language_holder = /datum/language_holder/mushroom

 /datum/species/mush/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
@@ -12,6 +12,7 @@
 	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant
 	disliked_food = MEAT | DAIRY
 	liked_food = VEGETABLES | FRUIT | GRAIN
+	species_language_holder = /datum/language_holder/sylvan
 	var/light_nutrition_gain_factor = 10
 	var/light_toxheal = 1
 	var/light_oxyheal = 1
@@ -16,6 +16,7 @@
 	var/list/initial_inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER,TRAIT_NOBREATH)
 	var/disguise_fail_health = 75 //When their health gets to this level their synthflesh partially falls off
 	var/datum/species/fake_species = null //a species to do most of our work for us, unless we're damaged
+	species_language_holder = /datum/language_holder/synthetic

 /datum/species/synth/military
 	name = "Military Synth"
@@ -34,12 +34,11 @@
 /mob/living/carbon/human/set_drugginess(amount)
 	..()
 	if(!amount)
-		remove_language(/datum/language/beachbum)
+		remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_HIGH)

 /mob/living/carbon/human/adjust_drugginess(amount)
 	..()
-	if(!dna.check_mutation(STONER))
-		if(druggy)
-			grant_language(/datum/language/beachbum)
-		else
-			remove_language(/datum/language/beachbum)
+	if(druggy)
+		grant_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_HIGH)
+	else
+		remove_language(/datum/language/beachbum, TRUE, TRUE, LANGUAGE_HIGH)
@@ -12,9 +12,9 @@
 		return 0
 	return ..()

-/mob/living/carbon/could_speak_in_language(datum/language/dt)
+/mob/living/carbon/could_speak_language(datum/language/language)
 	var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
 	if(T)
-		. = T.could_speak_in_language(dt)
+		return T.could_speak_language(language)
 	else
-		. = initial(dt.flags) & TONGUELESS_SPEECH
+		return initial(language.flags) & TONGUELESS_SPEECH
@@ -98,8 +98,6 @@

 	var/datum/riding/riding_datum

-	var/datum/language/selected_default_language
-
 	var/last_words	//used for database logging

 	var/list/obj/effect/proc_holder/abilities = list()
@@ -133,7 +133,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	var/datum/language/message_language = get_message_language(message)
 	if(message_language)
 		// No, you cannot speak in xenocommon just because you know the key
-		if(can_speak_in_language(message_language))
+		if(can_speak_language(message_language))
 			language = message_language
 		message = copytext_char(message, 3)

@@ -141,7 +141,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		message = trim_left(message)

 	if(!language)
-		language = get_default_language()
+		language = get_selected_language()

 	// Detection of language needs to be before inherent channels, because
 	// AIs use inherent channels for the holopad. Most inherent channels
@@ -415,11 +415,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 /mob/living/whisper(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
 	say("#[message]", bubble_type, spans, sanitize, language, ignore_spam, forced)

-/mob/living/get_language_holder(shadow=TRUE)
-	if(mind && shadow)
-		// Mind language holders shadow mob holders.
-		. = mind.get_language_holder()
-		if(.)
-			return .
-
+/mob/living/get_language_holder(get_minds = TRUE)
+	if(get_minds && mind)
+		return mind.get_language_holder()
 	. = ..()
@@ -171,10 +171,3 @@

 #undef VOX_DELAY
 #endif
-
-/mob/living/silicon/ai/could_speak_in_language(datum/language/dt)
-	if(is_servant_of_ratvar(src))
-		// Ratvarian AIs can only speak Ratvarian
-		. = ispath(dt, /datum/language/ratvar)
-	else
-		. = ..()
@@ -267,9 +267,8 @@
 			if(href_list["toggle"])
 				encryptmod = TRUE
 		if("translator")
-			if(href_list["toggle"])
-				grant_all_languages(TRUE)
-					// this is PERMAMENT.
+			if(href_list["toggle"])	//This is permanent.
+				grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_SOFTWARE)
 		if("doorjack")
 			if(href_list["jack"])
 				if(cable && cable.machine)
@@ -911,7 +911,6 @@ Pass a positive integer as an argument to override a bot's default speed.
 				bot_name = name
 				name = paicard.pai.name
 				faction = user.faction.Copy()
-				language_holder = paicard.pai.language_holder.copy(src)
 				log_combat(user, paicard.pai, "uploaded to [bot_name],")
 				return TRUE
 			else
@@ -425,6 +425,7 @@
 		mind.transfer_to(new_xeno)
 	else
 		transfer_ckey(new_xeno)
+	update_atom_languages()

 	to_chat(new_xeno, "<B>You are now an alien.</B>")
 	. = new_xeno