diff --git a/code/modules/clothing/under/xenos/unathi.dm b/code/modules/clothing/under/xenos/unathi.dm index 2f28a8e1e28..6674d0f0256 100644 --- a/code/modules/clothing/under/xenos/unathi.dm +++ b/code/modules/clothing/under/xenos/unathi.dm @@ -2,49 +2,109 @@ name = "sinta tunic" desc = "A tunic common on both Moghes and Ouerea, it's simple and easy to manufacture design makes it universally favorable." icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_tunic" - item_state = "unathi_tunic" - contained_sprite = 1 + icon_state = "tunic" + item_state = "tunic" + var/has_down_and_sleeves = TRUE // does this under uniform have down and sleeve sprites? + contained_sprite = TRUE + +/obj/item/clothing/under/unathi/Initialize() + ..() + rolled_down = FALSE + rolled_sleeves = FALSE /obj/item/clothing/under/unathi/jizixi name = "jizixi dress" desc = "A striking, modern dress typically worn by Moghean women of high birth." - icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_formal_fem" - item_state = "unathi_formal_fem" + icon_state = "jizixi" + item_state = "jizixi" + has_down_and_sleeves = FALSE /obj/item/clothing/under/unathi/sashes name = "gy'zao sashes" gender = PLURAL desc = "An androgynous set of sashes worn by Unathi when they want to bask under the sun. Not appropriate to wear outside of that." - icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_sunwear" - item_state = "unathi_sunwear" + icon_state = "gyzao" + item_state = "gyzao" + has_down_and_sleeves = FALSE /obj/item/clothing/under/unathi/mogazali name = "mogazali attire" desc = "A traditional Moghean uniform worn by men of high status whether merchants, priests, or nobility." - icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_uniform_male" - item_state = "unathi_uniform_male" + icon_state = "mogazali" + item_state = "mogazali" + has_down_and_sleeves = FALSE /obj/item/clothing/under/unathi/zazali name = "zazali garb" desc = "An old fashioned, extremely striking garb for the Unathi man with pointy shoulders. It's typically worn by those in the warrior caste... Or those with something to prove." - icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_garb_male" - item_state = "unathi_garb_male" + icon_state = "zazali" + item_state = "zazali" + has_down_and_sleeves = FALSE /obj/item/clothing/under/unathi/huytai name = "huytai outfit" desc = "Typically worn by Unathi women who engage in a trade. Popular with fisherwomen and others." - icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_trader" - item_state = "unathi_trader" + icon_state = "huytai" + item_state = "huytai" + has_down_and_sleeves = FALSE /obj/item/clothing/under/unathi/zozo name = "zo'zo top" desc = "A modern blend of Ouerean and Moghean style for the Unathi man on the go. Great for sunbathing." - icon = 'icons/obj/unathi_items.dmi' - icon_state = "unathi_sunwear_male" - item_state = "unathi_sunwear_male" + icon_state = "zozo" + item_state = "zozo" + has_down_and_sleeves = FALSE + +// Turns out normal rolling was pretty shoddy, so I made my own for 'Nathi - geeves +/obj/item/clothing/under/unathi/rollsuit(mob/user) + set name = "Roll Down Jumpsuit" + set category = "Object" + set src in usr + + if(use_check_and_message(user)) + return + if(has_down_and_sleeves == FALSE) + to_chat(user, span("notice", "You cannot roll down the [src]!")) + return + + if((rolled_sleeves == TRUE) && !(rolled_down)) + rolled_sleeves = FALSE + + if(rolled_down) + body_parts_covered = initial(body_parts_covered) + item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow. + to_chat(user, span("notice", "You roll up your [src].")) + rolled_down = FALSE + else + body_parts_covered &= LOWER_TORSO|LEGS|FEET + item_state = "[initial(item_state)]_d" + to_chat(user, span("notice", "You roll down your [src].")) + rolled_down = TRUE + update_clothing_icon() + +/obj/item/clothing/under/unathi/rollsleeves(mob/user) + set name = "Roll Up Sleeves" + set category = "Object" + set src in usr + + if(use_check_and_message(user)) + return + if(has_down_and_sleeves == FALSE) + to_chat(user, span("notice", "You cannot roll up your [src]'s sleeves!")) + return + + if(rolled_down == TRUE) + to_chat(user, span("notice", "You must roll up your [src] first!")) + return + + if(rolled_sleeves) + body_parts_covered = initial(body_parts_covered) + item_state = "[initial(item_state)]" // REMINDER!: Contained Sprites automatically take out the _un after the spritename, somehow. + to_chat(user, span("notice", "You roll up your [src]'s sleeves.")) + rolled_sleeves = FALSE + else + body_parts_covered &= ~(ARMS|HANDS) + item_state = "[initial(item_state)]_r" + to_chat(user, span("notice", "You roll down your [src]'s sleeves.")) + rolled_sleeves = TRUE + update_clothing_icon() \ No newline at end of file diff --git a/html/changelogs/geeves - unathiClothing.yml b/html/changelogs/geeves - unathiClothing.yml new file mode 100644 index 00000000000..1036c673945 --- /dev/null +++ b/html/changelogs/geeves - unathiClothing.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Sinta Tunics can now be rolled down." + - tweak: "Tweaked unathi clothing colours to be properly recolourable." diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi index 0bf309ecc10..a360c67dc15 100644 Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