From cab884b5dc19791e04f87add902f5e93cf7abcce Mon Sep 17 00:00:00 2001 From: Mark9013100 Date: Fri, 12 Feb 2016 20:30:43 -0500 Subject: [PATCH] Implements sprites for shotgun shell boxes. --- .../objects/items/weapons/storage/boxes.dm | 14 ++++++++++++++ icons/obj/storage.dmi | Bin 65588 -> 66781 bytes 2 files changed, 14 insertions(+) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 60b131b487..d09c20c2a9 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -161,6 +161,8 @@ /obj/item/weapon/storage/box/blanks name = "box of blank shells" desc = "It has a picture of a gun and several warning symbols on the front." + icon_state = "blankshot_box" + item_state = "syringe_kit" New() ..() @@ -175,6 +177,8 @@ /obj/item/weapon/storage/box/beanbags name = "box of beanbag shells" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon_state = "beanshot_box" + item_state = "syringe_kit" New() ..() @@ -189,6 +193,8 @@ /obj/item/weapon/storage/box/shotgunammo name = "box of shotgun slugs" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon_state = "lethalshellshot_box" + item_state = "syringe_kit" New() ..() @@ -203,6 +209,8 @@ /obj/item/weapon/storage/box/shotgunshells name = "box of shotgun shells" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon_state = "lethalslug_box" + item_state = "syringe_kit" New() ..() @@ -217,6 +225,8 @@ /obj/item/weapon/storage/box/flashshells name = "box of illumination shells" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon_state = "illumshot_box" + item_state = "syringe_kit" New() ..() @@ -231,6 +241,8 @@ /obj/item/weapon/storage/box/stunshells name = "box of stun shells" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon_state = "stunshot_box" + item_state = "syringe_kit" New() ..() @@ -245,6 +257,8 @@ /obj/item/weapon/storage/box/practiceshells name = "box of practice shells" desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death." + icon_state = "blankshot_box" + item_state = "syringe_kit" New() ..() diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 88d832c1d6502c00eaaf1287e2906d67a6b70d09..5dff42780f7ab9943190d1bd18cc45939e2b2f83 100644 GIT binary patch delta 5774 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 SML7Zh;I5Xzol;HPi2njGF*s-d delta 4572 zcmX9?XH=6}6Mh32qz05;gNTUIQMv>{KxwidRVgA0Dn+`4@=^tnrnsOKgY;gEND&B9 zm7b-9CRGR}2nZn%Nb+U(d(N33Gxs@jX6~I^=Kg%i^f{6#jSmJ{I1L2=V03JJ1pt_m z>ZBr=_{MX#!-(z^O|EE|4% z%-n7Rn-rU1U#5F=RDNexgmFFcTU^5yn6}X(hH|cfPyK!ur0V1^=IrdZgk+t~`!C3! z%WoMM5_kWuwkimoy+bzssp3BT&reUB-VX_N{{z{}848)3Plh62ym%qxIotTx^X)a{ z(cvycg^Fq2gC#DR?i~gnO2O3~*u^f{Ev>Uh3llBm)!)cnotlnw#mg3Cx-Oqe(@ly^ z<1z--GONzjJ9RtOe@>`2iG`@yU*aWxcN-!+GBC@?edh|ZNB6-7HJ9E1eO>y#y6;Cw zM#D3s*G5NGMn^g1_e;v3BIii!RCAaDMSFN=`<;%<-rs*; zT2oU}7!Z8}G^>h{=|_$i&0EfN5aJ*9mCXNMz)*wU*MOH)$}U5U$5r5&)S+BZtE|W* zBkyQ{?+S{AFpD_);qIY>mYPg0&C63vmKeHSG0w2v+~-xMipy5TRR?8fXqdA~f1mJa zHz?K~U;W3Y`yv`uL*bv=pBbXlWGP>CY@31#KI0JMyQhKj^74xZ+h-Wt4-eG=`1#lm zR~sMna$?ZIKD}vwjLcBF${<+C=j3Szj4{5?t~?y}{B>XC4gDyUFm$9HJX~zY+lINM`oUA?FZG4_Rj}`x*>TP1 z*K5G?4i=zAV_s^=eGXUS%nYoyA{xaXe*jeoVOQf7lytor-mOrw-~EIa^rh^78Ol_(36EN4px$1cK)!Ev@V~qb%mZ;Y%k+BCQ`Q z6P4du|MeeXPlMdjqJ2q0A@z;QY4{Lo7^_wvW^k1*KLnY$@Wc2uSVm0=CtV6T8H9v{ zEYyW{#UoW42&j?O%HZkE0L@!O_eH^dN%krMaK()lYm<~ezi$3(#0VN0y8m$c`Th)f z4XLqTqHGE*^dB*_FLl3SEN@ z0zUe$J|E-O)7OUppj|_X(5YtwkDsb$^M-TRs!(dz?2@#^I_{Tj`)L^PI-y4fzrrk* zQ{n}{Lm=|d3DS1JFD$(Imk~VBvL16FOcLZ6L=47f}?{y~bw}0=HlkMmf+(c?p}U=tN(ts>bBR zuyx|yEC)a|GV}y@I|tGHI8=sMqI@5~?9mTV0}qdjNF?(7*-?)xIiz3U(XrbmGlTER z`uZ%%(#q0OZ#_UWAUIeBOK5KgTwPsjUA{4(deL4c#>S<(J{?U>O>Z5ldPYXL#-3b_ zD6m;Zc+a-)1^-@%F?hw48rU#6I9S9G7){-fcBmSN@bUZe7OO_DoBQacg~q4)ld{d7 zYD~Iao*a7T!h`GHFy8|uUMq2pUS9Ay4o$gw@!)WEa3G>~tA^4O{-l#^nxh3mgeTk? zfHuO~w>Q7yo@+m78eYZ_^0tLj-DP{5_V`P6V

