From 9eefdf4db80f10c6569ddcc000e45b5b7175e928 Mon Sep 17 00:00:00 2001
From: Zuhayr <AGMogett@gmail.com>
Date: Fri, 1 Aug 2014 22:54:57 +0930
Subject: [PATCH] A bit of prep work for integegrating player-set backgrounds
 into gameplay.

---
 code/game/gamemodes/gameticker.dm           |  1 +
 code/modules/client/preferences_factions.dm | 15 ++++++++++++++-
 code/modules/mob/new_player/new_player.dm   |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm
index 0c8a7aa8bd..797afab1d4 100644
--- a/code/game/gamemodes/gameticker.dm
+++ b/code/game/gamemodes/gameticker.dm
@@ -297,6 +297,7 @@ var/global/datum/controller/gameticker/ticker
 					captainless=0
 				if(player.mind.assigned_role != "MODE")
 					job_master.EquipRank(player, player.mind.assigned_role, 0)
+					UpdateFactionList(player)
 					EquipCustomItems(player)
 		if(captainless)
 			for(var/mob/M in player_list)
diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm
index 7b158be0eb..2293be7dd6 100644
--- a/code/modules/client/preferences_factions.dm
+++ b/code/modules/client/preferences_factions.dm
@@ -1,3 +1,17 @@
+var/global/list/seen_citizenships = list()
+var/global/list/seen_systems = list()
+var/global/list/seen_factions = list()
+var/global/list/seen_religions = list()
+
+//Commenting this out for now until I work the lists it into the event generator/journalist/chaplain.
+/proc/UpdateFactionList(mob/living/carbon/human/M)
+	/*if(M && M.client && M.client.prefs)
+		seen_citizenships |= M.client.prefs.citizenship
+		seen_systems      |= M.client.prefs.home_system
+		seen_factions     |= M.client.prefs.faction
+		seen_religions    |= M.client.prefs.religion*/
+	return
+
 var/global/list/citizenship_choices = list(
 	"Earth",
 	"Mars",
@@ -17,7 +31,6 @@ var/global/list/home_system_choices = list(
 var/global/list/faction_choices = list(
 	"Sol Central",
 	"Vey Med",
-	"Aleph",
 	"Einstein Engines",
 	"Free Trade Union",
 	"NanoTrasen",
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 0419924af7..69581c43ee 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -301,6 +301,7 @@
 
 		var/mob/living/carbon/human/character = create_character()	//creates the human and transfers vars and mind
 		job_master.EquipRank(character, rank, 1)					//equips the human
+		UpdateFactionList(character)
 		EquipCustomItems(character)
 
 		//Find our spawning point.