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 43fa6704cd9..92ba1c66f11 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -143,14 +143,18 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) /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 + path = /obj/item/clothing/under/tajaran/fancy/colorable whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) - flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION sort_category = "Xenowear - Tajara" /datum/gear/uniform/tajara_colorable/New() ..() var/list/uniform = list() + uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy/colorable + uniform["fancy uniform, silver buttons"] = /obj/item/clothing/under/tajaran/fancy/colorable/silver + uniform["fancy uniform with skirt"] = /obj/item/clothing/under/dress/tajaran/formal/colorable + uniform["fancy uniform with skirt, silver buttons"] = /obj/item/clothing/under/dress/tajaran/formal/colorable/silver 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) diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index a720f78d594..ab52dcb4701 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -29,6 +29,17 @@ icon_state = "male_taj_fancy_alt2" item_state = "male_taj_fancy_alt2" +/obj/item/clothing/under/tajaran/fancy/colorable + icon_state = "male_taj_fancy_colorable" + item_state = "male_taj_fancy_colorable" + contained_sprite = TRUE + build_from_parts = TRUE + has_accents = TRUE + worn_overlay = "base" + +/obj/item/clothing/under/tajaran/fancy/colorable/silver + worn_overlay = "base_silver" + /obj/item/clothing/under/tajaran/nt name = "NanoTrasen overalls" desc = "Overalls meant for NanoTrasen employees of xeno descent, modified to prevent overheating." @@ -193,6 +204,17 @@ icon_state = "female_taj_fancy_alt2" item_state = "female_taj_fancy_alt2" +/obj/item/clothing/under/dress/tajaran/formal/colorable + icon_state = "female_taj_fancy_colorable" + item_state = "female_taj_fancy_colorable" + contained_sprite = TRUE + build_from_parts = TRUE + has_accents = TRUE + worn_overlay = "base" + +/obj/item/clothing/under/dress/tajaran/formal/colorable/silver + worn_overlay = "base_silver" + /obj/item/clothing/pants/tajaran name = "adhomian summer pants" desc = "A pair of adhomian pants usually worn during the summer." diff --git a/html/changelogs/SierraKomodo-ColorableFancyUniform.yml b/html/changelogs/SierraKomodo-ColorableFancyUniform.yml new file mode 100644 index 00000000000..99079d1a268 --- /dev/null +++ b/html/changelogs/SierraKomodo-ColorableFancyUniform.yml @@ -0,0 +1,58 @@ +################################ +# 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: SierraKomodo + +# 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: "Added colorable versions of the Tajaran Fancy Uniform and Fancy Uniform With Skirt loadout items." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 2d557b066fb..36fad91a7d0 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