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 81a33aceeec..08d570ab412 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -748,3 +748,29 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) sort_category = "Xenowear - 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 + +/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) diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index fb0a8c1e5d3..42b030bb835 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -198,6 +198,43 @@ item_state = "hb_cloak" flags_inv = 0 +/obj/item/clothing/suit/storage/hooded/tajaran/colorable + icon = 'icons/obj/tajara_items.dmi' + icon_state = "taj_cloak_colorable" + item_state = "taj_cloak_colorable" + icon_override = null + contained_sprite = TRUE + build_from_parts = TRUE + has_accents = TRUE + +/obj/item/clothing/suit/storage/hooded/tajaran/colorable/fancy + name = "fancy adhomian cloak" + desc = "A fancy Adhomian cloak." + icon_state = "hb_cloak_colorable" + item_state = "hb_cloak_colorable" + worn_overlay = "adornment" + flags_inv = 0 + +/obj/item/clothing/suit/storage/hooded/tajaran/colorable/royal + name = "adhomian royal cloak" + desc = "An Adhomian cloak with an asymmetric design." + icon_state = "royal_cloak_colorable" + item_state = "royal_cloak_colorable" + worn_overlay = "adornment" + flags_inv = 0 + +/obj/item/clothing/suit/storage/hooded/tajaran/colorable/amohda + name = "amohdan cloak" + desc = "Originally used by the Amohdan swordsmen before the First Revolution, this cloak is now commonly worn by the island population." + icon_state = "amohda_cloak_colorable" + item_state = "amohda_cloak_colorable" + desc_extended = "The Feudal Era of Amohda is famous for the steel swords which became common. Many renowned swordsmen and famous warriors would travel the land fighting duels of \ + single combat in their quests to become the greatest swordsman. Modern Amohda is under the control of the DPRA's Adhomai Liberation Army, further solidified after the defeat \ + of a Nationalist revolt vying for a truly independent Amohda. The region is still beset by trouble within and without as a deeply divided Amohdan people continue to struggle in the \ + bloody conflict to stamp out Nationalistic and to a lesser extent, divided Monarchistic sentiments while their rivals from the New Kingdom of Adhomai watch from the seas they rule \ + and the People's Republic of Adhomai looms over the southern end of the island..." + flags_inv = 0 + /obj/item/clothing/suit/armor/amohda name = "amohdan swordsman armor" desc = "A suit of armor used by the traditional warriors of Amohda." diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index b23b53ccffd..a0b7a70c9dd 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -51,6 +51,11 @@ icon_state = "furscarf_cream" item_state = "furscarf_cream" +/obj/item/clothing/accessory/tajaran/colorable + desc = "A furred scarf, a common tajaran vanity item." + icon_state = "furscarf_colorable" + item_state = "furscarf_colorable" + /obj/item/clothing/accessory/tajaran/summershirt name = "adhomian summerwear shirt" desc = "A simple piece of adhomian summerwear made with linen." @@ -116,6 +121,22 @@ icon_state = "hb_cloak" item_state = "hb_cloak" +/obj/item/clothing/accessory/poncho/tajarancloak/colorable + name = "fancy adhomian cloak" + desc = "A fancy Adhomian cloak." + icon_state = "hb_cloak_colorable" + item_state = "hb_cloak_colorable" + worn_overlay = "adornment" + build_from_parts = TRUE + has_accents = TRUE + +/obj/item/clothing/accessory/poncho/tajarancloak/colorable/royal + name = "adhomian royal cloak" + desc = "An Adhomian cloak with an asymmetric design." + icon_state = "royal_cloak_colorable" + item_state = "royal_cloak_colorable" + worn_overlay = "adornment" + /obj/item/clothing/accessory/tajaran_wrap name = "marriage wrap" desc = "A holy cloth wrap that signifies marriage amongst tajara, it has white and gold markings. This one is meant for the husband." diff --git a/html/changelogs/ElorgRHG-colorable-taj-cloaks-and-scarf.yml b/html/changelogs/ElorgRHG-colorable-taj-cloaks-and-scarf.yml new file mode 100644 index 00000000000..f0ff9627eda --- /dev/null +++ b/html/changelogs/ElorgRHG-colorable-taj-cloaks-and-scarf.yml @@ -0,0 +1,14 @@ +# Your name. +author: ElorgRHG + +# 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 some Tajara cloaks to the loadout." + - rscadd: "Added colorable versions of Tajara fur scarf to the loadout." diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 5c633964b99..c8ac3e89f2c 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