Removed some files with old definitions left over from r5494.

Updated the map and all away missions again.

Full (really, this time, i think) list of path changes: http://pastebin.com/raw.php?i=7VJ7UBDh
/obj/item/weapon/storage/flashbang_kit	> /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box	> /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit	> /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit	> /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit	> /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit	> /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket		> /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps	> /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox		> /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit		> /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed	> /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit	> /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox	> /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes	> /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit		> /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox	> /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit	> /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit	> /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs	> /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag		> /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag		> /obj/item/weapon/storage/bag/trash
/obj/item/weapon/secstorage/ssafe/HoS	> /obj/item/weapon/storage/secure/safe/HoS
/obj/item/weapon/secstorage/ssafe	> /obj/item/weapon/storage/secure/safe
/obj/item/weapon/storage/crayonbox	> /obj/item/weapon/storage/fancy/crayons
/obj/item/weapon/secstorage/sbriefcase	> /obj/item/weapon/storage/secure/briefcase
/obj/item/weapon/storage/matchbox	> /obj/item/weapon/storage/box/matches
/obj/item/weapon/storage/monkeycube_box	> /obj/item/weapon/storage/box/monkeycubes
/obj/item/weapon/storage/satchel	> /obj/item/weapon/storage/backpack/satchel
/obj/item/weapon/storage/snappopbox	> /obj/item/weapon/storage/box/snappops

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

code/game/objects/items/weapons/secstorage/sbriefcase.dm

@@ -1,53 +0,0 @@
-/obj/item/weapon/secstorage/sbriefcase
-	name = "secure briefcase"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "secure"
-	item_state = "sec-case"
-	desc = "A large briefcase with a digital locking system."
-	flags = FPRINT | TABLEPASS
-	force = 8.0
-	throw_speed = 1
-	throw_range = 4
-	w_class = 4.0
-
-/obj/item/weapon/secstorage/sbriefcase/New()
-	..()
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/pen(src)
-
-/obj/item/weapon/secstorage/sbriefcase/attack(mob/M as mob, mob/living/user as mob)
-	if ((CLUMSY in user.mutations) && prob(50))
-		user << "\red The [src] slips out of your hand and hits your head."
-		user.take_organ_damage(10)
-		user.Paralyse(2)
-		return
-
-
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been attacked with [src.name] by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to attack [M.name] ([M.ckey])</font>")
-
-	log_attack("<font color='red'>[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>")
-
-	var/t = user:zone_sel.selecting
-	if (t == "head")
-
-		if(ishuman(M))
-			var/mob/living/carbon/human/H = M
-			if (H.stat < 2 && H.health < 50 && prob(90))
-			// ******* Check
-				if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
-					H << "\red The helmet protects you from being hit hard in the head!"
-					return
-				var/time = rand(2, 6)
-				if (prob(75))
-					H.Paralyse(time)
-				else
-					H.Stun(time)
-				if(H.stat != 2)	H.stat = 1
-				for(var/mob/O in viewers(H, null))
-					O.show_message(text("\red <B>[] has been knocked unconscious!</B>", H), 1, "\red You hear someone fall.", 2)
-			else
-				H << text("\red [] tried to knock you unconcious!",user)
-				H.eye_blurry += 3
-
-	return

code/game/objects/items/weapons/secstorage/secstorage.dm

