cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-28 07:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Tajara job restrictions to reflect ethnicity overhaul. (#21929)

Browse Source 
For the upcoming Tajara ethnicity overhaul.

Zhan-Khazan can now be Operations Managers and Chief Engineers. M'sai
can now be Executive Officers.

Putting this up now for code review purposes. Full retcon will be
announced soon (and then this can be merged).
This commit is contained in:
Cody Brittain
2026-03-01 06:40:50 +00:00
committed by GitHub
parent 2433027a5a
commit 7709489602
6 changed files with 84 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/background/citizenship/tajara.dm
+8 -14
View File
@@ -31,8 +31,7 @@
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN,
SPECIES_TAJARA_MSAI
SPECIES_TAJARA_ZHAN
),
"Diplomatic Aide" = list(
SPECIES_HUMAN,
@@ -54,8 +53,7 @@
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN
SPECIES_VAURCA_BREEDER
),
"Diplomatic Bodyguard" = list(
SPECIES_HUMAN,
@@ -77,8 +75,7 @@
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN
SPECIES_VAURCA_BREEDER
)
)
@@ -159,8 +156,7 @@
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN,
SPECIES_TAJARA_MSAI
SPECIES_TAJARA_ZHAN
),
"Diplomatic Aide" = list(
SPECIES_HUMAN,
@@ -182,8 +178,7 @@
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN
SPECIES_VAURCA_BREEDER
),
"Diplomatic Bodyguard" = list(
SPECIES_HUMAN,
@@ -205,8 +200,7 @@
SPECIES_VAURCA_WARRIOR,
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN
SPECIES_VAURCA_BREEDER
)
)
@@ -285,8 +279,7 @@
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_ZHAN,
SPECIES_TAJARA_MSAI
SPECIES_TAJARA_ZHAN
),
"Diplomatic Aide" = list(
SPECIES_HUMAN,
@@ -309,6 +302,7 @@
SPECIES_VAURCA_ATTENDANT,
SPECIES_VAURCA_BULWARK,
SPECIES_VAURCA_BREEDER,
SPECIES_TAJARA_MSAI,
SPECIES_TAJARA_ZHAN
),
"Diplomatic Bodyguard" = list(
code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm
+10 -7
View File
@@ -3,11 +3,12 @@
name_plural = "Zhan-Khazan Tajara"
blurb = "The Zhan-Khazan are a race of Tajara known for their dark fur and large bulky figures. \
They were at one point a race of cave-and-mountain dwelling Tajara that traditionally were \
entrusted with physical work like mining, farming, ranching, and logging. Zhan-Khazan make \
up a significant amount of Tajara employed in resource gathering, construction, civil jobs \
such as law enforcement and even culinary work such as butchering. They experience a lot of racism \
from their fellow Tajara who cite their lackluster test scores, even among Tajara, and their higher \
crime rates."
entrusted with physical work like mining, farming, ranching, and logging. Zhan-Khazan today make \
up a significant amount of Tajara employed in blue-collar work like resource gathering, \
construction, and even culinary work such as butchering. Despite being no less intelligent \
than other Tajara, the pressure from the caste system to enter unskilled labor rarely afforded Zhan \
an easy path to education. Zhan-Khazan are in a transformative state in modern Tajaran society, \
but still deal with the many barriers from centuries of the caste system."
species_height = HEIGHT_CLASS_TALL
secondary_langs = list(LANGUAGE_SIIK_TAJR, LANGUAGE_DELVAHII)
@@ -53,8 +54,10 @@
blurb = "The M'sai are a race of Tajara with slender lithe bodies and \
lightly covered fur which blends in with the snowy environments of Adhomai. \
They aren't as well-insulated against Adhomai's cold as their brethren. \
However, this gives them the benefit of being more agile. Hitorically, they often \
worked as hunters, later becoming warriors and soldiers as civilization developed."
However, this gives them the benefit of being more agile. Historically, they often \
worked as hunters, later becoming ranchers, warriors and soldiers as civilization developed. \
When these roles were shrunken down however, the M'sai commonly found themselves taking \
similar work to the Zhan-Khazan. As a result, the two races share much in common with their culture."
species_height = HEIGHT_CLASS_AVERAGE
slowdown = -0.6