Merge branch 'master' into prepare_stuff_for_second_week

code/modules/background/citizenship/human.dm

@@ -116,30 +116,7 @@
 	workplace of various contractors on board NSS Aurora."
 
 	job_species_blacklist = list(
-		"Consular Officer" = list(
-			SPECIES_HUMAN,
-			SPECIES_HUMAN_OFFWORLD,
-			SPECIES_IPC,
-			SPECIES_IPC_BISHOP,
-			SPECIES_IPC_G1,
-			SPECIES_IPC_G2,
-			SPECIES_IPC_SHELL,
-			SPECIES_IPC_UNBRANDED,
-			SPECIES_IPC_XION,
-			SPECIES_IPC_ZENGHU,
-			SPECIES_DIONA,
-			SPECIES_DIONA_COEUS,
-			SPECIES_SKRELL,
-			SPECIES_SKRELL_AXIORI,
-			SPECIES_TAJARA,
-			SPECIES_TAJARA_MSAI,
-			SPECIES_TAJARA_ZHAN,
-			SPECIES_UNATHI,
-			SPECIES_VAURCA_WORKER,
-			SPECIES_VAURCA_WARRIOR,
-			SPECIES_VAURCA_BULWARK,
-			SPECIES_VAURCA_BREEDER
-		)
+		"Consular Officer" = ALL_SPECIES
 	)
 
 /datum/citizenship/coalition

code/modules/background/citizenship/skrell.dm

@@ -55,3 +55,15 @@
 	name = "Jargon Consular Officer"
 
 	uniform = /obj/item/clothing/under/skrell
+
+/datum/citizenship/epsilon
+	name = CITIZENSHIP_EUM
+	description =  "An independent nation on the edge of Skrell space, the Co-Operative Territories of Epsilon Ursae Minoris, \
+	also known as the CT-EUM, is a nation primarily comprised of Dionae with a minority of skrell mostly situated \
+	in the city of Nral'Daaq. The CT-EUM is compromised of a myriad of smaller nations and city-states that make up \
+	the whole of the nation. While the nation is independent it does have heavy ties to the Jargon Federation, \
+	being instrumental in the nations' founding and contact with the rest of the galaxy. "
+
+	job_species_blacklist = list(
+		"Consular Officer" = ALL_SPECIES
+	)

code/modules/background/defines.dm

@@ -9,6 +9,7 @@
 #define CITIZENSHIP_IZWESKI "Izweski Hegemony"
 
 #define CITIZENSHIP_JARGON "Jargon Federation"
+#define CITIZENSHIP_EUM "Co-Operative Territories of EUM"
 
 #define CITIZENSHIP_PRA "People's Republic of Adhomai"
 #define CITIZENSHIP_DPRA "Democratic People's Republic of Adhomai"