From 42fa87c2b2549a538904367e1c16b1e42200aa86 Mon Sep 17 00:00:00 2001
From: "baloh.matevz" <baloh.matevz@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Sat, 11 Feb 2012 21:00:03 +0000
Subject: [PATCH] - Putting a normal or a gold ID card into a wallet now
 properly updates the sprite. The sprite that's chosen is the sprite of the
 card which is first in the list of items. Removing an ID from the wallet also
 properly updates the sprite.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3106 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/obj/storage.dm                  |  15 +++++++++++++--
 code/game/objects/items/weapons/cards_ids.dm |   8 ++++++++
 icons/obj/storage.dmi                        | Bin 41833 -> 41839 bytes
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index 3ff49fc793e..ecdb861cb1e 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -158,11 +158,22 @@
 		"/obj/item/weapon/stamp")
 
 	attackby(obj/item/A as obj, mob/user as mob)
-		if (istype(A, /obj/item/weapon/card/id))
-			icon_state = "walletid"
 		..()
+		update_icon()
 		return
 
+	update_icon()
+		for(var/obj/item/weapon/card/id/ID in contents)
+			if(ID.icon_state == "gold")
+				icon_state = "walletid_gold"
+				return
+			else if(ID.icon_state == "id")
+				icon_state = "walletid"
+				return
+		icon_state = "wallet"
+
+
+
 	proc/get_id()
 		for(var/obj/item/weapon/card/id/ID in contents)
 			if(istype(ID))
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index d5869bdd8b4..8fac0732dac 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -36,6 +36,14 @@ FINGERPRINT CARD
 	src.add_fingerprint(user)
 	return
 
+/obj/item/weapon/card/id/attack_hand(mob/user as mob)
+	var/obj/item/weapon/storage/wallet/WL
+	if( istype(loc, /obj/item/weapon/storage/wallet) )
+		WL = loc
+	..()
+	if(WL)
+		WL.update_icon()
+
 /obj/item/weapon/card/id/verb/read()
 	set name = "Read ID Card"
 	set category = "Object"
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 600c2bf5c6d3599a0641bfe4a7a4cfff259ef525..2362eea8faa070a5284464cca8254b912e16d19c 100644
GIT binary patch
delta 813
zcmV+|1JeBI#scrg0+1veBYIR=bVOxyV{&P5bZKvH004NLotV#V+b|5qkw7AUf9kEx
z$P~FGz|SO2e)=TkviWiU^WmwvdwiI`U@jCxvu<v_Ud?A4GSxNf=6W@sIV9`q?nkLm
zu~|143Urr1cNg=Sp<J4Evz*V`3_b3?zkzYfGnuf}P>?0b2ojo6fh{a(J(Pkx*HSJO
z1eqg++GD7ah$xN<p;C=o3R3ca+{g!hb?yV#>;oB$xS9#eS2BV5D$<aXmp44}=@q_W
z=CxnOOu_Q1ZaoyIAXt`k5R4w$mIXaj<QE?G$%8<!eH;qb42fSY8Tk&6=zZMqUG@Xt
zJB83;=KDd`@$c!$x>^Utr}boA?P)7`+hl-O3hE*AS$Ei#kW(LXtNF}-pog(pH_O|_
z^7h}yN`h0`zL`9_ST2@}cR6*2ir51$<q2OB<nDyDzP(F%GA*xy3CtI$GgN*gIzz>n
zkhkX^4QcSQuv1tRJ%b^r6we?<aSLjTkY!a*VNvwBk_Fy#(uxm5K8F>>_K+<q3cL><
zNHG`_hE^UoCJd5o;Eg_iVFw@3{MtB>0^{A2B2PHB_dkYk`+*@$w$hCFDsX~5CmQ+&
zA;lmQ)PxnqP991Rve*;$Jh7fdi(o^gd+vzeQ46$!RS2zQQ-k&sTN<>V-Ov;%&)43?
z3<6Km8Ip>TKQro#m;?geI1)(4ML)`pK2RND;kg=nKCOvCCJ#4%njB^7e?vtI)jn>5
z=!V);pkOudJwKA??DwJ?3hE(K9c2Z_fTI%FsX<RKm`7QI|Du2O;Jrj%hJrm^HFtVb
zId&);Q_WDEhAfciffSADNN>>dhxsxFLt4^K43<zfe5l$X-)#lKL{9>9s2Pe=V4ty1
zb(G^pH1#9i3vSbYN4OmXp?%byirX(@QXG*#{d5$p@McQY!S6wEt<!{|Mj!2|A$<RE
zft>nG&Ba&2-7}!hF~pv<;9{T$U*$_tVnCMKs=)Gl`yO0MLH;kA4S0{dSL`r>jt}6o
rji+tmvble{YwjK&=6?WN7eE&K1yZX303ZNKL_t(|oa~*mRs$2D7^{Si

delta 795
zcmV+$1LXYg#scZa0+1ve9ePw)bVOxyV{&P5bZKvH004NLotVvT+b|5rkw7AUANAH|
zWC~wm;3twM|01PaHb3rvK0Gydj}P+~%!OiT*3He=tNCn0rn+X`T(9Ochh$ydy_5<S
zn{{)cKz9jrcQKzC%B5L1%lWL$(Btm+8yL4dlL=c51zD1ez@Zrx*usL=Ln+8}E#*={
z;5kyLJ%%c=h+?Y{D%H59ASKU#wS3@L=PtNr7i2KvXeKNl$pq%3NJCCup76-KSNMvV
z*M1o@1<R|t^-!FGU|G^ZFnVZP7W7b&-+0s~4+6pVaVS_bB!0JK<TE^?_i@8#*$;f~
z6heoY&j(q@f2SwwY8@2s){}L$r>)>?lL1~SsE5pZ-C<WkPJPU+<}-tT9>!+fEN>Uf
z+kcmp1gErpGg-P=E|!aTK6QqQ*aI)+311TA?u4|yy>ofeEw6$J%m=75RK6rSL&cbo
zZ_hm%(%@xgr?AL+218IOo<WN27St9Y%c7pbBI|J_GrZ@d5g&?t4lA<lAzM@w_&#_b
z#b8VrTDjerFi6J08-1dG9ehCZd*eU~8t<MI^@L-3|I-j|KWGS(QJN871)X5eiHg2K
zNHNF+HDN`zlZVoS%=UymPpoIrBG^#ro;%_vYJpa;3!#+^HE2IE(xCn9KvSeVAA1)w
z2zrvvkW`HPnNerNBoOe%kw7vo`cZcDf$9hg&(+xTZcPj_dAQMk<S0}B8!A$$_Hh$L
zH`Ja21*?J2`H?(l-iu-=sE15-lm#3Ej!Mu@4SIUPJjxRM7yYXT?<Mjw6zu7!xzn4<
zu|rvzYKG!8WPwBvq^L|sdV`)n%$G43(voyyu!OSWL)8xXY%2&RdJ;5;nxQxa_8I$B
zM>$?ZRX^gr;5L12gxf)2+DF}~xcwp~#TNO~Pe;KDZ>Cfo{2m0?I!zdA^wFLw!uJn1
z$f;-ATznPWJp<|-L+nWlE(Ut=RlXG^4aibk6<B_@@4=-M<o}}CfcMDviXA4<F$Z2Y
Z_fL1t-Q&aj4*~T)5$jP&wX;wIAD|1-d(Qv>