From 6ef0d2061a842cb490d0e5494e9c732a72c993b2 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 9 Sep 2016 15:37:50 -0300 Subject: [PATCH] Custom Items - 09SEP2016 (#878) Items added in this update: Hand-me-down Bomber Jacket - superballs - Ash LaCroix Dog Tags - Dylan Sutton - sircatnip Racing Stripes - Ricochet - nebulaflare First Shot - Gabriel Barcia - mrgabol100 Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk --- code/modules/clothing/suits/storage.dm | 2 + code/modules/customitems/item_defines.dm | 69 ++++++++++++++++++++-- icons/obj/custom_items/ash_jacket.dmi | Bin 0 -> 926 bytes icons/obj/custom_items/barcia_flask.dmi | Bin 0 -> 419 bytes icons/obj/custom_items/dylan_tags.dmi | Bin 0 -> 743 bytes icons/obj/custom_items/rico_stripes.dmi | Bin 0 -> 410 bytes icons/obj/custom_items/sayyidah_dress.dmi | Bin 0 -> 683 bytes icons/obj/custom_items/stone_ring.dmi | Bin 0 -> 367 bytes 8 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 icons/obj/custom_items/ash_jacket.dmi create mode 100644 icons/obj/custom_items/barcia_flask.dmi create mode 100644 icons/obj/custom_items/dylan_tags.dmi create mode 100644 icons/obj/custom_items/rico_stripes.dmi create mode 100644 icons/obj/custom_items/sayyidah_dress.dmi create mode 100644 icons/obj/custom_items/stone_ring.dmi diff --git a/code/modules/clothing/suits/storage.dm b/code/modules/clothing/suits/storage.dm index fce85b18982..70e774c204d 100644 --- a/code/modules/clothing/suits/storage.dm +++ b/code/modules/clothing/suits/storage.dm @@ -46,9 +46,11 @@ if(icon_state == icon_open) //Will check whether icon state is currently set to the "open" or "closed" state and switch it around with a message to the user icon_state = icon_closed + item_state = icon_closed usr << "You button up the coat." else if(icon_state == icon_closed) icon_state = icon_open + item_state = icon_open usr << "You unbutton the coat." else //in case some goofy admin switches icon states around without switching the icon_open or icon_closed usr << "You attempt to button-up the velcro on your [src], before promptly realising how silly you are." diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 9cb011f1a7a..18d91394c33 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -118,14 +118,14 @@ contained_sprite = 1 -/obj/item/weapons/fluff/kiara_altar // Pocket Altar - Kiara Branwen - nursiekitty - DONE +/obj/item/weapon/fluff/kiara_altar // Pocket Altar - Kiara Branwen - nursiekitty - DONE name = "pocket altar" desc = "A black tin box with a symbol painted over it. It shimmers in the light." icon = 'icons/obj/custom_items/kiara_altar.dmi' icon_state = "kiara_altar1" w_class = 2 -/obj/item/weapons/fluff/kiara_altar/attack_self(mob/user as mob) +/obj/item/weapon/fluff/kiara_altar/attack_self(mob/user as mob) if(src.icon_state == "kiara_altar1") src.icon_state = "kiara_altar2" user << "You open the pocket altar, revealing its contents." @@ -337,7 +337,7 @@ ..() -/obj/item/weapons/fluff/moon_baton //Tiger Claw - Zander Moon - omnivac - DONE +/obj/item/weapon/fluff/moon_baton //Tiger Claw - Zander Moon - omnivac - DONE name = "tiger claw" desc = "A small energy dagger given to Golden Tigers." icon = 'icons/obj/custom_items/moon_baton.dmi' @@ -349,7 +349,7 @@ contained_sprite = 1 var/active = 0 -/obj/item/weapons/fluff/moon_baton/attack_self(mob/user) +/obj/item/weapon/fluff/moon_baton/attack_self(mob/user) active= !active if(active) playsound(user, 'sound/weapons/saberon.ogg', 50, 1) @@ -437,4 +437,63 @@ icon = 'icons/obj/custom_items/kir_bandanna.dmi' icon_state = "kir_bandanna" item_state = "kir_bandanna" - contained_sprite = 1 \ No newline at end of file + contained_sprite = 1 + + +/obj/item/clothing/suit/storage/toggle/bomber/fluff/ash_jacket //Hand-me-down Bomber Jacket - superballs - Ash LaCroix - DONE + name = "hand-me-down bomber jacket" + desc = "A custom tailored bomber jacket that seems to have been through some action. A silver badge is pinned to it, along with a black and blue strip covering it halfway. The badge reads, 'Christopher LaCroix, Special Agent, Mendell City, E.O.W. 10-7-38, 284'" + icon = 'icons/obj/custom_items/ash_jacket.dmi' + icon_state = "ash_jacket" + item_state = "ash_jacket" + icon_open = "ash_jacket_open" + icon_closed = "ash_jacket" + contained_sprite = 1 + + +/obj/item/clothing/accessory/badge/holo/cord/fluff/dylan_tags //Dog Tags - Dylan Sutton - sircatnip - DONE + name = "dog tags" + desc = "Some black dog tags, engraved on them is the following: Wright, Dylan L, O POS, Pacific Union Special Forces." + icon = 'icons/obj/custom_items/dylan_tags.dmi' + icon_state = "dylan_tags" + item_state = "dylan_tags" + stored_name = "Wright, Dylan L" + badge_string = "Pacific Union Special Forces" + contained_sprite = 1 + + +/obj/item/clothing/ears/fluff/rico_stripes //Racing Stripes - Ricochet - nebulaflare - DONE + name = "racing stripes" + desc = "A pair of fancy racing stripes." + icon = 'icons/obj/custom_items/rico_stripes.dmi' + icon_state = "rico_stripes" + item_state = "rico_stripes" + contained_sprite = 1 + canremove = 0 + abstract = 1 + species_restricted = list("Machine") + + +/obj/item/weapon/reagent_containers/food/drinks/flask/fluff/barcia_flask //First Shot - Gabriel Barcia - mrgabol100 - DONE + name = "first shot" + desc = "A flask. Smells of absinthe, maybe vodka. The bottom right corner has a silver bar. The bottom is engraved, it reads 'The First Shot'." + icon = 'icons/obj/custom_items/barcia_flask.dmi' + icon_state = "barcia_flask" + + +/obj/item/clothing/gloves/fluff/stone_ring //Thunder Dome Pendant Ring - Jerimiah Stone - dominicthemafiaso - DONE + name = "thunder dome pendant ring" + desc = "It appears to be a Collectors edition Thunder dome Pendant ring from the IGTDL's show rumble in the red planet in 2444. It has a decorative diamond center with a image of the Intergalactic belt in the center." + icon = 'icons/obj/custom_items/stone_ring.dmi' + icon_state = "stone_ring" + item_state = "stone_ring" + contained_sprite = 1 + + +/obj/item/clothing/under/dress/fluff/sayyidah_dress //Traditional Jumper Dress - Sayyidah Al-Kateb - alberyk - DONE + name = "traditional jumper dress" + desc = "A light summer-time dress, decorated neatly with black and silver colors, it seems to be rather old." + icon = 'icons/obj/custom_items/sayyidah_dress.dmi' //special thanks to Coalf for the sprites + icon_state = "sayyidah_dress" + item_state = "sayyidah_dress" + contained_sprite = 1 diff --git a/icons/obj/custom_items/ash_jacket.dmi b/icons/obj/custom_items/ash_jacket.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f7862fccd2dfe9ab3d20edea0ebf95ab0f14e6f2 GIT binary patch literal 926 zcmV;P17ZA$P)7A!PU{$R`G)T|&>>5Y_00N##L_t(oh3%NVZrd;vMz7pf z=orbh=TMH*)jvocARyJQMoAUjoLXd(&K>$9HqZy?(x>dDk%;%o2&Dj>0)5+eLmiW{ zU>yWt$bUc{(Y_r(#;Z*t17IQJ|)?JG`pSE zY8(1o%|lP+4BlLX3sNnWlmQ4eHuqJ^ZRl3rk*;qRE2*13TY~^)nx1MT+Fw6)6}naT zO$TeG_^2!a7^Tdf04xIj{;8|bt@;tVv9kQE>=Q5j{eXaP4+nA&wX&b80B{vLh(>ITOZ_J_T{sN<{q5xxY$K-o-W!Ze5?;b#^cDPh+H2upVIFO$3&x4FM1wEE?ujdq+P%|NsBp+0>4Sg;h;Xy}7jJ z0FX&UK~y-6?U6wegCGn=C1{bFN)oO2KWY>0GGXDWi~fOO@gEOnG7SIRN`lk}Adh`u zdh`sXl({~0UZNgho?aCZd}3{_k!>bkBR~lzV(|eo0h=HIuKP^F@e`zB4h`Dr5|PM& zXdjFXwC!wtXgGlj2>?WGtq%+$XK#lKjJ4KxN;V7dXMP;ZH`(ofHy`GP3Z;d*5*7de N002ovPDHLkV1lLCr7r*g literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/dylan_tags.dmi b/icons/obj/custom_items/dylan_tags.dmi new file mode 100644 index 0000000000000000000000000000000000000000..5baaf78d28e3f3a3d48bce617897583c7388597e GIT binary patch literal 743 zcmV?P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex7wuvIWN;^NFm z%}mcIfpCgT5=&AQY!#GJDsvL^;!6_KiJp@xj55`5_3}_Y%EISOY;z_ zO$e&aO~j>IS;5uMMZv|_lM4W++BhyReSC%h00JLLL_t(|obBAbvZ62)!12S*eF>|y zDH!Xt7P}8|x1pf%oh+!frrsx@W+>7*R6a&-vvI?{UKC7J^#5xdMogG<@_{iZ0ssI2 z;MHVvK4gq>d7ewxb<#A=Xc=W$x~}U)Yc1AV(OOGYRkP}SMi&Rd7~^~p^E{W`ZkPGs zhDivMb1F%`9Fj1BF~$`|;ZD6*mZdYsxbXFo^5S3RlNt;DBb4{lQUr_OPmm&53_n9Z z#@@8nMz2t79lcDE<@T)61Zb_Jx7ZX(OHJaPjWkis>sG4NTbL`@YYVQm*g&OyvKN@_FTxW#?&52FM3~yWNV2NL|-* zI2^mZ@f4G{r9ebPex5l-YHi!Ti(J?G zaithL{T4X{J<1lxm;I%Xopt~K00000000000001hxZ1X@#*T5h+5i9WZ+Gx75&64b zum8lmBrHbTww2!|ey951>HTv1L=gCI++y2$>^c_te86{Zv0wjXp9uf}0000000013 Zst=(qA><7AN7n!V002ovPDHLkV1ftqRnh zg2M`mO22;zF8KKMiI%sn*10q1gExd4Tr__0Nawtd=E(pc$L!IgGahGs&TBLlba@MT z2Z`p0PU$k5{P}UWcb5@&Q1{dw7Qsf{T|i-;ofen7go=X|bJlb{?hX=s<=YW3zd3mC zrl!^NyPLY#tBW(l#aMln?JC{~bk9Xk7srr_IdAXmgm}HzVmJ;>M^qzI~ah7 z4Ou6rzkYV1tl$55vFTGAZnhP(op;~Q4ffKE&F{bW!})pTOi|ZAHEQjG_UkvlHsi^?(j!VEDuGpC8PC5D(;k)Yizw#mbyv hILIRaC1CO*A6OXgtXwm1HvbBckf*Dk%Q~loCIEbRqfP(- literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/sayyidah_dress.dmi b/icons/obj/custom_items/sayyidah_dress.dmi new file mode 100644 index 0000000000000000000000000000000000000000..4e99764acd2da831631459c05f8d69da9c512480 GIT binary patch literal 683 zcmV;c0#yBpP)V=-0C=2JR&a84 z_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5sW`E+ zGBYJHBR-`lwYXS`i!&v&s2C_=$iu$p!425IBTwKzoA@BdJ1D5?721FK3n>e&l)8p{Tc2${W znVOpVUjiZHRSFpQ6)N7>fJRAW5cIHbtl@nJ%9!*5SBmKKZN;}h#zdc@Tv1|z<+q~kD|Y<&vgM$sE|D5 zyAl6WB|i&1k|gx(@4V@M0r(As5>-IMZvqHqF2ShZ0ZrA`g7gn-=D$M)YR0}-_UCX5TX_#1i< R;xhmM002ovPDHLkV1leBE%X2Y literal 0 HcmV?d00001 diff --git a/icons/obj/custom_items/stone_ring.dmi b/icons/obj/custom_items/stone_ring.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d9854c7731b28a47580293b58cfebe4937db1c67 GIT binary patch literal 367 zcmeAS@N?(olHy`uVBq!ia0vp^2|()e_1!5cyiE*d|0q;uX!^CUx2Pwx&3;~?Y9 z#$F0@9!)wjDMTT7|H-Nve$S4e1NoH#l&Y|4z;T#3nnQuF6E2jn&_ zii$jV^*rkvA%@N#Ex)%$$4!B5DD`x44DskpPLN<#<}%>onzSS?;KUJ+fCiS&Q$<-> zr;2u7SKu;=4VY4)-6Gsrm*Aro*PJnF!^({TTAXG}M8ZYHCnqo`2W6*c2P<8C)hNey zE5O5PgOLFTE9=B1a@9Wi2NHUk0u8v_4r)lSa8YVDNPH Kb6Mw<&;$S*s)}y_ literal 0 HcmV?d00001