You Tell 'Em, Boss: The Diplomatic Aide (#18289)

* midnight commits make me want to die

* driplomatic aide

* la fixe

* changelog

* obj outfits

---------

Signed-off-by: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com>

code/modules/background/citizenship/citizenship.dm

@@ -2,8 +2,10 @@
 	var/name
 	var/description
 	var/obj/outfit/consular_outfit = /obj/outfit/job/representative/consular
+	var/obj/outfit/assistant_outfit = /obj/outfit/job/consular_assistant
 	var/demonym
 	var/list/job_species_blacklist = list()
+	var/linked_citizenship //a secondary citizenship tied to this one. only used for vaurca snowflake code.
 
 /datum/citizenship/proc/get_objectives(mission_level, var/mob/living/carbon/human/H)
 	var/rep_objectives

code/modules/background/citizenship/dionae.dm

@@ -25,5 +25,25 @@
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK
+		),
+		"Diplomatic Aide" = list(
+			SPECIES_HUMAN,
+			SPECIES_HUMAN_OFFWORLD,
+			SPECIES_SKRELL,
+			SPECIES_IPC,
+			SPECIES_IPC_BISHOP,
+			SPECIES_IPC_G1,
+			SPECIES_IPC_G2,
+			SPECIES_IPC_SHELL,
+			SPECIES_IPC_UNBRANDED,
+			SPECIES_IPC_XION,
+			SPECIES_IPC_ZENGHU,
+			SPECIES_TAJARA,
+			SPECIES_TAJARA_MSAI,
+			SPECIES_TAJARA_ZHAN,
+			SPECIES_UNATHI,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK
 		)
 	)

code/modules/background/citizenship/human.dm

@@ -5,12 +5,17 @@
 	its large xeno population which enjoys various privileges compared to other space powers. With a very lax migration policy, virtually everyone is welcome to live here. However, \
 	unrest and gridlock undermine the government, and the aggressive attitude of the Sol Alliance against its former system has made many worried for the future of the Republic."
 	consular_outfit = /obj/outfit/job/representative/consular/ceti
+	consular_outfit = /obj/outfit/job/representative/consular/ceti
+	assistant_outfit = /obj/outfit/job/consular_assistant/ceti
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK
+		),
+		"Diplomatic Aide" = list(
+			SPECIES_VAURCA_BREEDER
 		)
 	)
 
@@ -59,6 +64,10 @@
 		/obj/item/stamp/biesel = 1,
 	)
 
+/obj/outfit/job/consular_assistant/ceti
+	name = "Tau Ceti Diplomatic Aide"
+	accessory = /obj/item/clothing/accessory/tc_pin
+
 /obj/outfit/job/representative/consular/ceti/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
 	if(H)
 		if(isvaurca(H))
@@ -83,7 +92,7 @@
 	Presently ruled by a military junta that is gradually giving way to civilian control, the Alliance is also generally xenophobic, and most non-humans find themselves discriminated against in Solarian territory. \
 	Though much of its former possessions are now occupied by warlord statelets and other interstellar powers, the Alliance still maintains a revanchist outlook, refusing to relinquish its claims to its lost territories."
 	consular_outfit = /obj/outfit/job/representative/consular/sol
-
+	assistant_outfit = /obj/outfit/job/consular_assistant/sol
 	job_species_blacklist = list(
 		"Consular Officer" = list(
 			SPECIES_HUMAN,
@@ -108,6 +117,28 @@
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK,
 			SPECIES_VAURCA_BREEDER
+		),
+		"Diplomatic Aide" = list(
+			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
 		)
 	)
 
@@ -139,6 +170,11 @@
 		/obj/item/gun/projectile/pistol/sol = 1
 	)
 
+/obj/outfit/job/consular_assistant/sol
+	name = "Sol Consular Officer"
+
+	accessory = /obj/item/clothing/accessory/sol_pin
+
 /datum/citizenship/sol_alliance/eridani
 	name = CITIZENSHIP_ERIDANI
 	description = "Eridani, or the Eridani Corporate Federation, is a dystopian oligarchic republic in the Epsilon Eridani system, dominated entirely by a council of mega-corporations \
@@ -147,7 +183,8 @@
 	workplace of various contractors on-board."
 
 	job_species_blacklist = list(
-		"Consular Officer" = ALL_SPECIES
+		"Consular Officer" = ALL_SPECIES,
+		"Diplomatic Aide" = ALL_SPECIES
 	)
 
 /datum/citizenship/coalition
@@ -168,6 +205,16 @@
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK,
 			SPECIES_VAURCA_BREEDER
+		),
+		"Diplomatic Aide" = list(
+			SPECIES_TAJARA,
+			SPECIES_TAJARA_MSAI,
+			SPECIES_TAJARA_ZHAN,
+			SPECIES_UNATHI,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK,
+			SPECIES_VAURCA_BREEDER
 		)
 	)
 
@@ -259,6 +306,25 @@
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK,
 			SPECIES_VAURCA_BREEDER
