From 871666156b7640d152f744c03cdae6b1f96ab6a5 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 15 Dec 2014 19:05:13 -0500 Subject: [PATCH] Icon Fixes --- code/game/objects/items/weapons/handcuffs.dm | 15 +++++++++------ code/game/objects/items/weapons/stunbaton.dm | 10 +++++++++- code/game/objects/items/weapons/weaponry.dm | 8 ++++++++ icons/mob/in-hand/tools.dmi | Bin 5181 -> 5915 bytes 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index c64cff22fdd..813e9fd4517 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -141,9 +141,12 @@ var/last_chew = 0 ..() if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I - var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod - R.use(1) - user.put_in_hands(W) - user << "You wrap the cable restraint around the top of the rod." - del(src) - + if (R.use(1)) + var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod + user.u_equip(src) + user.put_in_hands(W) + user << "You wrap the cable restraint around the top of the rod." + del(src) + else + user << "You need one rod to make a wired rod." + return diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index d7e501ea6e1..2e9ed7b70c9 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -196,4 +196,12 @@ throwforce = 5 stunforce = 5 hitcost = 3750 - slot_flags = null \ No newline at end of file + slot_flags = null + +/obj/item/weapon/melee/baton/cattleprod/update_icon() + if(status) + icon_state = "stunprod_active" + else if(!bcell) + icon_state = "stunprod_nocell" + else + icon_state = "stunprod" \ No newline at end of file diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 71b12cff1f7..43618e46b73 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -167,6 +167,10 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob) ..() if(istype(I, /obj/item/weapon/shard)) var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear + + user.u_equip(I) + user.u_equip(src) + user.put_in_hands(S) user << "You fasten the glass shard to the top of the rod with the cable." del(I) @@ -174,6 +178,10 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob) else if(istype(I, /obj/item/weapon/wirecutters)) var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod + + user.u_equip(I) + user.u_equip(src) + user.put_in_hands(P) user << "You fasten the wirecutters to the top of the rod with the cable, prongs outward." del(I) diff --git a/icons/mob/in-hand/tools.dmi b/icons/mob/in-hand/tools.dmi index f57d831c8c21fb6fe36e632e5a4df6320704ed4d..eba8ad5fb95e985a6e83dadb8d50275a14e1ea96 100644 GIT binary patch literal 5915 zcmcIoXHZk!);svwXAsZyj0FD-y{r3FQh z@+uIdNDD&uo*=s-RdDcGBy4tE|m@YB_0B}a_ zv9cZjK)@jcV4wp#i)Teo!LAQsVB)9j=xhJX#oN!t%M$>C-X`~HF+G<)dwQx?u3dMp zpw6>eT;0dELZ~18ROm`VK74oEl7q=Zyko8v8uwLW+9a#w7KeX(`6A4emTz+nD+*1x z4~c5a5@mAHo%Y`sqM?bxeAU)(Rq-+r?h2lIU7a6jr_9DzWxd2Die03;Juz;vrXYMU zQ1O@b52lx_>O8p%^bN1%t=W3QF7N)ZVtM(>J6fSO@wMJNV%fGS4$s3>*-W$?I=J?^ zG`Q+!NN=KL^(H*+L9kR#k>u{F)v2Xdg_!Ps0N|oiQ@(Ey^mc6`+&yt2f_}XsBnkag z&$5tN#)lzSt{+wkV#L_e(38vM`DGGGomq)oMwY_bs=Y4# zmCs6Rved_gIXuMSGp>UT^{Pposv2Vqnxr z_B_5z3c%Cetm_J=cqH`oC*U84j*V)d!{o~XqJ@BVp}rY?a16|DclD=COx26Qdy&gW zUA0H_KbjaF-(h)+i*yhG3mcorjT^lzklA!?(=6dQZ~4rsjH0CEzx%cyK|4dwcR%H) zGrSLb7!dKCn~q-qO_CKA6`c=YgW0Wr&JpR~5(_9ASW>pK5{Qh7a)j!O7Y?LtuV^JN zAEmJ#!eKD<&uXWPSsV8^asoy_Y;`YuVKpQ&t%`3lhyaraH@JjE%H`F!(Y+8*iBp{k7sLKPK z?8T`!OUq@G&5Fm*z~I^w851MDTKl5k*-M0DsQQjpC#$~+=a+76h>UHM`TTMt+qz*) z>Bxb>Ua#L`_;b#RN00cyfGw_s2(rP}-*4-`iFUsL47B^DKXy=%+!Z`I)BSMBtJ@ub z5P^pl_1K;T5XRgD{tX6kMie2qAkWXLIEho$A>|IgX+Qj5!kpqvKyQJVlkWeIolR^jqhzuJdAw#KY)kI-?L9O{8{c-gxqmc&kqMran7A zAL6pS>~?2kIJG)xFD`r@8hdV;#($ix>T2eZjvQe1$3s5S?+$tmd~9RNQQ7SC0%CiL z6Ew`@lQI}(`hc~C2Bl1s)h!6n!tQ>)stq-L&fGFbJ5*%k3Sd*&`vw7z=D6X3I*Z~t zKG+!}Tj7>y-{GqdUB#?uB2cn{zu%_%|9W-OI+^L(Kl&~x3!QyU_^u=*6!0z6t#sHu zDz={#{3++>Uh!^7cd`s{Zm-L)STe2WOBdTE!YJeUWPBjWiXCz254q&Nk-p~FRdalc zd>z2tv$Bp8L-T%G(l?gjqJ&;0Ew*ZLa;ExkU)4@dwsqRDxVGy-|KQnjQCV60bXyer zC|M+OtaUaGyB?`3SwK5tK`om^UkptHr1gp}MjmsVc4rlJ)=1?*(QX5S$jbam2 z@$k6bKn&3_iXZ4mDbvC>oEK9LoYH=4c4R#->pt@S(nlISgp^rZyYQq3P7 zNOWhia=)_<@FZqE6ZG-X6~=5Z-~Tsc;QvT#@zcN?=cj^w+X>Quj8!;{*`T&kN>>bw zEP(PlHKr`JecDmSO`|m7P~^!+@xct|u3XJw!QKwX;qi}zFr+(3LX(h_-AD zm>#30-6xX5dM#)WZINf3*=jY+Ax2zLD26p+Ts;1Wlb)6DHKD^|<+;0yhYKeXFPNE` zDUG}f8+aXX+$p6~3mttp?;yXm@%3sZlx>cab6sj%-OV>2Dom!3uXs=z8&IQ-*kJ6forL26?7e*mrCQP3flNXp*cve8ubhno|<0>c8rX2NTm`P$Tylh<#duA67@We=V1oA4I{K|5_` zP287X7t_w~b8s63S6iQMBXqAQ`p_Jf8i6kbL7&{l741+n?p6?1bz#tMy81DNrG`#3kmcQPFdJ)b?BRoIoU8o)vJW z^lv6DYc1CUYq5!8`ksrTeU8|YzL1 zKv;$mV!ug37JUglTF$ObH3m`-Gamt{9sH7d@#G6ZnscI(1YY)OZyvYr$Aobsg;~S5 zqrukQw$!z3{B^A5q3YJIWP5MkpMR<>)4R%CCyjzVi}^76{c ztN>%DpC|$XZH)0&9lMyrp(O52H#?lLX`CPx1yLddaU=K_Uou$ZEx{%9U0Uq3M}xCP z2xH=(r{9~VSP~B-HhjYXuo{sKBi96*CudlK8^hzWVLvtWu0<6B%IBIsP}ohq-34?rqq$!E2Lv8JK9P`-##&cvG2#o(O9gyxFlhU(}-WM$A;y| zjTp*vFFo*T+FS4`YekuFlMbNa^yg7gRgKTi&L;R)DI6KC-Ky*`+dY{qZMNbvK=|om zcL6+WYm4TmNB3rFIIHb8d2vh;eph_&ekBHta~oHPuW?IW!QXde7&&49cm)5luo?UX zHDRausYnCp35E|+G@7EzpHaoI{y2{%EPfjpfo%zac#@WuMt!@*_SC@0Z&gBq*(tZm zn=8-WShQA`Us4SJX@pV6G)N{3^suwB0TdJz)Z!fLz7k`?=2JTCu_pFq2r8x$TYG(C zW1(9~`Qoe~4f{V+KmWrecVALNb~(p{j`6ddR9T$a2O~oT79hqA_tC6rDfE<=ykJ*! zyJ;C0c-HoE-pM;WJ*ZL!2%S=bnYmfvDph%}w8Xez0dIjRDUnD5iR|Epu~X@VI!Dc; zTm3!GuI_p=+FBT`&nDD?v5WC7zimDP&LAm!)kG=Z4g6wIdDkv&sDwNoZ}t-hseEdW;%Kl}i$E)xnV_8LU1ZMF}(sq2{I zQmJ&wm!$1W?)4hNnQTVJD;-HwRTCrMH+Fm2112bg_(sJ>MTR|Xgr;0%!Jt!$>63^y zRjfl9$#;WcDz+B(ig+If6t(APT80|BaqyRt%&_FC}o6dMJV}xe(~MJbtJf zEq7pijB9VAXr{O7JzlYqF*sN@H+6RqBPi-#^%;TdS zd>BT^#*{jCPko?UY}HGb<8${bb2|Nm zJ4Zj21!N3F%Xvb7Z#H4hhh(achS^o=Mk&kb-JJtlpJG;Ac zU@#avaG1JWnFbRxzR`S!`Nc+h;b_WI`_-PS_a^V&v*a=`ilG?e&ccs3SbRcBW#Y9P z`;+GFz2UHj<9NH5Cc36BJ;QGnYZufN^pWDupa2w=lzd)Xyh=w$mtdAsR9vYBQphDZ zTo9y3Q}YL15|vyrNgsn8K+pY8$E&Kvl5F+2u{Z9XbIaflmgIib*~K>CY5iw!;g@q+ zH2Kx?xW7aT2258JGFIAptmN(v5&BAo(QiZtx-#4n@rd}aufka`Ag{kWq}1kboA}mB zry#TgRD0*i>m@0e?*(T~4yM#Eg$NtmDB+S6v~bB7=FzdWwKZD4LxyD{>krw1*JK3g zr8d&u~3{x07Jy`qrsV(_E>`016$imQdUjQl)w@5VN#cC^H*#kQeM^($gftU z&Zp7$4-7nyh=@QBC+Rqq?YWn;RUp3Yo2<0)j;*enqAF>-vl!A=r;HF~-xHH}n~fHH z^2eYS7hXNKr#=+=*Icc?bq3I04XmlFiHUT&ID_0V$fNky9<7YIr%3}xw*OGg12tpele6{BuczFJW7zDBH?#IiUy`Yx|J>m-n-0Rnckxm4CBLA z?pFGb-5sxXzYqfx;0T7z?<(9Nb&>a$)`ElMq_5!nTS8K}R5qYP5Kv zjP+v}6H=9m5_S2dwRo@-dRs*~+}ir{*JNXZ*2X@`iZe8Jy;%w$q-C8w)AzqOfUCrp zy^G*o$&#Ipg$dxy>sh^Ry6ZMLPzmz^jZZ8r__kVt#vGX%e{1chK4Z}++v>}GIRC4D z%=Q?A-t{0hXj$;^eaU?o2qCwzfE3o-`S3d0Hw8clNQv1iY+g^hpG|A(-iPB$$IU z$4Gpe1rxbUBr5s$DK=aYXEw{3X|Q%)@9Gn)Q)Ef*N~JamO0f6zLjaS*>J+uOwErw} zW$M?EManQk@1c0@AWaF%U{wFck?0Bi2Cg6a#dgIs5+`0XldL~aXfOeMv6K%VAksdC zlnnX|8T04kb|qqq2iC*)nv#!&uawi0%AHNg4@@%VYR;scF8to128y(@H#U7M zBFH0kWVi6oAmm^AD3CyAqymS%vR39eZ$J2Dgjps^S?{6n|m(#ND56m7nzSdlPbAVU22v+nd5q} zV&G8inT|}5r`f+x$yxL|YFQh0qVIT^)3l*9G~_DQElOnpwSual^#5f4$T6)X&Xtt7 TAYcgo?FQ5yX)BjMu=(R}uGAKw literal 5181 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