- In preparation of fixing issue 585, which extends far further than just the things listed there, as well as to standardize the many incarnations of satchel-type code (pill boxes, mining satchels, hydroponics satchels, etc.) I have added some functions to storage type items:

New variables:
var/use_to_pickup = if 1, the storage item also works like satchels, which means you can use it on something else to pick it up.
var/display_contents_with_number = if 1, the items in the storage item are grouped by type with the number of items being displayed. See the screenshot.
var/allow_quick_empty = if 1 on creation, it adds a verb that allows you to empty the item with one click
var/allow_quick_gather = if 1 on creation, it adds a verb which allows you to switch between pick-up methods. one-per-click or all-on-tile. Same as satchels worked. use_to_pickup must be 1 for any of that to matter.
var/collection_mode = 1;  //0 = pick one at a time, 1 = pick all on tile

New procs:
/obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0)
- Returns 0 or 1, depending on whether the item W can be inserted
/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj)
- Inserts the item into the storage item and calls all the procs it needs to. Doesn't check whether the item can fit tho, tha'ts what can_be_inserted() is for.
/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location)
- Removes item W from the storage object and sets it's loc to new_location or get_turf(src) if one is not provided.
/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj)
- Called after the object has been removed from the storage item S. The object's loc is already set to the new one.
/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj)
- Called after the object has been inserted into the storage item S. The object's loc is already set to S.

I made satchels work on this new code. The rest will be added to it soon. See the screenshot.

Screenshot:
http://www.kamletos.si/new%20satchels.png

This is yet another big change and it is very possible that bugs will come from it. Please report them to me or on the tracker.

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

code/defines/obj/storage.dm

@@ -578,3 +578,22 @@
 			R.amount = R.max_amount
 
 	return
+
+
+/obj/item/weapon/storage/satchel
+	name = "Mining Satchel"
+	desc = "This little bugger can be used to store and transport ores."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "satchel"
+	w_class = 3
+	storage_slots = 30
+	max_combined_w_class = 100 //Doesn't matter what this is
+	use_to_pickup = 1
+	max_w_class = 3
+	display_contents_with_number = 1
+	allow_quick_empty = 1
+	allow_quick_gather = 1
+
+	can_hold = list(
+		"/obj/item/weapon/ore"
+	)

code/game/jobs/job/civilian.dm

@@ -152,11 +152,11 @@
 		if(H.backbag == 1)
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H), slot_r_hand)
 			H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_l_hand)
-			H.equip_to_slot_or_del(new /obj/item/weapon/satchel(H), slot_l_store)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/satchel(H), slot_l_store)
 		else
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(H.back), slot_in_backpack)
 			H.equip_to_slot_or_del(new /obj/item/weapon/crowbar(H), slot_in_backpack)
-			H.equip_to_slot_or_del(new /obj/item/weapon/satchel(H), slot_in_backpack)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/satchel(H), slot_in_backpack)
 		return 1
 
 

code/game/objects/items/item.dm

@@ -15,6 +15,14 @@
 /obj/item/proc/pickup(mob/user)
 	return
 
+// called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called.
+/obj/item/proc/on_exit_storage(obj/item/weapon/storage/S as obj)
+	return
+
+// called when this item is added into a storage item, which is passed on as S. The loc variable is already set to the storage item.
+/obj/item/proc/on_enter_storage(obj/item/weapon/storage/S as obj)
+	return
+
 // called after an item is placed in an equipment slot
 // user is mob that equipped it
 // slot uses the slot_X defines found in setup.dm
@@ -91,17 +99,8 @@
 /obj/item/attack_hand(mob/user as mob)
 	if (!user) return
 	if (istype(src.loc, /obj/item/weapon/storage))