@@ -1,265 +0,0 @@
-/obj/item/weapon/secstorage
-	name = "secstorage"
-	var/obj/screen/storage/boxes = null
-	var/obj/screen/close/closer = null
-	var/icon_locking = "secureb"
-	var/icon_sparking = "securespark"
-	var/icon_opened = "secure0"
-	var/locked = 1
-	var/code = ""
-	var/l_code = null
-	var/l_set = 0
-	var/l_setshort = 0
-	var/l_hacking = 0
-	var/emagged = 0
-	var/open = 0
-	var/internalstorage = 3
-	w_class = 3.0
-
-/obj/item/weapon/secstorage/examine()
-	set src in oview(1)
-
-	..()
-	usr << text("The service panel is [src.open ? "open" : "closed"].")
-	return
-
-/obj/item/weapon/secstorage/proc/return_inv()
-
-	var/list/L = list(  )
-
-	L += src.contents
-
-	for(var/obj/item/weapon/secstorage/S in src)
-		L += S.return_inv()
-	for(var/obj/item/weapon/gift/G in src)
-		L += G.gift
-		if (istype(G.gift, /obj/item/weapon/secstorage))
-			L += G.gift:return_inv()
-	return L
-
-/obj/item/weapon/secstorage/proc/show_to(mob/user as mob)
-
-	user.client.screen -= src.boxes
-	user.client.screen -= src.closer
-	user.client.screen -= src.contents
-	user.client.screen += src.boxes
-	user.client.screen += src.closer
-	user.client.screen += src.contents
-	user.s_active = src
-	return
-
-/obj/item/weapon/secstorage/proc/hide_from(mob/user as mob)
-
-	if(!user.client)
-		return
-	user.client.screen -= src.boxes
-	user.client.screen -= src.closer
-	user.client.screen -= src.contents
-	return
-
-/obj/item/weapon/secstorage/proc/close(mob/user as mob)
-
-	src.hide_from(user)
-	user.s_active = null
-	return
-
-/obj/item/weapon/secstorage/proc/orient_objs(tx, ty, mx, my)
-
-	var/cx = tx
-	var/cy = ty
-	src.boxes.screen_loc = "[tx],[ty] to [mx],[my]"
-	for(var/obj/O in src.contents)
-		O.screen_loc = "[cx],[cy]"
-		O.layer = 20
-		cx++
-		if (cx > mx)
-			cx = tx
-			cy--
-		//Foreach goto(56)
-	src.closer.screen_loc = "[mx],[my]"
-	return
-
-//This proc draws out the inventory and places the items on it. It uses the standard position.
-/obj/item/weapon/secstorage/proc/standard_orient_objs()
-	var/rows = 0
-	var/cols = 6
-	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--
-	src.closer.screen_loc = "11:16,2:16"
-	return
-
-/obj/item/weapon/secstorage/proc/orient2hud(mob/user as mob)
-	standard_orient_objs()
-	return
-
-/obj/item/weapon/secstorage/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ( (istype(W, /obj/item/weapon/card/emag)||istype(W, /obj/item/weapon/melee/energy/blade)) && (src.locked == 1) && (!src.emagged))
-		emagged = 1
-		src.overlays += image('icons/obj/storage.dmi', icon_sparking)
-		sleep(6)
-		src.overlays.Cut()
-		overlays += image('icons/obj/storage.dmi', icon_locking)
-		locked = 0
-		if(istype(W, /obj/item/weapon/melee/energy/blade))
-			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
-			spark_system.set_up(5, 0, src.loc)
-			spark_system.start()
-			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
-			playsound(src.loc, "sparks", 50, 1)
-			user << "You slice through the lock on [src]."
-		else
-			user << "You short out the lock on [src]."
-		return
-	if ((W.w_class > internalstorage || istype(W, /obj/item/weapon/secstorage)))
-		return
-	if ((istype(W, /obj/item/weapon/screwdriver)) && (src.locked == 1))
-		sleep(6)
-		src.open =! src.open
-		user.show_message(text("\blue You [] the service panel.", (src.open ? "open" : "close")))
-		return
-	if ((istype(W, /obj/item/device/multitool)) && (src.open == 1) && (src.locked ==1) && (!src.l_hacking))
-		user.show_message(text("\red Now attempting to reset internal memory, please hold."), 1)
-		src.l_hacking = 1
-		if (do_after(usr, 100))
-			if (prob(40))
-				src.l_setshort = 1
-				src.l_set = 0
-				user.show_message(text("\red Internal memory reset.  Please give it a few seconds to reinitialize."), 1)
-				sleep(80)
-				src.l_setshort = 0
-				src.l_hacking = 0
-			else
-				user.show_message(text("\red Unable to reset internal memory."), 1)
-				src.l_hacking = 0
-		else	src.l_hacking = 0
-		return
-	if (src.contents.len >= 7)
-		return
-	if (src.locked == 1)
-		return
-	user.u_equip(W)
-	W.loc = src
-	if ((user.client && user.s_active != src))
-		user.client.screen -= W
-	src.orient2hud(user)
-	W.dropped(user)
-	add_fingerprint(user)
-	//if (istype(W, /obj/item/weapon/gun/energy/crossbow)) return //STEALTHY
-	for(var/mob/O in viewers(user, null))
-		O.show_message(text("\blue [] has added [] to []!", user, W, src), 1)
-		//Foreach goto(139)
-	return
-
-/obj/item/weapon/secstorage/dropped(mob/user as mob)
-
-	standard_orient_objs()
-	return
-
-/obj/item/weapon/secstorage/MouseDrop(over_object, src_location, over_location)
-	..()
-	if (src.locked == 1)
-		return
-
-	orient2hud(usr)
-	if ((over_object == usr && ((get_dist(src, usr) <= 1 ||src.locked == 0) || usr.contents.Find(src))))  //|| usr.telekinesis == 1
-		if (usr.s_active)
-			usr.s_active.close(usr)
-		src.show_to(usr)
-	return
-
-/obj/item/weapon/secstorage/attack_paw(mob/user as mob)
-	playsound(src.loc, "rustle", 50, 1, -5)
-	return src.attack_hand(user)
-	return
-
-/obj/item/weapon/secstorage/attack_hand(mob/user as mob)
-	if ((src.loc == user) && (src.locked == 1))
-		usr << "\red [src] is locked and cannot be opened!"
-	else if ((src.loc == user) && (!src.locked))
-		playsound(src.loc, "rustle", 50, 1, -5)
-		if (user.s_active)
-			user.s_active.close(user) //Close and re-open
-		src.show_to(user)
-	else
-		..()
-		for(var/mob/M in range(1))
-			if (M.s_active == src)
-				src.close(M)
-		src.orient2hud(user)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/weapon/secstorage/attack_self(mob/user as mob)
-	user.set_machine(src)
-	var/dat = text("<TT><B>[]</B><BR>\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
-	var/message = "Code"
-	if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
-		dat += text("<p>\n<b>5-DIGIT PASSCODE NOT SET.<br>ENTER NEW PASSCODE.</b>")
-	if (src.emagged)
-		dat += text("<p>\n<font color=red><b>LOCKING SYSTEM ERROR - 1701</b></font>")
-	if (src.l_setshort)
-		dat += text("<p>\n<font color=red><b>ALERT: MEMORY SYSTEM ERROR - 6040 201</b></font>")
-	message = text("[]", src.code)
-	if (!src.locked)
-		message = "*****"
-	dat += text("<HR>\n>[]<BR>\n<A href='?src=\ref[];type=1'>1</A>-<A href='?src=\ref[];type=2'>2</A>-<A href='?src=\ref[];type=3'>3</A><BR>\n<A href='?src=\ref[];type=4'>4</A>-<A href='?src=\ref[];type=5'>5</A>-<A href='?src=\ref[];type=6'>6</A><BR>\n<A href='?src=\ref[];type=7'>7</A>-<A href='?src=\ref[];type=8'>8</A>-<A href='?src=\ref[];type=9'>9</A><BR>\n<A href='?src=\ref[];type=R'>R</A>-<A href='?src=\ref[];type=0'>0</A>-<A href='?src=\ref[];type=E'>E</A><BR>\n</TT>", message, src, src, src, src, src, src, src, src, src, src, src, src)
-	user << browse(dat, "window=caselock;size=300x280")
-
-/obj/item/weapon/secstorage/Topic(href, href_list)
-	..()
-	if ((usr.stat || usr.restrained()) || (get_dist(src, usr) > 1))
-		return
-	if (href_list["type"])
-		if (href_list["type"] == "E")
-			if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
-				src.l_code = src.code
-				src.l_set = 1
-			else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
-				src.locked = 0
-				src.overlays.Cut()
-				overlays += image('icons/obj/storage.dmi', icon_opened)
-				src.code = null
-			else
-				src.code = "ERROR"
-		else
-			if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
-				src.locked = 1
-				src.overlays.Cut()
-				src.code = null
-				src.close(usr)
-			else
-				src.code += text("[]", href_list["type"])
-				if (length(src.code) > 5)
-					src.code = "ERROR"
-		src.add_fingerprint(usr)
-		for(var/mob/M in viewers(1, src.loc))
-			if ((M.client && M.machine == src))
-				src.attack_self(M)
-			return
-	return
-
-/obj/item/weapon/secstorage/New()
-
-	src.boxes = new /obj/screen/storage(  )
-	src.boxes.name = "storage"
-	src.boxes.master = src
-	src.boxes.icon_state = "block"
-	src.boxes.screen_loc = "7,7 to 10,8"
-	src.boxes.layer = 19
-	src.closer = new /obj/screen/close(  )
-	src.closer.master = src
-	src.closer.icon_state = "x"
-	src.closer.layer = 20
-	spawn( 5 )
-		standard_orient_objs()
-		return
- 	return

code/game/objects/items/weapons/secstorage/ssafe.dm

@@ -1,25 +0,0 @@
-/obj/item/weapon/secstorage/ssafe
-	name = "secure safe"
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "safe"
-	icon_opened = "safe0"
-	icon_locking = "safeb"
-	icon_sparking = "safespark"
-	flags = FPRINT | TABLEPASS
-	force = 8.0
-	w_class = 8.0
-	internalstorage = 8
-	anchored = 1.0
-	density = 0
-
-/obj/item/weapon/secstorage/ssafe/New()
-	..()
-	new /obj/item/weapon/paper(src)
-	new /obj/item/weapon/pen(src)
-
-/obj/item/weapon/secstorage/ssafe/HoS/New()
-	..()
-	//new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)
-
-/obj/item/weapon/secstorage/ssafe/attack_hand(mob/user as mob)
-	return attack_self(user)

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

@@ -1,18 +0,0 @@
-/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"
-	slot_flags = SLOT_BELT | SLOT_POCKET
-	w_class = 3
-	storage_slots = 50
-	max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
-	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/objects/items/weapons/storage/misc.dm

@@ -1,115 +0,0 @@
-/*
- * Contains:
- *		Monkey Cube Box
- *		Candle Packs
- *		Snap Pop Box
- *		Crayon Box
- */
-
-
-/*
- * Monkey Cube Box
- */
-
-/obj/item/weapon/storage/monkeycube_box
-	name = "monkey cube box"
-	desc = "Drymate brand monkey cubes. Just add water!"
-	icon = 'icons/obj/food.dmi'
-	icon_state = "monkeycubebox"
-	storage_slots = 7
-	can_hold = list("/obj/item/weapon/reagent_containers/food/snacks/monkeycube")
-
-
-/obj/item/weapon/storage/monkeycube_box/New()
-	..()
-	for(var/i = 1; i <= 5; i++)
-		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
-	return
-
-/*
- * Snap Pop Box
- */
-
-/obj/item/weapon/storage/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"
-	storage_slots = 8
-	can_hold = list("/obj/item/toy/snappop")
-
-/obj/item/weapon/storage/snappopbox/New()
-	..()
-	for(var/i=1; i <= storage_slots; i++)
-		new /obj/item/toy/snappop(src)
-
-/*
- * Match Box
- */
-
-/obj/item/weapon/storage/matchbox
-	name = "Matchbox"
-	desc = "A small box of Almost But Not Quite Plasma Premium Matches."
-	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "matchbox"
-	item_state = "zippo"
-	storage_slots = 10
-	w_class = 1
-	flags = TABLEPASS
-	slot_flags = SLOT_BELT
-
-
-/obj/item/weapon/storage/matchbox/New()
-	..()
-	for(var/i=1; i <= storage_slots; i++)
-		new /obj/item/weapon/match(src)
-	return
-
-/obj/item/weapon/storage/matchbox/attackby(obj/item/weapon/match/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/match) && W.lit == 0)
-		W.lit = 1
-		W.icon_state = "match_lit"
-		processing_objects.Add(W)
-	W.update_icon()
-	return
-
-/*
- * Crayon Box
- */
-/obj/item/weapon/storage/crayonbox
-	name = "box of crayons"
-	desc = "A box of crayons for all your rune drawing needs."
-	icon = 'icons/obj/crayons.dmi'
-	icon_state = "crayonbox"
-	w_class = 2.0
-	storage_slots = 6
-	can_hold = list(
-		"/obj/item/toy/crayon"
-	)
-
-/obj/item/weapon/storage/crayonbox/New()
-	..()
-	new /obj/item/toy/crayon/red(src)
-	new /obj/item/toy/crayon/orange(src)
-	new /obj/item/toy/crayon/yellow(src)
-	new /obj/item/toy/crayon/green(src)
-	new /obj/item/toy/crayon/blue(src)
-	new /obj/item/toy/crayon/purple(src)
-	update_icon()
-
-/obj/item/weapon/storage/crayonbox/update_icon()
-	overlays = list() //resets list
-	overlays += image('icons/obj/crayons.dmi',"crayonbox")
-	for(var/obj/item/toy/crayon/crayon in contents)
-		overlays += image('icons/obj/crayons.dmi',crayon.colourName)
-
-/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")
-				usr << "This crayon is too sad to be contained in this box."
-				return
-			if("rainbow")
-				usr << "This crayon is too powerful to be contained in this box."
-				return
-	..()

