diff --git a/aurorastation.dme b/aurorastation.dme index 934335698b6..8e984a9b1d0 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -1390,6 +1390,7 @@ #include "code\modules\clothing\head\misc_special.dm" #include "code\modules\clothing\head\soft_caps.dm" #include "code\modules\clothing\head\xenos\tajara.dm" +#include "code\modules\clothing\head\xenos\unathi.dm" #include "code\modules\clothing\masks\boxing.dm" #include "code\modules\clothing\masks\breath.dm" #include "code\modules\clothing\masks\gasmask.dm" @@ -1462,6 +1463,7 @@ #include "code\modules\clothing\under\accessories\shirts.dm" #include "code\modules\clothing\under\accessories\storage.dm" #include "code\modules\clothing\under\accessories\xeno\tajara.dm" +#include "code\modules\clothing\under\accessories\xeno\unathi.dm" #include "code\modules\clothing\under\jobs\civilian.dm" #include "code\modules\clothing\under\jobs\engineering.dm" #include "code\modules\clothing\under\jobs\medsci.dm" diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ce4bcfafa9f..87b106541e3 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -121,11 +121,13 @@ /obj/structure/closet/wardrobe/xenos/fill() ..() new /obj/item/clothing/suit/unathi/mantle(src) - new /obj/item/clothing/suit/unathi/robe(src) + new /obj/item/clothing/suit/unathi/robe/beige(src) + new /obj/item/clothing/shoes/footwraps(src) + new /obj/item/clothing/shoes/footwraps(src) + new /obj/item/clothing/shoes/caligae(src) new /obj/item/clothing/shoes/sandal(src) new /obj/item/clothing/shoes/sandal(src) new /obj/item/clothing/shoes/sandal(src) - return /obj/structure/closet/wardrobe/orange diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm index 72faec54a99..89ebbadd4c5 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm @@ -11,6 +11,11 @@ cost = 1 whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/suit/unathi_robe/kilt + display_name = "wasteland kilt" + path = /obj/item/clothing/suit/unathi/robe/kilt /datum/gear/suit/robe_coat display_name = "tzirzi robe" @@ -46,6 +51,26 @@ sort_category = "Xenowear - Unathi" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/head/sinta_ronin + display_name = "straw hat" + path = /obj/item/clothing/head/sinta_ronin + whitelisted = list(SPECIES_UNATHI) + sort_category = "Xenowear - Unathi" + +/datum/gear/eyes/wasteland_goggles + display_name = "wasteland goggles" + path = /obj/item/clothing/glasses/safety/goggles/wasteland + whitelisted = list(SPECIES_UNATHI) + sort_category = "Xenowear - Unathi" + +/datum/gear/accessory/sinta_hood + display_name = "clan hood" + slot = slot_head + path = /obj/item/clothing/accessory/sinta_hood + whitelisted = list(SPECIES_UNATHI) + sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/augment/autakh_engineering display_name = "engineering grasper" description = "An Aut'akh augment limb, this one is outfitted with a limited toolkit." @@ -103,6 +128,7 @@ path = /obj/item/clothing/under/unathi/mogazali whitelisted = list(SPECIES_UNATHI) sort_category = "Xenowear - Unathi" + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION /datum/gear/uniform/unathi/zazali display_name = "zazali garb" diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b0cf727fc8b..74a75e5296f 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -198,6 +198,8 @@ BLIND // can't see anything item_state = "goggles_standard" off_state = "goggles_standard" action_button_name = "Flip Goggles" + var/flip_down = "down to protect your eyes." + var/flip_up = "up out of your face." var/up = 0 /obj/item/clothing/glasses/safety/goggles/attack_self() @@ -215,17 +217,39 @@ BLIND // can't see anything flags_inv |= HIDEEYES body_parts_covered |= EYES icon_state = initial(item_state) - to_chat(usr, SPAN_NOTICE("You flip \the [src] down to protect your eyes.")) + to_chat(usr, SPAN_NOTICE("You flip \the [src] [flip_down]")) else src.up = !src.up flags_inv &= ~HIDEEYES body_parts_covered &= ~EYES icon_state = "[initial(icon_state)]_up" - to_chat(usr, SPAN_NOTICE("You push \the [src] up out of your face.")) + to_chat(usr, SPAN_NOTICE("You push \the [src] [flip_up]")) update_clothing_icon() update_icon() usr.update_action_buttons() +/obj/item/clothing/glasses/safety/goggles/wasteland + name = "wasteland goggles" + desc = "A pair of old goggles common in the Wasteland. A few denizens unfortunate enough to not keep this protection on them after the nukes dropped no longer have the ability to see." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "wasteland_goggles" + item_state = "wasteland_goggles" + off_state = "wasteland_goggles" + contained_sprite = TRUE + flip_down = "up to protect your eyes." + flip_up = "and let it hang around your neck." + +/obj/item/clothing/glasses/safety/goggles/wasteland/toggle() + ..() + icon_state = initial(icon_state) + if(up) + item_state = "[initial(item_state)]_up" + else + item_state = initial(icon_state) + update_worn_icon() + update_clothing_icon() + update_icon() + /obj/item/clothing/glasses/eyepatch name = "eyepatch" desc = "Yarr." diff --git a/code/modules/clothing/head/xenos/unathi.dm b/code/modules/clothing/head/xenos/unathi.dm new file mode 100644 index 00000000000..6de145836b5 --- /dev/null +++ b/code/modules/clothing/head/xenos/unathi.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/head/sinta_ronin + name = "straw hat" + desc = "A simple straw hat, completely protecting the head from harsh sun and heavy rain." + icon = 'icons/obj/unathi_items.dmi' + icon_state = "ronin_hat" + item_state = "ronin_hat" + contained_sprite = TRUE \ No newline at end of file diff --git a/code/modules/clothing/suits/alien.dm b/code/modules/clothing/suits/alien.dm index 5197e420117..a60d659c89a 100644 --- a/code/modules/clothing/suits/alien.dm +++ b/code/modules/clothing/suits/alien.dm @@ -3,9 +3,20 @@ /obj/item/clothing/suit/unathi/robe name = "roughspun robes" desc = "A traditional Unathi garment." - icon_state = "robe-unathi" - item_state = "robe-unathi" + icon = 'icons/obj/unathi_items.dmi' + icon_state = "roughspun_robe" + item_state = "roughspun_robe" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS + contained_sprite = TRUE + +/obj/item/clothing/suit/unathi/robe/beige + color = "#DBC684" + +/obj/item/clothing/suit/unathi/robe/kilt + name = "wasteland kilt" + desc = "A long tunic made of old material that acts as a kilt for the poorest of unathi, who aren't afraid to let the sand and sun strike their scales." + icon_state = "wasteland_kilt" + item_state = "wasteland_kilt" /obj/item/clothing/suit/unathi/robe/robe_coat //I was at a loss for names under-the-hood. name = "tzirzi robes" diff --git a/code/modules/clothing/under/accessories/xeno/unathi.dm b/code/modules/clothing/under/accessories/xeno/unathi.dm new file mode 100644 index 00000000000..c29b84aa7ea --- /dev/null +++ b/code/modules/clothing/under/accessories/xeno/unathi.dm @@ -0,0 +1,35 @@ +/obj/item/clothing/accessory/sinta_hood + name = "clan hood" + desc = "A hood worn commonly by unathi away from home. No better way of both representing your clan to foreigners and keeping the sun out of your eyes in style!" + icon = 'icons/obj/unathi_items.dmi' + icon_state = "sinta_hood" + item_state = "sinta_hood_up" + slot_flags = SLOT_TIE|SLOT_HEAD + contained_sprite = TRUE + action_button_name = "Adjust Hood" + var/up = TRUE + +/obj/item/clothing/accessory/sinta_hood/attack_self() + toggle() + +/obj/item/clothing/accessory/sinta_hood/verb/toggle() + set category = "Object" + set name = "Adjust Hood" + set src in usr + + if(use_check_and_message(usr)) + return + up = !up + if(up) + flags_inv = BLOCKHAIR|BLOCKHEADHAIR + body_parts_covered = HEAD + item_state = "sinta_hood_up" + to_chat(usr, SPAN_NOTICE("You flip \the [src] up.")) + else + flags_inv = 0 + body_parts_covered = 0 + item_state = "sinta_hood" + to_chat(usr, SPAN_NOTICE("You flip \the [src] down.")) + update_worn_icon() + update_clothing_icon() + update_icon() \ No newline at end of file diff --git a/html/changelogs/geeves-more_unathi_clothes.yml b/html/changelogs/geeves-more_unathi_clothes.yml new file mode 100644 index 00000000000..4832679da8e --- /dev/null +++ b/html/changelogs/geeves-more_unathi_clothes.yml @@ -0,0 +1,8 @@ +author: Geeves, Dronz + +delete-after: True + +changes: + - rscadd: "Added new clothes for unathi, wasteland kilts, straw hats, wasteland goggles, standalone hoods." + - tweak: "Roughspun robes are now recolourable. Mogazali attire is no longer recolourable." + - rscadd: "Added footwraps and caligae to the xeno clothes closet." \ No newline at end of file diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 77a8d488b55..486794d9c60 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