Merge branch 'master' into ship_and_stuff

# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_eyes.dm

code/modules/background/citizenship/tajara.dm

@@ -165,3 +165,14 @@
 		/obj/item/storage/box/syndie_kit/spy/hidden = 1
 	)
 	accessory = /obj/item/clothing/accessory/nka_pin
+
+/datum/citizenship/free_council
+	name = CITIZENSHIP_FREE_COUNCIL
+	description = "The Free Tajaran Council is the largest Tajaran community in Himeo. Its origins can be traced back to the First Revolution-era revolutionaries that fled Adhomai. Built upon \
+	radical principles of equality and communal democracy, the Free Tajaran Council remained relatively isolated from the rest of the Tajaran community until the start of the Adhomian Cold War. \
+	Its population was granted a temporary citizenship status as part of an agreement between the Tajaran nations. While the council struggles to decide its future, some of its members travel \
+	the galaxy in search of aid and new allies for their ultimate masterplan."
+
+	job_species_blacklist = list(
+		"Consular Officer" = ALL_SPECIES
+	)

code/modules/background/defines.dm

@@ -14,6 +14,7 @@
 #define CITIZENSHIP_PRA "People's Republic of Adhomai"
 #define CITIZENSHIP_DPRA "Democratic People's Republic of Adhomai"
 #define CITIZENSHIP_NKA "New Kingdom of Adhomai"
+#define CITIZENSHIP_FREE_COUNCIL "Free Tajaran Council"
 
 #define CITIZENSHIP_ZORA "Zo'ra Hive"
 #define CITIZENSHIP_KLAX "K'lax Hive"