code/game/objects/items/weapons/trashbag.dm

@@ -1,77 +0,0 @@
-/obj/item/weapon/trashbag
-	name = "trash bag"
-	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
-	icon = 'icons/obj/trash.dmi'
-	icon_state = "trashbag0"
-	item_state = "trashbag"
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	w_class = 4
-	var/mode = 1		//0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 25	//the amount of trash it can carry.
-
-	suicide_act(mob/user)
-		viewers(user) << "/red <b>[user] has put the [src] over \his head and is starting to hyperventilate! It looks like \he's trying to commit suicide.</b>"
-		return(OXYLOSS)
-
-/obj/item/weapon/trashbag/update_icon()
-	if(contents.len == 0)
-		icon_state = "trashbag0"
-	else if(contents.len < 12)
-		icon_state = "trashbag1"
-	else if(contents.len < 25)
-		icon_state = "trashbag2"
-	else icon_state = "trashbag3"
-
-/obj/item/weapon/trashbag/attackby(obj/item/I as obj, mob/user as mob)
-	..()
-	if(contents.len < capacity)
-		if(istype(I, /obj/item))
-			if(I.w_class <= 2)
-				user.drop_item()
-				I.loc = src
-	else
-		user << "<span class='notice'>[src] is full!</span>"
-
-/obj/item/weapon/trashbag/attack_self(mob/living/user as mob)
-	if(contents.len > 0)
-		for(var/obj/item/I in contents)
-			I.loc = user.loc
-		update_icon()
-		user << "<span class='notice'>You empty [src] onto [user.loc].</span>"
-
-/obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/user as mob|obj, flag)
-	if(istype(target, /obj/item))
-		var/obj/item/W = target
-		if(W.w_class <= 2)
-			if(mode == 1)
-				if(contents.len < capacity)	//slightly redundant, but it makes it prettier in the chatbox. -Pete
-					user << "<span class='notice'>You pick up all the trash.</span>"
-					for(var/obj/item/O in get_turf(W))
-						if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
-						if(contents.len < capacity)
-							if(O.w_class <= 2)
-								O.loc = src
-						else
-							user << "<span class='notice'>[src] is full!</span>"
-							break
-				else
-					user << "<span class='notice'>[src] is full!</span>"
-			else
-				if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak
-				if(contents.len < capacity)
-					contents += W;
-				else
-					user << "<span class='notice'>[src] is full!</span>"
-			update_icon()
-		return
-
-/obj/item/weapon/trashbag/verb/toggle_mode()
-	set name = "Switch Bag Method"
-	set category = "Object"
-
-	mode = !mode
-	if(mode == 1)
-		usr << "<span class='notice'>[src] now picks up all trash in a tile at once.</span>"
-	else
-		usr << "<span class='notice'>[src] now picks up one piece of trash at a time.</span>"

