misc improvements

Author: Sorenon

code/__DEFINES/~monkestation/quirk_costs.dm

@@ -8,4 +8,6 @@
 #define QUIRK_COST_LISTENER -3
 #define QUIRK_HARDCORE_LISTENER 3
 
-#define QUIRK_COST_OUTSIDER -2
+#define QUIRK_COST_OUTSIDER -QUIRK_COST_BILINGUAL // Effectively allows players to choose their character's alt language
+
+#define QUIRK_COST_BILINGUAL 2

code/datums/quirks/neutral_quirks/foreigner.dm

@@ -1,14 +1,17 @@
-/* monkestation removal - replaced with /datum/quirk/language_holder/uncommon
 /datum/quirk/foreigner
 	name = "Foreigner"
-	desc = "You're not from around here. You don't know Galactic Common!"
+	// monkestation edit original: desc = "You're not from around here. You don't know Galactic Common!"
+	desc = "You don't understand Galactic Common. If you are human you have learned Galactic Uncommon instead."
 	icon = FA_ICON_LANGUAGE
-	value = -2 //Monkestation change 0->-2
+	value = QUIRK_COST_UNCOMMON //Monkestation change 0->QUIRK_COST_UNCOMMON
 	gain_text = span_notice("The words being spoken around you don't make any sense.")
 	lose_text = span_notice("You've developed fluency in Galactic Common.")
-	medical_record_text = "Patient does not speak Galactic Common and may require an interpreter."
+	// monkestation edit original: medical_record_text = "Patient does not speak Galactic Common and may require an interpreter."
+	medical_record_text = "Patient does not understand Galactic Common and may require an interpreter."
 	mail_goodies = list(/obj/item/taperecorder) // for translation
 
+// monkestation edit start
+/* original
 /datum/quirk/foreigner/add(client/client_source)
 	var/mob/living/carbon/human/human_holder = quirk_holder
 	human_holder.add_blocked_language(/datum/language/common)
@@ -21,3 +24,10 @@
 	if(ishumanbasic(human_holder))
 		human_holder.remove_language(/datum/language/uncommon)
 */
+/datum/quirk/foreigner/add_unique(client/client_source)
+	. = ..()
+	var/mob/living/carbon/human/human_holder = quirk_holder
+	quirk_holder.remove_language(/datum/language/common, TRUE, TRUE, LANGUAGE_ALL)
+	if(ishumanbasic(human_holder))
+		human_holder.grant_language(/datum/language/uncommon, understood = TRUE, spoken = TRUE, source = LANGUAGE_QUIRK)
+// monkestation edit end

code/datums/quirks/positive_quirks/bilingual.dm

@@ -2,7 +2,7 @@
 	name = "Bilingual"
 	desc = "Over the years you've picked up an extra language!"
 	icon = FA_ICON_GLOBE
-	value = 4
+	value = QUIRK_COST_BILINGUAL // monkestation edit 4 -> QUIRK_COST_BILINGUAL
 	gain_text = span_notice("Some of the words of the people around you certainly aren't common. Good thing you studied for this.")
 	lose_text = span_notice("You seem to have forgotten your second language.")
 	medical_record_text = "Patient speaks multiple languages."

code/modules/language/language_holder.dm

@@ -62,31 +62,6 @@ Key procs
 		if(M.current)
 			update_atom_languages(M.current)
 
-	// monkestation edit start
-	var/mob/living/carbon/carbon_owner = owner
-	if (istype(carbon_owner))
-		var/uncommon = carbon_owner.has_quirk(/datum/quirk/language_holder/uncommon)
-		var/outsider = carbon_owner.has_quirk(/datum/quirk/language_holder/outsider)
-		var/is_human = istype(carbon_owner.dna.species, /datum/species/human)
-		var/outsider_human = outsider && is_human
-		if (uncommon || outsider_human)
-			remove_language(/datum/language/common, TRUE, TRUE, LANGUAGE_ATOM)
-			add_blocked_language(/datum/language/common, LANGUAGE_QUIRK)
-		if (outsider)
-			for (var/language in understood_languages)
-				if (language != /datum/language/common)
-					remove_language(language, TRUE, FALSE, LANGUAGE_ATOM)
-			for (var/language in spoken_languages)
-				if (language != /datum/language/common)
-					remove_language(language, FALSE, TRUE, LANGUAGE_ATOM)
-		if (uncommon)
-			grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_QUIRK)
-		if (outsider_human)
-			grant_language(pick(GLOB.roundstart_languages), TRUE, TRUE, LANGUAGE_QUIRK)
-		if (carbon_owner.has_quirk(/datum/quirk/language_holder/listener))
-			remove_language(/datum/language/common, FALSE, TRUE, LANGUAGE_ATOM)
-	// monkestation edit end
-
 	// If we have an owner, we'll set a default selected language
 	if(owner)
 		get_selected_language()

