From df1f62a54cf180d2f77d1efc60e2d7ceb3cdb46c Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 10 Aug 2016 17:50:53 -0300 Subject: [PATCH] Custom items 10AUG2016 & contained sprites for accessories (#693) --- .../clothing/under/accessories/accessory.dm | 8 ++- code/modules/customitems/item_defines.dm | 65 ++++++++++++++++++ icons/obj/custom_items/centurion_cloak.dmi | Bin 0 -> 1232 bytes icons/obj/custom_items/fabian_coat.dmi | Bin 0 -> 734 bytes icons/obj/custom_items/kir_bandanna.dmi | Bin 0 -> 2067 bytes icons/obj/custom_items/vittorio_armband.dmi | Bin 0 -> 847 bytes icons/obj/custom_items/vittorio_fez.dmi | Bin 0 -> 711 bytes 7 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 icons/obj/custom_items/centurion_cloak.dmi create mode 100644 icons/obj/custom_items/fabian_coat.dmi create mode 100644 icons/obj/custom_items/kir_bandanna.dmi create mode 100644 icons/obj/custom_items/vittorio_armband.dmi create mode 100644 icons/obj/custom_items/vittorio_fez.dmi diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index dfbfc92d4b8..dd7ec5a5c3b 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -16,12 +16,15 @@ if(!inv_overlay) if(!mob_overlay) get_mob_overlay() - + var/tmp_icon_state = "[overlay_state? "[overlay_state]" : "[icon_state]"]" if(icon_override) if("[tmp_icon_state]_tie" in icon_states(icon_override)) tmp_icon_state = "[tmp_icon_state]_tie" inv_overlay = image(icon = mob_overlay.icon, icon_state = tmp_icon_state, dir = SOUTH) + if(contained_sprite) + tmp_icon_state = "[tmp_icon_state]" + inv_overlay = image("icon" = icon, "icon_state" = "[tmp_icon_state]_w", dir = SOUTH) return inv_overlay /obj/item/clothing/accessory/proc/get_mob_overlay() @@ -31,6 +34,9 @@ if("[tmp_icon_state]_mob" in icon_states(icon_override)) tmp_icon_state = "[tmp_icon_state]_mob" mob_overlay = image("icon" = icon_override, "icon_state" = "[tmp_icon_state]") + else if(contained_sprite) + tmp_icon_state = "[tmp_icon_state]_w" + mob_overlay = image("icon" = icon, "icon_state" = "[tmp_icon_state]") else mob_overlay = image("icon" = INV_ACCESSORIES_DEF_ICON, "icon_state" = "[tmp_icon_state]") return mob_overlay diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 7db6f5999c9..32bd5a28be8 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -352,3 +352,68 @@ icon_state = initial(icon_state) slot_flags = initial(slot_flags) attack_verb = list() + + +/obj/item/clothing/suit/armor/vest/fabian_coat //NT APF Armor - Fabian Goellstein - mirkoloio - DONE + name = "NT APF armor" + desc = "This is a NT Asset Protection Force Armor, it is fashioned as a jacket in NT Security Colors. The nameplate carries the Name 'Goellstein'." + icon = 'icons/obj/custom_items/fabian_coat.dmi' + icon_state = "fabian_coat_open" + contained_sprite = 1 + +/obj/item/clothing/suit/armor/vest/fabian_coat/verb/toggle() + set name = "Toggle Coat Zipper" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(icon_state) + if("fabian_coat_open") + icon_state = "fabian_coat_closed" + usr << "You zip up \the [src]." + if("fabian_coat_closed") + icon_state = "fabian_coat_open" + usr << "You unzip \the [src]." + else + usr << "You attempt to button-up the velcro on your [src], before promptly realising how silly you are." + return + + usr.update_inv_wear_suit() + +/obj/item/clothing/head/beret/centcom/officer/fluff/fabian_beret //Worn Security Beret - Fabian Goellstein - mirkoloio - DONE + name = "worn security beret" + desc = "A NT Asset Protection Force Beret. It has the NT APF insignia on it as well as the Name 'Goellstein' inside." + + +/obj/item/clothing/accessory/armband/fluff/vittorio_armband //ATLAS Armband - Vittorio Giurifiglio - tytostyris - DONE + name = "Atlas armband" + desc = "This is an atlas armband showing anyone who sees this person, as a member of the Political party Atlas." + icon = 'icons/obj/custom_items/vittorio_armband.dmi' + icon_state = "vittorio_armband" + contained_sprite = 1 + +/obj/item/clothing/head/fluff/vittorio_fez //Black Fez - Vittorio Giurifiglio - tytostyris - DONE + name = "black fez" + desc = "It is a black fez, it bears an Emblem of the Astronomical symbol of Earth, It also has some nice tassels." + icon = 'icons/obj/custom_items/vittorio_fez.dmi' + icon_state = "vittorio_fez" + contained_sprite = 1 + + +/obj/item/clothing/suit/fluff/centurion_cloak //Paludamentum - Centurion - cakeisossim - DONE + name = "paludamentum" + desc = "A cloak-like piece of silky, red fabric. Fashioned at one point where the shoulder would be with a golden pin." + icon = 'icons/obj/custom_items/centurion_cloak.dmi' + icon_state = "centurion_cloak" + body_parts_covered = UPPER_TORSO|LOWER_TORSO + contained_sprite = 1 + + +/obj/item/clothing/ears/bandanna/fluff/kir_bandanna// Kir's Bandanna - Kir Iziki - araskael - DONE + name = "purple bandanna" + desc = "A worn and faded purple bandanna with a knotted, dragon-like design on it." + icon = 'icons/obj/custom_items/kir_bandanna.dmi' + icon_state = "kir_bandanna" + contained_sprite = 1 diff --git a/icons/obj/custom_items/centurion_cloak.dmi b/icons/obj/custom_items/centurion_cloak.dmi new file mode 100644 index 0000000000000000000000000000000000000000..22ce3fbe21665bc0ccb7fcde966a07e397a7c515 GIT binary patch literal 1232 zcmV;>1TXuEP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#G}Q}aqni!$@`;*)do6SI}LI8!o^m)Hd7iD}?~$d}8Q%a-Z6%EiVBEjYdLakl4Bnqk0_x z@MJPEwqYe>d#zTI)^0PfDKxuOo_=|N&yRmCIYJd84-w9q&7@wfLd3BgPZa?G>eVVj zA*^h$Hni7jCEflZ`rY3Mg^=y5sJ{woGz>itS&;#_iw2qm^=cIWAmUi=>(~mA{w;S9 z3W1A9Kc(}Bo`<35Es2pQC(~(##w6(YV6l*!E7S<2YotgJag0z185QLGEOFAP*%(84 zP`yBPf1M)GzUm-V6qjj;(#_EGa3F+?c74oMFg9|~Xe8=@l<(9w665Il+G!d(Yc>-T zhnn^?rPpdDbd95WUCwlMEudonOXp2fu~h^B%Zm>grOuFTLtc~O@HA*$5cl-cv0ekx zoSe7gO=or9&j2Qiur0iZv7S?*Ticzg5)3ADe zRIAAeX^Zt;kZT8NL1^$YnJ3dXI`^aZySp%QiZRaUQ zXXg6|qey-dl;hK!ZJU+~FTneD+p0g^44ei*9_B1XJeqjW`?eSpW-E zF?3u+9K$dS!!QiPFbu;m48t%vV)Y+9suWvSA+8N-#deYGx({ms(%RR3!D)8rmD*(y z!T6PAmh-#)L-bm$gf@4kW!us1AIjrU2&na&YT;}dFrFoP`ca{F`pk3o-6gVaUm2oc zrFX*mg^^R%G5gY-s*ayENs5Yf1h_6ecZnVyWrzTyHQ=uFQzV{DCKcQA@J&n;NZZ(z}MOloB#j-0d!JMQvg8b*k%9#0E&84Sad{Xb7OL8aCB*J zZU6vyoKseCa&`CgQ*iP1{ki!&v&s2C_^$im2rVYW+Jak?vVyCh3)u4j?A=cXX@n`{0005uNkllvYZpUB0QYj6k!aO0 zee_jx7|;mL-A<)eiww4LSg5835h@3N{fFD2mfJN^Edp}44$OkNXAK3c=y_P+o^niW=$W<`*ejowPA;1E#3vylp zzrFQ?B*0h~0yd|!_zu7}S(@I&0fpS|K`kBvlv;-XtxFEjb>IWp4{~yH{&f<5kWRu6 z(i4dL!2v+r4~_t$esBN~J>LHW5cPutNgeOc2c-NU4M_Mw8j$dVoSbLp6W*F(bGao5 Q2mk;807*qoM6N<$f)<)T-T(jq literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/kir_bandanna.dmi b/icons/obj/custom_items/kir_bandanna.dmi new file mode 100644 index 0000000000000000000000000000000000000000..111b5aa83f8ce5ed4af320af518c533687c71ead GIT binary patch literal 2067 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 ZUIEHgA*WT}3v~bh002ovPDHLkV1nDuKga+8 literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/vittorio_fez.dmi b/icons/obj/custom_items/vittorio_fez.dmi new file mode 100644 index 0000000000000000000000000000000000000000..34c70fd0d7bc6ad5baf9119adb2c9d1ae383b316 GIT binary patch literal 711 zcmV;&0yzDNP)%vDWDk>u* zBbN{nqI(2z4-k_N5NZt$W(*A{CMJd!7q1Z#V+#z84Gu3ZE-Wi6A08ebA0HbU8k!v* zc@h(x5)-Kx7^M{!TUuI+g@u-mj-eA2qZJk|E-ol2D1;Ul+olS)iw7MY9j}B2CnqN! z9v&MT8!Ia-sec7=5D~z@z?R_00DGTPE!Ct=GbNc004PfFDZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TB zGg33tGfE(w;*!LYR3KBSEVHB}zbG?5J}tFMiHkEOv#1y-Y{U_2hpDl_8%OE(@>}t zKy>G`;R0ifF!t2~2_hz%5c`kDB+pb^wcZttj@2rCiXKV(uCgp^B@ za#!-0Eu}>Hgnw3`t~-I}PQZeHQdq4>;04#OZ_-L3z-C=0@q1FrjkT5w+|U_@*@G$w zdMrNr40`-;xATc+yWQao_fNO0*{7=>$UaT&sX;sZ5+ORS7by)Q+Rrf*gI5CD@4*2t tRT`x9^(KD+d%ZAE42EGChGCe0$~RNs7BO`b5%B;3002ovPDHLkV1kfJ5mo>I literal 0 HcmV?d00001