TKNR+%en#nUiy9oEwE#fc9OpvJ zSLE>u`G()6D*%xAr6p3IPU~WV5Q#*w>pcr*?uLY()NL@DlWR5wwyL3yYU6Fdjy#*_ zoOqFZ)3Aj=UV{ob2x}*g=P@#|5K9;(01IpDB4cA?y)bPOtkJcbb%;+?bc?haQK{vL z*P0?nSy-{Rj6y%xV{800!FmS{zq2+K<3MC>tzsC3h_k2|j~1R$m6VK8d$0%fjo{|y zhMT8>`|>v!CXvg~bLY-6seSPZ3)A-L5vh#GA5Wa;fEDN#b!@+gf9+9k-bnSKvWiee zo^Qg^Oi}8f*~z^$xb9g5KfrZ{FKQQi-(v~S>g_ob3p!m;_ioSCot}@6i%U4g#g?}} zCUa{V^>q&sOl5d9oC5(8QeJlRS7j=NuCjyQlD)pFY|EJYL@UhZ(ms+>&V^Bf0U+=* zYrS+t^3Ksb3*D*OLGLr=B_Ga5iM>g$aIj)CW zDil%g#0#=Cgp$1fRx@G;aMg~TL3=@KgUGc3&GYZm^OT;ZxtZ%lYd~(To~N5Y`iQ5R zPjCHG90M7iUbU?twGDKy2f%cFH7QP(|_qo~k+8A#Y?tQAM|r9xYzd8FJ~4;(*SxAgy%V%L&?ksBXVQ-U@TIpUnQ^^MpBt zO#TI69B58tM>5`baRF?T4KdU6FZrEgIqOCwY(5>>wh)abzRu8C2 zEv-)6lllQeIFX<%L!1)SLFtrbnxJwQ_tw*qW%TVRroR}xJy!)LCMErP%Z;CjlV^A3 zvNg4JxoVH~+2|GM8F{)9H|`cE8br4{uASM64POTzk=f}KMJN)E8Y8#C1;M+*q}H)Y z2V-|%1^B%1irVQj{vvZ(k>A2WR;^i(nzKpY}>7`>OO%cGIsl z>b^9Pj-!I#2T)ZS!tXwXpgTgm{O2@ZPEOkWY6*PPpd;`hZ18HYch9WhkKyg)`iID& z4g{dqiSKNs+J(wZWULzywcoBQ`14UAje)OVwcW0!b6_#G^cJcB%JVkLpnGdF^rY23S+Z|3F|_{l1I@`Ns=4J2RW42O^Z> z2tYSKYAC7l0y)GpOTtW=)L=}5j*l0> zeT@?mE$otqKe^<#B)%$LoibV?h4Yz1rG#TV_q;AjJni4-NrcoQ`4N}=&Aj}#=Y|Fb zx{RKU`~R7DC5NGG@18{bvMF6K$>WV)qm+PlY;KXrO>+99$*?}qJySpHQ1JMKLLGC z5}k^@hhNROSu&G-Uy$ zS68lBgoD3B7+iE(mz=X_{Ny0cn9RM4ji=WdfWn}SDCH^gSpze(ANqy1WE@lm{qo0%^J~v%6gMTQ{e@UAXHDNb|{kHcRX9p=4zV{ry)Bse*DXc!LKG z?cW{DhS+@l^%>KjNttl2_b4vsraQ2LyxePm&37&f_G?5%sU>W^?opv1l5FuX@dFc3 z-vHfrcp%0KsPNYA3S6rJzng#b=w}l+?jeOFY<<9`ES=rd_S^|ifQLEGpZ!6vC@|4< zBNZZZXcQc*hCVa1v!mGjH7>rhN1eHcdxjp;c=bPC`9__b92`oQ7e%vG;{DU{%OPra z(NmSm0_=%xH${TI28<(@Vd9FHPeM9>PTX-U>YJkKW6643+r*XrsTV-YXGH5Eb`n42 z>|(?4c^(t*kB_qr@oxx}XE^Tw(ndm!-v156i(9Dg&;4~hG zjUwBZDbJINU#I?!w(pP~K!%2fzdt;$q=aq2N|qz+wXN=a)Z2oTQxw2&3Y-|>v4RB0 zqM1_b%eK&fB&^3BUOqlc)ohLn=`XP~UjPsP0*#6KQ*vyM4fg$mzW|PpB2+9S=fk2# z12M3TZ4{ake`oBZy}64`j*q?`CCv)XJqohllJn+@a8^;(18qL@I@S*#O05jcTDNm? zoq|UciyQfSnV6WAm6n!9?z1@~^&f_X!icxj&L7d(+`P!cD0Jz>A5-VEE3?yUd#C(v zetcNpS4wlfwSQMB5!CD7h}@UEZGVTX^3Of+u6TG`BrNAbsVv{`n@6poB+G(=g2RIu zpE~+`XaC^9)y<7bC>a_P69d5*8W>0@DRF1YJGy2pZEbFLVhfByXcyC~Xr;St^v2*Y zRK?Z(q{61Ukdc*}OZujZmcGQKpwGQ~B1wh?`3el0r=LAM0jW?%LK5N$l|ARA2}I3^ z7C7CmJI+4gfKCcxI0JMg3^AWRy%7==ygxVkEz-x>#KaLN&KnngeDLxswSiuDOUPZ5Z>8>!weNtJs(?C z?sj4zHMXzM7)L}$L+JTn?C`hY%Mjo&?8NZ@j)dm|cU$4TWRjJ&GYcTg2g9>9iqziW zV%AnyPuSRaavhJrl4&<Gwq{0}bx