-		for(var/mob/M in range(1, src.loc))
-			if (M.s_active == src.loc)
-				if (M.client)
-					M.client.screen -= src
-		if(istype(src.loc, /obj/item/weapon/storage/backpack/santabag))
-			if(src.loc.contents.len < 5)
-				src.loc.icon_state = "giftbag0"
-			else if(src.loc.contents.len >= 5 && src.loc.contents.len < 15)
-				src.loc.icon_state = "giftbag1"
-			else if(src.loc.contents.len >= 15)
-				src.loc.icon_state = "giftbag2"
+		var/obj/item/weapon/storage/S = src.loc
+		S.remove_from_storage(src)
 
 	src.throwing = 0
 	if (src.loc == user)
@@ -155,6 +154,22 @@
 	return
 
 /obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob)
+
+	if(istype(W,/obj/item/weapon/storage))
+		var/obj/item/weapon/storage/S = W
+		if(S.use_to_pickup)
+			if(!S.can_be_inserted(src))
+				return
+			if(S.collection_mode) //Mode is set to collect all items on a tile and we clicked on a valid one.
+				if(isturf(src.loc))
+					for(var/obj/item/I in src.loc)
+						if(I != src) //We'll do the one we clicked on last.
+							if(!S.can_be_inserted(src))
+								continue
+							S.handle_item_insertion(I)
+			S.handle_item_insertion(src)
+
+
 	return
 
 /obj/item/proc/attack(mob/living/M as mob, mob/living/user as mob, def_zone)

code/game/objects/storage/storage.dm

@@ -8,6 +8,11 @@
 	var/storage_slots = 7 //The number of storage slots in this container.
 	var/obj/screen/storage/boxes = null
 	var/obj/screen/close/closer = null
+	var/use_to_pickup	//Set this to make it possible to use this item in an inverse way, so you can have the item in your hand and click items on the floor to pick them up.
+	var/display_contents_with_number	//Set this to make the storage item group contents of the same type and display them as a number.
+	var/allow_quick_empty	//Set this variable to allow the object to have the 'empty' verb, which dumps all the contents on the floor.
+	var/allow_quick_gather	//Set this variable to allow the object to have the 'toggle mode' verb, which quickly collects all items from a tile.
+	var/collection_mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	w_class = 3.0
 	var/foldable = null	// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
 
@@ -26,6 +31,8 @@
 	return L
 
 /obj/item/weapon/storage/proc/show_to(mob/user as mob)
+	if(user.s_active)
+		user.s_active.hide_from(user)
 	for(var/obj/item/weapon/mousetrap/MT in src)
 		if(MT.armed)
 			for(var/mob/O in viewers(user, null))
@@ -77,43 +84,82 @@
 	return
 
 //This proc draws out the inventory and places the items on it. It uses the standard position.
-/obj/item/weapon/storage/proc/standard_orient_objs(var/rows,var/cols)
+/obj/item/weapon/storage/proc/standard_orient_objs(var/rows, var/cols, var/list/obj/item/display_contents)
 	var/cx = 4
 	var/cy = 2+rows
 	src.boxes.screen_loc = "4:16,2:16 to [4+cols]:16,[2+rows]:16"
-	for(var/obj/O in src.contents)
-		O.screen_loc = "[cx]:16,[cy]:16"
-		O.layer = 20
-		cx++
-		if (cx > (4+cols))
-			cx = 4
-			cy--
+
+	if(display_contents_with_number)
+		for(var/datum/numbered_display/ND in display_contents)
+			ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
+			ND.sample_object.maptext = "<font color='white'>[(ND.number > 1)? "[ND.number]" : ""]</font>"
+			ND.sample_object.layer = 20
+			cx++
+			if (cx > (4+cols))
+				cx = 4
+				cy--
+	else
+		for(var/obj/O in contents)
+			O.screen_loc = "[cx]:16,[cy]:16"
+			O.maptext = ""
+			O.layer = 20
+			cx++
+			if (cx > (4+cols))
+				cx = 4
+				cy--
 	src.closer.screen_loc = "[4+cols+1]:16,2:16"
 	return
 
