From a7f606c04f7111cd961840fc7d1ce3d33b7b2008 Mon Sep 17 00:00:00 2001
From: Sun-Sam-San <43503975+Sun-Sam-San@users.noreply.github.com>
Date: Tue, 28 May 2019 15:51:27 -0500
Subject: [PATCH] Minor Touchup To Character Setup (#6489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reworks home systems, citizenships, factions, and religions to better lore consistency and improve quality of life.

New additions are in italics.

Home System: Tau Ceti, Sol, Wintermute's Perches, Alpha Centauri, Trummer Flotilla, Xanu, Techno-Conglomerate Fleet, Scarab Fleet, New Ankara, Epsilon Eridani, X’yr Vharn’p, Jargon, S’rand’marr, Uueoa-Esa, Unset, Other
Citizenship: Republic of Biesel, Sol Alliance, Frontier Alliance, Republic of Elyra, Eridani Federation, Empire of Dominia, Jargon Federation, People’s Republic of Adhomai, Izweski Hegemony, Zo’ra Hive, K’lax Hive, C’thur Hive, None, Other
Faction: NanoTrasen, Hephaestus Industries, Idris Incorporated, Zeng-Hu Pharmaceuticals, Einstein Engines, Necropolis Industries, None, Other
Religion Sure Looks Lacking: Agnosticism, Deism, Christianity, Islam, Hinduism, Buddhism, Folk Religion, Moroz Holy Tribunal, Qeblak, Weishii, S’rendarr & Messa, Ma’ta’ke, Th’akh, Sk'akh, Aut'kah, None, Other
---
 code/modules/client/preferences_factions.dm   | 47 ++++++++++---------
 .../changelogs/sunsamsan-thesunchildrises.yml | 42 +++++++++++++++++
 2 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 html/changelogs/sunsamsan-thesunchildrises.yml

diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm
index 66a183792f6..8f1f9686ad8 100644
--- a/code/modules/client/preferences_factions.dm
+++ b/code/modules/client/preferences_factions.dm
@@ -13,58 +13,59 @@ var/global/list/seen_religions = list()
 	return
 
 var/global/list/citizenship_choices = list(
-	"Sol Alliance",
 	"Republic of Biesel",
+	"Sol Alliance",
+	"Frontier Alliance",
 	"Republic of Elyra",
 	"Eridani Federation",
+	"Empire of Dominia",
 	"Jargon Federation",
 	"People's Republic of Adhomai",
 	"Izweski Hegemony",
 	"Zo'ra Hive",
-	"K'lax Hive",
-	"Empire of Dominia"
+	"K'lax Hive"
 	)
 
 var/global/list/home_system_choices = list(
-	"Sol",
 	"Tau Ceti",
+	"Sol",
+	"Wintermute's Perches",
+	"Alpha Centauri",
+	"Trummer Flotilla",
+	"Xanu",
+	"Techno-Conglomerate Fleet",
+	"Scarab Fleet",
 	"New Ankara",
 	"Epsilon Eridani",
+	"X'yr Vharn'p",
 	"Jargon",
-	"S'rand'marr ",
-	"Uueoa-Esa",
-	"X'yr Vharn'p"
+	"S'rand'marr",
+	"Uueoa-Esa"
 	)
 
 var/global/list/faction_choices = list(
-	"Sol Central",
-	"Vey Med",
-	"Einstein Engines",
-	"Free Trade Union",
 	"NanoTrasen",
-	"Ward-Takahashi GMB",
-	"Gilthari Exports",
-	"Grayson Manufactories Ltd.",
-	"Aether Atmospherics",
-	"Zeng-Hu Pharmaceuticals",
 	"Hephaestus Industries",
 	"Idris Incorporated",
+	"Zeng-Hu Pharmaceuticals",
+	"Einstein Engines",
 	"Necropolis Industries"
 	)
 
 var/global/list/religion_choices = list(
-	"Unitarianism",
+	"Agnosticism",
+	"Deism",
+	"Christianity",
+	"Islam",
 	"Hinduism",
-	"Buddhist",
-	"Islamic",
-	"Christian",
-	"Agnostic",
-	"Deist",
+	"Buddhism",
+	"Folk Religion",
+	"Moroz Holy Tribunal",
 	"Qeblak",
 	"Weishii",
 	"S'rendarr & Messa",
 	"Ma'ta'ke",
 	"Th'akh",
 	"Sk'akh",
-	"Moroz Holy Tribunal"
+	"Aut'akh"
 	)
diff --git a/html/changelogs/sunsamsan-thesunchildrises.yml b/html/changelogs/sunsamsan-thesunchildrises.yml
new file mode 100644
index 00000000000..9a99bf91fa7
--- /dev/null
+++ b/html/changelogs/sunsamsan-thesunchildrises.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: SunSamSan
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Added new options for home systems, citizenships, factions, and religions."
+  - rscdel: "Removed unused factions."