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

New Tajaran Clothes (#17072)

Browse Source 
* New Tajaran Clothes

* Le Epic Linter Fails
This commit is contained in:
SleepyGemmy
2023-08-21 20:35:09 +00:00
committed by GitHub
parent 16046892dd
commit 4a25ab88bc
16 changed files with 236 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/items/xeno/tajara.dm
+52 -6
View File
@@ -143,6 +143,12 @@
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["adhomian evening suit"] = /obj/item/clothing/under/tajaran/fancy/evening_suit
uniform["high-waisted men's wear"] = /obj/item/clothing/under/tajaran/high_waisted
uniform["high-waisted men's business wear"] = /obj/item/clothing/under/tajaran/high_waisted/business
uniform["relaxed men's wear"] = /obj/item/clothing/under/tajaran/relaxed
uniform["stylish relaxed men's wear"] = /obj/item/clothing/under/tajaran/relaxed/stylish
uniform["smart study outfit"] = /obj/item/clothing/under/tajaran/smart
gear_tweaks += new /datum/gear_tweak/path(uniform)
/datum/gear/uniform/nka_colorable_uniform
@@ -189,6 +195,12 @@
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
dress["polka dot dress, red"] = /obj/item/clothing/under/dress/tajaran/polka_dot
dress["polka dot dress, black"] = /obj/item/clothing/under/dress/tajaran/polka_dot/black
dress["floral dress"] = /obj/item/clothing/under/dress/tajaran/floral
dress["housewife dress, plaid"] = /obj/item/clothing/under/dress/tajaran/housewife
dress["housewife dress, mauve"] = /obj/item/clothing/under/dress/tajaran/housewife/mauve
dress["housewife dress, yellow"] = /obj/item/clothing/under/dress/tajaran/housewife/yellow
gear_tweaks += new /datum/gear_tweak/path(dress)
/datum/gear/uniform/tajara_long_dress
@@ -198,10 +210,10 @@
sort_category = "Xenowear - Tajara"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION
// Dress Flats
/datum/gear/shoes/tajara/flats
display_name = "tajaran flats selection"
description = "Dress flats, in a selection of colors. Refitted for Tajara"
display_name = "tajaran dress flats selection"
description = "Dress flats, in a selection of colours. Fitted for Tajara."
path = /obj/item/clothing/shoes/tajara
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
sort_category = "Xenowear - Tajara"
@@ -210,8 +222,11 @@
..()
var/list/flats = list()
flats["dress flats, black"] = /obj/item/clothing/shoes/flats/tajara
flats["dress flats, dark"] = /obj/item/clothing/shoes/flats/tajara/dark
flats["dress flats, white"] = /obj/item/clothing/shoes/flats/tajara/white
flats["dress flats, red"] = /obj/item/clothing/shoes/flats/tajara/red
flats["dress flats, scarlet"] = /obj/item/clothing/shoes/flats/tajara/scarlet
flats["dress flats, mauve"] = /obj/item/clothing/shoes/flats/tajara/mauve
flats["dress flats, blue"] = /obj/item/clothing/shoes/flats/tajara/blue
flats["dress flats, green"] = /obj/item/clothing/shoes/flats/tajara/green
flats["dress flats, purple"] = /obj/item/clothing/shoes/flats/tajara/purple
@@ -291,7 +306,7 @@
flags = GEAR_HAS_DESC_SELECTION
/datum/gear/shoes/tajara/shoes
display_name = "tajaran foot-wear"
display_name = "tajaran footwear"
path = /obj/item/clothing/shoes/tajara/footwraps
sort_category = "Xenowear - Tajara"
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
@@ -299,8 +314,9 @@
/datum/gear/shoes/tajara/shoes/New()
..()
var/list/shoes = list()
shoes["native tajaran foot-wear"] = /obj/item/clothing/shoes/tajara/footwraps
shoes["native tajaran footwear"] = /obj/item/clothing/shoes/tajara/footwraps
shoes["fancy adhomian shoes"] = /obj/item/clothing/shoes/tajara/fancy
shoes["saddle shoes, black"] = /obj/item/clothing/shoes/tajara/saddle
gear_tweaks += new /datum/gear_tweak/path(shoes)
/datum/gear/gloves/shumalia_belt
@@ -533,4 +549,34 @@
var/list/hats = list()
hats["PRA consular service side cap"] = /obj/item/clothing/head/tajaran/consular/side_cap
hats["DPRA consular service side cap"] = /obj/item/clothing/head/tajaran/consular/dpra/side_cap
gear_tweaks += new /datum/gear_tweak/path(hats)
gear_tweaks += new /datum/gear_tweak/path(hats)
// High-heeled Adhomian Shoes
/datum/gear/shoes/tajara/heels
display_name = "high-heeled adhomian shoes selection"
description = "High-heeled shoes, in a selection of colours. Fitted for Tajara."
path = /obj/item/clothing/shoes/tajara
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
sort_category = "Xenowear - Tajara"
/datum/gear/shoes/tajara/heels/New()
..()
var/list/heels = list()
heels["high-heeled adhomian shoes, black"] = /obj/item/clothing/shoes/heels/tajara
heels["high-heeled adhomian shoes, red"] = /obj/item/clothing/shoes/heels/tajara/red
gear_tweaks += new /datum/gear_tweak/path(heels)
// Adhomian Loafers
/datum/gear/shoes/tajara/loafers
display_name = "adhomian loafers selection"
description = "Loafers, in a selection of colours. Fitted for Tajara."
path = /obj/item/clothing/shoes/tajara/loafers
whitelisted = list(SPECIES_TAJARA, SPECIES_TAJARA_ZHAN, SPECIES_TAJARA_MSAI)
sort_category = "Xenowear - Tajara"
/datum/gear/shoes/tajara/loafers/New()
..()
var/list/loafers = list()
loafers["loafers, black"] = /obj/item/clothing/shoes/tajara/loafers
loafers["loafers, brown"] = /obj/item/clothing/shoes/tajara/loafers/brown
gear_tweaks += new /datum/gear_tweak/path(loafers)
code/modules/clothing/shoes/xeno/tajara.dm
+79 -15
View File
@@ -17,9 +17,9 @@
/obj/item/clothing/shoes/flats/tajara
desc = "A pair of black women's flats. Refitted for Tajara."
name = "black dress flats"
icon = 'icons/mob/species/tajaran/shoes.dmi'
icon_state = "tblackdf"
item_state = "tblackdf"
icon = 'icons/obj/item/clothing/shoes/flats/tajara/flats.dmi'
icon_state = "flats_black"
item_state = "flats_black"
body_parts_covered = FEET
species_restricted = list(BODYTYPE_TAJARA)
contained_sprite = TRUE
@@ -27,33 +27,32 @@
/obj/item/clothing/shoes/flats/tajara/red
desc = "A pair of red women's flats. Refitted for Tajara."
name = "red dress flats"
icon = 'icons/mob/species/tajaran/shoes.dmi'
icon_state = "treddf"
item_state = "treddf"
icon_state = "flats_red"
item_state = "flats_red"
/obj/item/clothing/shoes/flats/tajara/blue
desc = "A pair of blue women's flats. Refitted for Tajara."
name = "blue dress flats"
icon_state = "tbluedf"
item_state = "tbluedf"
icon_state = "flats_blue"
item_state = "flats_blue"
/obj/item/clothing/shoes/flats/tajara/green
desc = "A pair of green women's flats. Refitted for Tajara."
name = "green dress flats"
icon_state = "tgreendf"
item_state = "tgreendf"
icon_state = "flats_green"
item_state = "flats_green"
/obj/item/clothing/shoes/flats/tajara/purple
desc = "A pair of purple women's flats. Refitted for Tajara."
name = "purple dress flats"
icon_state = "tpurpledf"
item_state = "tpurpledf"
icon_state = "flats_purple"
item_state = "flats_purple"
/obj/item/clothing/shoes/flats/tajara/white
desc = "A pair of white women's flats. Refitted for Tajara."
name = "white dress flats"
icon_state = "twhitedf"
item_state = "twhitedf"
icon_state = "flats_white"
item_state = "flats_white"
/obj/item/clothing/shoes/tajara/jackboots // Because yes, Tajara don't leave their toes out all the time.
name = "black boots"
@@ -198,4 +197,69 @@
laser = ARMOR_LASER_SMALL,
energy = ARMOR_ENERGY_MINOR,
bomb = ARMOR_BOMB_MINOR
)
)
// Black High-heeled Adhomian Shoes
/obj/item/clothing/shoes/heels/tajara
name = "black high-heeled adhomian shoes"
desc = "A pair of black heels adapted specifically for tajara anatomy, in the latest style."
icon = 'icons/obj/item/clothing/shoes/heels/tajara/heels.dmi'
icon_state = "heels_black"
item_state = "heels_black"
species_restricted = list(BODYTYPE_TAJARA)
contained_sprite = TRUE
// Red High-heeled Adhomian Shoes
/obj/item/clothing/shoes/heels/tajara/red
name = "red high-heeled adhomian shoes"
desc = "A pair of red heels adapted specifically for tajara anatomy, in the latest style."
icon_state = "heels_red"
item_state = "heels_red"
// Scarlet Dress Flats
/obj/item/clothing/shoes/flats/tajara/scarlet
name = "scarlet dress flats"
desc = "A pair of scarlet women's flats, made specifically for tajara."
icon_state = "flats_scarlet"
item_state = "flats_scarlet"
// Mauve Dress Flats
/obj/item/clothing/shoes/flats/tajara/mauve
name = "mauve dress flats"
desc = "A pair of mauve women's flats, made specifically for tajara."
icon_state = "flats_mauve"
item_state = "flats_mauve"
// Dark Dress Flats
/obj/item/clothing/shoes/flats/tajara/dark
name = "dark dress flats"
desc = "A pair of dark women's flats, made specifically for tajara."
icon_state = "flats_dark"
item_state = "flats_dark"
// Saddle Shoes
/obj/item/clothing/shoes/tajara/saddle
name = "black saddle shoes"
desc = "A pair of black, well-cared for saddle shoes, made for tajara anatomy. Nifty!"
icon = 'icons/obj/item/clothing/shoes/tajara/saddle_shoes.dmi'
icon_state = "saddle"
item_state = "saddle"
species_restricted = list(BODYTYPE_TAJARA)
contained_sprite = TRUE
// Adhomian Loafers
/obj/item/clothing/shoes/tajara/loafers
name = "black adhomian loafers"
desc = "A pair of black men's loafers, made specifically for tajara anatomy. Pipe and robe not included."
icon = 'icons/obj/item/clothing/shoes/tajara/loafers.dmi'
icon_state = "loafers_black"
item_state = "loafers_black"
species_restricted = list(BODYTYPE_TAJARA)
contained_sprite = TRUE
// Brown Adhomian Loafers
/obj/item/clothing/shoes/tajara/loafers/brown
name = "brown adhomian loafers"
desc = "A pair of brown men's loafers, made specifically for tajara anatomy. Pipe and robe not included."
icon_state = "loafers_brown"
item_state = "loafers_brown"
code/modules/clothing/under/xenos/tajara.dm
+96
View File
@@ -402,3 +402,99 @@
icon_state = "psis"
item_state = "psis"
starting_accessories = (/obj/item/clothing/accessory/holster/hip)
// Red Polka Dot Dress
/obj/item/clothing/under/dress/tajaran/polka_dot
name = "red polka dot dress"
desc = "A newer fashion style, this dress sports a jaunty, summery print with a scandalous shape by tajara standards. This one is red."
desc_extended = "Fundamentally at odds with the more traditional \"Flapper\" variety of clothing popular in the 2440s and 2450s, newer, more revealing and less restrictive dresses have found themselves surging amongst the teenage and young adult demographic on Adhomai, and in the People's Republic of Adhomai specifically. Many parents do not approve of these new styles, but shops sell them all the same, and celebrities flaunt them at red carpet events. Like it or not, times have begun to change."
icon = 'icons/obj/item/clothing/under/dress/tajaran/polka_dot_dresses.dmi'
icon_state = "polka_red"
item_state = "polka_red"
// Black Polka Dot Dress
/obj/item/clothing/under/dress/tajaran/polka_dot/black
name = "black polka dot dress"
desc = "A newer fashion style, this dress sports a jaunty, summery print with a scandalous shape by tajara standards. This one is black."
icon_state = "polka_black"
item_state = "polka_black"
// Floral Dress
/obj/item/clothing/under/dress/tajaran/floral
name = "floral dress"
desc = "A newer fashion style, this flower-printed blouse and pencil skirt sport a colorful print and a scandalous shape by tajara standards."
icon = 'icons/obj/item/clothing/under/dress/tajaran/floral_dress.dmi'
icon_state = "floral_dress"
item_state = "floral_dress"
// Plaid Housewife Dress
/obj/item/clothing/under/dress/tajaran/housewife
name = "plaid housewife dress"
desc = "A modest plaid dress, done in the latest tajaran styles."
icon = 'icons/obj/item/clothing/under/dress/tajaran/housewife_dresses.dmi'
icon_state = "housewife_plaid"
item_state = "housewife_plaid"
// Mauve Housewife Dress
/obj/item/clothing/under/dress/tajaran/housewife/mauve
name = "mauve housewife dress"
desc = "A modest mauve dress with a white collar, done in the latest tajaran styles."
icon_state = "housewife_mauve"
item_state = "housewife_mauve"
desc_extended = "Born of changing styles in the People's Republic and elsewhere, this dress blends the newer, more flattering shapes and traditional modestness so that the modern tajara woman may avail herself of the latest fashion trends. It blends this earnestness and fashionability together in a beautiful compromise, so it should come as no surprise that housewives and middle-aged women are oft found in dresses just like this."
// Yellow Housewife Dress
/obj/item/clothing/under/dress/tajaran/housewife/yellow
name = "yellow housewife dress"
desc = "A modest yellow dress, accented in black, done in the latest tajaran styles."
icon_state = "housewife_yellow"
item_state = "housewife_yellow"
// Adhomian Evening Suit
/obj/item/clothing/under/tajaran/fancy/evening_suit
name = "adhomian evening suit"
desc = "A rich purple evening suit meant for lounging or other luxury."
icon = 'icons/obj/item/clothing/under/tajaran/fancy/evening_suit.dmi'
icon_state = "evening_suit"
item_state = "evening_suit"
// High-waisted Men's Wear
/obj/item/clothing/under/tajaran/high_waisted
name = "high-waisted men's wear"
desc = "Dark, black, and high-waisted trousers with accompanying vibrant yellow shirt, for the modern and fashionable men."
desc_extended = "Fashion for men, much like for women, is slowly moving away from many-layered outfits and extravagant and flashy suits and dresses; one would be hard-pressed to find young men sporting three-piece suits any longer. Teenage boys and young adults are drawn more and more to relaxing styles and more comfortable fits that would never have found root on Adhomai before. Now, though, up-and-coming businessmen and well-to-do middle-class boys would rather wear trousers and a dress shirt than waste time with vests and oxfords."
icon = 'icons/obj/item/clothing/under/tajaran/high_waisted_wear.dmi'
icon_state = "high_waisted"
item_state = "high_waisted"
// High-waisted Men's Business Wear
/obj/item/clothing/under/tajaran/high_waisted/business
name = "high-waisted men's business wear"
desc = "Blue trousers and a white dress shirt with accompanying tie, all for the eventual fashionable used car salesman."
icon_state = "high_waisted_business"
item_state = "high_waisted_business"
// Relaxed Men's Wear
/obj/item/clothing/under/tajaran/relaxed
name = "relaxed men's wear"
desc = "Plaid pants and an unbuttoned silk shirt mean comfort and style."
desc_extended = "Fashion for men, much like for women, is slowly moving away from many-layered outfits and extravagant and flashy suits and dresses; one would be hard-pressed to find young men sporting three-piece suits any longer. Teenage boys and young adults are drawn more and more to relaxing styles and more comfortable fits that would never have found root on Adhomai before. Now, though, up-and-coming businessmen and well-to-do middle-class boys would rather wear trousers and a dress shirt than waste time with vests and oxfords."
icon = 'icons/obj/item/clothing/under/tajaran/relaxed_wear.dmi'
icon_state = "relaxed_wear"
item_state = "relaxed_wear"
// Stylish Relaxed Men's Wear
/obj/item/clothing/under/tajaran/relaxed/stylish
name = "stylish relaxed men's wear"
desc = "Blue trousers and a silken shirt with matching accents. It even has a pocket."
icon_state = "stylish_relaxed_wear"
item_state = "stylish_relaxed_wear"
// Smart Study Outfit
/obj/item/clothing/under/tajaran/smart
name = "smart study outfit"
desc = "A brown, interwoven argyle sweater with accompanying trousers - for the modern academian in all of us."
desc_extended = "Fashion for men, much like for women, is slowly moving away from many-layered outfits and extravagant and flashy suits and dresses; one would be hard-pressed to find young men sporting three-piece suits any longer. Teenage boys and young adults are drawn more and more to relaxing styles and more comfortable fits that would never have found root on Adhomai before. Now, though, up-and-coming businessmen and well-to-do middle-class boys would rather wear trousers and a dress shirt than waste time with vests and oxfords."
icon = 'icons/obj/item/clothing/under/tajaran/smart_study_outfit.dmi'
icon_state = "study_outfit"
item_state = "study_outfit"