+/datum/numbered_display
+	var/obj/item/sample_object
+	var/number
+
+	New(obj/item/sample as obj)
+		if(!istype(sample))
+			del(src)
+		sample_object = sample
+		number = 1
+
 //This proc determins the size of the inventory to be displayed. Please touch it only if you know what you're doing.
 /obj/item/weapon/storage/proc/orient2hud(mob/user as mob)
+
+	var/adjusted_contents = contents.len
+
+	//Numbered contents display
+	var/list/datum/numbered_display/numbered_contents
+	if(display_contents_with_number)
+		numbered_contents = list()
+		adjusted_contents = 0
+		for(var/obj/item/I in contents)
+			var/found = 0
+			for(var/datum/numbered_display/ND in numbered_contents)
+				if(ND.sample_object.type == I.type)
+					ND.number++
+					found = 1
+					break
+			if(!found)
+				adjusted_contents++
+				numbered_contents.Add( new/datum/numbered_display(I) )
+
 	//var/mob/living/carbon/human/H = user
 	var/row_num = 0
 	var/col_count = min(7,storage_slots) -1
-	if (contents.len > 7)
-		row_num = round((contents.len-1) / 7) // 7 is the maximum allowed width.
-	src.standard_orient_objs(row_num,col_count)
+	if (adjusted_contents > 7)
+		row_num = round((adjusted_contents-1) / 7) // 7 is the maximum allowed width.
+	src.standard_orient_objs(row_num, col_count, numbered_contents)
 	return
 
-//This proc is called when you want to place an item into the storage item.
-/obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob)
-	..()
-	if(isrobot(user))
-		user << "\blue You're a robot. No."
-		return //Robots can't interact with storage items.
+//This proc return 1 if the item can be picked up and 0 if it can't.
+//Set the stop_messages to stop it from printing emssages
+/obj/item/weapon/storage/proc/can_be_inserted(obj/item/W as obj, stop_messages = 0)
+	if(!istype(W)) return //Not an item
 
 	if(src.loc == W)
-		return //Means the item is already in the storage item
-
+		return 0 //Means the item is already in the storage item
 	if(contents.len >= storage_slots)
-		user << "\red The [src] is full, make some space."
-		return //Storage item is full
+		if(!stop_messages)
+			usr << "\red The [src] is full, make some space."
+		return 0 //Storage item is full
 
 	if(can_hold.len)
 		var/ok = 0
@@ -122,16 +168,94 @@
 				ok = 1
 				break
 		if(!ok)
-			user << "\red This [src] cannot hold [W]."
-			return
+			if(!stop_messages)
+				usr << "\red This [src] cannot hold [W]."
+			return 0
 
 	for(var/A in cant_hold) //Check for specific items which this container can't hold.
 		if(istype(W, text2path(A) ))
-			user << "\red This [src] cannot hold [W]."
-			return
+			if(!stop_messages)
+				usr << "\red This [src] cannot hold [W]."
+			return 0
 
 	if (W.w_class > max_w_class)
