Crayon boxes are now storage items. I have no idea why they weren't storage items to being with but now they are.

6 storage slots, can only hold crayons. Icon_state is properly updated when crayons are taken out as well as when crayons are put in.

Updated uterus and 2.0.8 with the new type path, which is /obj/item/weapon/storage/crayonbox

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

code/game/objects/storage/storage.dm

@@ -97,7 +97,7 @@
 	return
 
 //This proc is called when you want to place an item into the storage item.
-/obj/item/weapon/storage/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob)
 	..()
 	if(isrobot(user))
 		user << "\blue You're a robot. No."

code/game/objects/toys.dm

@@ -2,7 +2,7 @@
 //CONTAINS
 CRAYONS
 --------*/
-/obj/item/toy/crayonbox/New()
+/obj/item/weapon/storage/crayonbox/New()
 	..()
 	new /obj/item/toy/crayon/red(src)
 	new /obj/item/toy/crayon/orange(src)
@@ -12,13 +12,13 @@ CRAYONS
 	new /obj/item/toy/crayon/purple(src)
 	updateIcon()
 
-/obj/item/toy/crayonbox/proc/updateIcon()
+/obj/item/weapon/storage/crayonbox/proc/updateIcon()
 	overlays = list() //resets list
 	overlays += image('crayons.dmi',"crayonbox")
 	for(var/obj/item/toy/crayon/crayon in contents)
 		overlays += image('crayons.dmi',crayon.colourName)
 
-/obj/item/toy/crayonbox/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/weapon/storage/crayonbox/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W,/obj/item/toy/crayon))
 		switch(W:colourName)
 			if("mime")
@@ -27,38 +27,12 @@ CRAYONS
 			if("rainbow")
 				usr << "This crayon is too powerful to be contained in this box."
 				return
-			else
-				usr << "You add the crayon to the box."
-				user.u_equip(W)
-				W.loc = src
-				if ((user.client && user.s_active != src))
-					user.client.screen -= W
-				W.dropped(user)
-				add_fingerprint(user)
-				updateIcon()
-				return
-	else
-		..()
+	..()
+	updateIcon()
 
-/obj/item/toy/crayonbox/attack_hand(mob/user as mob)
-	if(user.r_hand == src || user.l_hand == src)
-		if(!contents.len)
-			user << "\red You're out of crayons!"
-			return
-		else
-			var/crayon = pick(contents)
-			user.contents += crayon
-			if(user.hand)
-				user.l_hand = crayon
-			else
-				user.r_hand = crayon
-			crayon:layer = 20
-			user << "You take the [crayon:colourName] crayon out of the box."
-			updateIcon()
-	else
-		return ..()
-	icon_state = "crayonbox[contents.len]"
-	return
+/obj/item/weapon/storage/crayonbox/attack_hand(mob/user as mob)
+	updateIcon()
+	..()
 
 /obj/item/toy/crayon/red
 	icon_state = "crayonred"
@@ -160,6 +134,14 @@ CRAYONS
 	else
 		..()
 
+/obj/item/toy/crayon/attack_hand(mob/user as mob)
+	var/obj/item/weapon/storage/crayonbox/CB
+	if(istype(src.loc, /obj/item/weapon/storage/crayonbox))
+		CB = src.loc
+	..()
+	if(CB)
+		CB.updateIcon()
+
 /obj/effect/decal/cleanable/crayon
 	name = "rune"
 	desc = "A rune drawn in crayon."