Merge pull request #14548 from KillianKirilenko/kk-lore

Character Setup Lore Option Tweaks

code/modules/client/preference_setup/general/05_background.dm

@@ -7,6 +7,7 @@
 	S["sec_record"]				>> pref.sec_record
 	S["gen_record"]				>> pref.gen_record
 	S["home_system"]			>> pref.home_system
+	S["birthplace"]				>> pref.birthplace
 	S["citizenship"]			>> pref.citizenship
 	S["faction"]				>> pref.faction
 	S["religion"]				>> pref.religion
@@ -17,6 +18,7 @@
 	S["sec_record"]				<< pref.sec_record
 	S["gen_record"]				<< pref.gen_record
 	S["home_system"]			<< pref.home_system
+	S["birthplace"]				<< pref.birthplace
 	S["citizenship"]			<< pref.citizenship
 	S["faction"]				<< pref.faction
 	S["religion"]				<< pref.religion
@@ -24,6 +26,7 @@
 
 /datum/category_item/player_setup_item/general/background/sanitize_character()
 	if(!pref.home_system) pref.home_system = "Unset"
+	if(!pref.birthplace)  pref.birthplace =  "Unset"
 	if(!pref.citizenship) pref.citizenship = "None"
 	if(!pref.faction)     pref.faction =     "None"
 	if(!pref.religion)    pref.religion =    "None"
@@ -36,6 +39,7 @@
 	character.sec_record		= pref.sec_record
 	character.gen_record		= pref.gen_record
 	character.home_system		= pref.home_system
+	character.birthplace		= pref.birthplace
 	character.citizenship		= pref.citizenship
 	character.personal_faction	= pref.faction
 	character.religion			= pref.religion
@@ -43,7 +47,8 @@
 /datum/category_item/player_setup_item/general/background/content(var/mob/user)
 	. += "<b>Background Information</b><br>"
 	. += "Economic Status: <a href='?src=\ref[src];econ_status=1'>[pref.economic_status]</a><br/>"
-	. += "Home System: <a href='?src=\ref[src];home_system=1'>[pref.home_system]</a><br/>"
+	. += "Home: <a href='?src=\ref[src];home_system=1'>[pref.home_system]</a><br/>"
+	. += "Birthplace: <a href='?src=\ref[src];birthplace=1'>[pref.birthplace]</a><br/>"
 	. += "Citizenship: <a href='?src=\ref[src];citizenship=1'>[pref.citizenship]</a><br/>"
 	. += "Faction: <a href='?src=\ref[src];faction=1'>[pref.faction]</a><br/>"
 	. += "Religion: <a href='?src=\ref[src];religion=1'>[pref.religion]</a><br/>"
@@ -67,7 +72,7 @@
 			return TOPIC_REFRESH
 
 	else if(href_list["home_system"])
-		var/choice = tgui_input_list(user, "Please choose a home system.", "Character Preference", home_system_choices + list("Unset","Other"), pref.home_system)
+		var/choice = tgui_input_list(user, "Please choose your home planet and/or system. This should be your current primary residence. Select \"Other\" to specify manually.", "Character Preference", home_system_choices + list("Unset","Other"), pref.home_system)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")
@@ -78,8 +83,20 @@
 			pref.home_system = choice
 		return TOPIC_REFRESH
 
+	else if(href_list["birthplace"])
+		var/choice = tgui_input_list(user, "Please choose the planet and/or system or other appropriate location that you were born/created. Select \"Other\" to specify manually.", "Character Preference", home_system_choices + list("Unset","Other"), pref.birthplace)
+		if(!choice || !CanUseTopic(user))
+			return TOPIC_NOACTION
+		if(choice == "Other")
+			var/raw_choice = sanitize(tgui_input_text(user, "Please enter a birthplace.", "Character Preference", null, MAX_NAME_LEN), MAX_NAME_LEN)
+			if(raw_choice && CanUseTopic(user))
+				pref.birthplace = raw_choice
+		else
+			pref.birthplace = choice
+		return TOPIC_REFRESH
+
 	else if(href_list["citizenship"])
-		var/choice = tgui_input_list(user, "Please choose your current citizenship.", "Character Preference", citizenship_choices + list("None","Other"), pref.citizenship)
+		var/choice = tgui_input_list(user, "Please select the faction or political entity with which you currently hold citizenship. Select \"Other\" to specify manually.", "Character Preference", citizenship_choices + list("None","Other"), pref.citizenship)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")
@@ -91,7 +108,7 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["faction"])
-		var/choice = tgui_input_list(user, "Please choose a faction to work for.", "Character Preference", faction_choices + list("None","Other"), pref.faction)
+		var/choice = tgui_input_list(user, "Please choose the faction you primarily work for, if you are not under the direct employ of NanoTrasen. Select \"Other\" to specify manually.", "Character Preference", faction_choices + list("None","Other"), pref.faction)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")
@@ -103,7 +120,7 @@
 		return TOPIC_REFRESH
 
 	else if(href_list["religion"])
-		var/choice = tgui_input_list(user, "Please choose a religion.", "Character Preference", religion_choices + list("None","Other"), pref.religion)
+		var/choice = tgui_input_list(user, "Please choose a religion. Select \"Other\" to specify manually.", "Character Preference", religion_choices + list("None","Other"), pref.religion)
 		if(!choice || !CanUseTopic(user))
 			return TOPIC_NOACTION
 		if(choice == "Other")

