diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm index e257afaefbe..dc7a5c915b7 100644 --- a/code/datums/outfits/ert/kataphract.dm +++ b/code/datums/outfits/ert/kataphract.dm @@ -31,6 +31,7 @@ /datum/outfit/admin/ert/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#42b360", "#b68029", "#5574c2") + H.w_uniform.accent_color = H.w_uniform.color if(H?.shoes) var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) 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 ac95d0410ba..726c46bb559 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/unathi.dm @@ -156,7 +156,7 @@ path = /obj/item/clothing/under/unathi whitelisted = list(SPECIES_UNATHI, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_SKRELL_AXIORI) sort_category = "Xenowear - Unathi" - 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 /datum/gear/uniform/unathi/himation display_name = "himation cloak" diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index 35ccc91c42a..65d9a615adb 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -1,11 +1,14 @@ /obj/item/clothing/under/unathi name = "sinta tunic" - desc = "A tunic common on both Moghes and Ouerea. It's simple and easily-manufactured design makes it \ + desc = "A tunic common on both Moghes and Ouerea. Its simple and easily-manufactured design makes it \ universally favorable." icon = 'icons/obj/unathi_items.dmi' icon_state = "tunic" item_state = "tunic" contained_sprite = TRUE + build_from_parts = TRUE + worn_overlay = "belt" + has_accents = TRUE /obj/item/clothing/under/unathi/jizixi name = "jizixi dress" diff --git a/html/changelogs/RustingWithYou - tuniccolor.yml b/html/changelogs/RustingWithYou - tuniccolor.yml new file mode 100644 index 00000000000..035f3d510c1 --- /dev/null +++ b/html/changelogs/RustingWithYou - tuniccolor.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Sinta tunic shirt and pants are now separately colorable." diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 805f7219545..d21aeec5530 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ diff --git a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm index c63092ce9c2..3ff06a58229 100644 --- a/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm +++ b/maps/away/away_site/unathi_pirate/izharshan/unathi_pirate_izharshan_ghostroles.dm @@ -35,6 +35,7 @@ /obj/item/clothing/under/unathi/izharshan color = "#f3840e" + accent_color = "#f3840e" /obj/item/clothing/suit/storage/toggle/asymmetriccoat/izharshan color = "#eed8c1" diff --git a/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship_ghostroles.dm b/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship_ghostroles.dm index 5e9b59bd449..3867ad05101 100644 --- a/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship_ghostroles.dm +++ b/maps/away/ships/dionae/diona_rokz_ship/diona_rokz_ship_ghostroles.dm @@ -30,9 +30,10 @@ l_pocket = /obj/item/device/radio backpack_contents = list(/obj/item/device/flashlight/lantern = 1, /obj/item/device/flashlight/survival = 1) -/datum/outfit/admin/serz_voidtamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/admin/rokz_voidtamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = "#6D3175" + H.w_uniform.accent_color = H.w_uniform.color /datum/ghostspawner/human/rokz_voidtamer/captain short_name = "rokz_voidtamer_captain" diff --git a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm index 4ebdf1f3c95..55d40419666 100644 --- a/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm +++ b/maps/away/ships/dionae/diona_serz_ship/diona_serz_ship_ghostroles.dm @@ -44,6 +44,7 @@ /datum/outfit/admin/serz_voidtamer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = "#6D3175" + H.w_uniform.accent_color = H.w_uniform.color /datum/ghostspawner/human/serz_voidtamer/captain short_name = "serz_voidtamer_captain" diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm index 2400f553a37..faea26b5095 100644 --- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm +++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm @@ -41,6 +41,7 @@ var/uniform_colour = pick("#540e06", "#ab7318", "#302d26") if(H?.w_uniform) H.w_uniform.color = uniform_colour + H.w_uniform.accent_color = uniform_colour /datum/outfit/admin/kazhkz_privateer/get_id_access() return list(ACCESS_IMPERIAL_FLEET_VOIDSMAN_SHIP, ACCESS_EXTERNAL_AIRLOCKS) diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm index b36aa1ad8c9..b0fa9088f8d 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm @@ -86,6 +86,7 @@ /datum/outfit/admin/izweski/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") + H.w_uniform.accent_color = H.w_uniform.color /datum/outfit/admin/izweski/get_id_access() return list(ACCESS_KATAPHRACT, ACCESS_EXTERNAL_AIRLOCKS) diff --git a/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm b/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm index 65bf5d0f524..17b28b5e850 100644 --- a/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm +++ b/maps/away/ships/hegemony/merchants_guild/merchant_freighter_ghostroles.dm @@ -34,6 +34,7 @@ /datum/outfit/admin/merchant_guild/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") + H.w_uniform.accent_color = H.w_uniform.color if(H?.wear_suit) H.wear_suit.color = "#2a2b2e" diff --git a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm index 23c90ac2093..673f78a17fd 100644 --- a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm +++ b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm @@ -87,6 +87,7 @@ /datum/outfit/admin/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(H?.w_uniform) H.w_uniform.color = pick("#1f8c3c", "#ab7318", "#1846ba") + H.w_uniform.accent_color = H.w_uniform.color /datum/outfit/admin/kataphract/get_id_access() return list(ACCESS_KATAPHRACT, ACCESS_EXTERNAL_AIRLOCKS)