From 1751548025a80cbd4481abcc9330628142ef098a Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:22:54 +0100
Subject: [PATCH] Reorganizes the taj loadout options (#21670)

Reorganizes the tajaran loadout. Mostly condensing it heavily, as there
is no need for 5 shoe selections and so on.
The golden sun pin was clarified what it was for, as it was unclear in
the loadout.
The archaeology set was also job restricted, as per request from Catsin.
---
 .../loadout/items/xeno/tajara.dm              | 1082 ++++++++---------
 html/changelogs/TajCondensing.yml             |    7 +
 2 files changed, 533 insertions(+), 556 deletions(-)
 create mode 100644 html/changelogs/TajCondensing.yml

diff --git a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
index da3b49bbc19..0916a358844 100644
--- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
+++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
@@ -1,33 +1,14 @@
 ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 
+// Shoes
+
 /datum/gear/shoes/tajara/boots
 	display_name = "tajaran boots selection"
-	description = "A selection of boots fitted for Tajara."
+	description = "A selection of shoes and boots fitted for Tajara."
 	path = /obj/item/clothing/shoes/tajara
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
 	sort_category = "Xenowear - Tajara"
 
-/datum/gear/uniform/archeologist_uniform
-	display_name = "archeologist uniform"
-	description = "A rugged uniform used by Adhomian archeologists."
-	path = /obj/item/clothing/under/tajaran/archeologist
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/suit/archaeologist_jacket
-	display_name = "archeologist jacket"
-	description = "A leather jacket used by Adhomian archeologists."
-	path = /obj/item/clothing/suit/storage/tajaran/archeologist
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/suit/archaeologist_hat
-	display_name = "archeologist hat"
-	description = "A well-worn fedora favored by Adhomian explorers and archeologists."
-	path = /obj/item/clothing/head/tajaran/archeologist
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
 /datum/gear/shoes/tajara/boots/New()
 	..()
 	var/list/boots = list()
@@ -39,8 +20,26 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	boots["grey workboots"] = /obj/item/clothing/shoes/workboots/tajara/grey
 	boots["dark workboots"] = /obj/item/clothing/shoes/workboots/tajara/dark
 	boots["adhomian boots"] = /obj/item/clothing/shoes/workboots/tajara/adhomian_boots
+	boots["native tajaran footwear"] = /obj/item/clothing/shoes/tajara/footwraps
+	boots["fancy adhomian shoes"] = /obj/item/clothing/shoes/tajara/fancy
+	boots["saddle shoes, black"] = /obj/item/clothing/shoes/sneakers/black/tajara
+	boots["high-heeled adhomian shoes, black"] = /obj/item/clothing/shoes/heels/tajara
+	boots["high-heeled adhomian shoes, red"] = /obj/item/clothing/shoes/heels/tajara/red
+	boots["oxfords, black"] = /obj/item/clothing/shoes/laceup/tajara
+	boots["oxfords, brown"] = /obj/item/clothing/shoes/laceup/brown/tajara
+	boots["dress flats, black"] = /obj/item/clothing/shoes/flats/tajara
+	boots["dress flats, dark"] = /obj/item/clothing/shoes/flats/tajara/dark
+	boots["dress flats, white"] = /obj/item/clothing/shoes/flats/tajara/white
+	boots["dress flats, red"] = /obj/item/clothing/shoes/flats/tajara/red
+	boots["dress flats, scarlet"] = /obj/item/clothing/shoes/flats/tajara/scarlet
+	boots["dress flats, mauve"] = /obj/item/clothing/shoes/flats/tajara/mauve
+	boots["dress flats, blue"] = /obj/item/clothing/shoes/flats/tajara/blue
+	boots["dress flats, green"] = /obj/item/clothing/shoes/flats/tajara/green
+	boots["dress flats, purple"] = /obj/item/clothing/shoes/flats/tajara/purple
 	gear_tweaks += new /datum/gear_tweak/path(boots)
 
+// gloves
+
 /datum/gear/gloves/tajara
 	display_name = "tajara gloves selection"
 	description = "A selection of tajaran gloves."
@@ -66,6 +65,81 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	taj_gloves["machinist gloves"] =  /obj/item/clothing/gloves/black/tajara/smithgloves
 	gear_tweaks += new /datum/gear_tweak/path(taj_gloves)
 
+// Uniforms
+
+/datum/gear/uniform/tajara
+	display_name = "tajaran uniform and dress selection"
+	description = "A selection of tajaran native uniforms and dresses."
+	path = /obj/item/clothing/under/tajaran
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+
+/datum/gear/uniform/tajara/New()
+	..()
+	var/list/uniform = list()
+	uniform["laborer clothes"] = /obj/item/clothing/under/tajaran
+	uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy
+	uniform["fancy uniform, alt 1"] = /obj/item/clothing/under/tajaran/fancy/alt1
+	uniform["fancy uniform, alt 2"] = /obj/item/clothing/under/tajaran/fancy/alt2
+	uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt
+	uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake
+	uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer
+	uniform["adhomian summer pants"] = /obj/item/clothing/pants/tajaran
+	uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic
+	uniform["a'lmariist laborer clothes"] = /obj/item/clothing/under/tajaran/dpra
+	uniform["a'lmariist laborer clothes, alternate"] = /obj/item/clothing/under/tajaran/dpra/alt
+	uniform["adhomian evening suit"] = /obj/item/clothing/under/tajaran/fancy/evening_suit
+	uniform["high-waisted men's wear"] = /obj/item/clothing/under/tajaran/high_waisted
+	uniform["high-waisted men's business wear"] = /obj/item/clothing/under/tajaran/high_waisted/business
+	uniform["relaxed men's wear"] = /obj/item/clothing/under/tajaran/relaxed
+	uniform["stylish relaxed men's wear"] = /obj/item/clothing/under/tajaran/relaxed/stylish
+	uniform["smart study outfit"] = /obj/item/clothing/under/tajaran/smart
+	uniform["white fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran
+	uniform["blue fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/blue
+	uniform["green fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/green
+	uniform["red fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/red
+	uniform["red noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy
+	uniform["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black
+	uniform["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black
+	uniform["adhomian summer dress"] = /obj/item/clothing/under/dress/tajaran/summer
+	uniform["fancy uniform with skirt"] = /obj/item/clothing/under/dress/tajaran/formal
+	uniform["fancy uniform with skirt, alt 1"] = /obj/item/clothing/under/dress/tajaran/formal/alt1
+	uniform["fancy uniform with skirt, alt 2"] = /obj/item/clothing/under/dress/tajaran/formal/alt2
+	uniform["polka dot dress, red"] = /obj/item/clothing/under/dress/tajaran/polka_dot
+	uniform["polka dot dress, black"] = /obj/item/clothing/under/dress/tajaran/polka_dot/black
+	uniform["floral dress"] = /obj/item/clothing/under/dress/tajaran/floral
+	uniform["housewife dress, plaid"] = /obj/item/clothing/under/dress/tajaran/housewife
+	uniform["housewife dress, mauve"] = /obj/item/clothing/under/dress/tajaran/housewife/mauve
+	uniform["housewife dress, yellow"] = /obj/item/clothing/under/dress/tajaran/housewife/yellow
+	gear_tweaks += new /datum/gear_tweak/path(uniform)
+
+/datum/gear/uniform/tajara_colorable
+	display_name = "tajaran uniform and dress selection (colorable)"
+	description = "A selection of colorable tajaran native uniforms and dresses."
+	path = /obj/item/clothing/under/dress/tajaran/long
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+	sort_category = "Xenowear - Tajara"
+
+/datum/gear/uniform/tajara_colorable/New()
+	..()
+	var/list/uniform = list()
+	uniform["tajaran long dress"] = /obj/item/clothing/under/dress/tajaran/long
+	uniform["new kingdom noble clothes"] = /obj/item/clothing/under/tajaran/nka_noble
+	gear_tweaks += new /datum/gear_tweak/path(uniform)
+
+// Suits and voidsuits
+
+/datum/gear/utility/himeo_kit/tajara
+	display_name = "tajaran himean voidsuit kit"
+	description = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit fitted for Tajara. Only \
+	Tajara connected to Himeo and the Free Tajaran Council would have this."
+	path = /obj/item/voidsuit_modkit/himeo/tajara
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
+	origin_restriction = list(/singleton/origin_item/origin/free_council)
+
 /datum/gear/suit/tajara_coat
 	display_name = "tajara coat and jacket selection"
 	description = "A selection of tajaran native coats and jackets."
@@ -90,6 +164,41 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	coat["fancy royalist jacket"] = /obj/item/clothing/suit/storage/tajaran/fancy
 	gear_tweaks += new /datum/gear_tweak/path(coat)
 
+/datum/gear/suit/tajaran_labcoat
+	display_name = "PRA medical coat"
+	path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel")
+	sort_category = "Xenowear - Tajara"
+
+/datum/gear/suit/tajaran_surgeon
+	display_name = "adhomian surgeon garb"
+	path = /obj/item/clothing/suit/storage/hooded/tajaran/surgery
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Xenobiologist", "Roboticist", "Medical Intern", "Medical Personnel")
+	sort_category = "Xenowear - Tajara"
+
+// Cloaks
+
+/datum/gear/suit/colorable_tajara_cloak
+	display_name = "tajara cloaks selection (colorable)"
+	description = "A selection of colorable tajaran native cloaks."
+	path = /obj/item/clothing/accessory/poncho/tajarancloak/colorable
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION
+
+/datum/gear/suit/colorable_tajara_cloak/New()
+	..()
+	var/list/colorable_cloaks = list()
+	colorable_cloaks["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable
+	colorable_cloaks["fancy cloak"] = /obj/item/clothing/accessory/poncho/tajarancloak/colorable
+	colorable_cloaks["fancy cloak (hooded)"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/fancy
+	colorable_cloaks["royal cloak"] = /obj/item/clothing/accessory/poncho/tajarancloak/colorable/royal
+	colorable_cloaks["royal cloak (hooded)"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/royal
+	colorable_cloaks["amohda cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/amohda
+	gear_tweaks += new /datum/gear_tweak/path(colorable_cloaks)
+
 /datum/gear/suit/tajara_cloak
 	display_name = "tajara cloak selection"
 	description = "A selection of tajaran native cloaks."
@@ -116,487 +225,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	tajarancloak["black fancy adhomian cloak, hoodless"] = /obj/item/clothing/accessory/poncho/tajarancloak/fancyblack
 	gear_tweaks += new /datum/gear_tweak/path(tajarancloak)
 
-/datum/gear/suit/tajara_priest
-	display_name = "tajaran religious suits selection"
-	description = "A selection of tajaran religious robes."
-	path = /obj/item/clothing/suit/storage/hooded/tajaran/priest
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/suit/tajara_priest/New()
-	..()
-	var/list/robes = list()
-	robes["sun priest robe"] = /obj/item/clothing/suit/storage/hooded/tajaran/priest
-	robes["sun sister robe"] = /obj/item/clothing/suit/storage/tajaran/messa
-	robes["matake priest mantle"] = /obj/item/clothing/suit/storage/tajaran/matake
-	robes["azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre
-	robes["dharmela apron"] = /obj/item/clothing/accessory/apron/dharmela
-	gear_tweaks += new /datum/gear_tweak/path(robes)
-
-/datum/gear/suit/tajaran_labcoat
-	display_name = "PRA medical coat"
-	path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Intern", "Medical Personnel")
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/suit/tajaran_surgeon
-	display_name = "adhomian surgeon garb"
-	path = /obj/item/clothing/suit/storage/hooded/tajaran/surgery
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Xenobiologist", "Roboticist", "Medical Intern", "Medical Personnel")
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/uniform/tajara
-	display_name = "tajaran uniform selection"
-	description = "A selection of tajaran native uniforms."
-	path = /obj/item/clothing/under/tajaran
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/uniform/tajara/New()
-	..()
-	var/list/uniform = list()
-	uniform["laborer clothes"] = /obj/item/clothing/under/tajaran
-	uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy
-	uniform["fancy uniform, alt 1"] = /obj/item/clothing/under/tajaran/fancy/alt1
-	uniform["fancy uniform, alt 2"] = /obj/item/clothing/under/tajaran/fancy/alt2
-	uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt
-	uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake
-	uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer
-	uniform["adhomian summer pants"] = /obj/item/clothing/pants/tajaran
-	uniform["machinist uniform"] = /obj/item/clothing/under/tajaran/mechanic
-	uniform["a'lmariist laborer clothes"] = /obj/item/clothing/under/tajaran/dpra
-	uniform["a'lmariist laborer clothes, alternate"] = /obj/item/clothing/under/tajaran/dpra/alt
-	uniform["adhomian evening suit"] = /obj/item/clothing/under/tajaran/fancy/evening_suit
-	uniform["high-waisted men's wear"] = /obj/item/clothing/under/tajaran/high_waisted
-	uniform["high-waisted men's business wear"] = /obj/item/clothing/under/tajaran/high_waisted/business
-	uniform["relaxed men's wear"] = /obj/item/clothing/under/tajaran/relaxed
-	uniform["stylish relaxed men's wear"] = /obj/item/clothing/under/tajaran/relaxed/stylish
-	uniform["smart study outfit"] = /obj/item/clothing/under/tajaran/smart
-	gear_tweaks += new /datum/gear_tweak/path(uniform)
-
-/datum/gear/uniform/nka_colorable_uniform
-	display_name = "new kingdom noble clothes"
-	description = "A colorable set of clothes used by the New Kingdom's Tajara."
-	path = /obj/item/clothing/under/tajaran/nka_noble
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
-
-/datum/gear/accessory/nka_colorable_accessory
-	display_name = "new kingdom noble accessories clothes"
-	description = "A colorable set of accessories used by the New Kingdom's Tajara."
-	path = /obj/item/clothing/accessory/tajaran/nka_waistcoat
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
-
-/datum/gear/accessory/nka_colorable_accessory/New()
-	..()
-	var/list/accessory = list()
-	accessory["noble adhomian waistcoat"] = /obj/item/clothing/accessory/tajaran/nka_waistcoat
-	accessory["noble adhomian vest"] = /obj/item/clothing/accessory/tajaran/nka_vest
-	gear_tweaks += new /datum/gear_tweak/path(accessory)
-
-/datum/gear/uniform/tajara_dress
-	display_name = "tajaran dress selection"
-	description = "A selection of tajaran native dresses."
-	path = /obj/item/clothing/under/dress/tajaran
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/uniform/tajara_dress/New()
-	..()
-	var/list/dress = list()
-	dress["white fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran
-	dress["blue fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/blue
-	dress["green fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/green
-	dress["red fancy adhomian dress"] = /obj/item/clothing/under/dress/tajaran/red
-	dress["red noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy
-	dress["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black
-	dress["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black
-	dress["adhomian summer dress"] = /obj/item/clothing/under/dress/tajaran/summer
-	dress["fancy uniform with skirt"] = /obj/item/clothing/under/dress/tajaran/formal
-	dress["fancy uniform with skirt, alt 1"] = /obj/item/clothing/under/dress/tajaran/formal/alt1
-	dress["fancy uniform with skirt, alt 2"] = /obj/item/clothing/under/dress/tajaran/formal/alt2
-	dress["polka dot dress, red"] = /obj/item/clothing/under/dress/tajaran/polka_dot
-	dress["polka dot dress, black"] = /obj/item/clothing/under/dress/tajaran/polka_dot/black
-	dress["floral dress"] = /obj/item/clothing/under/dress/tajaran/floral
-	dress["housewife dress, plaid"] = /obj/item/clothing/under/dress/tajaran/housewife
-	dress["housewife dress, mauve"] = /obj/item/clothing/under/dress/tajaran/housewife/mauve
-	dress["housewife dress, yellow"] = /obj/item/clothing/under/dress/tajaran/housewife/yellow
-	gear_tweaks += new /datum/gear_tweak/path(dress)
-
-/datum/gear/uniform/tajara_long_dress
-	display_name = "tajaran long dress (recolorable)"
-	path = /obj/item/clothing/under/dress/tajaran/long
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
-
-// Dress Flats
-/datum/gear/shoes/tajara/flats
-	display_name = "tajaran dress flats selection"
-	description = "Dress flats, in a selection of colours. Fitted for Tajara."
-	path = /obj/item/clothing/shoes/tajara
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/shoes/tajara/flats/New()
-	..()
-	var/list/flats = list()
-	flats["dress flats, black"] = /obj/item/clothing/shoes/flats/tajara
-	flats["dress flats, dark"] = /obj/item/clothing/shoes/flats/tajara/dark
-	flats["dress flats, white"] = /obj/item/clothing/shoes/flats/tajara/white
-	flats["dress flats, red"] = /obj/item/clothing/shoes/flats/tajara/red
-	flats["dress flats, scarlet"] = /obj/item/clothing/shoes/flats/tajara/scarlet
-	flats["dress flats, mauve"] = /obj/item/clothing/shoes/flats/tajara/mauve
-	flats["dress flats, blue"] = /obj/item/clothing/shoes/flats/tajara/blue
-	flats["dress flats, green"] = /obj/item/clothing/shoes/flats/tajara/green
-	flats["dress flats, purple"] = /obj/item/clothing/shoes/flats/tajara/purple
-	gear_tweaks += new /datum/gear_tweak/path(flats)
-
-/datum/gear/accessory/tajara
-	display_name = "fur scarf"
-	description = "A selection of tajaran colored fur scarfs."
-	path = /obj/item/clothing/accessory/tajaran
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/accessory/tajara/New()
-	..()
-	var/list/scarf = list()
-	scarf["brown fur scarf"] = /obj/item/clothing/accessory/tajaran
-	scarf["light brown fur scarf"] = /obj/item/clothing/accessory/tajaran/lbrown
-	scarf["cinnamon fur scarf"] = /obj/item/clothing/accessory/tajaran/cinnamon
-	scarf["blue fur scarf"] = /obj/item/clothing/accessory/tajaran/blue
-	scarf["silver fur scarf"] = /obj/item/clothing/accessory/tajaran/silver
-	scarf["black fur scarf"] = /obj/item/clothing/accessory/tajaran/black
-	scarf["ruddy fur scarf"] = /obj/item/clothing/accessory/tajaran/ruddy
-	scarf["orange fur scarf"] = /obj/item/clothing/accessory/tajaran/orange
-	scarf["cream fur scarf"] = /obj/item/clothing/accessory/tajaran/cream
-	gear_tweaks += new /datum/gear_tweak/path(scarf)
-
-/datum/gear/head/tajara
-	display_name = "adhomian headgear selection"
-	description = "A selection of tajaran native headgear."
-	path = /obj/item/clothing/head/tajaran/circlet
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/head/tajara/New()
-	..()
-	var/list/circlet = list()
-	circlet["golden dress circlet"] = /obj/item/clothing/head/tajaran/circlet
-	circlet["silver dress circlet"] = /obj/item/clothing/head/tajaran/circlet/silver
-	circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur
-	circlet["PRA urban police winter hat"] = /obj/item/clothing/head/tajaran/pra_cop/winter
-	circlet["matake priest hat"] = /obj/item/clothing/head/tajaran/matake
-	circlet["raakti shariim beret"] = /obj/item/clothing/head/beret/tajaran/raakti_shariim
-	circlet["hadiist army beret"] = /obj/item/clothing/head/beret/tajaran/pra
-	circlet["liberation army beret"] = /obj/item/clothing/head/beret/tajaran/dpra
-	circlet["liberation army beret, alternative"] = /obj/item/clothing/head/beret/tajaran/dpra/alt
-	circlet["new kingdom naval beret"] = /obj/item/clothing/head/beret/tajaran/nka
-	circlet["new kingdom naval officer beret"] = /obj/item/clothing/head/beret/tajaran/nka/officer
-	gear_tweaks += new /datum/gear_tweak/path(circlet)
-
-/datum/gear/accessory/tajara_wrap
-	display_name = "marriage wrap"
-	description = "A holy cloth wrap that signifies marriage amongst tajara."
-	path = /obj/item/clothing/accessory/tajaran_wrap
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajara_wrap/New()
-	..()
-	var/list/wrap = list()
-	wrap["marriage wrap, male"] = /obj/item/clothing/accessory/tajaran_wrap
-	wrap["marriage wrap, female"] = /obj/item/clothing/accessory/tajaran_wrap/female
-	gear_tweaks += new /datum/gear_tweak/path(wrap)
-
-/datum/gear/accessory/tajara_pelt
-	display_name = "ceremonial pelt"
-	path = /obj/item/clothing/accessory/tajaran_pelt
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/mask/tajara
-	display_name = "sun sister veil"
-	path = /obj/item/clothing/mask/tajara
-	cost = 1
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/shoes/tajara/shoes
-	display_name = "tajaran footwear"
-	path = /obj/item/clothing/shoes/tajara/footwraps
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-
-/datum/gear/shoes/tajara/shoes/New()
-	..()
-	var/list/shoes = list()
-	shoes["native tajaran footwear"] = /obj/item/clothing/shoes/tajara/footwraps
-	shoes["fancy adhomian shoes"] = /obj/item/clothing/shoes/tajara/fancy
-	shoes["saddle shoes, black"] = /obj/item/clothing/shoes/sneakers/black/tajara
-	gear_tweaks += new /datum/gear_tweak/path(shoes)
-
-/datum/gear/gloves/shumalia_belt
-	display_name = "hammer buckle belt"
-	description = "A leather belt adorned by a hammer shaped buckle, worn by priesthood and worshippers of Shumaila."
-	path = /obj/item/storage/belt/shumaila_buckle
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/augment/tesla_spine
-	display_name = "tesla spine"
-	description = "A People's Republic of Adhomai made tesla spine issued to disabled veterans and civilians."
-	path = /obj/item/organ/internal/augment/tesla
-	cost = 2
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-
-/datum/gear/accessory/tajaran_card
-	display_name = "tajaran faction cards, badges and pins selection"
-	description = "A selection of Tajaran related cards, badges and pins."
-	path = /obj/item/clothing/accessory/badge/hadii_card
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajaran_card/New()
-	..()
-	var/list/card = list()
-	card["honorary party member card"] = /obj/item/clothing/accessory/badge/hadii_card
-	card["a'lmariist pin"] = /obj/item/clothing/accessory/dpra_badge
-	card["royalist badge"] = /obj/item/clothing/accessory/nka_badge
-	card["free tajaran council badge"] = /obj/item/clothing/accessory/tajaran/council_badge
-	gear_tweaks += new /datum/gear_tweak/path(card)
-
-/datum/gear/accessory/tajaranbookspol
-	display_name = "tajaran political books"
-	description = "Tajaran books on the Adhomian ideologies."
-	path = /obj/item/device/versebook/pra
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajaranbookspol/New()
-	..()
-	var/list/card = list()
-	card["hadiist manifesto"] = /obj/item/device/versebook/pra
-	card["in defense of al'mari's legacy"] = /obj/item/device/versebook/dpra
-	card["the new kingdom"] = /obj/item/device/versebook/nka
-	gear_tweaks += new /datum/gear_tweak/path(card)
-
-/datum/gear/accessory/tajaranbooksrel
-	display_name = "tajaran religious books"
-	description = "Tajaran religious texts."
-	path = /obj/item/device/versebook/twinsuns
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajaranbooksrel/New()
-	..()
-	var/list/card = list()
-	card["holy scrolls"] = /obj/item/device/versebook/twinsuns
-	card["ma'ta'ke legends"] = /obj/item/device/versebook/matake
-	gear_tweaks += new /datum/gear_tweak/path(card)
-
-/datum/gear/tajaran_passports
-	display_name = "adhomian passports selection"
-	description = "A selection of Adhomian passports."
-	path = /obj/item/clothing/accessory/badge/pra_passport
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-	cost = 1
-
-/datum/gear/tajaran_passports/New()
-	..()
-	var/list/passports = list()
-	passports["people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/pra_passport
-	passports["democratic people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/dpra_passport
-	passports["new kingdom of adhomai passport"] = /obj/item/clothing/accessory/badge/nka_passport
-	passports["free tajaran council passport"] =/obj/item/clothing/accessory/badge/ftc_passport
-	gear_tweaks += new /datum/gear_tweak/path(passports)
-
-/datum/gear/adhomai_zippo
-	display_name = "adhomian lighter"
-	path = /obj/item/flame/lighter/adhomai
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/adhomai_watch
-	display_name = "adhomian watch selection"
-	description = "A selection of Adhomian watches."
-	path = /obj/item/clothing/wrists/watch/pocketwatch/adhomai
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/adhomai_watch/New()
-	..()
-	var/list/watch = list()
-	watch["adhomian pocket watch"] = /obj/item/clothing/wrists/watch/pocketwatch/adhomai
-	watch["male adhomian wrist watch"] = /obj/item/clothing/wrists/watch/tajara
-	watch["female adhomian wrist watch"] = /obj/item/clothing/wrists/watch/tajara/female
-	gear_tweaks += new /datum/gear_tweak/path(watch)
-
-/datum/gear/tajaran_dice
-	display_name = "bag of adhomian dice"
-	path = /obj/item/storage/pill_bottle/dice/tajara
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/utility/himeo_kit/tajara
-	display_name = "tajaran himean voidsuit kit"
-	description = "A simple cardboard box containing the requisition forms, permits, and decal kits for a Himean voidsuit fitted for Tajara. Only \
-	Tajara connected to Himeo and the Free Tajaran Council would have this."
-	path = /obj/item/voidsuit_modkit/himeo/tajara
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	allowed_roles = list("Shaft Miner", "Operations Manager", "Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice", "Engineering Personnel", "Operations Personnel")
-	origin_restriction = list(/singleton/origin_item/origin/free_council)
-
-/datum/gear/tajaran_tarot
-	display_name = "adhomian divination cards deck"
-	path = /obj/item/deck/tarot/adhomai
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajara_charm
-	display_name = "charms and talismans"
-	description = "Charms and talismans often thought of to bring good luck, or of religious significance."
-	path = /obj/item/clothing/accessory/tajaran/charm
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION
-
-/datum/gear/accessory/tajara_charm/New()
-	..()
-	var/list/charm = list()
-	charm["wooden charm"] = /obj/item/clothing/accessory/tajaran/charm
-	charm["stone charm"] = /obj/item/clothing/accessory/tajaran/charm/stone
-	charm["steel charm"] = /obj/item/clothing/accessory/tajaran/charm/steel
-	charm["silver charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver
-	charm["bone charm"] = /obj/item/clothing/accessory/tajaran/charm/bone
-	charm["silver seashell charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell
-	charm["tajani charm"] = /obj/item/clothing/accessory/tajaran/charm/tajani
-	charm["twin suns charm"] = /obj/item/clothing/accessory/tajaran/charm/twin_suns
-	charm["Kin of S'rendarr rosette"] = /obj/item/clothing/accessory/tajaran/kin_srendarr
-	gear_tweaks += new /datum/gear_tweak/path(charm)
-
-/datum/gear/accessory/tajara_raskariim_charm
-	display_name = "raskariim charms and talismans"
-	description = "Charms and talismans often thought of to bring good luck, or of religious significance. These should only be taken by true raskariim, and can be identified by other raskariim."
-	path = /obj/item/clothing/accessory/tajaran/charm/raskariim
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION
-	religion = list(RELIGION_RASKARA, RELIGION_RASKARA_ALT)
-
-/datum/gear/accessory/tajara_raskariim_charm/New()
-	..()
-	var/list/charm = list()
-	charm["key charm (door and key)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/doorandkey
-	charm["coin charm (king of maggots)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/kingofmaggots
-	charm["glass charm (black mirror)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/blackmirror
-	gear_tweaks += new /datum/gear_tweak/path(charm)
-
-/datum/gear/tail_cloth
-	display_name = "tail cloth"
-	path = /obj/item/clothing/tail_accessory/tail_cloth
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
-
-/datum/gear/accessory/dpra_party_pin
-	display_name = "democratic peoples republic party pins selection"
-	description = "A selection of DPRA party pins."
-	path = /obj/item/clothing/accessory/tajaran/nawparty_pin
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/dpra_party_pin/New()
-	..()
-	var/list/card = list()
-	card["national adhomai workers party pin"] = /obj/item/clothing/accessory/tajaran/nawparty_pin
-	card["free tajaran people party pin"] = /obj/item/clothing/accessory/tajaran/ftpparty_pin
-	card["followers of Nated party pin"] = /obj/item/clothing/accessory/tajaran/fonparty_pin
-	card["adhomian blue party pin"] = /obj/item/clothing/accessory/tajaran/abparty_pin
-	card["amohdan free lodge party pin"] = /obj/item/clothing/accessory/tajaran/aflparty_pin
-	gear_tweaks += new /datum/gear_tweak/path(card)
-
-/datum/gear/accessory/tajaran_gen_accessorry
-	display_name = "tajaran accessories selection"
-	description = "A selection of tajaran related accessories."
-	path = /obj/item/clothing/accessory/tajaran/zbrojny_badge
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajaran_gen_accessorry/New()
-	..()
-	var/list/card = list()
-	card["zbrojny badge"] = /obj/item/clothing/accessory/tajaran/zbrojny_badge
-	card["golden sun pin"] = /obj/item/clothing/accessory/tajaran/tanker_pin
-	card["pra brooch"] = /obj/item/clothing/accessory/tajaran/pra_brooch
-	card["dpra brooch"] = /obj/item/clothing/accessory/tajaran/dpra_brooch
-	card["nka brooch"] = /obj/item/clothing/accessory/tajaran/nka_brooch
-	card["bronze president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge
-	card["silver president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge/silver
-	card["golden president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge/gold
-	card["adhomian pearl necklace"] = /obj/item/clothing/accessory/necklace/adhomian
-	gear_tweaks += new /datum/gear_tweak/path(card)
-
-/datum/gear/accessory/tajaran_portraits
-	display_name = "tajaran leader portrait selection"
-	description = "A selection of tajaran leaders portraits."
-	path = /obj/item/sign/painting_frame/hadii
-	sort_category = "Xenowear - Tajara"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajaran_portraits/New()
-	..()
-	var/list/portrait = list()
-	portrait["president hadii portrait"] = /obj/item/sign/painting_frame/hadii
-	portrait["president almari portrait"] = /obj/item/sign/painting_frame/almari
-	portrait["supreme commander nated portrait"] = /obj/item/sign/painting_frame/nated
-	portrait["president harrlala portrait"] = /obj/item/sign/painting_frame/harrlala
-	portrait["king vahzirthaamro portrait"] = /obj/item/sign/painting_frame/vahzirthaamro
-	portrait["queen shumaila portrait"] = /obj/item/sign/painting_frame/shumaila
-	gear_tweaks += new /datum/gear_tweak/path(portrait)
-
-/datum/gear/accessory/tajara_medal
-	display_name = "tajaran medals"
-	description = "Because of the cultural impact of the civil wars in the Tajara species, medals are treated with the utmost respect by society. Veterans commonly wear their decorations to formal occasions."
-	path = /obj/item/clothing/accessory/medal/dasnrra_evac
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
-
-/datum/gear/accessory/tajara_medal/New()
-	..()
-	var/list/accessory = list()
-	accessory["PRA medal for the evacuation of das'nrra"] = /obj/item/clothing/accessory/medal/dasnrra_evac
-	accessory["PRA medal for the defense of the homeland"] = /obj/item/clothing/accessory/medal/homeland_defense
-	accessory["DPRA medal for the liberation of das'nrra"] = /obj/item/clothing/accessory/medal/dasnrra_liberation
-	accessory["DPRA medal for the liberation of gakal'zaal"] = /obj/item/clothing/accessory/medal/gakalzaal_liberation
-	accessory["NKA medal for the defense of the kingdom"] = /obj/item/clothing/accessory/medal/kingdom_defense
-	accessory["NKA medal for the harr'masir offensive"] = /obj/item/clothing/accessory/medal/harrmasir_offensive
-	gear_tweaks += new /datum/gear_tweak/path(accessory)
+// Consular set
 
 /datum/gear/uniform/tajara_consular
 	display_name = "tajaran alternative consular uniform selection"
@@ -628,34 +257,59 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	hats["DPRA consular service side cap"] = /obj/item/clothing/head/tajaran/consular/dpra/side_cap
 	gear_tweaks += new /datum/gear_tweak/path(hats)
 
-/datum/gear/shoes/tajara/heels
-	display_name = "high-heeled adhomian shoes selection"
-	description = "High-heeled shoes, in a selection of colours. Fitted for Tajara."
-	path = /obj/item/clothing/shoes/tajara
+// Archeology set
+
+/datum/gear/uniform/archeologist_uniform
+	display_name = "archeologist uniform"
+	description = "A rugged uniform used by Adhomian archeologists."
+	path = /obj/item/clothing/under/tajaran/archeologist
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	allowed_roles = list("Scientist", "Xenoarchaeologist", "Research Director", "Librarian", "Shaft Miner", "Off-Duty Crew Member", "Passenger")
 	sort_category = "Xenowear - Tajara"
 
-/datum/gear/shoes/tajara/heels/New()
-	..()
-	var/list/heels = list()
-	heels["high-heeled adhomian shoes, black"] = /obj/item/clothing/shoes/heels/tajara
-	heels["high-heeled adhomian shoes, red"] = /obj/item/clothing/shoes/heels/tajara/red
-	gear_tweaks += new /datum/gear_tweak/path(heels)
-
-/datum/gear/shoes/tajara/oxford
-	display_name = "adhomian oxford shoes selection"
-	description = "Oxfords, in a selection of colours. Fitted for Tajara."
-	path = /obj/item/clothing/shoes/laceup/tajara
+/datum/gear/suit/archaeologist_jacket
+	display_name = "archeologist jacket"
+	description = "A leather jacket used by Adhomian archeologists."
+	path = /obj/item/clothing/suit/storage/tajaran/archeologist
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	allowed_roles = list("Scientist", "Xenoarchaeologist", "Research Director", "Librarian", "Shaft Miner", "Off-Duty Crew Member", "Passenger")
 	sort_category = "Xenowear - Tajara"
 
-/datum/gear/shoes/tajara/oxford/New()
-	..()
-	var/list/oxford = list()
-	oxford["oxfords, black"] = /obj/item/clothing/shoes/laceup/tajara
-	oxford["oxfords, brown"] = /obj/item/clothing/shoes/laceup/brown/tajara
-	gear_tweaks += new /datum/gear_tweak/path(oxford)
+/datum/gear/suit/archaeologist_hat
+	display_name = "archeologist hat"
+	description = "A well-worn fedora favored by Adhomian explorers and archeologists."
+	path = /obj/item/clothing/head/tajaran/archeologist
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	allowed_roles = list("Scientist", "Xenoarchaeologist", "Research Director", "Librarian", "Shaft Miner", "Off-Duty Crew Member", "Passenger")
+	sort_category = "Xenowear - Tajara"
 
+// Religion
+
+/datum/gear/suit/tajara_priest
+	display_name = "tajaran religious suits selection"
+	description = "A selection of tajaran religious robes."
+	path = /obj/item/clothing/suit/storage/hooded/tajaran/priest
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/suit/tajara_priest/New()
+	..()
+	var/list/robes = list()
+	robes["sun priest robe"] = /obj/item/clothing/suit/storage/hooded/tajaran/priest
+	robes["sun sister robe"] = /obj/item/clothing/suit/storage/tajaran/messa
+	robes["matake priest mantle"] = /obj/item/clothing/suit/storage/tajaran/matake
+	robes["azubarre priest robes"] = /obj/item/clothing/suit/storage/tajaran/azubarre
+	robes["dharmela apron"] = /obj/item/clothing/accessory/apron/dharmela
+	gear_tweaks += new /datum/gear_tweak/path(robes)
+
+/datum/gear/gloves/shumalia_belt
+	display_name = "hammer buckle belt"
+	description = "A leather belt adorned by a hammer shaped buckle, worn by priesthood and worshippers of Shumaila."
+	path = /obj/item/storage/belt/shumaila_buckle
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/accessory/tajara_god_banners
 	display_name = "tajaran deity banners"
@@ -713,12 +367,254 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	altar["Zhukamir altar"] = /obj/item/reagent_containers/bowl/zhukamir
 	gear_tweaks += new /datum/gear_tweak/path(altar)
 
+/datum/gear/accessory/tajaranbooksrel
+	display_name = "tajaran religious books"
+	description = "Tajaran religious texts."
+	path = /obj/item/device/versebook/twinsuns
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajaranbooksrel/New()
+	..()
+	var/list/card = list()
+	card["holy scrolls"] = /obj/item/device/versebook/twinsuns
+	card["ma'ta'ke legends"] = /obj/item/device/versebook/matake
+	gear_tweaks += new /datum/gear_tweak/path(card)
+
+// Accessories
+
+/datum/gear/accessory/tajara_colorable_fur_scarf
+	display_name = "fur scarf (colorable)"
+	path = /obj/item/clothing/accessory/tajaran/colorable
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/accessory/tajara
+	display_name = "fur scarf"
+	description = "A selection of tajaran colored fur scarfs."
+	path = /obj/item/clothing/accessory/tajaran
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+
+/datum/gear/accessory/tajara/New()
+	..()
+	var/list/scarf = list()
+	scarf["brown fur scarf"] = /obj/item/clothing/accessory/tajaran
+	scarf["light brown fur scarf"] = /obj/item/clothing/accessory/tajaran/lbrown
+	scarf["cinnamon fur scarf"] = /obj/item/clothing/accessory/tajaran/cinnamon
+	scarf["blue fur scarf"] = /obj/item/clothing/accessory/tajaran/blue
+	scarf["silver fur scarf"] = /obj/item/clothing/accessory/tajaran/silver
+	scarf["black fur scarf"] = /obj/item/clothing/accessory/tajaran/black
+	scarf["ruddy fur scarf"] = /obj/item/clothing/accessory/tajaran/ruddy
+	scarf["orange fur scarf"] = /obj/item/clothing/accessory/tajaran/orange
+	scarf["cream fur scarf"] = /obj/item/clothing/accessory/tajaran/cream
+	gear_tweaks += new /datum/gear_tweak/path(scarf)
+
+/datum/gear/accessory/tajara_medal
+	display_name = "tajaran medals"
+	description = "Because of the cultural impact of the civil wars in the Tajara species, medals are treated with the utmost respect by society. Veterans commonly wear their decorations to formal occasions."
+	path = /obj/item/clothing/accessory/medal/dasnrra_evac
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajara_medal/New()
+	..()
+	var/list/accessory = list()
+	accessory["PRA medal for the evacuation of das'nrra"] = /obj/item/clothing/accessory/medal/dasnrra_evac
+	accessory["PRA medal for the defense of the homeland"] = /obj/item/clothing/accessory/medal/homeland_defense
+	accessory["DPRA medal for the liberation of das'nrra"] = /obj/item/clothing/accessory/medal/dasnrra_liberation
+	accessory["DPRA medal for the liberation of gakal'zaal"] = /obj/item/clothing/accessory/medal/gakalzaal_liberation
+	accessory["NKA medal for the defense of the kingdom"] = /obj/item/clothing/accessory/medal/kingdom_defense
+	accessory["NKA medal for the harr'masir offensive"] = /obj/item/clothing/accessory/medal/harrmasir_offensive
+	gear_tweaks += new /datum/gear_tweak/path(accessory)
+
+/datum/gear/accessory/dpra_party_pin
+	display_name = "democratic peoples republic party pins selection"
+	description = "A selection of DPRA party pins."
+	path = /obj/item/clothing/accessory/tajaran/nawparty_pin
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/dpra_party_pin/New()
+	..()
+	var/list/card = list()
+	card["national adhomai workers party pin"] = /obj/item/clothing/accessory/tajaran/nawparty_pin
+	card["free tajaran people party pin"] = /obj/item/clothing/accessory/tajaran/ftpparty_pin
+	card["followers of Nated party pin"] = /obj/item/clothing/accessory/tajaran/fonparty_pin
+	card["adhomian blue party pin"] = /obj/item/clothing/accessory/tajaran/abparty_pin
+	card["amohdan free lodge party pin"] = /obj/item/clothing/accessory/tajaran/aflparty_pin
+	gear_tweaks += new /datum/gear_tweak/path(card)
+
+/datum/gear/accessory/tajaran_gen_accessorry
+	display_name = "tajaran accessories selection"
+	description = "A selection of tajaran related accessories."
+	path = /obj/item/clothing/accessory/tajaran/zbrojny_badge
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajaran_gen_accessorry/New()
+	..()
+	var/list/card = list()
+	card["pra zbrojny badge"] = /obj/item/clothing/accessory/tajaran/zbrojny_badge
+	card["dpra tank corps golden sun pin"] = /obj/item/clothing/accessory/tajaran/tanker_pin
+	card["pra brooch"] = /obj/item/clothing/accessory/tajaran/pra_brooch
+	card["dpra brooch"] = /obj/item/clothing/accessory/tajaran/dpra_brooch
+	card["nka brooch"] = /obj/item/clothing/accessory/tajaran/nka_brooch
+	card["bronze president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge
+	card["silver president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge/silver
+	card["golden president hadii badge"] = /obj/item/clothing/accessory/tajaran/hadii_badge/gold
+	card["adhomian pearl necklace"] = /obj/item/clothing/accessory/necklace/adhomian
+	gear_tweaks += new /datum/gear_tweak/path(card)
+
+/datum/gear/accessory/tajaran_card
+	display_name = "tajaran faction cards, badges and pins selection"
+	description = "A selection of Tajaran related cards, badges and pins."
+	path = /obj/item/clothing/accessory/badge/hadii_card
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajaran_card/New()
+	..()
+	var/list/card = list()
+	card["honorary party member card"] = /obj/item/clothing/accessory/badge/hadii_card
+	card["a'lmariist pin"] = /obj/item/clothing/accessory/dpra_badge
+	card["royalist badge"] = /obj/item/clothing/accessory/nka_badge
+	card["free tajaran council badge"] = /obj/item/clothing/accessory/tajaran/council_badge
+	gear_tweaks += new /datum/gear_tweak/path(card)
+
+/datum/gear/accessory/tajara_charm
+	display_name = "charms and talismans"
+	description = "Charms and talismans often thought of to bring good luck, or of religious significance."
+	path = /obj/item/clothing/accessory/tajaran/charm
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION
+
+/datum/gear/accessory/tajara_charm/New()
+	..()
+	var/list/charm = list()
+	charm["wooden charm"] = /obj/item/clothing/accessory/tajaran/charm
+	charm["stone charm"] = /obj/item/clothing/accessory/tajaran/charm/stone
+	charm["steel charm"] = /obj/item/clothing/accessory/tajaran/charm/steel
+	charm["silver charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver
+	charm["bone charm"] = /obj/item/clothing/accessory/tajaran/charm/bone
+	charm["silver seashell charm"] = /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell
+	charm["tajani charm"] = /obj/item/clothing/accessory/tajaran/charm/tajani
+	charm["twin suns charm"] = /obj/item/clothing/accessory/tajaran/charm/twin_suns
+	charm["Kin of S'rendarr rosette"] = /obj/item/clothing/accessory/tajaran/kin_srendarr
+	gear_tweaks += new /datum/gear_tweak/path(charm)
+
+/datum/gear/accessory/tajara_raskariim_charm
+	display_name = "raskariim charms and talismans"
+	description = "Charms and talismans often thought of to bring good luck, or of religious significance. These should only be taken by true raskariim, and can be identified by other raskariim."
+	path = /obj/item/clothing/accessory/tajaran/charm/raskariim
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION | GEAR_HAS_NAME_SELECTION
+	religion = list(RELIGION_RASKARA, RELIGION_RASKARA_ALT)
+
+/datum/gear/accessory/tajara_raskariim_charm/New()
+	..()
+	var/list/charm = list()
+	charm["key charm (door and key)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/doorandkey
+	charm["coin charm (king of maggots)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/kingofmaggots
+	charm["glass charm (black mirror)"] = /obj/item/clothing/accessory/tajaran/charm/raskariim/blackmirror
+	gear_tweaks += new /datum/gear_tweak/path(charm)
+
+/datum/gear/tajaran_passports
+	display_name = "adhomian passports selection"
+	description = "A selection of Adhomian passports."
+	path = /obj/item/clothing/accessory/badge/pra_passport
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+	cost = 1
+
+/datum/gear/tajaran_passports/New()
+	..()
+	var/list/passports = list()
+	passports["people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/pra_passport
+	passports["democratic people's republic of adhomai passport"] = /obj/item/clothing/accessory/badge/dpra_passport
+	passports["new kingdom of adhomai passport"] = /obj/item/clothing/accessory/badge/nka_passport
+	passports["free tajaran council passport"] =/obj/item/clothing/accessory/badge/ftc_passport
+	gear_tweaks += new /datum/gear_tweak/path(passports)
+
+/datum/gear/accessory/nka_colorable_accessory
+	display_name = "new kingdom noble accessories clothes (colorable)"
+	description = "A colorable set of accessories used by the New Kingdom's Tajara."
+	path = /obj/item/clothing/accessory/tajaran/nka_waistcoat
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+
+/datum/gear/accessory/nka_colorable_accessory/New()
+	..()
+	var/list/accessory = list()
+	accessory["noble adhomian waistcoat"] = /obj/item/clothing/accessory/tajaran/nka_waistcoat
+	accessory["noble adhomian vest"] = /obj/item/clothing/accessory/tajaran/nka_vest
+	gear_tweaks += new /datum/gear_tweak/path(accessory)
+
+/datum/gear/accessory/tajara_wrap
+	display_name = "marriage items"
+	description = "Items from the S'rand'marr and Ma'ta'ke signifying marriage between two people."
+	path = /obj/item/clothing/accessory/tajaran_wrap
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajara_wrap/New()
+	..()
+	var/list/wrap = list()
+	wrap["S'rand'marr marriage wrap, male"] = /obj/item/clothing/accessory/tajaran_wrap
+	wrap["S'rand'marr marriage wrap, female"] = /obj/item/clothing/accessory/tajaran_wrap/female
+	wrap["Ma'ta'ke ceremonial pelt"] = /obj/item/clothing/accessory/tajaran_pelt
+	gear_tweaks += new /datum/gear_tweak/path(wrap)
+
 /datum/gear/gloves/tajara_ring
 	display_name = "adhomian costume ring"
 	path = /obj/item/clothing/ring/tajara
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
 	sort_category = "Xenowear - Tajara"
 
+// Hats, masks and earrings
+
+/datum/gear/head/tajara
+	display_name = "adhomian headgear selection"
+	description = "A selection of tajaran native headgear."
+	path = /obj/item/clothing/head/tajaran/circlet
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+
+/datum/gear/head/tajara/New()
+	..()
+	var/list/circlet = list()
+	circlet["golden dress circlet"] = /obj/item/clothing/head/tajaran/circlet
+	circlet["silver dress circlet"] = /obj/item/clothing/head/tajaran/circlet/silver
+	circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur
+	circlet["PRA urban police winter hat"] = /obj/item/clothing/head/tajaran/pra_cop/winter
+	circlet["matake priest hat"] = /obj/item/clothing/head/tajaran/matake
+	circlet["raakti shariim beret"] = /obj/item/clothing/head/beret/tajaran/raakti_shariim
+	circlet["hadiist army beret"] = /obj/item/clothing/head/beret/tajaran/pra
+	circlet["liberation army beret"] = /obj/item/clothing/head/beret/tajaran/dpra
+	circlet["liberation army beret, alternative"] = /obj/item/clothing/head/beret/tajaran/dpra/alt
+	circlet["new kingdom naval beret"] = /obj/item/clothing/head/beret/tajaran/nka
+	circlet["new kingdom naval officer beret"] = /obj/item/clothing/head/beret/tajaran/nka/officer
+	gear_tweaks += new /datum/gear_tweak/path(circlet)
+
+/datum/gear/mask/tajara
+	display_name = "sun sister veil"
+	path = /obj/item/clothing/mask/tajara
+	cost = 1
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION
+
 /datum/gear/ears/tajara
 	display_name = "tajaran earring selection"
 	description = "A selection of tajaran earrings."
@@ -732,19 +628,13 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	earrings["adhomian golden earrings"] = /obj/item/clothing/ears/earring/tajara/gold
 	gear_tweaks += new /datum/gear_tweak/path(earrings)
 
-/datum/gear/tajara_camera
-	display_name = "adhomian camera"
-	path = /obj/item/device/camera/adhomai
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_DESC_SELECTION
+// Tail
 
-/datum/gear/typewriter
-	display_name = "adhomian portable typewriter"
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+/datum/gear/tail_cloth
+	display_name = "tail cloth"
+	path = /obj/item/clothing/tail_accessory/tail_cloth
 	sort_category = "Xenowear - Tajara"
-	path = /obj/item/typewriter_case
-	flags = GEAR_HAS_DESC_SELECTION
+	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
 
 /datum/gear/prosthetic_tail
 	display_name = "prosthetic tail selection"
@@ -768,31 +658,94 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
 	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION
 
-/datum/gear/accessory/tajara_colorable_fur_scarf
-	display_name = "fur scarf (colorable)"
-	path = /obj/item/clothing/accessory/tajaran/colorable
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
-	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
+// Misc clothing
 
-/datum/gear/suit/colorable_tajara_cloak
-	display_name = "tajara cloaks selection (colorable)"
-	description = "A selection of colorable tajaran native cloaks."
-	path = /obj/item/clothing/accessory/poncho/tajarancloak/colorable
-	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+/datum/gear/adhomai_watch
+	display_name = "adhomian watch selection"
+	description = "A selection of Adhomian watches."
+	path = /obj/item/clothing/wrists/watch/pocketwatch/adhomai
+	slot = slot_wrists
 	sort_category = "Xenowear - Tajara"
-	flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
 
-/datum/gear/suit/colorable_tajara_cloak/New()
+/datum/gear/adhomai_watch/New()
 	..()
-	var/list/colorable_cloaks = list()
-	colorable_cloaks["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable
-	colorable_cloaks["fancy cloak"] = /obj/item/clothing/accessory/poncho/tajarancloak/colorable
-	colorable_cloaks["fancy cloak (hooded)"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/fancy
-	colorable_cloaks["royal cloak"] = /obj/item/clothing/accessory/poncho/tajarancloak/colorable/royal
-	colorable_cloaks["royal cloak (hooded)"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/royal
-	colorable_cloaks["amohda cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran/colorable/amohda
-	gear_tweaks += new /datum/gear_tweak/path(colorable_cloaks)
+	var/list/watch = list()
+	watch["adhomian pocket watch"] = /obj/item/clothing/wrists/watch/pocketwatch/adhomai
+	watch["male adhomian wrist watch"] = /obj/item/clothing/wrists/watch/tajara
+	watch["female adhomian wrist watch"] = /obj/item/clothing/wrists/watch/tajara/female
+	gear_tweaks += new /datum/gear_tweak/path(watch)
+
+// Misc prosthetic
+
+/datum/gear/augment/tesla_spine
+	display_name = "tesla spine"
+	description = "A People's Republic of Adhomai made tesla spine issued to disabled veterans and civilians."
+	path = /obj/item/organ/internal/augment/tesla
+	cost = 2
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+
+// Faction items
+
+/datum/gear/accessory/tajaranbookspol
+	display_name = "tajaran political books"
+	description = "Tajaran books on the Adhomian ideologies."
+	path = /obj/item/device/versebook/pra
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajaranbookspol/New()
+	..()
+	var/list/card = list()
+	card["hadiist manifesto"] = /obj/item/device/versebook/pra
+	card["in defense of al'mari's legacy"] = /obj/item/device/versebook/dpra
+	card["the new kingdom"] = /obj/item/device/versebook/nka
+	gear_tweaks += new /datum/gear_tweak/path(card)
+
+/datum/gear/accessory/tajaran_portraits
+	display_name = "tajaran leader portrait selection"
+	description = "A selection of tajaran leaders portraits."
+	path = /obj/item/sign/painting_frame/hadii
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/accessory/tajaran_portraits/New()
+	..()
+	var/list/portrait = list()
+	portrait["president hadii portrait"] = /obj/item/sign/painting_frame/hadii
+	portrait["president almari portrait"] = /obj/item/sign/painting_frame/almari
+	portrait["supreme commander nated portrait"] = /obj/item/sign/painting_frame/nated
+	portrait["president harrlala portrait"] = /obj/item/sign/painting_frame/harrlala
+	portrait["king vahzirthaamro portrait"] = /obj/item/sign/painting_frame/vahzirthaamro
+	portrait["queen shumaila portrait"] = /obj/item/sign/painting_frame/shumaila
+	gear_tweaks += new /datum/gear_tweak/path(portrait)
+
+// Misc items
+
+/datum/gear/adhomai_zippo
+	display_name = "adhomian lighter"
+	path = /obj/item/flame/lighter/adhomai
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/tajaran_dice
+	display_name = "bag of adhomian dice"
+	path = /obj/item/storage/pill_bottle/dice/tajara
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/tajaran_tarot
+	display_name = "adhomian divination cards deck"
+	path = /obj/item/deck/tarot/adhomai
+	sort_category = "Xenowear - Tajara"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	flags = GEAR_HAS_DESC_SELECTION
 
 /datum/gear/taj_rations
 	display_name = "tajaran field ration selection"
@@ -812,3 +765,20 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara)
 	tajrations["nka royal navy"] = /obj/item/storage/field_ration/nka/navy
 	tajrations["dpra"] = /obj/item/storage/field_ration/dpra
 	gear_tweaks += new /datum/gear_tweak/path(tajrations)
+
+/datum/gear/tajara_camera
+	display_name = "adhomian camera"
+	path = /obj/item/device/camera/adhomai
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	flags = GEAR_HAS_DESC_SELECTION
+
+/datum/gear/typewriter
+	display_name = "adhomian portable typewriter"
+	whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
+	sort_category = "Xenowear - Tajara"
+	path = /obj/item/typewriter_case
+	flags = GEAR_HAS_DESC_SELECTION
+
+// All the rest
+
diff --git a/html/changelogs/TajCondensing.yml b/html/changelogs/TajCondensing.yml
new file mode 100644
index 00000000000..22dd28caefa
--- /dev/null
+++ b/html/changelogs/TajCondensing.yml
@@ -0,0 +1,7 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - qol: "Several similar options in the tajaran loadout have been condensed into similar selections and the golden sun pin was made more clear."
+  - rscadd: "The tajaran archaeologist clothing is now job restricted."