code/modules/client/preferences.dm

@@ -76,8 +76,9 @@ var/list/preferences_datums = list()
 	var/synth_markings = 1				//Enable/disable markings on synth parts. //VOREStation Edit - 1 by default
 
 		//Some faction information.
-	var/home_system = "Unset"           //System of birth.
-	var/citizenship = "None"            //Current home system.
+	var/home_system = "Unset"           //Current home or residence.
+	var/birthplace = "Unset"           //Location of birth.
+	var/citizenship = "None"            //Government or similar entity with which you hold citizenship.
 	var/faction = "None"                //General associated faction.
 	var/religion = "None"               //Religious association.
 	var/antag_faction = "None"			//Antag associated faction.

code/modules/client/preferences_factions.dm

@@ -15,51 +15,90 @@ var/global/list/seen_religions = list()
 
 // VOREStation Edits Start
 var/global/list/citizenship_choices = list(
-	"Earth",
-	"Mars",
-	"Sif",
-	"Binma",
-	"Moghes",
-	"Meralar",
-	"Qerr'balak",
-	"Virgo 3b Colony",
-	"Virgo 4 NT Compound",
-	"Venus",
-	"Tiamat",
-	"An-Tahk-Et"
+	"Greater Human Diaspora",
+	"Commonwealth of Sol-Procyon",
+	"Skrell Consensus",
+	"Moghes Hegemony",
+	"Tajaran Diaspora",
+	"Unitary Alliance of Salthan Fyrds",
+	"Elysian Colonies",
+	"Third Ares Confederation",
+	"Teshari Expeditionary Fleet",
+	"Altevian Hegemony",
+	"Kitsuhana Heavy Industries",
+	"Kosaky Fleets"
 	)
 
 var/global/list/home_system_choices = list(
 	"Virgo-Erigone",
 	"Sol",
-	"Proxima Centauri",
+	"Earth, Sol",
+	"Luna, Sol",
+	"Mars, Sol",
+	"Venus, Sol",
+	"Titan, Sol",
+	"Toledo, New Ohio",
+	"The Pact, Myria",
+	"Kitsuhana Prime",
+	"Kishar, Alpha Centauri",
+	"Anshar, Alpha Centauri",
+	"Heaven Complex, Alpha Centauri",
 	"Procyon",
-	"Vir",
-	"Nyx",
-	"Tau Ceti",
-	"Qerr'valis",
+	"Altair",
+	"Kara, Vir",
+	"Sif, Vir",
+	"Brinkburn, Nyx",
+	"Binma, Tau Ceti",
+	"Qerr'balak, Qerr'valis",
 	"Epsilon Ursae Minoris",
-	"Rarkajar"
+	"Meralar, Rarkajar",
+	"Tal, Vilous",
+	"Menhir, Alat-Hahr",
+	"Altam, Vazzend",
+	"Uh'Zata, Kelezakata",
+	"Moghes, Uuoea-Esa",
+	"Xohok, Uuoea-Esa",
+	"Varilak, Antares",
+	"Sanctorum, Sanctum",
+	"Infernum, Sanctum",
+	"Abundance in All Things Serene, Beta-Carnelium Ventrum",
+	"Jorhul, Barkalis",
+	"Shelf Flotilla",
+	"Ue-Orsi Flotilla"
 	)
 
-
 var/global/list/faction_choices = list(
-	"Commonwealth of Sol-Procyon",
-	"United Fyrds",
-	"Elysian Colonies",
-	"Ares Confederation",
-	"Vey Med",
-	"Einstein Engines",
+	"NanoTrasen Incorporated",
+	"Hephaestus Industries",
+	"Vey-Medical",
+	"Zeng-Hu Pharmaceuticals",
+	"Ward-Takahashi GMC",
+	"Bishop Cybernetics",
+	"Morpheus Cyberkinetics",
+	"Xion Manufacturing Group",
 	"Free Trade Union",
-	"NanoTrasen",
-	"Ward-Takahashi GMB",
-	"Gilthari Exports",
+	"Major Bill's Transportation",
+	"Ironcrest Transport Group",
 	"Grayson Manufactories Ltd.",
 	"Aether Atmospherics",
-	"Zeng-Hu Pharmaceuticals",
-	"Hephaestus Industries",
-	"Morpheus Cyberkinetics",
-	"Xion Manufacturing Group"
+	"Focal Point Energistics",
+	"StarFlight Inc.",
+	"Oculum Broadcasting Network",
+	"Periphery Post",
+	"Free Anur Tribune",
+	"Centauri Provisions",
+	"Einstein Engines",
+	"Wulf Aeronautics",
+	"Gilthari Exports",
+	"Coyote Salvage Corp.",
+	"Chimera Genetics Corp.",
+	"Kitsuhana Heavy Industries",
+	"Independent Pilots Association",
+	"Local System Defense Force",
+	"United Solar Defense Force",
+	"Proxima Centauri Risk Control",
+	"HIVE Security",
+	"Stealth Assault Enterprises"
 	)
 // VOREStation Edits Stop