+		),
+		"Diplomatic Aide" = list(
+			SPECIES_IPC,
+			SPECIES_IPC_BISHOP,
+			SPECIES_IPC_G1,
+			SPECIES_IPC_G2,
+			SPECIES_IPC_SHELL,
+			SPECIES_IPC_UNBRANDED,
+			SPECIES_IPC_XION,
+			SPECIES_IPC_ZENGHU,
+			SPECIES_SKRELL,
+			SPECIES_SKRELL_AXIORI,
+			SPECIES_TAJARA,
+			SPECIES_TAJARA_MSAI,
+			SPECIES_TAJARA_ZHAN,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK,
+			SPECIES_VAURCA_BREEDER
 		)
 	)
 

code/modules/background/citizenship/ipc.dm

@@ -28,6 +28,22 @@
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK,
 			SPECIES_VAURCA_BREEDER
+		),
+		"Diplomatic Aide" = list(
+			SPECIES_HUMAN,
+			SPECIES_HUMAN_OFFWORLD,
+			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
 		)
 	)
 

code/modules/background/citizenship/skrell.dm

@@ -7,6 +7,7 @@
 	A rogue artificial intelligence, Glorsh-Omega, has traumatized this nation for centuries to come. The Federation is very wary of humanity, who has acquired AI technology \
 	after a Federation tech leak provided them with the research required to create their own AI, as well as allowing them to create IPCs."
 	consular_outfit = /obj/outfit/job/representative/consular/nralakk
+	assistant_outfit = /obj/outfit/job/consular_assistant/nralakk
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -28,6 +29,23 @@
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK
+		),
+		"Diplomatic Aide" = 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_TAJARA,
+			SPECIES_TAJARA_MSAI,
+			SPECIES_TAJARA_ZHAN,
+			SPECIES_UNATHI,
+			SPECIES_VAURCA_BREEDER
 		)
 	)
 
@@ -92,3 +110,6 @@
 		if(!visualsOnly)
 			addtimer(CALLBACK(src, PROC_REF(send_representative_mission), H), 5 MINUTES)
 	return TRUE
+
+/obj/outfit/job/consular_assistant/nralakk
+	uniform = /obj/item/clothing/under/skrell

code/modules/background/citizenship/tajara.dm

@@ -6,6 +6,7 @@
 	revolution to the masses. With land reform, enfranchisement of women and peasantry, literacy initiatives, and the collectivization of farms and the means of production, the PRA is \
 	struggling to hold true to its radical ideals while an entrenched upper party stubbornly tries to hold onto power."
 	consular_outfit = /obj/outfit/job/representative/consular/pra
+	assistant_outfit = /obj/outfit/job/consular_assistant/dpra
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -30,6 +31,28 @@
 			SPECIES_VAURCA_BREEDER,
 			SPECIES_TAJARA_ZHAN,
 			SPECIES_TAJARA_MSAI
+		),
+		"Diplomatic Aide" = 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_UNATHI,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK,
+			SPECIES_VAURCA_BREEDER,
+			SPECIES_TAJARA_ZHAN
 		)
 	)
 
@@ -53,6 +76,16 @@
 	)
 	accessory = /obj/item/clothing/accessory/hadii_pin
 
+/obj/outfit/job/consular_assistant/pra
+	glasses = null
+	uniform = /obj/item/clothing/under/tajaran/smart
+	backpack_contents = list(
+		/obj/item/storage/box/hadii_card = 1,
+		/obj/item/storage/box/hadii_manifesto = 1,
+		/obj/item/storage/field_ration = 1
+	)
+	accessory = /obj/item/clothing/accessory/hadii_pin
+
 /datum/citizenship/dpra
 	name = CITIZENSHIP_DPRA
 	description = "The most pervasive and successful rebellion came from a group calling themselves the Adhomai Liberation Army, a group made up of Tajara from almost every walk of life. \
@@ -62,6 +95,7 @@
 	insurgency movement, then an organized military, into a modern, democratic nation. With the help of Nated as a government minister going out to negotiate with ruling Juntas to \
 	voluntarily turn over power to civilian governments, the DPRA's future faces many fundamental changes."
 	consular_outfit = /obj/outfit/job/representative/consular/dpra
+	assistant_outfit = /obj/outfit/job/consular_assistant/dpra
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -86,6 +120,28 @@
 			SPECIES_VAURCA_BREEDER,
 			SPECIES_TAJARA_ZHAN,
 			SPECIES_TAJARA_MSAI
+		),
+		"Diplomatic Aide" = 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_UNATHI,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK,
+			SPECIES_VAURCA_BREEDER,
+			SPECIES_TAJARA_ZHAN
 		)
 	)
 
@@ -108,6 +164,15 @@
 	)
 	accessory = /obj/item/clothing/accessory/dpra_pin
 
