cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 06:22:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pants, skirt and shirt-ifies tajaran summer clothing (#21960)

Browse Source 
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.
This commit is contained in:
ElorgRHG
2026-03-11 16:38:30 +00:00
committed by GitHub
parent ebe618ef19
commit 6f63831667
10 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
+28 -1
View File
@@ -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."
code/modules/clothing/under/accessories/xeno/tajara.dm
-6
View File
@@ -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."
code/modules/clothing/under/xenos/tajara.dm
+14 -9
View File
@@ -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."