Removed storage.dm from defines and moved the storage item defines to the location of their respective procs.

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

code/game/objects/items/weapons/storage/backpack.dm

@@ -1,32 +1,32 @@
-/obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
-	if (ishuman(usr) || ismonkey(usr)) //so monkeys can take off their backpacks -- Urist
-		var/mob/M = usr
-		if (!( istype(over_object, /obj/screen) ))
-			return ..()
-		if (!(src.loc == usr) || (src.loc && src.loc.loc == usr))
-			return
-		playsound(src.loc, "rustle", 50, 1, -5)
-		if (!( M.restrained() ) && !( M.stat ))
-			switch(over_object.name)
-				if("r_hand")
-					M.u_equip(src)
-					M.put_in_r_hand(src)
-				if("l_hand")
-					M.u_equip(src)
-					M.put_in_l_hand(src)
-			src.add_fingerprint(usr)
-			return
-		if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
-			if (usr.s_active)
-				usr.s_active.close(usr)
-			src.show_to(usr)
-			return
-	return
+/* Backpacks
+ * Contains:
+ *		Backpack
+ *		Backpack Types
+ *		Satchel Types
+ */
+
+/*
+ * Backpack
+ */
+
+/obj/item/weapon/storage/backpack
+	name = "backpack"
+	desc = "You wear this on your back and put items into it."
+	icon_state = "backpack"
+	item_state = "backpack"
+	w_class = 4.0
+	flags = FPRINT|TABLEPASS
+	slot_flags = SLOT_BACK	//ERROOOOO
+	max_w_class = 3
+	max_combined_w_class = 21
 
 /obj/item/weapon/storage/backpack/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	playsound(src.loc, "rustle", 50, 1, -5)
 	..()
 
+/*
+ * Backpack Types
+ */
 
 /obj/item/weapon/storage/backpack/holding
 	name = "Bag of Holding"
@@ -78,7 +78,105 @@
 	max_w_class = 3
 	max_combined_w_class = 400 // can store a ton of shit!
 
+/obj/item/weapon/storage/backpack/cultpack
+	name = "trophy rack"
+	desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
+	icon_state = "cultpack"
+
+/obj/item/weapon/storage/backpack/clown
+	name = "Giggles Von Honkerton"
+	desc = "It's a backpack made by Honk! Co."
+	icon_state = "clownpack"
+	item_state = "clownpack"
+
+/obj/item/weapon/storage/backpack/medic
+	name = "medical backpack"
+	desc = "It's a backpack especially designed for use in a sterile environment."
+	icon_state = "medicalpack"
+	item_state = "medicalpack"
+
+/obj/item/weapon/storage/backpack/security
+	name = "security backpack"
+	desc = "It's a very robust backpack."
+	icon_state = "securitypack"
+	item_state = "securitypack"
+
+/obj/item/weapon/storage/backpack/captain
+	name = "captain's backpack"
+	desc = "It's a special backpack made exclusively for Nanotrasen officers."
+	icon_state = "captainpack"
+	item_state = "captainpack"
+
+/obj/item/weapon/storage/backpack/industrial
+	name = "industrial backpack"
+	desc = "It's a tough backpack for the daily grind of station life."
+	icon_state = "engiepack"
+	item_state = "engiepack"
+
+/*
+ * Satchel Types
+ */
+
+/obj/item/weapon/storage/backpack/satchel
+	name = "leather satchel"
+	desc = "It's a very fancy satchel made with fine leather."
+	icon_state = "satchel"
+
+/obj/item/weapon/storage/backpack/satchel/withwallet
 	New()
 		..()
-		return
+		new /obj/item/weapon/storage/wallet/random( src )
 
+/obj/item/weapon/storage/backpack/satchel_norm
+	name = "satchel"
+	desc = "A trendy looking satchel."
+	icon_state = "satchel-norm"
+
+/obj/item/weapon/storage/backpack/satchel_eng
+	name = "industrial satchel"
+	desc = "A tough satchel with extra pockets."
+	icon_state = "satchel-eng"
+	item_state = "engiepack"
+
+/obj/item/weapon/storage/backpack/satchel_med
+	name = "medical satchel"
+	desc = "A sterile satchel used in medical departments."
+	icon_state = "satchel-med"
+	item_state = "medicalpack"
+
+/obj/item/weapon/storage/backpack/satchel_vir
+	name = "virologist satchel"
+	desc = "A sterile satchel with virologist colours."
+	icon_state = "satchel-vir"
+
+/obj/item/weapon/storage/backpack/satchel_chem
+	name = "chemist satchel"
+	desc = "A sterile satchel with chemist colours."
+	icon_state = "satchel-chem"
+
+/obj/item/weapon/storage/backpack/satchel_gen
+	name = "geneticist satchel"
+	desc = "A sterile satchel with geneticist colours."
+	icon_state = "satchel-gen"
+
+/obj/item/weapon/storage/backpack/satchel_tox
+	name = "scientist satchel"
+	desc = "Useful for holding research materials."
+	icon_state = "satchel-tox"
+
+/obj/item/weapon/storage/backpack/satchel_sec
+	name = "security satchel"
+	desc = "A robust satchel for security related needs."
+	icon_state = "satchel-sec"
+	item_state = "securitypack"
+
+/obj/item/weapon/storage/backpack/satchel_hyd
+	name = "hydroponics satchel"
+	desc = "A green satchel for plant related work."
+	icon_state = "satchel_hyd"
+
+/obj/item/weapon/storage/backpack/satchel_cap
+	name = "captain's satchel"
+	desc = "An exclusive satchel for Nanotrasen officers."
+	icon_state = "satchel-cap"
+	item_state = "captainpack"