-		user << "\red This [W] is too big for this [src]"
+		if(!stop_messages)
+			usr << "\red This [W] is too big for this [src]"
+		return 0
+
+	var/sum_w_class = W.w_class
+	for(var/obj/item/I in contents)
+		sum_w_class += I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it.
+
+	if(sum_w_class > max_combined_w_class)
+		if(!stop_messages)
+			usr << "\red The [src] is full, make some space."
+		return 0
+
+	if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage)))
+		if(!istype(src, /obj/item/weapon/storage/backpack/holding))	//bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm.
+			if(!stop_messages)
+				usr << "\red The [src] cannot hold [W] as it's a storage item of the same size."
+			return 0 //To prevent the stacking of same sized storage items.
+
+	return 1
+
+//This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted()
+/obj/item/weapon/storage/proc/handle_item_insertion(obj/item/W as obj)
+	if(!istype(W)) return
+	if(usr)
+		usr.u_equip(W)
+		usr.update_icons()	//update our overlays
+	W.loc = src
+	W.on_enter_storage(src)
+	if(usr)
+		if (usr.client && usr.s_active != src)
+			usr.client.screen -= W
+		W.dropped(usr)
+		add_fingerprint(usr)
+
+		if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
+		for(var/mob/M in viewers(usr, null))
+			if (M == usr)
+				usr << "\blue You put the [W] into [src]."
+			else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
+				M.show_message("\blue [usr] puts [W] into [src].")
+			else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
+				M.show_message("\blue [usr] puts [W] into [src].")
+
+		src.orient2hud(usr)
+		if(usr.s_active)
+			src.show_to(usr)
+
+//Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
+/obj/item/weapon/storage/proc/remove_from_storage(obj/item/W as obj, atom/new_location)
+	if(!istype(W)) return
+	for(var/mob/M in range(1, src.loc))
+		if (M.s_active == src.loc)
+			if (M.client)
+				M.client.screen -= src
+
+	if(new_location)
+		W.loc = new_location
+	else
+		W.loc = get_turf(src)
+
+	if(usr)
+		src.orient2hud(usr)
+		if(usr.s_active)
+			src.show_to(usr)
+	if(W.maptext)
+		W.maptext = ""
+	W.on_exit_storage(src)
+
+//This proc is called when you want to place an item into the storage item.
+/obj/item/weapon/storage/attackby(obj/item/W as obj, mob/user as mob)
+	..()
+	if(isrobot(user))
+		user << "\blue You're a robot. No."
+		return //Robots can't interact with storage items.
+
+	if(!can_be_inserted(W))
 		return
 
 	if(istype(W, /obj/item/weapon/tray))
@@ -141,52 +265,13 @@
 				user << "\red The tray won't fit in [src]."
 				return
 			else
-
 				W.loc = user.loc
 				if ((user.client && user.s_active != src))
 					user.client.screen -= W
 				W.dropped(user)
 				user << "\red God damnit!"
 
-	var/sum_w_class = W.w_class
-	for(var/obj/item/I in contents)
-		sum_w_class += I.w_class //Adds up the combined w_classes which will be in the storage item if the item is added to it.
-
-	if(sum_w_class > max_combined_w_class)
-		user << "\red The [src] is full, make some space."
-		return
-
-	if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage)))
-		if(!istype(src, /obj/item/weapon/storage/backpack/holding))	//bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm.
-			user << "\red The [src] cannot hold [W] as it's a storage item of the same size."
-			return //To prevent the stacking of the same sized items.
-
-	user.u_equip(W)
-	user.update_icons()	//update our overlays
-	W.loc = src
-	if ((user.client && user.s_active != src))
-		user.client.screen -= W
-	W.dropped(user)
-	add_fingerprint(user)
-
-	if(istype(src, /obj/item/weapon/storage/backpack/santabag)) // update the santa bag icon
-		if(contents.len < 5)
-			src.icon_state = "giftbag0"
-		else if(contents.len >= 5 && contents.len < 15)
-			src.icon_state = "giftbag1"
-		else if(contents.len >= 15)
-			src.icon_state = "giftbag2"
-
-	src.orient2hud(user)
-	src.show_to(user)
-	if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
-	for(var/mob/M in viewers(user, null))
-		if (M == user)
-			user << "\blue You put the [W] into [src]."
-		else if (M in range(1)) //If someone is standing close enough, they can tell what it is...
-			M.show_message(text("\blue [user] puts [W] into [src]."))
-		else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance...
-			M.show_message(text("\blue [user] puts [W] into [src]."))
+	handle_item_insertion(W)
 	return
 
 /obj/item/weapon/storage/dropped(mob/user as mob)
@@ -228,8 +313,41 @@
 	src.add_fingerprint(user)
 	return
 
