diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index bf8ed129c3b..890c578f968 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -16,6 +16,7 @@ name = "welding helmet" desc = "A head-mounted face cover designed to protect the wearer completely from space-arc eye." icon_state = "welding" + item_state = "welding" item_state_slots = list( slot_l_hand_str = "welding", slot_r_hand_str = "welding" @@ -58,6 +59,7 @@ flash_protection = initial(flash_protection) tint = initial(tint) icon_state = base_state + item_state = base_state to_chat(usr, "You flip the [src] down to protect your eyes.") else src.up = !src.up @@ -66,6 +68,7 @@ tint = TINT_NONE flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[base_state]up" + item_state = "[base_state]up" to_chat(usr, "You push the [src] up out of your face.") update_clothing_icon() //so our mob-overlays usr.update_action_buttons() diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 5842223e498..f6c85a77c58 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -3196,4 +3196,73 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "oscar_helmet_active" else icon_state = initial(icon_state) - item_state = initial(item_state) \ No newline at end of file + item_state = initial(item_state) + + +/obj/item/storage/fancy/fluff/sentiment_bouquet //Bouquet of Chrysanthemums - IRU-Sentiment - niennab + name = "bouquet of chrysanthemums" + desc = "A bouquet of white artificial chrysanthemum flowers wrapped in a sheet of newsprint." + icon = 'icons/obj/custom_items/sentiment_bouquet.dmi' + icon_state = "sentiment_bouquet" + item_state = "sentiment_bouquet" + can_hold = list(/obj/item/clothing/accessory/fluff/sentiment_flower) + starts_with = list(/obj/item/clothing/accessory/fluff/sentiment_flower = 6) + storage_slots = 6 + contained_sprite = TRUE + drop_sound = 'sound/items/drop/gloves.ogg' + use_sound = 'sound/items/drop/paper.ogg' + +/obj/item/storage/fancy/fluff/sentiment_bouquet/fill() + . = ..() + update_icon() + +/obj/item/storage/fancy/fluff/sentiment_bouquet/update_icon() + icon_state = "[initial(icon_state)]_[contents.len]" + if(contents.len) + item_state = initial(item_state) + else + item_state = "[initial(item_state)]_e" + +/obj/item/clothing/accessory/fluff/sentiment_flower //Artificial Chrysanthemum - IRU-Sentiment - niennab + name = "artificial chrysanthemum" + desc = "An artificial white chrysanthemum flower." + icon = 'icons/obj/custom_items/sentiment_bouquet.dmi' + icon_state = "sentiment_flower" + item_state = "sentiment_flower" + contained_sprite = TRUE + + +/obj/item/clothing/head/welding/fluff/ioraks_mask //Iorakian Welding Mask - Kuhserze Ioraks - geeves + name = "iorakian welding mask" + desc = "A modified version of the standard issue NanoTrasen Engineering Corps welding mask, hand-painted into the colours of the Ioraks clan. Various alterations are clearly \ + visible, including a darkened visor and refitted straps to keep the mask in place. On the inner side there is an ingraving of the Ioraks clan emblem, an open splayed hand with \ + its palm facing the observer." + icon = 'icons/obj/custom_items/ioraks_cape.dmi' + icon_state = "ioraks_mask" + item_state = "ioraks_mask" + contained_sprite = TRUE + +/obj/item/storage/box/fluff/ioraks_armbands //Delegation Armbands - Kuhserze Ioraks - geeves + name = "delegation armbands box" + desc = "A box full of team coloured armbands. It has a small picture of an Unathi's face misprinted on it." + icon = 'icons/obj/custom_items/ioraks_cape.dmi' + icon_state = "ioraks_armbands" + item_state = "ioraks_armbands" + can_hold = list(/obj/item/clothing/accessory/armband/fluff/ioraks_armband) + starts_with = list(/obj/item/clothing/accessory/armband/fluff/ioraks_armband = 4, /obj/item/clothing/accessory/armband/fluff/ioraks_armband/alt = 4) + storage_slots = 8 + +/obj/item/clothing/accessory/armband/fluff/ioraks_armband + name = "azszau armband" + desc = " A quite comfortable armband denoting its wearer as a member of the Azszau team. In fine print on the in-line of the fabric, it has \"The Skilled Hands\" worked into it." + icon = 'icons/obj/custom_items/ioraks_cape.dmi' + icon_state = "ioraks_armband" + item_state = "ioraks_armband" + contained_sprite = TRUE + +/obj/item/clothing/accessory/armband/fluff/ioraks_armband/alt + name = "kutzis armband" + desc = "A quite comfortable armband denoting its wearer as a member of the Kutzis team. In fine print on the in-line of the fabric, it has \"The Bright Minds\" worked into it." + icon = 'icons/obj/custom_items/ioraks_cape.dmi' + icon_state = "ioraks_armband2" + item_state = "ioraks_armband2" diff --git a/icons/obj/custom_items/ioraks_cape.dmi b/icons/obj/custom_items/ioraks_cape.dmi index 499e541bae7..27ee72e6b88 100644 Binary files a/icons/obj/custom_items/ioraks_cape.dmi and b/icons/obj/custom_items/ioraks_cape.dmi differ diff --git a/icons/obj/custom_items/sentiment_bouquet.dmi b/icons/obj/custom_items/sentiment_bouquet.dmi new file mode 100644 index 00000000000..94a2e934816 Binary files /dev/null and b/icons/obj/custom_items/sentiment_bouquet.dmi differ