- Wallets once again spawn in the satchels in the cabinets in the dorm.

- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it will return that item to your hand

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3610 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/storage.dm

@@ -108,8 +108,10 @@
 	desc = "It's a very robust satchel to wear on your back."
 	icon_state = "satchel"
 
+/obj/item/weapon/storage/backpack/satchel/withwallet
 	New()
 		..()
+		new /obj/item/weapon/storage/wallet/random( src )
 
 /obj/item/weapon/storage/backpack/bandolier
 	name = "bandolier"
@@ -138,6 +140,7 @@
 	desc = "It can hold a few small and personal things."
 	storage_slots = 4
 	icon_state = "wallet"
+	w_class = 2
 	can_hold = list(
 		"/obj/item/weapon/spacecash",
 		"/obj/item/weapon/card",

code/game/objects/closets/secure/personal.dm

@@ -21,7 +21,7 @@
 	..()
 	spawn(4)
 		contents = list()
-		new /obj/item/weapon/storage/backpack/satchel( src )
+		new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
 		new /obj/item/device/radio/headset( src )
 	return
 

code/game/objects/storage/storage.dm

@@ -204,6 +204,19 @@
 
 /obj/item/weapon/storage/attack_hand(mob/user as mob)
 	playsound(src.loc, "rustle", 50, 1, -5)
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(H.l_store == src && !H.get_active_hand())
+			H.put_in_hand(src)
+			H.l_store = null
+			return
+		if(H.r_store == src && !H.get_active_hand())
+			H.put_in_hand(src)
+			H.r_store = null
+			return
+
+	src.orient2hud(user)
 	if (src.loc == user)
 		if (user.s_active)
 			user.s_active.close(user)
@@ -213,7 +226,6 @@
 		for(var/mob/M in range(1))
 			if (M.s_active == src)
 				src.close(M)
-	src.orient2hud(user)
 	src.add_fingerprint(user)
 	return
 

html/changelog.html

@@ -54,6 +54,8 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<ul class="changes bgimages16">
 		<li class="rscdel">Removed hat storage, which was useless.</li>
 		<li class="tweak">Implanting someone now takes 5 seconds, both people need to remain still. Implanting yourself remains instant.</li>
+		<li class="tweak">Wallets once again spawn in the cabinets in the dormitory</li>
+		<li class="tweak">Wallets now fit in pockets</li>
 	</ul>
 </div>