From 6f638316671d6b0cced35e4d8818f7d7f679c5f3 Mon Sep 17 00:00:00 2001 From: ElorgRHG <71735193+ElorgRHG@users.noreply.github.com> Date: Wed, 11 Mar 2026 17:38:30 +0100 Subject: [PATCH] Pants, skirt and shirt-ifies tajaran summer clothing (#21960) Changes: > - rscadd: "Added two new tajaran loadout options: pants and skirts + shirts. Summer pants and dress (renamed to skirt) have been put there." > - bugfix: "The tajaran summer dress and pants have been made into pants slot items and should now display properly." In the effort to fix the summer dress and pants not displaying properly in the loadout selection they have been split up to their own respective loadout options. --- code/datums/trading/misc.dm | 2 +- .../loadout/items/xeno/tajara.dm | 29 ++++++++++++++++++- .../clothing/under/accessories/xeno/tajara.dm | 6 ---- code/modules/clothing/under/xenos/tajara.dm | 23 +++++++++------ ...lorgRHG-tajara-pants-skirts-and-shirts.yml | 14 +++++++++ .../away_site/romanovich/grand_romanovich.dmm | 2 +- .../tajara/taj_smuggler/tajaran_smuggler.dmm | 2 +- .../exoplanets/adhomai/adhomai_bar.dmm | 2 +- .../exoplanets/adhomai/adhomai_village.dmm | 4 +-- .../exoplanets/raskara/raskara_wreck.dmm | 2 +- 10 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 html/changelogs/ElorgRHG-tajara-pants-skirts-and-shirts.yml diff --git a/code/datums/trading/misc.dm b/code/datums/trading/misc.dm index 3e92eea088b..f3bb9dfb9c9 100644 --- a/code/datums/trading/misc.dm +++ b/code/datums/trading/misc.dm @@ -276,7 +276,7 @@ /obj/item/clothing/under/tajaran/nka_noble = TRADER_THIS_TYPE, /obj/item/clothing/accessory/tajaran/nka_waistcoat = TRADER_THIS_TYPE, /obj/item/clothing/accessory/tajaran/nka_vest = TRADER_THIS_TYPE, - /obj/item/clothing/under/dress/tajaran/summer = TRADER_THIS_TYPE, + /obj/item/clothing/pants/skirt/tajaran = TRADER_THIS_TYPE, /obj/item/clothing/under/dress/tajaran/fancy = TRADER_THIS_TYPE, /obj/item/clothing/under/dress/tajaran/fancy/black = TRADER_THIS_TYPE, /obj/item/clothing/under/dress/tajaran/fancy = TRADER_THIS_TYPE, 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 8ae3a5018db..fe771b16112 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/tajara.dm @@ -101,7 +101,7 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) uniform["red noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy uniform["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black uniform["black noble adhomian dress"] = /obj/item/clothing/under/dress/tajaran/fancy/black - uniform["adhomian summer dress"] = /obj/item/clothing/under/dress/tajaran/summer + uniform["adhomian summer dress"] = /obj/item/clothing/pants/skirt/tajaran uniform["fancy uniform with skirt"] = /obj/item/clothing/under/dress/tajaran/formal uniform["fancy uniform with skirt, alt 1"] = /obj/item/clothing/under/dress/tajaran/formal/alt1 uniform["fancy uniform with skirt, alt 2"] = /obj/item/clothing/under/dress/tajaran/formal/alt2 @@ -113,6 +113,33 @@ ABSTRACT_TYPE(/datum/gear/shoes/tajara) uniform["housewife dress, yellow"] = /obj/item/clothing/under/dress/tajaran/housewife/yellow gear_tweaks += new /datum/gear_tweak/path(uniform) +/datum/gear/pants/tajara + display_name = "tajaran pants and skirts selection" + description = "A selection of tajaran native pants and skirts." + path = /obj/item/clothing/pants/tajaran + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + +/datum/gear/pants/tajara/New() + ..() + var/list/pants = list() + pants["adhomian summer pants"] = /obj/item/clothing/pants/tajaran + pants["adhomian summer skirt"] = /obj/item/clothing/pants/skirt/tajaran + gear_tweaks += new /datum/gear_tweak/path(pants) + +/datum/gear/shirts/tajara + display_name = "tajaran shirts selection" + description = "A selection of tajaran native shirts." + path = /obj/item/clothing/under/dressshirt/tajaran + whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI) + sort_category = "Xenowear - Tajara" + +/datum/gear/shirts/tajara/New() + ..() + var/list/shirt = list() + shirt["adhomian summer shirt"] = /obj/item/clothing/under/dressshirt/tajaran + gear_tweaks += new /datum/gear_tweak/path(shirt) + /datum/gear/uniform/tajara_colorable display_name = "tajaran uniform and dress selection (colorable)" description = "A selection of colorable tajaran native uniforms and dresses." diff --git a/code/modules/clothing/under/accessories/xeno/tajara.dm b/code/modules/clothing/under/accessories/xeno/tajara.dm index 9d04f4f4505..4013c97e715 100644 --- a/code/modules/clothing/under/accessories/xeno/tajara.dm +++ b/code/modules/clothing/under/accessories/xeno/tajara.dm @@ -56,12 +56,6 @@ 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." - icon_state = "summer-shirt" - item_state = "summer-shirt" - /obj/item/clothing/accessory/poncho/tajarancloak name = "common cloak" desc = "A tajaran cloak made with the middle class in mind, fancy but nothing special." diff --git a/code/modules/clothing/under/xenos/tajara.dm b/code/modules/clothing/under/xenos/tajara.dm index 9ee74f753f9..a720f78d594 100644 --- a/code/modules/clothing/under/xenos/tajara.dm +++ b/code/modules/clothing/under/xenos/tajara.dm @@ -193,14 +193,6 @@ 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." - icon_state = "summer-dress" - item_state = "summer-dress" - body_parts_covered = LOWER_TORSO - starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt) - /obj/item/clothing/pants/tajaran name = "adhomian summer pants" desc = "A pair of adhomian pants usually worn during the summer." @@ -208,11 +200,24 @@ icon_state = "summer-pants" item_state = "summer-pants" contained_sprite = TRUE - starting_accessories = list(/obj/item/clothing/accessory/tajaran/summershirt) desc_extended = "Having direct and friendly contact with humanity, The People's Republic of Adhomai has been the most influenced by the spacer fashion. The most known \ being the \"assistant jumpsuits\" which directly inspired the design of factory overalls, the plight and low pay of the assistants being close to the hearts of Tajara Hadiist \ workers and their Republic." +/obj/item/clothing/pants/skirt/tajaran + name = "adhomian summer skirt" + desc = "An Adhomian skirt usually worn during the summer." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "summer-dress" + item_state = "summer-dress" + +/obj/item/clothing/under/dressshirt/tajaran + name = "adhomian summer shirt" + desc = "A simple piece of Adhomian summerwear made with linen." + icon = 'icons/obj/tajara_items.dmi' + icon_state = "summer-shirt" + item_state = "summer-shirt" + /obj/item/clothing/under/tajaran/pra_uniform name = "republican army uniform" desc = "A military uniform used by the forces of Grand People's Army." diff --git a/html/changelogs/ElorgRHG-tajara-pants-skirts-and-shirts.yml b/html/changelogs/ElorgRHG-tajara-pants-skirts-and-shirts.yml new file mode 100644 index 00000000000..42a402917e1 --- /dev/null +++ b/html/changelogs/ElorgRHG-tajara-pants-skirts-and-shirts.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 two new tajaran loadout options: pants and skirts + shirts. Summer pants and dress (renamed to skirt) have been put there." + - bugfix: "The tajaran summer dress and pants have been made into pants slot items and should now display properly." diff --git a/maps/away/away_site/romanovich/grand_romanovich.dmm b/maps/away/away_site/romanovich/grand_romanovich.dmm index cdf87b971f3..9aa3350ff8a 100644 --- a/maps/away/away_site/romanovich/grand_romanovich.dmm +++ b/maps/away/away_site/romanovich/grand_romanovich.dmm @@ -6827,7 +6827,7 @@ /obj/item/clothing/under/dress/tajaran/fancy/black, /obj/item/clothing/under/dress/tajaran/green, /obj/item/clothing/under/dress/tajaran/red, -/obj/item/clothing/under/dress/tajaran/summer, +/obj/item/clothing/pants/skirt/tajaran, /obj/item/clothing/shoes/flats/blue, /obj/item/clothing/shoes/flats/green, /obj/item/clothing/shoes/flats/purple, diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm index 28de81601b6..44fc850bbfd 100644 --- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm +++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm @@ -2212,7 +2212,7 @@ /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell, /obj/item/clothing/accessory/tajaran/charm/steel/silver, /obj/item/clothing/accessory/tajaran/charm/tajani, -/obj/item/clothing/accessory/tajaran/summershirt, +/obj/item/clothing/under/dressshirt/tajaran, /obj/item/clothing/accessory/tajaran/ruddy, /obj/item/clothing/accessory/tajaran/silver, /obj/item/clothing/accessory/tajaran/orange, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm index a2ff5a96444..ae251f4cdce 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm @@ -358,7 +358,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/under/waiter, /obj/item/clothing/under/waiter, -/obj/item/clothing/under/dress/tajaran/summer, +/obj/item/clothing/pants/skirt/tajaran, /obj/item/clothing/under/dress/tajaran/red, /obj/item/clothing/head/tajaran/circlet/silver, /turf/simulated/floor/exoplanet/tiled/white, diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm index 7d3519f31da..1ed5f5f2d3b 100644 --- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm +++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm @@ -318,7 +318,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/clothing/under/dress/tajaran/summer, +/obj/item/clothing/pants/skirt/tajaran, /obj/item/clothing/under/dress/tajaran/red, /obj/item/clothing/under/dress/tajaran, /obj/item/clothing/accessory/tajaran/ruddy, @@ -855,7 +855,7 @@ /obj/structure/closet/cabinet, /obj/item/clothing/under/dress/tajaran/fancy, /obj/item/clothing/under/dress/tajaran/green, -/obj/item/clothing/under/dress/tajaran/summer, +/obj/item/clothing/pants/skirt/tajaran, /obj/item/clothing/shoes/flats, /obj/item/clothing/under/dress/tajaran, /obj/item/clothing/head/tajaran/circlet/silver, diff --git a/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm b/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm index 1d9b55875a5..d694025c14c 100644 --- a/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm +++ b/maps/random_ruins/exoplanets/raskara/raskara_wreck.dmm @@ -218,7 +218,7 @@ /obj/item/clothing/accessory/tajaran/charm/steel/silver/seashell, /obj/item/clothing/accessory/tajaran/charm/steel/silver, /obj/item/clothing/accessory/tajaran/charm/tajani, -/obj/item/clothing/accessory/tajaran/summershirt, +/obj/item/clothing/under/dressshirt/tajaran, /obj/item/clothing/accessory/tajaran/ruddy, /obj/item/clothing/accessory/tajaran/silver, /obj/item/clothing/accessory/tajaran/orange,