maps/RandomZLevels/Academy.dmm

@@ -321,7 +321,7 @@
 "gi" = (/obj/structure/table/reinforced,/obj/item/weapon/pen/red,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms)
 "gj" = (/obj/structure/filingcabinet/filingcabinet,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/awaymission/academy/classrooms)
 "gk" = (/obj/machinery/door/window{dir = 4},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/awaymission/academy/classrooms)
-"gl" = (/obj/item/weapon/storage/monkeycube_box,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms)
+"gl" = (/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor/plating,/area/awaymission/academy/classrooms)
 "gm" = (/obj/machinery/door/window{dir = 4},/obj/machinery/door/window{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating,/area/awaymission/academy/classrooms)
 "gn" = (/obj/structure/table,/turf/simulated/floor,/area/awaymission/academy/classrooms)
 "go" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/awaymission/academy/classrooms)
@@ -399,7 +399,7 @@
 "hI" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft)
 "hJ" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft)
 "hK" = (/obj/structure/grille,/obj/structure/cable,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft)
-"hL" = (/obj/structure/closet,/obj/item/candle,/obj/item/candle,/obj/item/weapon/storage/matchbox,/turf/simulated/floor,/area/awaymission/academy/academyaft)
+"hL" = (/obj/structure/closet,/obj/item/candle,/obj/item/candle,/obj/item/weapon/storage/box/matches,/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hM" = (/obj/structure/closet,/obj/item/weapon/storage/belt/soulstone,/obj/item/clothing/under/schoolgirl,/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hN" = (/obj/structure/closet,/obj/item/clothing/under/blackskirt,/obj/item/clothing/glasses/regular,/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hO" = (/obj/structure/closet,/obj/item/clothing/under/lightpurple,/obj/item/clothing/shoes/sandal,/turf/simulated/floor,/area/awaymission/academy/academyaft)
@@ -409,7 +409,7 @@
 "hS" = (/obj/structure/closet,/obj/item/weapon/storage/wallet/random,/obj/item/clothing/glasses/regular/hipster,/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hT" = (/obj/structure/closet,/obj/item/clothing/head/wizard/fake,/obj/item/clothing/suit/wizrobe/fake,/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hU" = (/obj/structure/closet,/obj/item/weapon/reagent_containers/food/drinks/beer,/obj/item/clothing/under/purple,/obj/item/weapon/contraband/poster,/turf/simulated/floor,/area/awaymission/academy/academyaft)
-"hV" = (/obj/structure/closet,/obj/item/weapon/storage/snappopbox,/obj/item/weapon/storage/backpack,/obj/item/weapon/paper{info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons.  Suggest additional tutilage."; name = "Pyromancy Evaluation"},/turf/simulated/floor,/area/awaymission/academy/academyaft)
+"hV" = (/obj/structure/closet,/obj/item/weapon/storage/box/snappops,/obj/item/weapon/storage/backpack,/obj/item/weapon/paper{info = "Current Grade: F. Educator's Notes: No improvement shown despite multiple private lessons.  Suggest additional tutilage."; name = "Pyromancy Evaluation"},/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hW" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "hydrofloor"},/area/awaymission/academy/academyaft)
 "hX" = (/obj/effect/decal/cleanable/oil,/turf/simulated/floor,/area/awaymission/academy/academyaft)
 "hY" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/power/smes/magical,/turf/simulated/floor/plating,/area/awaymission/academy/academyaft)

maps/RandomZLevels/blackmarketpackers.dmm

@@ -445,7 +445,7 @@
 "iC" = (/obj/item/clothing/gloves/fyellow,/turf/simulated/floor/plating/airless/asteroid,/area/awaymission)
 "iD" = (/turf/simulated/shuttle/wall{tag = "icon-swall4"; icon_state = "swall4"},/area/awaymission)
 "iE" = (/turf/simulated/shuttle/wall{tag = "icon-swall12"; icon_state = "swall12"},/area/awaymission)
-"iF" = (/obj/item/weapon/storage/matchbox,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/BMPship3)
+"iF" = (/obj/item/weapon/storage/box/matches,/obj/item/weapon/storage/fancy/cigarettes/dromedaryco,/turf/simulated/floor/plating,/area/awaymission/BMPship3)
 "iG" = (/obj/item/weapon/contraband/poster,/turf/simulated/floor/plating,/area/awaymission/BMPship3)
 "iH" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s9"; icon_state = "swall_s9"; dir = 2},/area/awaymission/BMPship3)
 "iI" = (/obj/item/weapon/reagent_containers/food/drinks/beer,/turf/simulated/floor/plating,/area/awaymission/BMPship3)

maps/tgstation.2.1.0.dmm

@@ -152,7 +152,7 @@
 "acV" = (/obj/structure/table/woodentable,/obj/item/weapon/folder/red,/turf/simulated/floor/carpet,/area/security/hos)
 "acW" = (/obj/item/weapon/stamp/hos,/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/security/hos)
 "acX" = (/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/structure/table/woodentable,/turf/simulated/floor/carpet,/area/security/hos)
-"acY" = (/obj/item/weapon/secstorage/ssafe/HoS{pixel_x = 35},/turf/simulated/floor/carpet,/area/security/hos)
+"acY" = (/obj/item/weapon/storage/secure/safe/HoS{pixel_x = 35},/turf/simulated/floor/carpet,/area/security/hos)
 "acZ" = (/obj/item/clothing/ears/earmuffs{pixel_x = -3; pixel_y = -2},/obj/item/clothing/ears/earmuffs,/obj/structure/table/reinforced,/turf/simulated/floor{icon_state = "red"; dir = 4},/area/security/range)
 "ada" = (/turf/simulated/floor{icon_state = "red"; dir = 5},/area/security/range)
 "adb" = (/turf/simulated/floor{icon_state = "red"},/area/security/range)
@@ -745,7 +745,7 @@
 "aoq" = (/obj/machinery/atmospherics/binary/pump{dir = 4; icon_state = "intact_on"; name = "Air In"; on = 1},/obj/effect/landmark{name = "blobstart"},/turf/simulated/floor/plating{tag = "icon-warnplate (WEST)"; icon_state = "warnplate"; dir = 8},/area/maintenance/fsmaint)
 "aor" = (/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 4; icon_state = "manifold-b-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/obj/item/weapon/wrench,/turf/simulated/floor/plating{tag = "icon-warnplate (EAST)"; icon_state = "warnplate"; dir = 4},/area/maintenance/fsmaint)
 "aos" = (/obj/structure/closet/emcloset,/turf/simulated/floor/plating,/area/maintenance/fpmaint)
-"aot" = (/obj/machinery/power/apc{dir = 1; name = "Detective APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/item/weapon/secstorage/ssafe{pixel_x = -23},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
+"aot" = (/obj/machinery/power/apc{dir = 1; name = "Detective APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/item/weapon/storage/secure/safe{pixel_x = -23},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aou" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aov" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"; tag = ""},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
 "aow" = (/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office)
@@ -1608,7 +1608,7 @@
 "aEV" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple{color = "red"; icon_state = "intact-r-f"; level = 1; name = "pipe"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor{icon_state = "dark"},/area/chapel/office)
 "aEW" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aEX" = (/obj/effect/landmark/start{name = "Chaplain"},/obj/structure/stool/bed/chair,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
-"aEY" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/storage/crayonbox,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
+"aEY" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin{pixel_x = -2; pixel_y = 5},/obj/item/weapon/storage/fancy/crayons,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aEZ" = (/turf/simulated/floor{icon_state = "grimy"},/area/chapel/office)
 "aFa" = (/obj/structure/closet/coffin,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
 "aFb" = (/turf/simulated/floor{icon_state = "dark"},/area/chapel/main)
@@ -2089,7 +2089,7 @@
 "aOi" = (/obj/structure/table/reinforced,/obj/item/device/aicard,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor{icon_state = "red"; dir = 10},/area/bridge)
 "aOj" = (/obj/machinery/computer/security,/turf/simulated/floor{icon_state = "red"},/area/bridge)
 "aOk" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/item/weapon/storage/box/PDAs{pixel_x = 4; pixel_y = 4},/obj/item/weapon/storage/box/ids,/turf/simulated/floor{icon_state = "red"},/area/bridge)
-"aOl" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/secstorage/sbriefcase,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/bridge)
+"aOl" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/storage/secure/briefcase,/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/bridge)
 "aOm" = (/obj/structure/window/reinforced/tinted{dir = 5},/turf/simulated/floor/plating,/area/bridge)
 "aOn" = (/obj/machinery/computer/communications,/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/bridge)
 "aOo" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/recharger,/turf/simulated/floor{icon_state = "blue"; dir = 8},/area/bridge)
@@ -2217,7 +2217,7 @@
 "aQG" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/mechanical{pixel_x = -2; pixel_y = -1},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/locker)
 "aQH" = (/obj/structure/closet/secure_closet/personal,/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/camera{c_tag = "Locker Room East"; dir = 8; network = "SS13"},/obj/machinery/light{dir = 4},/turf/simulated/floor,/area/crew_quarters/locker)
 "aQI" = (/obj/structure/table,/obj/item/weapon/hand_labeler,/turf/simulated/floor,/area/storage/art)
-"aQJ" = (/obj/structure/table,/obj/item/weapon/storage/crayonbox,/obj/item/weapon/storage/crayonbox,/turf/simulated/floor,/area/storage/art)
+"aQJ" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/turf/simulated/floor,/area/storage/art)
 "aQK" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 0; scrub_Toxins = 0},/obj/structure/table,/obj/item/device/camera_film,/obj/item/device/camera,/turf/simulated/floor,/area/storage/art)
 "aQL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/port)
 "aQM" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/storage/emergency2)
@@ -2860,7 +2860,7 @@
 "bcZ" = (/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bda" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bdb" = (/obj/machinery/hologram/holopad,/turf/simulated/floor/wood,/area/crew_quarters/captain)
-"bdc" = (/obj/structure/table/woodentable,/obj/item/weapon/pinpointer,/obj/item/weapon/disk/nuclear,/obj/item/weapon/secstorage/ssafe{pixel_x = 35; pixel_y = 5},/turf/simulated/floor/wood,/area/crew_quarters/captain)
+"bdc" = (/obj/structure/table/woodentable,/obj/item/weapon/pinpointer,/obj/item/weapon/disk/nuclear,/obj/item/weapon/storage/secure/safe{pixel_x = 35; pixel_y = 5},/turf/simulated/floor/wood,/area/crew_quarters/captain)
 "bdd" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/disposalpipe/segment,/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/hallway/primary/central)
 "bde" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor,/area/hallway/primary/central)
 "bdf" = (/turf/simulated/wall/r_wall,/area/medical/chemistry)
