[MIRROR] Tesh lore update (#10864)

Co-authored-by: TankTheBirb <96669534+TankTheBirb@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>

code/modules/busy_space/organizations.dm

@@ -2520,12 +2520,12 @@
 		fyrdsgen--
 
 /datum/lore/organization/gov/teshari
-	name = "Teshari Expeditionary Fleet"
-	short_name = "Teshari Expeditionary"
-	acronym = "TEF"
-	desc = "Though nominally a client state of the skrell, the teshari nevertheless maintain their own navy in the form of the Teshari Expeditionary Fleet. The TEF are as much civil and combat engineers as a competent space force, as they are the tip of the spear when it comes to locating and surveying new worlds suitable for teshari habitation, and in the establishment of full colonies. That isn't to say there aren't independent teshari colonies out there, but those that are founded under the wings of the TEF tend to be the largest and most prosperous. They're also responsible for maintaining the security of these colonies and protecting trade ships. Like the USDF (and unlike most other governmental fleets), TEF vessels almost universally sport the 'TEF' designator rather than specific terms.\
+	name = "Teshari Union"
+	short_name = "Teshari"
+	acronym = "TUV"
+	desc = "Though nominally a client state of the skrell, the Teshari Union nevertheless maintain their own navy of primarily civilian ships. The fleets of the TUV are the primary source of Teshari expansion, and effectively are the nation itself. That isn't to say there aren't independent teshari colonies out there, but those that are founded under the wings of the TUV tend to be the largest and most prosperous. They're also responsible for maintaining the security of these colonies and protecting trade ships, although heavier work is done by their Skrell allies. Like the USDF (and unlike most other governmental fleets), TU vessels almost universally sport the 'TUV' designator rather than specific terms.\
 	<br><br>\
-	The TEF's ships are named after famous teshari pioneers and explorers and the events surrounding those individuals."
+	The TU's ships are named after famous teshari pioneers and explorers and the events surrounding those individuals."
 	history = ""
 	work = "teshari colonization and infrastructure maintenance"
 	headquarters = "Qerr'balak, Qerr'valis"
@@ -2533,18 +2533,18 @@
 	autogenerate_destination_names = TRUE //big list of own holdings to come
 
 	org_type = "government"
-	//the tesh expeditionary fleet's closest analogue in modern terms would be the US Army Corps of Engineers, just with added combat personnel as well
-	ship_prefixes = list("TEF" = "a diplomatic", "TEF" = "a peacekeeping", "TEF" = "an escort", "TEF" = "an exploration", "TEF" = "a survey", "TEF" = "an expeditionary", "TEF" = "a pioneering")
+	//its more or less a civilian fleet of ships that have a few armed ones sprinkled in to deter pirates when needed. They call in the Skrell for anything heavier.
+	ship_prefixes = list("TUV" = "a diplomatic", "TUV" = "a peacekeeping", "TUV" = "an escort", "TUV" = "an exploration", "TUV" = "a survey", "TUV" = "an expeditionary", "TUV" = "a pioneering")
 	//TODO: better ship names? I just took a bunch of random teshnames from the Random Name button and added a word.
 	ship_names = list()
 	destination_names = list(
-			"an Expeditionary Fleet RV point",
-			"an Expeditionary Fleet Resupply Ship",
-			"an Expeditionary Fleet Supply Depot",
+			"an expeditionary fleet RV point",
+			"an expeditionary fleet Resupply Ship",
+			"an expeditionary fleet Supply Depot",
 			"a newly-founded Teshari colony",
 			"a prospective Teshari colony site",
 			"a potential Teshari colony site",
-			"Expeditionary Fleet HQ"
+			"a fleet hub"
 			)
 
 /datum/lore/organization/gov/teshari/New()

code/modules/catalogue/catalogue_data.dm

@@ -209,15 +209,16 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)
 
 /datum/category_item/catalogue/fauna/teshari
 	name = "Sapients - Teshari"
-	desc = "The Teshari are reptilian pack predators from the Skrell homeworld. \
+	desc = "The Teshari are nomadic pack predators from the Skrell homeworld. \
 	While they evolved alongside the Skrell, their interactions with them tended \
 	to be confused and violent, and until peaceful contact was made they largely \
-	stayed in their territories on and around the poles, in tundral terrain far \
-	too desolate and cold to be of interest to the Skrell. In more enlightened \
-	times, the Teshari are a minority culture on many Skrell worlds, maintaining \
-	their own settlements and cultures, but often finding themselves standing \
-	on the shoulders of their more technologically advanced neighbors when it \
-	comes to meeting and exploring the rest of the galaxy."
+	stayed in their territories on and around the poles, in tundral and alpine terrain \
+	far too desolate and cold to be of interest to the Skrell. In more enlightened \
+	times, the Teshari are a society of their own, holding territory on their home \
+	world as well as several colonies on others. They often found themselves \
+	standing on the shoulders of their more technologically advanced neighbours \
+	when it came to meeting and exploring the rest of the galaxy, but their \
+	independence has since grown."
 	value = CATALOGUER_REWARD_TRIVIAL
 
 /datum/category_item/catalogue/fauna/zaddat

code/modules/client/preferences_factions.dm

@@ -13,6 +13,7 @@ var/global/list/seen_religions = list()
 		seen_religions    |= M.client.prefs.religion*/
 	return
 
+// CHOMPEdit Start
 var/global/list/citizenship_choices = list(
 	"Earth",
 	"Mars",
@@ -22,6 +23,7 @@ var/global/list/citizenship_choices = list(
 	"Meralar",
 	"Qerr'balak"
 	)
+//CHOMPEdit End
 
 var/global/list/home_system_choices = list(
 	"Earth, Sol",
@@ -86,7 +88,8 @@ var/global/list/faction_choices = list(
 	"United Solar Defense Force",
 	"Proxima Centauri Risk Control",
 	"HIVE Security",
-	"Stealth Assault Enterprises"
+	"Stealth Assault Enterprises",
+	"Teshari Union"
 	)
 
 var/global/list/antag_faction_choices = list()	//Should be populated after brainstorming. Leaving as blank in case brainstorming does not occur.

code/modules/mob/living/carbon/human/species/station/station.dm

@@ -1089,7 +1089,7 @@
 	blurb = "A race of feathered raptors who developed alongside the Skrell, inhabiting \
 	the polar tundral regions outside of Skrell territory. Extremely fragile, they developed \
 	hunting skills that emphasized taking out their prey without themselves getting hit. They \
-	are only recently becoming known on human stations after reaching space with Skrell assistance."
+	are known for their communalism and pack based family structures."
 	wikilink="https://wiki.chompstation13.net/index.php?title=Teshari" //CHOMPedit: link to our wiki
 	catalogue_data = list(/datum/category_item/catalogue/fauna/teshari)
 
@@ -1099,9 +1099,9 @@
 	species_language = LANGUAGE_SCHECHI
 
 	min_age = 18
-	max_age = 45
+	max_age = 80
 
-	economic_modifier = 6
+	economic_modifier = 6 //I noticed this and the other mods were not the same, but we use ECO_MODIFIER for our calculation instead on virgo. In case anyone finds this and wonders why tesh are getting 60% of the pay (they aren't)
 
 	health_hud_intensity = 3