diff --git a/code/modules/client/preference_setup/general/05_background.dm b/code/modules/client/preference_setup/general/05_background.dm
index 4ca1cb86ad..ff03905eb8 100644
--- a/code/modules/client/preference_setup/general/05_background.dm
+++ b/code/modules/client/preference_setup/general/05_background.dm
@@ -43,7 +43,7 @@
/datum/category_item/player_setup_item/general/background/content(var/mob/user)
. += "Background Information
"
. += "Economic Status: [pref.economic_status]
"
- . += "Home System: [pref.home_system]
"
+ . += "Home: [pref.home_system]
"
. += "Citizenship: [pref.citizenship]
"
. += "Faction: [pref.faction]
"
. += "Religion: [pref.religion]
"
@@ -67,7 +67,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 may either be your place of birth or your current primary residence.", "Character Preference", home_system_choices + list("Unset","Other"), pref.home_system)
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
if(choice == "Other")
@@ -79,7 +79,7 @@
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.", "Character Preference", citizenship_choices + list("None","Other"), pref.citizenship)
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
if(choice == "Other")
@@ -91,7 +91,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.", "Character Preference", faction_choices + list("None","Other"), pref.faction)
if(!choice || !CanUseTopic(user))
return TOPIC_NOACTION
if(choice == "Other")
diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm
index 00294d3a3e..3cd19fa36e 100644
--- a/code/modules/client/preferences_factions.dm
+++ b/code/modules/client/preferences_factions.dm
@@ -15,51 +15,88 @@ 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",
+ "Unathi Hegemony",
+ "Tajaran Diaspora",
+ "Unitary Alliance of Salthan Fyrds",
+ "Elysian Colonies",
+ "Third Ares Confederation",
+ "Teshari Expeditionary Fleet",
+ "Altevian Hegemony",
+ "Kitsuhana Heavy Industries",
+ "Nomad"
)
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"
)
-
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",
"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