From d67a84e5952575f7ab02ccc1a9264f47a7bfdd47 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Tue, 7 Dec 2010 02:59:19 +0000 Subject: [PATCH] Changed the suit storage HUD icon to match the belt's icon Items that would be visible on your belt are visible on your suit storage git-svn-id: http://tgstation13.googlecode.com/svn/trunk@558 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/human/hud.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 9 +++++++-- icons/mob/belt.dmi | Bin 1722 -> 1727 bytes icons/mob/belt_mirror.dmi | Bin 0 -> 1725 bytes 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 icons/mob/belt_mirror.dmi diff --git a/code/modules/mob/living/carbon/human/hud.dm b/code/modules/mob/living/carbon/human/hud.dm index eaa70801cdb..59bb711b257 100644 --- a/code/modules/mob/living/carbon/human/hud.dm +++ b/code/modules/mob/living/carbon/human/hud.dm @@ -209,7 +209,7 @@ using = new src.h_type( src ) using.name = "suit storage" using.icon = ui_style - using.icon_state = "pocket" + using.icon_state = "belt" using.screen_loc = ui_sstore1 using.layer = 19 src.other += using diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 39fb3a9862d..296a9f6cbfc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1161,6 +1161,13 @@ src.overlays += image("icon" = 'belt.dmi', "icon_state" = text("[][]", t1, (!( src.lying ) ? null : "2")), "layer" = MOB_LAYER) src.belt.screen_loc = ui_belt + if (src.s_store) + var/t1 = src.s_store.item_state + if (!t1) + t1 = src.s_store.icon_state + src.overlays += image("icon" = 'belt_mirror.dmi', "icon_state" = text("[][]", t1, (!( src.lying ) ? null : "2")), "layer" = MOB_LAYER) + src.s_store.screen_loc = ui_sstore1 + if ((src.wear_mask && !(src.wear_mask.see_face)) || (src.head && !(src.head.see_face))) // can't see the face if (src.wear_id && src.wear_id.registered) src.name = src.wear_id.registered @@ -1181,8 +1188,6 @@ if (src.r_store) src.r_store.screen_loc = ui_storage2 - if (src.s_store) - src.s_store.screen_loc = ui_sstore1 if (src.back) var/t1 = src.back.icon_state diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi index b1c7aa4d3b8faaafdd4a33e6efb2d22bebdaba44..1b5d1741ce46f3253b31b173555035fc9f65399a 100644 GIT binary patch delta 1204 zcmV;l1WWt64ZjVr90GriNkl;?GN&}SH?4LCn|d4y3G zUKwP6_;!3aemfLTf@9kZ{dRE6%(XrvtUNWuL)#R~4!GkE4z+*n;BnS@!_cj#Q>oKP z>rM>Qat8M^GzL5rA}Ia-SC^3(rtK+W@s_)TJqH5-00000003~i(@jnDS$hTX>0FGl z(lnppy!M12%K<;mxsH-02i&r>)2SSAxoJL=7TBi@W7Tg?=Cq7MzNntx($n3296?Js z|u*zRQ0&f-07KIspIx000000L zX;RHo?%@0u1poj500000fCbBx-mJQGGO4w+XgJp+tTkt@4V%-Fm1RMI?WJ46ZPo*> zUYcu88_s{3SFoYFuyLUJ>s)QlTs!>-Tqnyf*L{GEAy-|gIx`F)cLdyfy1O{QzMtT~ z0RjX7000000D$|YZXhWNu(5RLlxWUe8#YhvbP5&_mJT(QSDnuF2y4xmYs2QWD8SQW zuz-=O{~qhJ)S6F^)k|~DX;FZudEP?7>s)QlT-$%}7EPKd!0i%XQWRi#hEf-vp%Wi5 zn{e~S#f|fy};Yu z!3+5om8V2==Gw41w2%PTs~+H7XXs`L5C8xG0DzVF-g^Pi!bY9gbMFOg+_QkECEsb; zz>|M^mhYq*;(ht?GQ&a^=yFx<&`|mEyOcE z0l!}Ts6K*UennT@N0-anr-=d%cW|sJyK<-I;Q!X~*AA{8QJ1&N+xs=YTLb?5{kQ87 zr3pSp|I_g=&EXD?WCMO}o2E8PE#Wxe-@ktrum1=s2>7E9A#XaMC_#?|lZZJ^aHV=rBUSDL?hfay z!}<7dJReH$)cxUb+#e6c_CJG^+A3pzHZT2;VCgr<;q@BuYx#}3|0Nux)KnY$>fs?+ zUvK%-=VkYWI`rBgUvJvo!w&8%JcBH|TY13oQ$%n1r-;s?=iuJfnkxXXM*jk56Ca8e S5v@D`0000vGyi5C%{{#$X&f;L5)Lt1iB*Ykx%3V_MQk z;+(1^Rq45iPs3PA#$>Yr000000H(EVeF1B?t7y}8xjC}^7wsWz(RImyvi;);Zmj*R z(cf)%5Btac!>)HH*w@V8as|hI%PlJA9`*h|RaX0=>?So&5wkbv73?_}000000001h+Z}EyO=s!nix0=%7z?H8 zbjPJ9{L~-t)0EfIXU+lFT-xE#A8>zZI-?(vzgaix!OS5X=CR55D(5%%bT{u?&>S}T ze%-OSJcoopLX*b^iq%0c*VibNv@^ zK5W?mTfv$BHA6oqr%$N7w+j!rndjQ$tMd%_^d&hs0000000000ELGd%iL0Nz>i>sd z>Fg7IHsb2nQ0v+6;3YPmz3mC+d!8Kt000000001h8#sUZl~fL}^7L=ere(Rg;`McP z0cRsvbi#wI(A*@mUBQFgnjuzbYL130IPBP^GoIu-D1yrjUq!Bee>n^=pYT8{G@K?? z9&-ifmnZ-L00000007Kb=IG6$k4`4l9xdvQiN~bf!0CHQvy{Eg018n;V{wp9r z000000002EU(O9AMFCbG9Xce+nZ99pY==W|0pZc1s^e9MV>!Z7Iny^Rr$qrCo`MS) z==9%Hd6rW7@Ko%YE2l*P9;SH<1^2mF&h)K#iza_f6ySOZFewT!+(Rh~_t25InAH;? z000000000B=AXTj(x(S0o5|_H^%^L^d;I|B=ZU@pAUY-=d_3fMV`s$yPIQCUyMkx( zEh^86a;9%s4$UOM;s9~Xw?4|VutlW!$$0gr!S-_)u zk?((~D&l?p{W`&g%+Tqo*r4L%%dd*%`+6QF;MWhSA^v;)vxkN3Ze5)4cSOK4} zeit9XPoL5CuA|fG@?oTa!xbE>%C5grb?|>{__>0MTh!@ty1ZTUyEWjC-@jak=$qhu z^zVj$DTgaKk`4G=H%)1lQo?b-U%&SDe-D2t2>88C&j4?4{nu8fF5upsvU2k%H!B4k zY!PFdXa%Rc2LaFbF>!!^b6>^>33$Fw;sbn%Af!J zT&V9SxtKMo3^*E~YL>fH6<{%+itz3@-vI)SPbmM@nIU;@Gd}V|niAVmaztyu8?Ucicbj zkGsBi>UOu=Z}+?2`u8AxwZhmR<+=Y6EdA!#ov#6(``@VBPvIbarPA0}kB`CiwU*y~ zUN=8Dhh7@w=cUa(tl+l7J-E4r2OK9qMYNWGifAl)4sLC!xdH%7^e=iTAByX N002ovPDHLkV1mjsO@{yg diff --git a/icons/mob/belt_mirror.dmi b/icons/mob/belt_mirror.dmi new file mode 100644 index 0000000000000000000000000000000000000000..43404ef2426fee69d17a690f2c004f1f8adc7fed GIT binary patch literal 1725 zcmV;u215CXP)*_YHDhLfPlcj!2kdM0RR6A@9$fFDZ*Bkpc$~eK z%Wi`(6hznX6)4$P<&kAKRiY}3<`<9)Cb%^w!lrHd^);jskBHv!COZ=ykLP-P9j}Au z-OK(EY+v{OCvUWix z0i|W%n5pSK%_P%WWa*6lPm^By#OZ}C1D%RAM9xJTK~xM;A!aPXuoyqH<60?ngQE@x z5*&>k%5re9abST2hRPgRAhMwofzU=U9oqcv0vwmT+!$I+FfMO!1JFlSQokD~>Jdbih3O+OBA!39O#YP&$^ithv000DxNkljdrp z|LQo)1OrUP$NGt;B%cGc1LMUM}4Pj zHQs`v6+Fry?XID==iz#-xAOV`=}T+a z#qmqI^`wtC&R_+H{r5b+`WzjeT|~fROyFw4=rag7^gPA{T3JHClO|vQ000000001( zu&(ddT>j{rt}ig{JNk`Y-n#fT)O++hxWvw*Px=t^qDKb+000000002s3XXmyl>@9i z{TtNjS=?Q5ew(_0vk}ZX;Zas-Zji~Y;8AYP7%Mb2M#mK#Hr%8$zR5Qzf@y|Vk!wF( z90r(Ac%&5?4wEWwxq|ac6aWAK00000046MR^k&vaCzEQA7HtmY2usD8wqbEv@?=>M zVExgp;4;er7n|ma(>9099jrKASlLneJ{OBKZQH-#I(htZ-W%8$a;Gbu&I|*{Z2|Y5 z?kWzj?;HFVK!5-M000000C2yY8%T-*tUNljPZVd`hQ+Pz_rV0hqeE54tM-R-gr(w4 z+pst-3UL1vOkkwbe^2F6O2zx9V$)o4S`^^^HXotjJ{OBKZ7V*aNjC~`xdfOL1sLw3 zl!bd}<1J?K1PA~C00000z>N84@1*qULCPj_dT_Z$3h-WE!2EopZvaHcV0dXaBa74e>ao^CLa2|8XBD^#3(`BAZaPv<59pFX6z`1ktDF)R#2YXkoH z``1esLj%0`{$248#o-E$WCK3e4O1GWlyDsI*Pny!-$M!ley=mo!Q0#L-0IW?Jh)R< zZXV@orGSGiqO}{X;B@mK;ORalju3F}$M`4#PxncDgdcKAmG>vC_VO~x|DV@CU;qFB z005}+>p#C2%6B)J%o0@w9Cc7N%3Z1ou$WIpcz2xd2m#0O-E+Qiz?ZThAOV-e0k3{n zb&;vCWL9v}IwH T@O%|v00000NkvXXu0mjfUoa>q literal 0 HcmV?d00001