+/obj/item/weapon/storage/verb/toggle_gathering_mode()
+	set name = "Switch Gathering Method"
+	set category = "Object"
+
+	collection_mode = !collection_mode
+	switch (collection_mode)
+		if(1)
+			usr << "The [src] now picks up all ore in a tile at once."
+		if(0)
+			usr << "The [src] now picks up one ore at a time."
+
+
+/obj/item/weapon/storage/verb/quick_empty()
+	set name = "Empty Contents"
+	set category = "Object"
+
+	if(!ishuman(usr) || usr.stat || usr.restrained())
+		return
+
+	var/turf/T = get_turf(src)
+	for(var/obj/item/I in contents)
+		remove_from_storage(I, T)
+
 /obj/item/weapon/storage/New()
 
+	if(allow_quick_empty)
+		verbs += /obj/item/weapon/storage/verb/quick_empty
+	else
+		verbs -= /obj/item/weapon/storage/verb/quick_empty
+
+	if(allow_quick_gather)
+		verbs += /obj/item/weapon/storage/verb/toggle_gathering_mode
+	else
+		verbs -= /obj/item/weapon/storage/verb/toggle_gathering_mode
+
 	src.boxes = new /obj/screen/storage(  )
 	src.boxes.name = "storage"
 	src.boxes.master = src

code/modules/clothing/spacesuits/rig.dm

@@ -43,7 +43,7 @@
 	item_state = "eng_hardsuit"
 	slowdown = 2
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 60)
-	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
+	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/satchel,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 
 
 //Chief Engineer's rig

code/modules/mining/mine_items.dm

@@ -31,7 +31,7 @@
 	new /obj/item/clothing/gloves/black(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/device/analyzer(src)
-	new /obj/item/weapon/satchel(src)
+	new /obj/item/weapon/storage/satchel(src)
 	new /obj/item/device/flashlight/lantern(src)
 	new /obj/item/weapon/shovel(src)
 	new /obj/item/weapon/pickaxe(src)

code/modules/mining/mine_turfs.dm

@@ -380,9 +380,9 @@
 			user << "\blue You dug a hole."
 			gets_dug()
 
-	if(istype(W,/obj/item/weapon/satchel))
-		var/obj/item/weapon/satchel/S = W
-		if(S.mode)
+	if(istype(W,/obj/item/weapon/storage/satchel))
+		var/obj/item/weapon/storage/satchel/S = W
+		if(S.collection_mode)
 			for(var/obj/item/weapon/ore/O in src.contents)
 				O.attackby(W,user)
 				return
@@ -451,11 +451,11 @@
 	if(istype(M,/mob/living/silicon/robot))
 		var/mob/living/silicon/robot/R = M
 		if(istype(R.module, /obj/item/weapon/robot_module/miner))
-			if(istype(R.module_state_1,/obj/item/weapon/satchel/borg))
+			if(istype(R.module_state_1,/obj/item/weapon/storage/satchel))
 				src.attackby(R.module_state_1,R)
-			else if(istype(R.module_state_2,/obj/item/weapon/satchel/borg))
+			else if(istype(R.module_state_2,/obj/item/weapon/storage/satchel))
 				src.attackby(R.module_state_2,R)
-			else if(istype(R.module_state_3,/obj/item/weapon/satchel/borg))
+			else if(istype(R.module_state_3,/obj/item/weapon/storage/satchel))
 				src.attackby(R.module_state_3,R)
 			else
 				return

code/modules/mining/ores_materials_coins.dm

@@ -5,25 +5,6 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore"
 
-/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/weapon/satchel))
-		var/obj/item/weapon/satchel/S = W
-		if (S.mode == 1)
-			for (var/obj/item/weapon/ore/O in locate(src.x,src.y,src.z))
-				if (S.contents.len < S.capacity)
-					S.contents += O;
-				else
-					user << "\blue The satchel is full."
-					return
-			user << "\blue You pick up all the ores."
-		else
-			if (S.contents.len < S.capacity)
-				S.contents += src;
-			else
-				user << "\blue The satchel is full."
-	return
-
 
 /obj/item/weapon/ore/uranium
 	name = "Uranium ore"

