diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm index 3ea492070b3..69bf331c0c2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm @@ -57,6 +57,11 @@ coat["raakti shariim coat"] = /obj/item/clothing/suit/storage/toggle/tajaran/raakti_shariim coat["hadiist surplus jacket"] = /obj/item/clothing/suit/storage/tajaran/pra_jacket coat["al'mariist jacket"] = /obj/item/clothing/suit/storage/tajaran/dpra_jacket + coat["fancy black ladies coat"] = /obj/item/clothing/suit/storage/tajaran/fancycoat + coat["fancy red ladies coat"] = /obj/item/clothing/suit/storage/tajaran/fancycoat/red + coat["fine brown coat"] = /obj/item/clothing/suit/storage/tajaran/finecoat + coat["fine blue coat"] = /obj/item/clothing/suit/storage/tajaran/finecoat/blue + coat["fancy royalist jacket"] = /obj/item/clothing/suit/storage/tajaran/fancy gear_tweaks += new /datum/gear_tweak/path(coat) /datum/gear/suit/tajara_cloak @@ -128,6 +133,8 @@ var/list/uniform = list() uniform["laborer clothes"] = /obj/item/clothing/under/tajaran uniform["fancy uniform"] = /obj/item/clothing/under/tajaran/fancy + uniform["fancy uniform, alt 1"] = /obj/item/clothing/under/tajaran/fancy/alt1 + uniform["fancy uniform, alt 2"] = /obj/item/clothing/under/tajaran/fancy/alt2 uniform["nanotrasen overalls"] = /obj/item/clothing/under/tajaran/nt uniform["matake priest garments"] = /obj/item/clothing/under/tajaran/matake uniform["adhomian summerwear"] = /obj/item/clothing/under/tajaran/summer @@ -136,7 +143,6 @@ uniform["raakti shariim uniform"] = /obj/item/clothing/under/tajaran/raakti_shariim uniform["a'lmariist laborer clothes"] = /obj/item/clothing/under/tajaran/dpra uniform["a'lmariist laborer clothes, alternate"] = /obj/item/clothing/under/tajaran/dpra/alt - uniform["fancy royalist jacket"] = /obj/item/clothing/suit/storage/tajaran/fancy gear_tweaks += new /datum/gear_tweak/path(uniform) /datum/gear/uniform/nka_colorable_uniform @@ -180,8 +186,19 @@ dress["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black dress["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black dress["adhomian summer dress"] = /obj/item/clothing/under/dress/tajaran/summer + dress["fancy uniform with skirt"] = /obj/item/clothing/under/dress/tajaran/formal + dress["fancy uniform with skirt, alt 1"] = /obj/item/clothing/under/dress/tajaran/formal/alt1 + dress["fancy uniform with skirt, alt 2"] = /obj/item/clothing/under/dress/tajaran/formal/alt2 gear_tweaks += new /datum/gear_tweak/path(dress) +/datum/gear/uniform/tajara_long_dress + display_name = "tajaran long dress (recolorable)" + path = /obj/item/clothing/under/dress/tajaran/long + 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/shoes/tajara/flats display_name = "tajaran flats selection" description = "Dress flats, in a selection of colors. Refitted for Tajara" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index f09dac82edf..46fd44fc41c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -309,6 +309,10 @@ throwforce = 2 slot_flags = SLOT_EARS + sprite_sheets = list( + BODYTYPE_TAJARA = 'icons/mob/species/tajaran/l_ear.dmi', + ) + /obj/item/clothing/ears/attack_hand(mob/user as mob) if (!user) return @@ -345,6 +349,10 @@ icon_state = "blocked" slot_flags = SLOT_EARS | SLOT_TWOEARS + sprite_sheets = list( + BODYTYPE_TAJARA = 'icons/mob/species/tajaran/r_ear.dmi', + ) + /obj/item/clothing/ears/offear/proc/copy_ear(var/obj/O) name = O.name desc = O.desc diff --git a/code/modules/clothing/suits/xeno/tajara.dm b/code/modules/clothing/suits/xeno/tajara.dm index 68fb931d604..5110c4f26ab 100644 --- a/code/modules/clothing/suits/xeno/tajara.dm +++ b/code/modules/clothing/suits/xeno/tajara.dm @@ -275,4 +275,32 @@ icon_state = "nka_Jacket" item_state = "nka_Jacket" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - contained_sprite = TRUE \ No newline at end of file + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/tajaran/fancycoat + name = "fancy black ladies coat" + desc = "A long tailed coat, commonly worn by woman in the New Kingdom." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "ladies_coat" + item_state = "ladies_coat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/tajaran/fancycoat/red + name = "fancy red ladies coat" + icon_state = "ladies_coat_red" + item_state = "ladies_coat_red" + +/obj/item/clothing/suit/storage/tajaran/finecoat + name = "fine brown coat" + desc = "A fancy, warm coat suitable for a noble." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "finecoat" + item_state = "finecoat" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + contained_sprite = TRUE + +/obj/item/clothing/suit/storage/tajaran/finecoat/blue + name = "fine blue coat" + icon_state = "finecoat_blue" + item_state = "finecoat_blue" \ No newline at end of file diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 0b43bb2679d..369c5ba3346 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -485,8 +485,50 @@ icon_state = "nka_waistcoat" item_state = "nka_waistcoat" +/obj/item/clothing/accessory/tajaran/nka_waistcoat/update_icon() + cut_overlays() + var/image/buttons = image(icon, null, "nka_waistcoat_buttons") + buttons.appearance_flags = RESET_COLOR + add_overlay(buttons) + +/obj/item/clothing/accessory/tajaran/nka_waistcoat/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(slot == slot_wear_suit_str) + var/image/buttons = image(mob_icon, null, "nka_waistcoat_un_buttons") + buttons.appearance_flags = RESET_COLOR + I.add_overlay(buttons) + return I + +/obj/item/clothing/accessory/tajaran/nka_waistcoat/get_accessory_mob_overlay(mob/living/carbon/human/H, force) + var/image/base = ..() + var/image/buttons = image(icon, null, "nka_waistcoat_un_buttons") + buttons.appearance_flags = RESET_COLOR + base.add_overlay(buttons) + return base + /obj/item/clothing/accessory/tajaran/nka_vest name = "noble adhomian vest" desc = "A fancy vest worn by the New Kingdom's nobility. Likely a hand-me-down." icon_state = "nka_vest" - item_state = "nka_vest" \ No newline at end of file + item_state = "nka_vest" + +/obj/item/clothing/accessory/tajaran/nka_vest/update_icon() + cut_overlays() + var/image/buttons = image(icon, null, "nka_vest_buttons") + buttons.appearance_flags = RESET_COLOR + add_overlay(buttons) + +/obj/item/clothing/accessory/tajaran/nka_vest/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(slot == slot_wear_suit_str) + var/image/buttons = image(mob_icon, null, "nka_vest_un_buttons") + buttons.appearance_flags = RESET_COLOR + I.add_overlay(buttons) + return I + +/obj/item/clothing/accessory/tajaran/nka_vest/get_accessory_mob_overlay(mob/living/carbon/human/H, force) + var/image/base = ..() + var/image/buttons = image(icon, null, "nka_vest_un_buttons") + buttons.appearance_flags = RESET_COLOR + base.add_overlay(buttons) + return base \ No newline at end of file diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index ae360546f6a..5116cb42e4a 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -12,7 +12,7 @@ /obj/item/clothing/under/tajaran/fancy name = "fancy uniform" - desc = "Worn by princess, barons and lords of Adhomai, now in stores near you!" + desc = "Worn by princes, barons and lords of Adhomai, now in stores near you!" icon_state = "male_taj_fancy" item_state = "male_taj_fancy" desc_extended = "While money and riches are at an all time low, the New Kingdom is symbolized by one thing, hope. While the often attacked, poor and shaggy nation is compared to \ @@ -21,6 +21,14 @@ overcoats, white shirts, pants although often in poorer state. However jewelry, tail adornments and veils are in rich abundance, often showing off small and intricate details of \ individual personalities. But where the NKA really shines are their parties and special events." +/obj/item/clothing/under/tajaran/fancy/alt1 + icon_state = "male_taj_fancy_alt1" + item_state = "male_taj_fancy_alt1" + +/obj/item/clothing/under/tajaran/fancy/alt2 + icon_state = "male_taj_fancy_alt2" + item_state = "male_taj_fancy_alt2" + /obj/item/clothing/under/tajaran/nt name = "NanoTrasen overalls" desc = "Overalls meant for NanoTrasen employees of xeno descent, modified to prevent overheating." @@ -151,6 +159,40 @@ icon_state = "taj_dress_fancy_dark" item_state = "taj_dress_fancy_dark" +/obj/item/clothing/under/dress/tajaran/long + name = "adhomian dress" + desc = "A prim and proper dress, covers from neck to ankle." + icon_state = "longdress" + item_state = "longdress" + +/obj/item/clothing/under/dress/tajaran/long/update_icon() + cut_overlays() + var/image/buttons = image(icon, null, "longdress_buttons") + buttons.appearance_flags = RESET_COLOR + add_overlay(buttons) + +/obj/item/clothing/under/dress/tajaran/long/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(slot == slot_w_uniform_str) + var/image/buttons = image(mob_icon, null, "longdress_un_buttons") + buttons.appearance_flags = RESET_COLOR + I.add_overlay(buttons) + return I + +/obj/item/clothing/under/dress/tajaran/formal + name = "fancy uniform with skirt" + desc = "Formal Tajaran clothing with a skirt." + icon_state = "female_taj_fancy" + item_state = "female_taj_fancy" + +/obj/item/clothing/under/dress/tajaran/formal/alt1 + icon_state = "female_taj_fancy_alt1" + item_state = "female_taj_fancy_alt1" + +/obj/item/clothing/under/dress/tajaran/formal/alt2 + icon_state = "female_taj_fancy_alt2" + item_state = "female_taj_fancy_alt2" + /obj/item/clothing/under/dress/tajaran/summer name = "adhomian summer dress" desc = "An Adhomian dress usually worn during the summer." @@ -222,4 +264,18 @@ name = "noble adhomian clothes" desc = "Clothes frequently worn by the New Kingdom's nobles. Likely a hand-me-down." icon_state = "nka_noble_uniform" - item_state = "nka_noble_uniform" \ No newline at end of file + item_state = "nka_noble_uniform" + +/obj/item/clothing/under/tajaran/nka_noble/update_icon() + cut_overlays() + var/image/lining = image(icon, null, "nka_noble_uniform_lining") + lining.appearance_flags = RESET_COLOR + add_overlay(lining) + +/obj/item/clothing/under/tajaran/nka_noble/get_mob_overlay(var/mob/living/carbon/human/H, var/mob_icon, var/mob_state, var/slot) + var/image/I = ..() + if(slot == slot_w_uniform_str) + var/image/lining = image(mob_icon, null, "nka_noble_uniform_un_lining") + lining.appearance_flags = RESET_COLOR + I.add_overlay(lining) + return I \ No newline at end of file diff --git a/html/changelogs/greenjoe12345 - tajclothes.yml b/html/changelogs/greenjoe12345 - tajclothes.yml new file mode 100644 index 00000000000..e71c0795b35 --- /dev/null +++ b/html/changelogs/greenjoe12345 - tajclothes.yml @@ -0,0 +1,44 @@ +################################ +# 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: Greenjoe + +# 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: + - rscadd: "Adds a selection of Tajaran clothing, aimed towards New Kingdom nobles, which can be selected in the loadout." + - tweak: "adjusts some of the existing Tajaran clothing items so that they may be colored better, and so their details are not lost when coloring." + - tweak: "adds tajara adjusted earring sprites, now actually on their ears rather then the sides of their head." + - bugfix: "the fancy jacket is now in the coat section, instead of wrongly in the uniform section." diff --git a/icons/mob/species/tajaran/l_ear.dmi b/icons/mob/species/tajaran/l_ear.dmi new file mode 100644 index 00000000000..ac1e974d248 Binary files /dev/null and b/icons/mob/species/tajaran/l_ear.dmi differ diff --git a/icons/mob/species/tajaran/r_ear.dmi b/icons/mob/species/tajaran/r_ear.dmi new file mode 100644 index 00000000000..ac1e974d248 Binary files /dev/null and b/icons/mob/species/tajaran/r_ear.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 67ea425e1a3..ef9e3001006 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