@@ -3411,7 +3411,7 @@
 "bnE" = (/obj/machinery/atmospherics/pipe/manifold{color = "red"; dir = 8; icon_state = "manifold-r-f"; initialize_directions = 11; level = 1; name = "pipe manifold"},/turf/simulated/wall,/area/crew_quarters/captain)
 "bnF" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 8; on = 1; scrub_Toxins = 0},/obj/structure/table/woodentable,/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/carpet,/area/crew_quarters/captain)
 "bnG" = (/obj/structure/stool/bed/chair/comfy/brown{dir = 4},/obj/machinery/camera{c_tag = "Captain's Quarters"; dir = 1},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
-"bnH" = (/obj/structure/table/woodentable,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/item/weapon/storage/matchbox,/obj/item/clothing/mask/cigarette/cigar,/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
+"bnH" = (/obj/structure/table/woodentable,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/item/weapon/storage/box/matches,/obj/item/clothing/mask/cigarette/cigar,/obj/item/weapon/reagent_containers/food/drinks/flask{pixel_x = 8},/turf/simulated/floor/carpet,/area/crew_quarters/captain)
 "bnI" = (/obj/machinery/door/window/eastright{base_state = "left"; dir = 1; icon_state = "left"; name = "Shower"; req_access_txt = "0"},/obj/machinery/shower{tag = "icon-shower (EAST)"; icon_state = "shower"; dir = 4},/obj/item/weapon/soap/deluxe,/obj/item/weapon/bikehorn/rubberducky,/turf/simulated/floor{icon_state = "freezerfloor"},/area/crew_quarters/captain)
 "bnJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/crew_quarters/captain)
 "bnK" = (/obj/structure/closet/wardrobe/chemistry_white,/obj/machinery/light_switch{pixel_x = -23; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/chemistry)
@@ -5114,7 +5114,7 @@
 "bUr" = (/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bUs" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "bUt" = (/obj/structure/closet/wardrobe/virology_white,/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
-"bUu" = (/obj/item/weapon/secstorage/ssafe{pixel_x = 5; pixel_y = 29},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/camera{c_tag = "Virology Break Room"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
+"bUu" = (/obj/item/weapon/storage/secure/safe{pixel_x = 5; pixel_y = 29},/obj/structure/stool/bed,/obj/item/weapon/bedsheet,/obj/machinery/camera{c_tag = "Virology Break Room"},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bUv" = (/obj/machinery/light{dir = 1},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bUw" = (/obj/machinery/atmospherics/pipe/tank/air{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/medical/virology)
 "bUx" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/simulated/wall,/area/medical/virology)
@@ -5514,7 +5514,7 @@
 "ccb" = (/obj/machinery/camera{c_tag = "Atmospherics South East"; dir = 1},/obj/machinery/atmospherics/valve/digital{name = "Mixed Air Outlet Valve"; openDuringInit = 1},/turf/simulated/floor{icon_state = "arrival"; dir = 6},/area/atmos)
 "ccc" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plating,/area/medical/virology)
 "ccd" = (/obj/structure/closet/l3closet/scientist,/obj/machinery/light{dir = 8},/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/toxins/xenobiology)
-"cce" = (/obj/structure/table,/obj/item/weapon/storage/monkeycube_box,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/storage/monkeycube_box,/obj/item/weapon/storage/monkeycube_box,/obj/item/weapon/storage/monkeycube_box,/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology)
+"cce" = (/obj/structure/table,/obj/item/weapon/storage/box/monkeycubes,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/obj/item/weapon/storage/box/monkeycubes,/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology)
 "ccf" = (/obj/structure/table,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/stack/sheet/mineral/plasma{amount = 5; layer = 2.9},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology)
 "ccg" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "white"},/area/toxins/xenobiology)
 "cch" = (/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/toxins/xenobiology)
@@ -6826,7 +6826,7 @@
 "cBn" = (/obj/structure/bookcase{name = "bookcase (Tactics)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cBo" = (/obj/structure/closet/secure_closet/hos,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cBp" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
-"cBq" = (/obj/structure/rack,/obj/item/weapon/secstorage/sbriefcase,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
+"cBq" = (/obj/structure/rack,/obj/item/weapon/storage/secure/briefcase,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter/zippo,/obj/item/weapon/storage/belt/utility,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cBr" = (/obj/structure/bookcase{name = "bookcase (Reports)"},/turf/unsimulated/floor{icon_state = "grimy"},/area/centcom/creed)
 "cBs" = (/obj/structure/table/woodentable,/turf/unsimulated/floor{dir = 8; icon_state = "wood"},/area/centcom/control)
 "cBt" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/evac)
@@ -7026,7 +7026,7 @@
 "cFf" = (/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Escape Shuttle Infirmary"; req_access_txt = "0"},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
 "cFg" = (/obj/machinery/status_display,/turf/simulated/shuttle/wall{tag = "icon-swall11"; icon_state = "swall11"; dir = 2},/area/shuttle/escape/centcom)
 "cFh" = (/obj/structure/closet/emcloset,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/shuttle/escape/centcom)
-"cFi" = (/obj/structure/rack,/obj/item/weapon/storage/crayonbox,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
+"cFi" = (/obj/structure/rack,/obj/item/weapon/storage/fancy/crayons,/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cFj" = (/obj/machinery/vending/coffee,/obj/structure/window/reinforced{dir = 4},/turf/unsimulated/floor{icon_state = "cafeteria"; dir = 2},/area/centcom/holding)
 "cFk" = (/obj/structure/stool/bed/chair{dir = 4},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome)
 "cFl" = (/obj/structure/table/reinforced{dir = 4; icon_state = "reinf_tabledir"},/turf/unsimulated/floor{icon_state = "floor"},/area/tdome)
@@ -8405,7 +8405,7 @@
 "dfG" = (/obj/effect/alien/weeds{icon_state = "weeds"},/turf/simulated/floor/airless{icon_state = "floorscorched1"},/area/mine/abandoned)
 "dfH" = (/turf/simulated/wall,/area/mine/explored)
 "dfI" = (/obj/structure/ore_box,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
-"dfJ" = (/obj/structure/table,/obj/item/weapon/storage/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/north_outpost)
+"dfJ" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/north_outpost)
 "dfK" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; layer = 2.4; on = 1},/turf/simulated/floor,/area/mine/north_outpost)
 "dfL" = (/obj/machinery/atmospherics/pipe/simple{dir = 4; level = 1},/turf/simulated/floor,/area/mine/north_outpost)
 "dfM" = (/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)
@@ -8598,9 +8598,9 @@
 "djr" = (/turf/simulated/floor,/area/mine/living_quarters)
 "djs" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/mine/living_quarters)
 "djt" = (/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)
-"dju" = (/obj/structure/rack,/obj/item/weapon/storage/satchel,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/mine/eva)
+"dju" = (/obj/structure/rack,/obj/item/weapon/storage/backpack/satchel,/obj/item/weapon/pickaxe,/turf/simulated/floor,/area/mine/eva)
 "djv" = (/obj/machinery/light,/turf/simulated/floor/plating/airless/asteroid,/area/mine/explored)
-"djw" = (/obj/structure/table,/obj/item/weapon/storage/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/west_outpost)
+"djw" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/obj/item/clothing/glasses/meson,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/mine/west_outpost)
 "djx" = (/obj/machinery/door/airlock/glass_mining{name = "Break Room"; req_access_txt = "54"},/turf/simulated/floor,/area/mine/west_outpost)
 "djy" = (/obj/structure/closet/emcloset,/turf/simulated/floor,/area/mine/west_outpost)
 "djz" = (/obj/structure/ore_box,/turf/simulated/floor{dir = 4; icon_state = "warning"},/area/mine/west_outpost)

tgstation.dme

@@ -490,7 +490,6 @@
 #include "code\game\objects\items\weapons\table_rack_parts.dm"
 #include "code\game\objects\items\weapons\teleportation.dm"
 #include "code\game\objects\items\weapons\tools.dm"
-#include "code\game\objects\items\weapons\trashbag.dm"
 #include "code\game\objects\items\weapons\twohanded.dm"
 #include "code\game\objects\items\weapons\weaponry.dm"
 #include "code\game\objects\items\weapons\wires.dm"
@@ -510,9 +509,6 @@
 #include "code\game\objects\items\weapons\implants\implantuplink.dm"
 #include "code\game\objects\items\weapons\melee\energy.dm"
 #include "code\game\objects\items\weapons\melee\misc.dm"
-#include "code\game\objects\items\weapons\secstorage\sbriefcase.dm"
-#include "code\game\objects\items\weapons\secstorage\secstorage.dm"
-#include "code\game\objects\items\weapons\secstorage\ssafe.dm"
 #include "code\game\objects\items\weapons\storage\backpack.dm"
 #include "code\game\objects\items\weapons\storage\bags.dm"
 #include "code\game\objects\items\weapons\storage\belt.dm"
@@ -522,8 +518,6 @@
 #include "code\game\objects\items\weapons\storage\fancy.dm"
 #include "code\game\objects\items\weapons\storage\firstaid.dm"
 #include "code\game\objects\items\weapons\storage\lockbox.dm"
-#include "code\game\objects\items\weapons\storage\mining_satchel.dm"
-#include "code\game\objects\items\weapons\storage\misc.dm"
 #include "code\game\objects\items\weapons\storage\secure.dm"
 #include "code\game\objects\items\weapons\storage\storage.dm"
 #include "code\game\objects\items\weapons\storage\toolbox.dm"