From 09215013023904a5f6259a4cc612a8e68b29d8ac Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 1 Jan 2020 15:25:36 -0300 Subject: [PATCH] Custom items 28/12 (#7839) Adds the following items: https://forums.aurorastation.org/topic/13242-iru-sentiments-artificial-flowers/ https://forums.aurorastation.org/topic/13266-kuhserze-ioraks-departmental-delegation-armbands-and-custom-welding-mask/ --- code/modules/clothing/head/misc_special.dm | 3 + code/modules/customitems/item_defines.dm | 71 ++++++++++++++++++- icons/obj/custom_items/ioraks_cape.dmi | Bin 1137 -> 3451 bytes icons/obj/custom_items/sentiment_bouquet.dmi | Bin 0 -> 1291 bytes 4 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 icons/obj/custom_items/sentiment_bouquet.dmi 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 499e541bae73ef5bbda642dd26144f1a150b9bde..27ee72e6b88fae81e37aaa038a450a78cc0a1641 100644 GIT binary patch delta 3298 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 delta 966 zcmV;%13CQr8u17viBL{Q4GJ0x0000DNk~Le0001B0001B2m=5B0M$l^3IG5A#*rl@ z1*J^@uu_pyHv+s=k%(u1HYp5I00001bW%=J06^y0W&i*HetJ|`bVOxyV{&P5bZKvH z004NLQ&w5jPyv9a_t&cEJc*geCgmWPTpTr54 zVIoU;r30BH63>)MxRhcl4x~(sN{k?~Dy)Po9gLr;7cb?jshEqYv>7--!_lr!;|~vB z8-6jL8<7h+nIHs5$ela>cp@bi0Q31$tR#Q)b|3+XKRK0uaw_1R1`zKh|8U%{(HkWG z@MDv(1Urk#r-1|{er?9J0Ikg<=rhSb4+#5{Q0UL&vSdx zi`EmQo8soa*tFIuiC=3yg{96RuM+jw`w3ZbOF@wh#?SP(?|XI}gvng#)+$JgTMCMn z0us-*@#2Sn1|w1EGx+&ybU&f275uIhl!Nh%&9+;eo8Mus*B5_~KfAIjdi3vhD1NtN zqwV_S;&R4zNQLXP&H)E}S?;c`%AV>(_~Ju^2od6u1nbz@yJb=S!Dc}B;B{@rREIwx z{6keAfRB4*u(9IirLY2&f3R>+Hp#GbF;qn|;3z|X)axH=1!0iU|Ku5j5X&&rCH57y;oQEP(=71=ti3{=sG_*L9i!AO-sU zL;bOTKvKga{Ghp@ZuGd;15X|L^S|i2lE?e{eWI@beE2=LdfN!QuSC&p*)T z2cG_cK0omE5A^wgr+=W&4?O(?eSYBSAL#P~Pyayn|9$-f+5h+T4`lz}*FTW`e_#LL o(Es=K4`lz}-#>)@|Nn`<7{l52QhZ44%11kX#2xN}m;U8wS z&GQO1HDVmNWUJA*h6WP@nwy*3gnbY-JZ=5xugb~6)xXFQdV^DL3xR>G|mlAt2={O}R`4|X9E#XSMfHv19 zi$?~%S@_xfh{jYWvo(GxkOC_{+7Ye%tAYL#h640OX3_7naaT)Zcha#{vto(+3g_Dg zBcvrj&?yfOOW&AX4me>}PRkv!PvVwuMGvA8cc$mNEV|a3 zPcN(J;H?oxab$Aw_|nu9;M=5Gj$D#T^`aD!l5^M6NUBH56SUV)>q2AdAG-YO?V{l< zQ%K85w4sky69KCxcdetg8MZus4Hx3CZs zsd*vnl=4<-8GdGldpiv1FX*}8i#>zpX6}|gLr2?*uZ*!;5pMN|MZBs1FF9G>9A#A_ zIv%%VEI+#XUX`cdAO3&fBD@%LD61M#Hx3i?$~4`gX?v0g zv$+3AyHjmwOBa;obW)#woQRBJGX^+AfbaGzx%f;vz;}w&rA6-QBsFq4Tyme6^L+$l zSFuh_tCT^)PRHX1rv9uK=(Uf8KKbjaslRJ<>SR;K_X}i<$UA7m;3e}K_Evms+%vZ* zu;S!3@Aev1p@$7r5uEs5C2)_1+z923sW025Y`dCxzer14x%=<4EX$Q)Kib0mQ!rv8 z^4YW^s*=f_Pn|cbWSdr$o*P%x9H?BrE(-QiFB%7QQpdy+r&&uNk$49{2?1aHSLUmew6Q(d?=Wv@@q!gek)pMuHQOKf3Eti$s! zJ6MIf`cFPj?fp9av>}#n1fb$sRY3%{+~d%+yIQW*)xA_~R?Bs|{z(N|ZLQT6PAc5h zUdGsF^Vg*y1H5&nr_9I08vAne1}e5BRa$x*JW&F}@?`iBDeQc;G;OL4HduG8p!imZ ztltiTvPS=a6)@nR6c}CmiVEiB!r$k_XOiMh|1vrN{RCumjW+qk zGI~e9`N|AuLeuL(6t!k`&xC@5<2At+Dl1sSPl8-F1Z1;!%qQ>x1pi9k{bxS|0Y7Ou literal 0 HcmV?d00001