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

Tajaran fashion: the revolution strikes again (#5356)

Browse Source 
This pr adds more fashion related options to the tajaran species, with a special focus on the religious side, as well a new hairstyle suggested at the forums: https://forums.aurorastation.org/viewtopic.php?f=18&t=12019
This commit is contained in:
Alberyk
2018-10-06 11:50:15 +03:00
committed by Erki
parent 56fc1cf5f1
commit a39399ff4c
6 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_xeno.dm
+29 -1
View File
@@ -177,8 +177,22 @@
coat["commoner cloak"] = /obj/item/clothing/suit/storage/tajaran/cloak
coat["royal cloak"] = /obj/item/clothing/suit/storage/tajaran/cloak/fancy
coat["gruff cloak"] = /obj/item/clothing/suit/storage/hooded/tajaran
coat["adhomian wool coat"] = /obj/item/clothing/suit/storage/tajaran/nomad
gear_tweaks += new/datum/gear_tweak/path(coat)
/datum/gear/suit/tajara_priest
display_name = "tajara priest robe selection (Tajara)"
path = /obj/item/clothing/suit/storage/tajaran
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear"
/datum/gear/suit/tajara_priest/New()
..()
var/robes = list()
robes["sun priest robe"] = /obj/item/clothing/suit/storage/hooded/tajaran/priest
robes["sun sister robe"] = /obj/item/clothing/suit/storage/tajaran/messa
gear_tweaks += new/datum/gear_tweak/path(robes)
/datum/gear/suit/tajaran_labcoat
display_name = "PRA medical coat (Tajara)"
path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
@@ -238,7 +252,7 @@
gear_tweaks += new/datum/gear_tweak/path(scarf)
/datum/gear/head/tajara
display_name = "dress circlet selection (Tajara)"
display_name = "adhomian headgear selection (Tajara)"
path = /obj/item/clothing/head/tajaran/circlet
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear"
@@ -248,6 +262,7 @@
var/circlet = list()
circlet["golden dress circlet"] = /obj/item/clothing/head/tajaran/circlet
circlet["silver dress circlet"] = /obj/item/clothing/head/tajaran/circlet/silver
circlet["fur hat"] = /obj/item/clothing/head/tajaran/fur
gear_tweaks += new/datum/gear_tweak/path(circlet)
/datum/gear/accessory/tajara_wrap
@@ -269,6 +284,19 @@
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear"
/datum/gear/mask/tajara
display_name = "sun sister veil (Tajara)"
path = /obj/item/clothing/mask/tajara
cost = 1
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
sort_category = "Xenowear"
/datum/gear/shoes/tajara
display_name = "native tajaran foot-wear"
path = /obj/item/clothing/shoes/tajara
sort_category = "Xenowear"
whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
//other things
/datum/gear/uniform/gearharness
code/modules/clothing/suits/alien.dm
+57 -7
View File
@@ -38,12 +38,6 @@
icon_state = "zhan_scarf"
body_parts_covered = HEAD|FACE
/obj/item/clothing/suit/storage/tajaran
name = "tajaran naval coat"
desc = "A thick wool coat from Adhomai."
icon_state = "naval_coat"
item_state = "naval_coat"
/obj/item/clothing/suit/storage/toggle/labcoat/tajaran
name = "people's republic medical coat"
desc = "A sterile insulated coat made of leather stitched over fur."
@@ -52,6 +46,12 @@
icon_open = "taj_jacket_open"
icon_closed = "taj_jacket"
/obj/item/clothing/suit/storage/tajaran
name = "tajaran naval coat"
desc = "A thick wool coat from Adhomai."
icon_state = "naval_coat"
item_state = "naval_coat"
/obj/item/clothing/suit/storage/tajaran/cloak
name = "commoner cloak"
desc = "A tajaran cloak made with the middle class in mind, fancy but nothing special."
@@ -67,6 +67,22 @@
icon_state = "taj_fancycloak"
item_state = "taj_fancycloak"
/obj/item/clothing/suit/storage/tajaran/nomad
name = "adhomian wool coat"
desc = "An adhomian coat, this one is a design commonly found among the Rhazar'Hrujmagh people."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "zhan_coat"
item_state = "zhan_coat"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/tajaran/messa
name = "sun sister robe"
desc = "A robe worn by the female priests of the S'rand'Marr religion"
icon = 'icons/obj/tajara_items.dmi'
icon_state = "messarobes"
item_state = "messarobes"
contained_sprite = TRUE
/obj/item/clothing/suit/storage/hooded/tajaran
name = "gruff cloak"
desc = "A cloak designated for the lowest classes."
@@ -77,6 +93,15 @@
flags_inv = HIDETAIL
hoodtype = /obj/item/clothing/head/winterhood
/obj/item/clothing/suit/storage/hooded/tajaran/priest
name = "sun priest robe"
desc = "A robe worn by male priests of the S'rand'marr religion."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "priestrobe"
item_state = "priestrobe"
contained_sprite = TRUE
flags_inv = 0
/obj/item/clothing/head/tajaran/circlet
name = "golden dress circlet"
desc = "A golden circlet with a pearl in the middle of it."
@@ -84,7 +109,6 @@
icon_state = "taj_circlet"
item_state = "taj_circlet"
contained_sprite = TRUE
body_parts_covered = 0
/obj/item/clothing/head/tajaran/circlet/silver
name = "silver dress circlet"
@@ -92,6 +116,32 @@
icon_state = "taj_circlet_s"
item_state = "taj_circlet_s"
/obj/item/clothing/head/tajaran/fur
name = "adhomian fur hat"
icon = 'icons/obj/tajara_items.dmi'
desc = "A typical tajaran hat, made with the fur of some adhomian animal."
icon_state = "fur_hat"
item_state = "fur_hat"
contained_sprite = TRUE
/obj/item/clothing/mask/tajara
name = "sun sister veil"
desc = "A veil worn by the female Priests of the S'rand'Marr religion."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "veil"
item_state = "veil"
contained_sprite = TRUE
/obj/item/clothing/shoes/tajara
name = "native tajaran foot-wear"
desc = "Native foot and leg wear worn by Tajara, completely covering the legs in wraps and the feet in adhomian fabric."
icon = 'icons/obj/tajara_items.dmi'
icon_state = "adhomai_shoes"
item_state = "adhomai_shoes"
body_parts_covered = FEET|LEGS
species_restricted = list("Tajara")
contained_sprite = TRUE
//Vaurca clothing
/obj/item/clothing/suit/vaurca
code/modules/mob/abstract/new_player/sprite_accessories.dm
+4
View File
@@ -1059,6 +1059,10 @@
name = "Tajara Finger Curls"
icon_state = "hair_fingerwave"
taj_ears_pompadour
name = "Tajara Greaser"
icon_state = "hair_greaser"
//vox hair
vox_quills_short