diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index 0362215a26e..af60c3bb83f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -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 diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index eb727f04035..8b04f257b1d 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -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 diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 7b734afd76c..ef2ac94b4f2 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -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 diff --git a/html/changelogs/alberyk-tajara.yml b/html/changelogs/alberyk-tajara.yml new file mode 100644 index 00000000000..968c885202a --- /dev/null +++ b/html/changelogs/alberyk-tajara.yml @@ -0,0 +1,7 @@ +author: Alberyk, AndurilFlame, Bauser, DronzTheWolf + +delete-after: True + +changes: + - rscadd: "Added tajaran clothing options to the loadout." + - rscadd: "Added a new tajaran hairstyle option." diff --git a/icons/mob/human_face/tajara_hair.dmi b/icons/mob/human_face/tajara_hair.dmi index 5b3b6d5e5ed..648765137d8 100644 Binary files a/icons/mob/human_face/tajara_hair.dmi and b/icons/mob/human_face/tajara_hair.dmi differ diff --git a/icons/obj/tajara_items.dmi b/icons/obj/tajara_items.dmi index 98954f32e9a..0b9d07edb56 100644 Binary files a/icons/obj/tajara_items.dmi and b/icons/obj/tajara_items.dmi differ