monkestation/code/datums/quirks/negative_quirks/language_quirks.dm

@@ -1,39 +1,25 @@
-/datum/quirk/language_holder
-	abstract_parent_type = /datum/quirk/language_holder
-	mail_goodies = list(/obj/item/taperecorder) // for translation
-
-/datum/quirk/language_holder/proc/recreate_language_holder(client_source)
-	var/mob/living/carbon/human/human_holder = quirk_holder
-	human_holder.language_holder = new human_holder.language_holder.type(human_holder)
-	human_holder.update_atom_languages()
-	var/datum/quirk/bilingual/bilingual = human_holder.get_quirk(/datum/quirk/bilingual)
-	if (bilingual)
-		bilingual.add_unique(client_source)
-
-/datum/quirk/language_holder/add(client/client_source)
-	recreate_language_holder(client_source)
-
-/datum/quirk/language_holder/remove(client/client_source)
-	recreate_language_holder(client_source)
-
-/datum/quirk/language_holder/uncommon
-	name = "Uncommon"
-	desc = "You don't understand Galactic Common having learned Galactic Uncommon instead."
-	icon = FA_ICON_LANGUAGE
-	value = QUIRK_COST_UNCOMMON
-	gain_text = span_notice("The words being spoken around you don't make any sense.")
-	lose_text = span_notice("You've developed fluency in Galactic Common.")
-	medical_record_text = "Patient does not understand Galactic Common and may require an interpreter."
-
-/datum/quirk/language_holder/outsider
+/datum/quirk/outsider
 	name = "Outsider"
 	desc = "You don't know your species' language. If you are human you know a random language instead of Galactic Common."
 	icon = FA_ICON_BAN
 	value = QUIRK_COST_OUTSIDER
 	gain_text = span_notice("You can't understand your species' language.")
 	lose_text = span_notice("You've remembered your species' language.")
 
-/datum/quirk/language_holder/listener
+/datum/quirk/outsider/add_unique(client/client_source)
+	var/is_human = ishumanbasic(quirk_holder)
+	if (is_human)
+		quirk_holder.remove_language(/datum/language/common, TRUE, TRUE, LANGUAGE_ALL)
+	for (var/language in quirk_holder.language_holder.understood_languages)
+		if (language != /datum/language/common)
+			quirk_holder.remove_language(language, TRUE, FALSE, LANGUAGE_ALL)
+	for (var/language in quirk_holder.language_holder.spoken_languages)
+		if (language != /datum/language/common)
+			quirk_holder.remove_language(language, FALSE, TRUE, LANGUAGE_ALL)
+	if (is_human)
+		quirk_holder.grant_language(pick(GLOB.roundstart_languages), TRUE, TRUE, LANGUAGE_QUIRK)
+
+/datum/quirk/listener
 	name = "Listener"
 	desc = "You are unable to speak Galactic Common though you understand it just fine."
 	icon = FA_ICON_BELL_SLASH
@@ -42,3 +28,12 @@
 	gain_text = span_notice("You don't know how to speak Galactic Common.")
 	lose_text = span_notice("You're able to speak Galactic Common.")
 	medical_record_text = "Patient does not speak Galactic Common and may require an interpreter."
+
+/datum/quirk/listener/add_unique(client/client_source)
+	quirk_holder.remove_language(/datum/language/common, FALSE, TRUE, LANGUAGE_ATOM)
+	var/mob/living/carbon/carbon_holder = quirk_holder
+	if (istype(carbon_holder))
+		for (var/item in carbon_holder.get_all_gear())
+			if (istype(item, /obj/item/clothing/mask/translator))
+				carbon_holder.dropItemToGround(item, force = TRUE, silent = TRUE, invdrop = FALSE)
+				qdel(item)

monkestation/code/game/objects/items/translation_hat.dm renamed to monkestation/code/game/objects/items/translator.dm

@@ -6138,7 +6138,7 @@
 #include "monkestation\code\game\objects\items\stickers.dm"
 #include "monkestation\code\game\objects\items\superglue.dm"
 #include "monkestation\code\game\objects\items\tactical_shields.dm"
-#include "monkestation\code\game\objects\items\translation_hat.dm"
+#include "monkestation\code\game\objects\items\translator.dm"
 #include "monkestation\code\game\objects\items\trash.dm"
 #include "monkestation\code\game\objects\items\turf_demolisher.dm"
 #include "monkestation\code\game\objects\items\venom_knife.dm"