code/modules/mining/satchel_ore_boxdm.dm

@@ -1,46 +1,3 @@
-/**********************Satchel**************************/
-
-/obj/item/weapon/satchel
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "satchel"
-	name = "Mining Satchel"
-	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 50; //the number of ore pieces it can carry.
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	w_class = 1
-
-/obj/item/weapon/satchel/attack_self(mob/user as mob)
-	for (var/obj/item/weapon/ore/O in contents)
-		contents -= O
-		O.loc = user.loc
-	user << "\blue You empty the satchel."
-	return
-
-/obj/item/weapon/satchel/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/weapon/ore))
-		var/obj/item/weapon/ore/O = W
-		src.contents += O;
-	return
-
-/obj/item/weapon/satchel/verb/toggle_mode()
-	set name = "Switch Satchel Method"
-	set category = "Object"
-
-	mode = !mode
-	switch (mode)
-		if(1)
-			usr << "The satchel now picks up all ore in a tile at once."
-		if(0)
-			usr << "The satchel now picks up one ore at a time."
-
-/obj/item/weapon/satchel/borg
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "satchel"
-	name = "Cyborg Mining Satchel"
-	mode = 1;  //0 = pick one at a time, 1 = pick all on tile
-	capacity = 200; //the number of ore pieces it can carry.
 
 /**********************Ore box**************************/
 
@@ -54,8 +11,10 @@
 /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/ore))
 		src.contents += W;
-	if (istype(W, /obj/item/weapon/satchel))
-		src.contents += W.contents
+	if (istype(W, /obj/item/weapon/storage))
+		var/obj/item/weapon/storage/S = W
+		for(var/obj/item/weapon/ore/O in S.contents)
+			S.remove_from_storage(W,src) //This will move the item to this item's contents
 		user << "\blue You empty the satchel into the box."
 	return
 

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -198,7 +198,7 @@
 		..()
 		src.modules += new /obj/item/borg/sight/meson(src)
 		src.emag = new /obj/item/borg/stun(src)
-		src.modules += new /obj/item/weapon/satchel/borg(src)
+		src.modules += new /obj/item/weapon/storage/satchel(src)
 		src.modules += new /obj/item/weapon/pickaxe/borgdrill(src)
 		src.modules += new /obj/item/weapon/sheetsnatcher/borg(src)
 //		src.modules += new /obj/item/weapon/shovel(src) Uneeded due to buffed drill

maps/tgstation.2.0.9.dmm

@@ -8377,7 +8377,7 @@
 "dfe" = (/turf/simulated/wall,/area/mine/explored)
 "dff" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
 "dfg" = (/obj/structure/ore_box,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
-"dfh" = (/obj/structure/table,/obj/item/weapon/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/mine/north_outpost)
+"dfh" = (/obj/structure/table,/obj/item/weapon/storage/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/mine/north_outpost)
 "dfi" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/mine/north_outpost)
 "dfj" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area/mine/north_outpost)
 "dfk" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor,/area/mine/north_outpost)
@@ -8577,8 +8577,8 @@
 "diW" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/mine/living_quarters)
 "diX" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/obj/machinery/light{dir = 1},/turf/simulated/floor,/area/mine/eva)
 "diY" = (/obj/structure/rack,/obj/item/clothing/suit/space/rig/mining,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/mining,/turf/simulated/floor,/area/mine/eva)
-"diZ" = (/obj/structure/rack,/obj/item/weapon/satchel,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/mine/eva)
-"dja" = (/obj/structure/table,/obj/item/weapon/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/mine/west_outpost)
+"diZ" = (/obj/structure/rack,/obj/item/weapon/storage/satchel,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/mine/eva)
+"dja" = (/obj/structure/table,/obj/item/weapon/storage/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/mine/west_outpost)
 "djb" = (/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor,/area/mine/west_outpost)
 "djc" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/mine/west_outpost)
 "djd" = (/obj/structure/ore_box,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/mine/west_outpost)