There were a bunch of boxes that had their own special code when they all do the same thing. So I've merged them into proper storage items.

Boxes affected:
- Donut boxes
- Egg cartons
- Candle packs
- Match boxes
- Snap pop boxes
- Monkey cube boxes

Items I didn't merge:
- Pizza boxes
- Cigarette packs

Pizza boxes are a whole new kind of 'special snowflake code' that is best left the way it is. Cigarette packs involve some stuff I'm unfamiliar with so that can wait until I learn what I need to learn.

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

code/defines/obj/supplypacks.dm

@@ -27,7 +27,7 @@
 					"/obj/item/weapon/reagent_containers/food/snacks/flour",
 					"/obj/item/weapon/reagent_containers/food/drinks/milk",
 					"/obj/item/weapon/reagent_containers/food/drinks/milk",
-					"/obj/item/kitchen/egg_box",
+					"/obj/item/weapon/storage/fancy/egg_box",
 					"/obj/item/weapon/reagent_containers/food/condiment/enzyme",
 					"/obj/item/weapon/reagent_containers/food/snacks/grown/banana",
 					"/obj/item/weapon/reagent_containers/food/snacks/grown/banana",
@@ -38,7 +38,7 @@
 
 /datum/supply_packs/monkey
 	name = "Monkey crate"
-	contains = list ("/obj/item/weapon/monkeycube_box")
+	contains = list ("/obj/item/weapon/storage/monkeycube_box")
 	cost = 20
 	containertype = "/obj/structure/closet/crate/freezer"
 	containername = "Monkey crate"

code/defines/obj/toy.dm

@@ -334,6 +334,7 @@
 	desc = "Wow!"
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snappop"
+	w_class = 1
 
 	throw_impact(atom/hit_atom)
 		..()
@@ -359,31 +360,6 @@
 			playsound(src, 'snap.ogg', 50, 1)
 			del(src)
 
-/obj/item/toy/snappopbox
-	name = "snap pop box"
-	desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
-	icon = 'icons/obj/toy.dmi'
-	icon_state = "spbox"
-	var/amount = 8
-
-	attack_hand(mob/user as mob, unused, flag)
-		add_fingerprint(user)
-
-		if(user.r_hand == src || user.l_hand == src)
-			if(amount>0)
-				user.put_in_active_hand( new /obj/item/toy/snappop(src) )
-				user << "You take a snap pop out of the box."
-				amount--
-			else
-				user << "There are no snap pops left in the box."
-		else
-			..()
-
-		return
-
-	attack_paw(mob/user as mob)
-		return attack_hand(user)
-
 /obj/item/toy/waterflower
 	name = "Water Flower"
 	desc = "A seemingly innocent sunflower...with a twist."

code/defines/obj/vending.dm

@@ -139,7 +139,7 @@
 	name = "cigarette machine"
 	desc = "If you want to get cancer, might as well do it in style"
 	icon_state = "cigs"
-	product_paths = "/obj/item/weapon/cigpacket;/obj/item/weapon/matchbox;/obj/item/weapon/lighter/random"
+	product_paths = "/obj/item/weapon/cigpacket;/obj/item/weapon/storage/matchbox;/obj/item/weapon/lighter/random"
 	product_amounts = "10;10;4"
 	product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!"
 	vend_delay = 34
@@ -205,7 +205,7 @@
 	req_access_txt = "1"
 	product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/grenade/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut/normal;/obj/item/weapon/storage/box/evidence"
 	product_amounts = "8;4;5;12;6"
-	product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/kitchen/donut_box"
+	product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/weapon/storage/fancy/donut_box"
 	product_hideamt = "2;2"
 	product_ads = "Crack capitalist skulls!;Beat some heads in!;Don't forget - harm is good!;Your weapons are right here.;Handcuffs!;Freeze, scumbag!;Don't tase me bro!;Tase them, bro.;Why not have a donut?"