From 770948960299f1254615336d0584c72f64ca8bc9 Mon Sep 17 00:00:00 2001 From: Cody Brittain <1779662+Generalcamo@users.noreply.github.com> Date: Sun, 1 Mar 2026 01:40:50 -0500 Subject: [PATCH] Updated Tajara job restrictions to reflect ethnicity overhaul. (#21929) 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). --- code/game/jobs/job/captain.dm | 2 +- code/game/jobs/job/civilian.dm | 2 +- code/game/jobs/job/engineering.dm | 2 +- code/modules/background/citizenship/tajara.dm | 22 +++---- .../station/tajara/tajaran_subspecies.dm | 17 ++--- .../GeneralCamo - Taj Ethnicity.yml | 63 +++++++++++++++++++ 6 files changed, 84 insertions(+), 24 deletions(-) create mode 100644 html/changelogs/GeneralCamo - Taj Ethnicity.yml diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b2bbbf91774..3df4564e804 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -112,7 +112,7 @@ GLOBAL_DATUM_INIT(captain_announcement, /datum/announcement/minor, new(do_newsca ACCESS_WEAPONS, ACCESS_JOURNALIST, ACCESS_BRIDGE_CREW, ACCESS_INTREPID, ACCESS_SPARK, ACCESS_QUARK, ACCESS_CANARY, ACCESS_TELEPORTER ) - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/xo name = "Executive Officer" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index cc2339802fe..ef6edde12a0 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -360,7 +360,7 @@ outfit = /obj/outfit/job/operations_manager - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/operations_manager name = "Operations Manager" diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index d1571a163c4..97f1567c574 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -34,7 +34,7 @@ minimal_player_age = 7 outfit = /obj/outfit/job/chief_engineer - blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) /obj/outfit/job/chief_engineer name = "Chief Engineer" diff --git a/code/modules/background/citizenship/tajara.dm b/code/modules/background/citizenship/tajara.dm index 5749baff6f9..34d9e7588c4 100644 --- a/code/modules/background/citizenship/tajara.dm +++ b/code/modules/background/citizenship/tajara.dm @@ -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( diff --git a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm index 76404d5a91d..deed857b277 100644 --- a/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm +++ b/code/modules/mob/living/carbon/human/species/station/tajara/tajaran_subspecies.dm @@ -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 diff --git a/html/changelogs/GeneralCamo - Taj Ethnicity.yml b/html/changelogs/GeneralCamo - Taj Ethnicity.yml new file mode 100644 index 00000000000..3e817ed311c --- /dev/null +++ b/html/changelogs/GeneralCamo - Taj Ethnicity.yml @@ -0,0 +1,63 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: GeneralCamo + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Allowed M'sai Tajara to be Executive Officers." + - rscadd: "Allowed Zhan-Khazan Tajara to be Operations Managers and Chief Engineers." + - rscadd: "Allowed Zhan-Khazan Tajara to be Diplomatic Aides and Bodyguards for the PRA, and DPRA." + - rscadd: "Allowed M'sai Tajara to be Consular Officers for the PRA, DPRA, and NKA." + - rscdel: "Disallowed M'sai Tajara to be Diplomatic Aides for the NKA." + - qol: "Touched up the Tajara ethnicity descriptions."