diff --git a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm index 8c2844bf491..8f5ffa15c57 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/diona.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/diona.dm @@ -518,6 +518,7 @@ ABSTRACT_TYPE(/datum/gear/accessory/diona) whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) origin_restriction = list(/singleton/origin_item/origin/viridis_noble) sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION /datum/gear/uniform/diona/jizixi/New() ..() @@ -527,8 +528,27 @@ ABSTRACT_TYPE(/datum/gear/accessory/diona) jizixi["jizixi dress, blue"] = /obj/item/clothing/under/unathi/jizixi/blue jizixi["jizixi dress, white"] = /obj/item/clothing/under/unathi/jizixi/white jizixi["jizixi dress, orange"] = /obj/item/clothing/under/unathi/jizixi/orange + jizixi["jizixi dress, black"] = /obj/item/clothing/under/unathi/jizixi/black gear_tweaks += new /datum/gear_tweak/path(jizixi) +/datum/gear/uniform/diona/jizixi_colorable + display_name = "jizixi dress (colorable)" + path = /obj/item/clothing/under/unathi/jizixi/colorable + whitelisted = list(SPECIES_DIONA, SPECIES_DIONA_COEUS) + sort_category = "Xenowear - Diona" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/uniform/diona/jizixi_colorable/New() + ..() + var/list/jizixi_colorable = list() + jizixi_colorable["jizixi dress, colorable"] = /obj/item/clothing/under/unathi/jizixi/colorable + jizixi_colorable["jizixi dress, pattern 1"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent1 + jizixi_colorable["jizixi dress, pattern 2"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent2 + jizixi_colorable["jizixi dress, pattern 3"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent3 + jizixi_colorable["jizixi dress, pattern 4"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent4 + jizixi_colorable["jizixi dress, pattern 5"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent5 + gear_tweaks += new /datum/gear_tweak/path(jizixi_colorable) + /datum/gear/accessory/consortium_passport display_name = "consortium of hieroaetheria passport" path = /obj/item/clothing/accessory/badge/passport/consortium diff --git a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm index 25e3c19e873..459e7bbd523 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -269,6 +269,7 @@ path = /obj/item/clothing/under/unathi/jizixi whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION /datum/gear/uniform/unathi/jizixi/New() ..() @@ -278,8 +279,27 @@ jizixi["jizixi dress, blue"] = /obj/item/clothing/under/unathi/jizixi/blue jizixi["jizixi dress, white"] = /obj/item/clothing/under/unathi/jizixi/white jizixi["jizixi dress, orange"] = /obj/item/clothing/under/unathi/jizixi/orange + jizixi["jizixi dress, black"] = /obj/item/clothing/under/unathi/jizixi/black gear_tweaks += new /datum/gear_tweak/path(jizixi) +/datum/gear/uniform/unathi/jizixi_colorable + display_name = "jizixi dress (colorable)" + path = /obj/item/clothing/under/unathi/jizixi/colorable + whitelisted = list(SPECIES_UNATHI) + sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION + +/datum/gear/uniform/unathi/jizixi_colorable/New() + ..() + var/list/jizixi_colorable = list() + jizixi_colorable["jizixi dress, colorable"] = /obj/item/clothing/under/unathi/jizixi/colorable + jizixi_colorable["jizixi dress, pattern 1"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent1 + jizixi_colorable["jizixi dress, pattern 2"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent2 + jizixi_colorable["jizixi dress, pattern 3"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent3 + jizixi_colorable["jizixi dress, pattern 4"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent4 + jizixi_colorable["jizixi dress, pattern 5"] = /obj/item/clothing/under/unathi/jizixi/colorable/accent5 + gear_tweaks += new /datum/gear_tweak/path(jizixi_colorable) + /datum/gear/uniform/unathi/sashes display_name = "gyzao sashes" path = /obj/item/clothing/under/unathi/sashes diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index e402f374c88..a0146a28cad 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -13,26 +13,57 @@ /obj/item/clothing/under/unathi/jizixi name = "jizixi dress" desc = "A striking, modern dress typically worn by Moghean women of high birth." - icon_state = "jizixi" - item_state = "jizixi" + icon_state = "jizixi_red" + item_state = "jizixi_red" build_from_parts = FALSE has_accents = FALSE /obj/item/clothing/under/unathi/jizixi/green - icon_state = "jizixi2" - item_state = "jizixi2" + icon_state = "jizixi_green" + item_state = "jizixi_green" /obj/item/clothing/under/unathi/jizixi/blue - icon_state = "jizixi3" - item_state = "jizixi3" + icon_state = "jizixi_blue" + item_state = "jizixi_blue" /obj/item/clothing/under/unathi/jizixi/white - icon_state = "jizixi4" - item_state = "jizixi4" + icon_state = "jizixi_white" + item_state = "jizixi_white" /obj/item/clothing/under/unathi/jizixi/orange - icon_state = "jizixi5" - item_state = "jizixi5" + icon_state = "jizixi_orange" + item_state = "jizixi_orange" + +/obj/item/clothing/under/unathi/jizixi/black + icon_state = "jizixi_black" + item_state = "jizixi_black" + +/obj/item/clothing/under/unathi/jizixi/colorable + icon_state = "jizixi_colorable" + item_state = "jizixi_colorable" + contained_sprite = TRUE + build_from_parts = TRUE + has_accents = TRUE + +/obj/item/clothing/under/unathi/jizixi/colorable/accent1 + icon_state = "jizixi_colorable_accent1" + item_state = "jizixi_colorable_accent1" + +/obj/item/clothing/under/unathi/jizixi/colorable/accent2 + icon_state = "jizixi_colorable_accent2" + item_state = "jizixi_colorable_accent2" + +/obj/item/clothing/under/unathi/jizixi/colorable/accent3 + icon_state = "jizixi_colorable_accent3" + item_state = "jizixi_colorable_accent3" + +/obj/item/clothing/under/unathi/jizixi/colorable/accent4 + icon_state = "jizixi_colorable_accent4" + item_state = "jizixi_colorable_accent4" + +/obj/item/clothing/under/unathi/jizixi/colorable/accent5 + icon_state = "jizixi_colorable_accent5" + item_state = "jizixi_colorable_accent5" /obj/item/clothing/under/unathi/sashes name = "gy'zao sashes" diff --git a/html/changelogs/ElorgRHG-unathi-jizixi-resprite-and-colorables.yml b/html/changelogs/ElorgRHG-unathi-jizixi-resprite-and-colorables.yml new file mode 100644 index 00000000000..29ff2503422 --- /dev/null +++ b/html/changelogs/ElorgRHG-unathi-jizixi-resprite-and-colorables.yml @@ -0,0 +1,15 @@ +# 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: + - imageadd: "Resprited the unathi jizixi dress, and added a colorable version of it." + - imageadd: "Added a blank, unpatterned version of the unathi jizixi dress." + - rscdel: "Removed the ability to change the colors of the jizixi dress due to a colorable version now existing." diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 20c1fdaf8cb..1ce884be298 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