+/obj/outfit/job/consular_assistant/dpra
+	glasses = null
+	uniform = /obj/item/clothing/under/tajaran/smart
+	backpack_contents = list(
+		/obj/item/storage/box/dpra_manifesto = 1,
+		/obj/item/storage/field_ration/dpra = 1
+	)
+	accessory = /obj/item/clothing/accessory/dpra_pin
+
 /datum/citizenship/nka
 	name = CITIZENSHIP_NKA
 	description = "The last major faction is the rebellious New Kingdom of Adhomai, which seceded and declared itself a nation in 2450. The New Kingdom is ruled by a Njarir'Akhran noble \
@@ -119,6 +184,7 @@
 	The lofty titles of the nobles disguise the fact that most of the nobility of this new kingdom remain in squalor only marginally better than the peasants. Life is difficult, and \
 	the Azunja dynasty finds itself struggling to function with their limited constitutional powers and factional in-fighting between the military and the civilian government."
 	consular_outfit = /obj/outfit/job/representative/consular/nka
+	assistant_outfit = /obj/outfit/job/consular_assistant/nka
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -143,6 +209,28 @@
 			SPECIES_VAURCA_BREEDER,
 			SPECIES_TAJARA_ZHAN,
 			SPECIES_TAJARA_MSAI
+		),
+		"Diplomatic Aide" = 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_UNATHI,
+			SPECIES_VAURCA_WORKER,
+			SPECIES_VAURCA_WARRIOR,
+			SPECIES_VAURCA_BULWARK,
+			SPECIES_VAURCA_BREEDER,
+			SPECIES_TAJARA_ZHAN
 		)
 	)
 
@@ -166,6 +254,16 @@
 	)
 	accessory = /obj/item/clothing/accessory/nka_pin
 
+/obj/outfit/job/consular_assistant/nka
+	glasses = null
+	uniform = /obj/item/clothing/under/tajaran/fancy
+	backpack_contents = list(
+		/obj/item/folder/blue/nka = 1,
+		/obj/item/storage/box/nka_manifesto = 1,
+		/obj/item/storage/field_ration/nka = 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 \

code/modules/background/citizenship/unathi.dm

@@ -5,6 +5,7 @@
 	with everything else revolving around it. It forms a major part of their code of honor, which stresses the importance of martial abilities and loyalty to the Clan. Despite an \
 	apocalyptic world war that nearly plunged the species into ruin, the Izweski Hegemony has rebounded and is currently working on making the Hegemony a galactic power."
 	consular_outfit = /obj/outfit/job/representative/consular/izweski
+	assistant_outfit = /obj/outfit/job/consular_assistant/izweski
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -28,6 +29,26 @@
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK,
+		),
+		"Diplomatic Aide" = 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_VAURCA_BREEDER
 		)
 	)
 
@@ -85,3 +106,7 @@
 		if(!visualsOnly)
 			addtimer(CALLBACK(src, .proc/send_representative_mission, H), 5 MINUTES)
 	return TRUE
+
+/obj/outfit/job/consular_assistant/izweski
+	uniform = /obj/item/clothing/under/unathi
+	suit = /obj/item/clothing/accessory/poncho/unathimantle

code/modules/background/citizenship/vaurca.dm

@@ -6,6 +6,7 @@
 	Tau Ceti, this has lead to confrontations between them and other Hives arriving in the system. The Zo'ra are the most politically developed Hive, recently helping in the funding of \
 	the Tau Ceti Foreign Legion, and making active progress to spread their influence."
 	consular_outfit = /obj/outfit/job/representative/consular/zora
+	linked_citizenship = CITIZENSHIP_BIESEL
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -30,7 +31,8 @@
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK
-		)
+		),
+		"Diplomatic Aide" = ALL_SPECIES
 	)
 
 /datum/citizenship/zora/get_objectives(mission_level, var/mob/living/carbon/human/H)
@@ -80,6 +82,7 @@
 	They maintain subtly warm, if terse relations with the Hegemony as a whole, and have committed to its terraforming agenda, being instrumental in the implementation of such a monumental undertaking. \
 	The K'lax are the most technologically developed Hive, and are leading the way in reconstructing the species' superior technology."
 	consular_outfit = /obj/outfit/job/representative/consular/klax
+	linked_citizenship = CITIZENSHIP_IZWESKI
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -103,7 +106,8 @@
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK
-		)
+		),
+		"Diplomatic Aide" = ALL_SPECIES
 	)
 
 /datum/citizenship/klax/get_objectives(mission_level, var/mob/living/carbon/human/H)
@@ -150,6 +154,7 @@
 	In this effort, the Hive has begun dealing with the multitude of governments and corporations of the galaxy, all under the auspices of their Skrellian saviors. \
 	The C'thur are the most economically developed Hive, having stakes in Einstein Engines and Zeng-Hu Pharmaceuticals."
 	consular_outfit = /obj/outfit/job/representative/consular/cthur
+	linked_citizenship = CITIZENSHIP_NRALAKK
 
 	job_species_blacklist = list(
 		"Consular Officer" = list(
@@ -173,7 +178,8 @@
 			SPECIES_VAURCA_WORKER,
 			SPECIES_VAURCA_WARRIOR,
 			SPECIES_VAURCA_BULWARK
-		)
+		),
+		"Diplomatic Aide" = ALL_SPECIES
 	)
 
 /datum/citizenship/cthur/get_objectives(mission_level, var/mob/living/carbon/human/H)