Merge branch 'dev' into ofBotsAndMobs

Conflicts:
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/robot/robot_parts.dm

code/game/objects/items/apc_frame.dm

@@ -11,7 +11,7 @@
 	..()
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 )
-		del(src)
+		qdel(src)
 
 /obj/item/apc_frame/proc/try_build(turf/on_wall)
 	if (get_dist(on_wall,usr)>1)
@@ -38,6 +38,6 @@
 			var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc)
 			C.amount = 10
 			usr << "You cut the cables and disassemble the unused power terminal."
-			del(T)
+			qdel(T)
 	new /obj/machinery/power/apc(loc, ndir, 1)
-	del(src)
+	qdel(src)

code/game/objects/items/ashtray.dm

@@ -31,7 +31,7 @@
 				processing_objects.Remove(cig)
 				var/obj/item/butt = new cig.type_butt(src)
 				cig.transfer_fingerprints_to(butt)
-				del(cig)
+				qdel(cig)
 				W = butt
 			else if (cig.lit == 0)
 				user << "You place [cig] in [src] without even smoking it. Why would you do that?"

code/game/objects/items/bodybag.dm

@@ -10,7 +10,7 @@
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
 		R.add_fingerprint(user)
-		del(src)
+		qdel(src)
 
 
 /obj/item/weapon/storage/box/bodybags
@@ -83,7 +83,7 @@
 		visible_message("[usr] folds up the [src.name]")
 		new item_path(get_turf(src))
 		spawn(0)
-			del(src)
+			qdel(src)
 		return
 
 /obj/structure/closet/body_bag/update_icon()
@@ -105,7 +105,7 @@
 	attack_self(mob/user)
 		var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
 		R.add_fingerprint(user)
-		del(src)
+		qdel(src)
 
 
 
@@ -126,7 +126,7 @@
 		O.icon = src.icon
 		O.icon_state = "bodybag_used"
 		O.desc = "Pretty useless now.."
-		del(src)
+		qdel(src)
 
 /obj/structure/closet/body_bag/cryobag/MouseDrop(over_object, src_location, over_location)
 	if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))

code/game/objects/items/crayons.dm

@@ -85,7 +85,7 @@
 				uses--
 				if(!uses)
 					user << "\red You used up your crayon!"
-					del(src)
+					qdel(src)
 	return
 
 /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob)
@@ -97,6 +97,6 @@
 			uses -= 5
 			if(uses <= 0)
 				user << "\red You ate your crayon!"
-				del(src)
+				qdel(src)
 	else
 		..()

code/game/objects/items/devices/PDA/PDA.dm

@@ -617,16 +617,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 			ownrank = id.rank
 			name = "PDA-[owner] ([ownjob])"
 		if("Eject")//Ejects the cart, only done from hub.
-			if (!isnull(cartridge))
-				var/turf/T = loc
-				if(ismob(T))
-					T = T.loc
-				cartridge.loc = T
-				mode = 0
-				scanmode = 0
-				if (cartridge.radio)
-					cartridge.radio.hostpda = null
-				cartridge = null
+			verb_remove_cartridge()
 
 //MENU FUNCTIONS===================================
 
@@ -947,7 +938,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		j = prob(10)
 
 	if(j) //This kills the PDA
-		P.Del()
+		qdel(P)
 		if(message)
 			message += "It melts in a puddle of plastic."
 		else
@@ -1120,6 +1111,30 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	else
 		usr << "<span class='notice'>You cannot do this while restrained.</span>"
 
+/obj/item/device/pda/verb/verb_remove_cartridge()
+	set category = "Object"
+	set name = "Remove cartridge"
+	set src in usr
+
+	if(issilicon(usr))
+		return
+
+	if (can_use(usr) && !isnull(cartridge))
+		var/turf/T = get_turf(src)
+		cartridge.loc = T
+		if (ismob(loc))
+			var/mob/M = loc
+			M.put_in_hands(cartridge)
+		else
+			cartridge.loc = get_turf(src)
+		mode = 0
+		scanmode = 0
+		if (cartridge.radio)
+			cartridge.radio.hostpda = null
+		cartridge = null
+		usr << "<span class='notice'>You remove \the [cartridge] from the [name].</span>"
+	else
+		usr << "<span class='notice'>You cannot do this while restrained.</span>"
 
 /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use.
 	if(choice == 1)
@@ -1225,7 +1240,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 				if ( !(C:blood_DNA) )
 					user << "\blue No blood found on [C]"
 					if(C:blood_DNA)
-						del(C:blood_DNA)
+						qdel(C:blood_DNA)
 				else
 					user << "\blue Blood found on [C]. Analysing..."
 					spawn(15)
@@ -1355,7 +1370,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		explosion(T, 0, 0, 1, rand(1,2))
 	return
 
-/obj/item/device/pda/Del()
+/obj/item/device/pda/Destroy()
 	PDAs -= src
 	if (src.id && prob(90)) //IDs are kept in 90% of the cases
 		src.id.loc = get_turf(src.loc)

code/game/objects/items/devices/PDA/cart.dm

@@ -115,7 +115,9 @@
 	spawn(5)
 		radio = new /obj/item/radio/integrated/signal(src)
 
-
+/obj/item/weapon/cartridge/signal/Destroy()
+	qdel(radio)
+	..()
 
 /obj/item/weapon/cartridge/quartermaster
 	name = "\improper Space Parts & Space Vendors cartridge"

code/game/objects/items/devices/PDA/radio.dm

@@ -99,6 +99,12 @@
 				post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(PDA) , s_filter = RADIO_SECBOT)
 				post_signal(control_freq, "command", "bot_status", "active", active, s_filter = RADIO_SECBOT)
 
+
+/obj/item/radio/integrated/beepsky/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src, control_freq)
+	..()
+
 /obj/item/radio/integrated/mule
 	var/list/botlist = null		// list of bots
 	var/obj/machinery/bot/mulebot/active 	// the active bot; if null, show bot list
@@ -245,3 +251,8 @@
 		radio_connection.post_signal(src, signal)
 
 		return
+
+/obj/item/radio/integrated/signal/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src, frequency)
+	..()

code/game/objects/items/devices/chameleonproj.dm

@@ -41,25 +41,25 @@
 	if(active_dummy)
 		eject_all()
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
-		del(active_dummy)
+		qdel(active_dummy)
 		active_dummy = null
 		usr << "\blue You deactivate the [src]."
-		var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
+		var/obj/effect/overlay/T = PoolOrNew(/obj/effect/overlay, get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'
 		flick("emppulse",T)
-		spawn(8) T.delete()
+		spawn(8) qdel(T)
 	else
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
 		var/obj/O = new saved_item(src)
 		if(!O) return
-		var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
+		var/obj/effect/dummy/chameleon/C = PoolOrNew(/obj/effect/dummy/chameleon, usr.loc)
 		C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src)
-		del(O)
+		qdel(O)
 		usr << "\blue You activate the [src]."
 		var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'
 		flick("emppulse",T)
-		spawn(8) T.delete()
+		spawn(8) qdel(T)
 
 /obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1)
 	if(active_dummy)
@@ -69,7 +69,7 @@
 		spark_system.start()
 		eject_all()
 		if(delete_dummy)
-			del(active_dummy)
+			qdel(active_dummy)
 		active_dummy = null
 		can_use = 0
 		spawn(50) can_use = 1
@@ -140,6 +140,6 @@
 		step(src, direction)
 	return
 
-/obj/effect/dummy/chameleon/Del()
+/obj/effect/dummy/chameleon/Destroy()
 	master.disrupt(0)
 	..()

code/game/objects/items/devices/flash.dm

@@ -103,7 +103,7 @@
 			animation.master = user
 			flick("blspell", animation)
 			sleep(5)
-			del(animation)
+			qdel(animation)
 
 	if(!flashfail)
 		flick("flash2", src)
@@ -154,7 +154,7 @@
 			animation.master = user
 			flick("blspell", animation)
 			sleep(5)
-			del(animation)
+			qdel(animation)
 
 	for(var/mob/living/carbon/M in oviewers(3, null))
 		if(prob(50))

code/game/objects/items/devices/floor_painter.dm

@@ -97,6 +97,10 @@
 				mode = "white"
 				mode_nice = "white"
 				return
+			if(design == "dark")
+				mode = "dark"
+				mode_nice = "dark"
+				return
 			if(design == "showroom" || design == "hydro" || design == "freezer")
 				mode = "[design]floor"
 				mode_nice = design
@@ -135,9 +139,9 @@
 				mode_nice = design
 				mode = "whitebluegreencorners"
 				tile_dir_mode = 2
-			else if(design == "delivery" || design == "bot")
+			else if(design == "delivery" || design == "bot" || design == "white-delivery" || design == "white-bot")
 				mode_nice = design
-				mode = design
+				mode = replacetext(design, "-", "")
 				tile_dir_mode = 0
 			else if(design == "loadingarea")
 				mode_nice = design

code/game/objects/items/devices/lightreplacer.dm

@@ -90,7 +90,7 @@
 				AddUses(1)
 				user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining."
 				user.drop_item()
-				del(L)
+				qdel(L)
 				return
 		else
 			user << "You need a working light."
@@ -156,7 +156,7 @@
 			target.brightness = L2.brightness
 			target.on = target.has_power()
 			target.update()
-			del(L2)
+			qdel(L2)
 
 			if(target.on && target.rigged)
 				target.explode()

code/game/objects/items/devices/modkit.dm

@@ -24,7 +24,7 @@
 	if(!parts)
 		user << "<span class='warning'>This kit has no parts for this modification left.</span>"
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 		return
 
 	var/allowed = 0
@@ -60,7 +60,7 @@
 
 	if(!parts)
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 
 /obj/item/device/modkit/examine(mob/user)
 	..(user)

code/game/objects/items/devices/paicard.dm

@@ -21,7 +21,7 @@
 	..()
 	overlays += "pai-off"
 
-/obj/item/device/paicard/Del()
+/obj/item/device/paicard/Destroy()
 	//Will stop people throwing friend pAIs into the singularity so they can respawn
 	if(!isnull(pai))
 		pai.death(0)
@@ -311,7 +311,7 @@
 	if(pai)
 		pai.ex_act(severity)
 	else
-		del(src)
+		qdel(src)
 
 /obj/item/device/paicard/see_emote(mob/living/M, text)
 	if(pai && pai.client)

code/game/objects/items/devices/powersink.dm

@@ -118,4 +118,4 @@
 			if(power_drained >= max_power)
 				processing_objects.Remove(src)
 				explosion(src.loc, 3,6,9,12)
-				del(src)
+				qdel(src)

code/game/objects/items/devices/radio/beacon.dm

@@ -30,7 +30,7 @@
 /obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy.
 	proc/digest_delay()
 		spawn(600)
-			del(src)
+			qdel(src)
 
 
 // SINGULO BEACON SPAWNER
@@ -45,5 +45,5 @@
 		user << "\blue Locked In"
 		new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
 		playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
-		del(src)
+		qdel(src)
 	return

code/game/objects/items/devices/radio/headset.dm

@@ -26,6 +26,13 @@
 		keyslot2 = new ks2type(src)
 	recalculateChannels(1)
 
+/obj/item/device/radio/headset/Destroy()
+	qdel(keyslot1)
+	qdel(keyslot2)
+	keyslot1 = null
+	keyslot2 = null
+	..()
+
 /obj/item/device/radio/headset/examine(mob/user)
 	if(!(..(user, 1) && radio_desc))
 		return

code/game/objects/items/devices/radio/intercom.dm

@@ -15,7 +15,7 @@
 	..()
 	processing_objects += src
 
-/obj/item/device/radio/intercom/Del()
+/obj/item/device/radio/intercom/Destroy()
 	processing_objects -= src
 	..()
 

code/game/objects/items/devices/radio/radio.dm

@@ -45,6 +45,15 @@
 	if(radio_controller)
 		initialize()
 
+/obj/item/device/radio/Destroy()
+	qdel(wires)
+	wires = null
+	if(radio_controller)
+		radio_controller.remove_object(src, frequency)
+		for (var/ch_name in channels)
+			radio_controller.remove_object(src, radiochannels[ch_name])
+	..()
+
 
 /obj/item/device/radio/initialize()
 
@@ -172,7 +181,7 @@
 						0, "*garbled automated announcement*", src,
 						message, from, "Automated Announcement", from, "synthesized voice",
 						4, 0, list(0), connection.frequency, "states")
-	del(A)
+	qdel(A)
 	return
 
 // Interprets the message mode when talking into a radio, possibly returning a connection datum
@@ -625,7 +634,6 @@
 	onclose(user, "radio")
 	return
 
-
 /obj/item/device/radio/proc/config(op)
 	if(radio_controller)
 		for (var/ch_name in channels)

code/game/objects/items/devices/taperecorder.dm

@@ -48,7 +48,7 @@
 	if(T)
 		T.hotspot_expose(700,125)
 		explosion(T, -1, -1, 0, 4)
-	del(src)
+	qdel(src)
 	return
 
 /obj/item/device/taperecorder/verb/record()

code/game/objects/items/devices/uplinks.dm

@@ -64,7 +64,7 @@ datum/nano_item_lists
 
 	world_uplinks += src
 
-/obj/item/device/uplink/Del()
+/obj/item/device/uplink/Destroy()
 	world_uplinks -= src
 	..()
 
@@ -180,7 +180,7 @@ datum/nano_item_lists
 /obj/item/device/uplink/hidden/New()
 	spawn(2)
 		if(!istype(src.loc, /obj/item))
-			del(src)
+			qdel(src)
 	..()
 
 // Toggles the uplink on and off. Normally this will bypass the item's normal functions and go to the uplink menu, if activated.

code/game/objects/items/glassjar.dm

@@ -0,0 +1,108 @@
+/obj/item/glass_jar
+	name = "glass jar"
+	desc = "A small empty jar."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "jar"
+	w_class = 2
+	matter = list("glass" = 200)
+	flags = NOBLUDGEON
+	var/list/accept_mobs = list(/mob/living/simple_animal/lizard, /mob/living/simple_animal/mouse)
+	var/contains = 0 // 0 = nothing, 1 = money, 2 = animal, 3 = spiderling
+
+/obj/item/glass_jar/New()
+	..()
+	update_icon()
+
+/obj/item/glass_jar/afterattack(var/atom/A, var/mob/user, var/proximity)
+	if(!proximity || contains)
+		return
+	if(istype(A, /mob))
+		var/accept = 0
+		for(var/D in accept_mobs)
+			if(istype(A, D))
+				accept = 1
+		if(!accept)
+			user << "[A] doesn't fit into \the [src]."
+			return
+		var/mob/L = A
+		user.visible_message("<span class='notice'>[user] scoops [L] into \the [src].</span>", "<span class='notice'>You scoop [L] into \the [src].</span>")
+		L.loc = src
+		contains = 2
+		update_icon()
+		return
+	else if(istype(A, /obj/effect/spider/spiderling))
+		var/obj/effect/spider/spiderling/S = A
+		user.visible_message("<span class='notice'>[user] scoops [S] into \the [src].</span>", "<span class='notice'>You scoop [S] into \the [src].</span>")
+		S.loc = src
+		processing_objects.Remove(S) // No growing inside jars
+		contains = 3
+		update_icon()
+		return
+
+/obj/item/glass_jar/attack_self(var/mob/user)
+	switch(contains)
+		if(1)
+			for(var/obj/O in src)
+				O.loc = user.loc
+			user << "<span class='notice'>You take money out of \the [src].</span>"
+			contains = 0
+			update_icon()
+			return
+		if(2)
+			for(var/mob/M in src)
+				M.loc = user.loc
+				user.visible_message("<span class='notice'>[user] releases [M] from \the [src].</span>", "<span class='notice'>You release [M] from \the [src].</span>")
+			contains = 0
+			update_icon()
+			return
+		if(3)
+			for(var/obj/effect/spider/spiderling/S in src)
+				S.loc = user.loc
+				user.visible_message("<span class='notice'>[user] releases [S] from \the [src].</span>", "<span class='notice'>You release [S] from \the [src].</span>")
+				processing_objects.Add(S) // They can grow after being let out though
+			contains = 0
+			update_icon()
+			return
+
+/obj/item/glass_jar/attackby(var/obj/item/W, var/mob/user)
+	if(istype(W, /obj/item/weapon/spacecash))
+		if(contains == 0)
+			contains = 1
+		if(contains != 1)
+			return
+		var/obj/item/weapon/spacecash/S = W
+		user.visible_message("<span class='notice'>[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].</span>")
+		user.drop_from_inventory(S)
+		S.loc = src
+		update_icon()
+
+/obj/item/glass_jar/update_icon() // Also updates name and desc
+	underlays.Cut()
+	overlays.Cut()
+	switch(contains)
+		if(0)
+			name = initial(name)
+			desc = initial(desc)
+		if(1)
+			name = "tip jar"
+			desc = "A small jar with money inside."
+			for(var/obj/item/weapon/spacecash/S in src)
+				var/image/money = image(S.icon, S.icon_state)
+				money.pixel_x = rand(-2, 3)
+				money.pixel_y = rand(-6, 6)
+				money.transform *= 0.6
+				underlays += money
+		if(2)
+			for(var/mob/M in src)
+				var/image/victim = image(M.icon, M.icon_state)
+				victim.pixel_y = 6
+				underlays += victim
+				name = "glass jar with [M]"
+				desc = "A small jar with [M] inside."
+		if(3)
+			for(var/obj/effect/spider/spiderling/S in src)
+				var/image/victim = image(S.icon, S.icon_state)
+				underlays += victim
+				name = "glass jar with [S]"
+				desc = "A small jar with [S] inside."
+	return

code/game/objects/items/latexballoon.dm

@@ -30,10 +30,10 @@
 	burst()
 	switch(severity)
 		if (1)
-			del(src)
+			qdel(src)
 		if (2)
 			if (prob(50))
-				del(src)
+				qdel(src)
 
 /obj/item/latexballon/bullet_act()
 	burst()

code/game/objects/items/robot/robot_parts.dm

@@ -128,13 +128,13 @@
 	if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
 		var/obj/item/stack/sheet/metal/M = W
 		if (M.use(1))
-			//var/obj/item/weapon/secbot_assembly/ed209_assembly/B = new /obj/item/weapon/secbot_assembly/ed209_assembly
-			//B.loc = get_turf(src)
+			var/obj/item/weapon/secbot_assembly/ed209_assembly/B = new /obj/item/weapon/secbot_assembly/ed209_assembly
+			B.loc = get_turf(src)
 			user << "<span class='notice'>You armed the robot frame.</span>"
 			if (user.get_inactive_hand()==src)
 				user.remove_from_mob(src)
-			//	user.put_in_inactive_hand(B)
-			del(src)
+				user.put_in_inactive_hand(B)
+			qdel(src)
 		else
 			user << "<span class='warning'>You need one sheet of metal to arm the robot frame.</span>"
 	if(istype(W, /obj/item/robot_parts/l_leg))
@@ -250,7 +250,7 @@
 			callHook("borgify", list(O))
 			O.Namepick()
 
-			del(src)
+			qdel(src)
 		else
 			user << "\blue The MMI must go in after everything else!"
 
@@ -303,8 +303,8 @@
 		user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!"
 		new /mob/living/simple_animal/spiderbot(get_turf(loc))
 		user.drop_item()
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 		return
 	return
 

code/game/objects/items/robot/robot_upgrades.dm

@@ -35,7 +35,7 @@
 		//world << R.icon_state
 		icon = 'icons/mob/custom-synthetic.dmi'
 		R.icon_state = "[R.ckey]-Standard"
-	del(R.module)
+	qdel(R.module)
 	R.notify_ai(ROBOT_NOTIFICATION_MODULE_RESET, R.module.name)
 	R.module = null
 	R.camera.remove_networks(list("Engineering","Medical","MINE"))

code/game/objects/items/shooting_range.dm

@@ -9,7 +9,7 @@
 	var/icon/virtualIcon
 	var/list/bulletholes = list()
 
-	Del()
+	Destroy()
 		// if a target is deleted and associated with a stake, force stake to forget
 		for(var/obj/structure/target_stake/T in view(3,src))
 			if(T.pinned_target == src)
@@ -97,7 +97,7 @@
 			for(var/mob/O in oviewers())
 				if ((O.client && !( O.blinded )))
 					O << "\red [src] breaks into tiny pieces and collapses!"
-			del(src)
+			qdel(src)
 
 		// Create a temporary object to represent the damage
 		var/obj/bmark = new

code/game/objects/items/stacks/sheets/light.dm

@@ -20,7 +20,7 @@
 		new/obj/item/stack/sheet/glass(user.loc)
 		if(amount <= 0)
 			user.drop_from_inventory(src)
-			del(src)
+			qdel(src)
 
 	if(istype(O,/obj/item/stack/sheet/metal))
 		var/obj/item/stack/sheet/metal/M = O

code/game/objects/items/stacks/stack.dm

@@ -29,12 +29,12 @@
 		src.amount = amount
 	return
 
-/obj/item/stack/Del()
+/obj/item/stack/Destroy()
 	if(uses_charge)
-		return
+		return 1
 	if (src && usr && usr.machine == src)
 		usr << browse(null, "window=stack")
-	..()
+	return ..()
 
 /obj/item/stack/examine(mob/user)
 	if(..(user, 1))
@@ -139,7 +139,7 @@
 
 		if (istype(O, /obj/item/weapon/storage)) //BubbleWrap - so newly formed boxes are empty
 			for (var/obj/item/I in O)
-				del(I)
+				qdel(I)
 
 /obj/item/stack/Topic(href, href_list)
 	..()
@@ -150,7 +150,7 @@
 		list_recipes(usr, text2num(href_list["sublist"]))
 
 	if (href_list["make"])
-		if (src.get_amount() < 1) del(src) //Never should happen
+		if (src.get_amount() < 1) qdel(src) //Never should happen
 
 		var/list/recipes_list = recipes
 		if (href_list["sublist"])
@@ -187,7 +187,7 @@
 				if (amount <= 0) //check again in case someone transferred stuff to us
 					if(usr)
 						usr.remove_from_mob(src)
-					del(src)
+					qdel(src)
 		return 1
 	else
 		if(get_amount() < used)

code/game/objects/items/stacks/tiles/light.dm

@@ -33,4 +33,4 @@
 		new/obj/item/stack/light_w(user.loc)
 		if(amount <= 0)
 			user.drop_from_inventory(src)
-			del(src)
+			qdel(src)

code/game/objects/items/toys.dm

@@ -63,7 +63,7 @@
 				if(O.reagents.has_reagent("pacid", 1))
 					user << "The acid chews through the balloon!"
 					O.reagents.reaction(user)
-					del(src)
+					qdel(src)
 				else
 					src.desc = "A translucent balloon with some form of liquid sloshing around in it."
 					user << "\blue You fill the balloon with the contents of [O]."
@@ -80,7 +80,7 @@
 		src.icon_state = "burst"
 		spawn(5)
 			if(src)
-				del(src)
+				qdel(src)
 	return
 
 /obj/item/toy/balloon/update_icon()
@@ -233,7 +233,7 @@
 		if(istype(I, /obj/item/toy/ammo/crossbow))
 			if(bullets <= 4)
 				user.drop_item()
-				del(I)
+				qdel(I)
 				bullets++
 				user << "\blue You load the foam dart into the crossbow."
 			else
@@ -265,21 +265,21 @@
 						for(var/mob/O in viewers(world.view, D))
 							O.show_message(text("\red [] was hit by the foam dart!", M), 1)
 						new /obj/item/toy/ammo/crossbow(M.loc)
-						del(D)
+						qdel(D)
 						return
 
 					for(var/atom/A in D.loc)
 						if(A == user) continue
 						if(A.density)
 							new /obj/item/toy/ammo/crossbow(A.loc)
-							del(D)
+							qdel(D)
 
 				sleep(1)
 
 			spawn(10)
 				if(D)
 					new /obj/item/toy/ammo/crossbow(D.loc)
-					del(D)
+					qdel(D)
 
 			return
 		else if (bullets == 0)
@@ -418,7 +418,7 @@
 		new /obj/effect/decal/cleanable/ash(src.loc)
 		src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
 		playsound(src, 'sound/effects/snap.ogg', 50, 1)
-		del(src)
+		qdel(src)
 
 /obj/item/toy/snappop/Crossed(H as mob|obj)
 	if((ishuman(H))) //i guess carp and shit shouldn't set them off
@@ -432,7 +432,7 @@
 			new /obj/effect/decal/cleanable/ash(src.loc)
 			src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
 			playsound(src, 'sound/effects/snap.ogg', 50, 1)
-			del(src)
+			qdel(src)
 
 /*
  * Water flower
@@ -440,7 +440,7 @@
 /obj/item/toy/waterflower
 	name = "water flower"
 	desc = "A seemingly innocent sunflower...with a twist."
-	//icon = 'icons/obj/harvest.dmi'
+	icon = 'icons/obj/device.dmi'
 	icon_state = "sunflower"
 	item_state = "sunflower"
 	var/empty = 0
@@ -494,7 +494,7 @@
 					if(ismob(T) && T:client)
 						T:client << "\red [user] has sprayed you with water!"
 				sleep(4)
-			del(D)
+			qdel(D)
 
 		return
 

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

@@ -40,6 +40,11 @@
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
+/obj/item/weapon/rcd/Destroy()
+	qdel(spark_system)
+	spark_system = null
+	return ..()
+
 /obj/item/weapon/rcd/attackby(obj/item/weapon/W, mob/user)
 
 	if(istype(W, /obj/item/weapon/rcd_ammo))
@@ -47,7 +52,7 @@
 			user << "<span class='notice'>The RCD can't hold any more matter-units.</span>"
 			return
 		user.drop_from_inventory(W)
-		del(W)
+		qdel(W)
 		stored_matter += 10
 		playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
 		user << "<span class='notice'>The RCD now holds [stored_matter]/30 matter-units.</span>"
@@ -138,7 +143,7 @@
 	else if(build_other)
 		new build_other(T)
 	else
-		del(T)
+		qdel(T)
 
 	playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 	return 1

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

@@ -28,7 +28,7 @@ RSF
 			user << "The RSF can't hold any more matter."
 			return
 
-		del(W)
+		qdel(W)
 
 		stored_matter += 10
 		playsound(src.loc, 'sound/machines/click.ogg', 10, 1)

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

@@ -68,7 +68,7 @@
 			else
 				D.organ_names += ", [O.name]"
 
-		del D.organs_scanned[O.name]
+		qdel(D.organs_scanned[O.name])
 		D.organs_scanned[O.name] = W.copy()
 
 	for(var/V in O.trace_chemicals)

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

@@ -56,7 +56,7 @@
 		new/obj/item/trash/candle(src.loc)
 		if(istype(src.loc, /mob))
 			src.dropped()
-		del(src)
+		qdel(src)
 	update_icon()
 	if(istype(loc, /turf)) //start a fire if possible
 		var/turf/T = loc

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

@@ -118,7 +118,7 @@
 		user.drop_item()
 		var/obj/item/weapon/card/emag_broken/junk = new(user.loc)
 		junk.add_fingerprint(user)
-		del(src)
+		qdel(src)
 		return
 
 	..()
@@ -170,7 +170,7 @@
 		src.desc = W.desc
 		src.icon = W.icon
 		src.icon_state = W.icon_state
-		del(W)
+		qdel(W)
 		return
 
 /obj/item/weapon/card/id/verb/read()

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

@@ -93,9 +93,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	flags |= NOREACT // so it doesn't react until you light it
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 15
 
-/obj/item/clothing/mask/smokable/Del()
+/obj/item/clothing/mask/smokable/Destroy()
 	..()
-	del(reagents)
+	qdel(reagents)
 
 /obj/item/clothing/mask/smokable/process()
 	var/turf/location = get_turf(src)
@@ -127,13 +127,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			var/datum/effect/effect/system/reagents_explosion/e = new()
 			e.set_up(round(reagents.get_reagent_amount("phoron") / 2.5, 1), get_turf(src), 0, 0)
 			e.start()
-			del(src)
+			qdel(src)
 			return
 		if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
 			var/datum/effect/effect/system/reagents_explosion/e = new()
 			e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
 			e.start()
-			del(src)
+			qdel(src)
 			return
 		flags &= ~NOREACT // allowing reagents to react after being lit
 		reagents.handle_reactions()
@@ -162,7 +162,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			M.update_inv_l_hand(0)
 			M.update_inv_r_hand(1)
 		processing_objects.Remove(src)
-		del(src)
+		qdel(src)
 	else
 		new /obj/effect/decal/cleanable/ash(T)
 		if(ismob(loc))
@@ -377,7 +377,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(G.reagents)
 			G.reagents.trans_to(src, G.reagents.total_volume)
 		name = "[G.name]-packed [initial(name)]"
-		del(G)
+		qdel(G)
 
 	else if(istype(W, /obj/item/weapon/flame/lighter))
 		var/obj/item/weapon/flame/lighter/L = W

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

@@ -28,7 +28,11 @@
 		user << "<span class='notice'>You need to take that [target.name] off before cleaning it.</span>"
 	else if(istype(target,/obj/effect/decal/cleanable))
 		user << "<span class='notice'>You scrub \the [target.name] out.</span>"
-		del(target)
+		qdel(target)
+	else if(istype(target,/turf))
+		user << "<span class='notice'>You scrub \the [target.name] clean.</span>"
+		var/turf/T = target
+		T.clean()
 	else
 		user << "<span class='notice'>You clean \the [target.name].</span>"
 		target.clean_blood()

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

@@ -92,7 +92,7 @@
 	spawn(0)//this prevents the collapse of space-time continuum
 		if (user)
 			user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 	return uses
 
 /obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob)

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

@@ -80,7 +80,7 @@
 			target.ex_act(1)
 	if(target)
 		target.overlays -= image_overlay
-	del(src) // qdel
+	qdel(src)
 
 /obj/item/weapon/plastique/attack(mob/M as mob, mob/user as mob, def_zone)
 	return

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

@@ -115,7 +115,7 @@
 
 		for(var/a=0, a < spray_particles, a++)
 			spawn(0)
-				var/obj/effect/effect/water/W = new /obj/effect/effect/water( get_turf(src) )
+				var/obj/effect/effect/water/W = PoolOrNew(/obj/effect/effect/water, get_turf(src))
 				var/turf/my_target = pick(the_targets)
 				var/datum/reagents/R = new/datum/reagents(spray_amount)
 				if(!W) return
@@ -139,7 +139,7 @@
 							M.ExtinguishMob()
 					if(W.loc == my_target) break
 					sleep(2)
-				W.delete()
+				qdel(W)
 
 		if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0))
 			user.inertia_dir = get_dir(target, user)

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

@@ -22,13 +22,13 @@
 	var/obj/item/weapon/tank/phoron/ptank = null
 
 
-/obj/item/weapon/flamethrower/Del()
+/obj/item/weapon/flamethrower/Destroy()
 	if(weldtool)
-		del(weldtool)
+		qdel(weldtool)
 	if(igniter)
-		del(igniter)
+		qdel(igniter)
 	if(ptank)
-		del(ptank)
+		qdel(ptank)
 	..()
 	return
 
@@ -83,7 +83,7 @@
 			ptank.loc = T
 			ptank = null
 		new /obj/item/stack/rods(T)
-		del(src)
+		qdel(src)
 		return
 
 	if(isscrewdriver(W) && igniter && !lit)

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

@@ -31,11 +31,11 @@
 		src.gift.add_fingerprint(user)
 	else
 		user << "\blue The gift was empty!"
-	del(src)
+	qdel(src)
 	return
 
 /obj/item/weapon/a_gift/ex_act()
-	del(src)
+	qdel(src)
 	return
 
 /obj/effect/spresent/relaymove(mob/user as mob)
@@ -58,7 +58,7 @@
 			M.client.eye = M.client.mob
 			M.client.perspective = MOB_PERSPECTIVE
 
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/a_gift/attack_self(mob/M as mob)
 	var/gift_type = pick(/obj/item/weapon/sord,
@@ -112,7 +112,7 @@
 	M.remove_from_mob(src)
 	M.put_in_hands(I)
 	I.add_fingerprint(M)
-	del(src)
+	qdel(src)
 	return
 
 /*
@@ -152,7 +152,7 @@
 				src.add_fingerprint(user)
 			if (src.amount <= 0)
 				new /obj/item/weapon/c_tube( src.loc )
-				del(src)
+				qdel(src)
 				return
 		else
 			user << "\blue You need scissors!"

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -167,7 +167,7 @@
 
 		invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
 		spawn(50)		   //To make sure all reagents can work
-			del(src)	   //correctly before deleting the grenade.
+			qdel(src)	   //correctly before deleting the grenade.
 
 
 /obj/item/weapon/grenade/chem_grenade/large

code/game/objects/items/weapons/grenades/emgrenade.dm

@@ -7,5 +7,5 @@
 	prime()
 		..()
 		if(empulse(src, 4, 10))
-			del(src)
+			qdel(src)
 		return

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -23,7 +23,7 @@
 
 		new/obj/effect/effect/sparks(src.loc)
 		new/obj/effect/effect/smoke/illumination(src.loc, brightness=15)
-		del(src)
+		qdel(src)
 		return
 
 	proc/bang(var/turf/T , var/mob/living/carbon/M)					// Added a new proc called 'bang' that takes a location and a person to be banged.
@@ -124,9 +124,8 @@
 		spawn(0)
 			new /obj/item/weapon/grenade/flashbang/clusterbang/segment(src.loc)//Creates a 'segment' that launches a few more flashbangs
 			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
-	spawn(0)
-		del(src)
-		return
+	qdel(src)
+	return
 
 /obj/item/weapon/grenade/flashbang/clusterbang/segment
 	desc = "A smaller segment of a clusterbang. Better run."
@@ -156,9 +155,8 @@
 		spawn(0)
 			new /obj/item/weapon/grenade/flashbang/cluster(src.loc)
 			playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
-	spawn(0)
-		del(src)
-		return
+	qdel(src)
+	return
 
 /obj/item/weapon/grenade/flashbang/cluster/New()//Same concept as the segments, so that all of the parts don't become reliant on the clusterbang
 	spawn(0)

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -10,7 +10,7 @@
 
 	New()
 		..()
-		src.smoke = new /datum/effect/effect/system/smoke_spread/bad
+		src.smoke = PoolOrNew(/datum/effect/effect/system/smoke_spread/bad)
 		src.smoke.attach(src)
 
 	prime()
@@ -30,5 +30,5 @@
 			B.health -= damage
 			B.update_icon()
 		sleep(80)
-		del(src)
+		qdel(src)
 		return

code/game/objects/items/weapons/grenades/spawnergrenade.dm

@@ -28,7 +28,7 @@
 
 				// Spawn some hostile syndicate critters
 
-		del(src)
+		qdel(src)
 		return
 
 /obj/item/weapon/grenade/spawnergrenade/manhacks

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

@@ -132,7 +132,7 @@ var/last_chew = 0
 
 			user.put_in_hands(W)
 			user << "<span class='notice'>You wrap the cable restraint around the top of the rod.</span>"
-			del(src)
+			qdel(src)
 			update_icon(user)
 
 

code/game/objects/items/weapons/implants/implant.dm

@@ -46,7 +46,7 @@
 		icon_state = "implant_melted"
 		malfunction = MALFUNCTION_PERMANENT
 
-	Del()
+	Destroy()
 		if(part)
 			part.implants.Remove(src)
 		..()
@@ -155,7 +155,7 @@ Implant Specifics:<BR>"}
 		msg = replace_characters(msg, replacechars)
 		if(findtext(msg,phrase))
 			activate()
-			del(src)
+			qdel(src)
 
 	activate()
 		if (malfunction == MALFUNCTION_PERMANENT)
@@ -179,11 +179,11 @@ Implant Specifics:<BR>"}
 							istype(part,/obj/item/organ/external/head))
 							part.createwound(BRUISE, 60)	//mangle them instead
 							explosion(get_turf(imp_in), -1, -1, 2, 3)
-							del(src)
+							qdel(src)
 						else
 							explosion(get_turf(imp_in), -1, -1, 2, 3)
 							part.droplimb(0,DROPLIMB_BLUNT)
-							del(src)
+							qdel(src)
 				if (elevel == "Destroy Body")
 					explosion(get_turf(T), -1, 0, 1, 6)
 					T.gib()
@@ -249,7 +249,7 @@ Implant Specifics:<BR>"}
 					else
 						part.droplimb(0,DROPLIMB_BLUNT)
 				explosion(get_turf(imp_in), -1, -1, 2, 3)
-				del(src)
+				qdel(src)
 
 /obj/item/weapon/implant/chem
 	name = "chemical implant"
@@ -296,7 +296,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		if(!src.reagents.total_volume)
 			R << "You hear a faint click from your chest."
 			spawn(0)
-				del(src)
+				qdel(src)
 		return
 
 	emp_act(severity)
@@ -421,17 +421,17 @@ the implant may become unstable and either pre-maturely inject the subject or si
 					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm")
 				else
 					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
-				del(a)
+				qdel(a)
 				processing_objects.Remove(src)
 			if ("emp")
 				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 				var/name = prob(50) ? t.name : pick(teleportlocs)
 				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
-				del(a)
+				qdel(a)
 			else
 				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
-				del(a)
+				qdel(a)
 				processing_objects.Remove(src)
 
 	emp_act(severity)			//for some reason alarms stop going off in case they are emp'd, even without this
@@ -489,7 +489,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 			imp_in.put_in_hands(scanned)
 		else
 			scanned.loc = t
-		del src
+		qdel(src)
 
 	implanted(mob/source as mob)
 		src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")

code/game/objects/items/weapons/implants/implantchair.dm

@@ -84,7 +84,7 @@
 					return
 			var/mob/M = G:affecting
 			if(put_mob(M))
-				del(G)
+				qdel(G)
 		src.updateUsrDialog()
 		return
 

code/game/objects/items/weapons/melee/energy.dm

@@ -192,16 +192,16 @@
 
 	processing_objects |= src
 
-/obj/item/weapon/melee/energy/blade/Del()
+/obj/item/weapon/melee/energy/blade/Destroy()
 	processing_objects -= src
 	..()
 
 /obj/item/weapon/melee/energy/blade/attack_self(mob/user as mob)
 	user.drop_from_inventory(src)
-	spawn(1) if(src) del(src)
+	spawn(1) if(src) qdel(src)
 
 /obj/item/weapon/melee/energy/blade/dropped()
-	spawn(1) if(src) del(src)
+	spawn(1) if(src) qdel(src)
 
 /obj/item/weapon/melee/energy/blade/process()
 	if(!creator || loc != creator || (creator.l_hand != src && creator.r_hand != src))
@@ -216,4 +216,4 @@
 			host.pinned -= src
 			host.embedded -= src
 			host.drop_from_inventory(src)
-		spawn(1) if(src) del(src)
+		spawn(1) if(src) qdel(src)

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

@@ -24,7 +24,7 @@
 			T.dirt = 0
 		for(var/obj/effect/O in src)
 			if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
-				del(O)
+				qdel(O)
 	source.reagents.reaction(src, TOUCH, 10)	//10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
 	source.reagents.remove_any(1)				//reaction() doesn't use up the reagents
 

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

@@ -191,10 +191,10 @@ var/list/tape_roll_applications = list()
 			for (var/obj/item/tape/P in cur)
 				if(P.icon_state == icon_dir)
 					N = 0
-					del(P)
+					qdel(P)
 			cur = get_step(cur,dir[i])
 
-	del(src)
+	qdel(src)
 	return
 
 

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

@@ -64,7 +64,7 @@
 				G.attackby(NG, user)
 				usr << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheets."
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 	return ..()
 

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

@@ -52,18 +52,18 @@
 			return
 		if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
 			user << "\red The Bluespace interfaces of the two devices conflict and malfunction."
-			del(W)
+			qdel(W)
 			return
 			/* //BoH+BoH=Singularity, commented out.
 		if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
 			investigate_log("has become a singularity. Caused by [user.key]","singulo")
 			user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!"
-			del(W)
-			var/obj/machinery/singularity/singulo = new /obj/machinery/singularity (get_turf(src))
+			qdel(W)
+			var/obj/singularity/singulo = new /obj/singularity (get_turf(src))
 			singulo.energy = 300 //should make it a bit bigger~
 			message_admins("[key_name_admin(user)] detonated a bag of holding")
 			log_game("[key_name(user)] detonated a bag of holding")
-			del(src)
+			qdel(src)
 			return
 			*/
 		..()
@@ -81,7 +81,7 @@
 		else
 			user << "\red The Bluespace generator malfunctions!"
 			for (var/obj/O in src.contents) //it broke, delete what was in it
-				del(O)
+				qdel(O)
 			crit_fail = 1
 			icon_state = "brokenpack"
 

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

@@ -162,7 +162,7 @@
 				usr.client.screen -= S
 			S.dropped(usr)
 			if(!S.amount)
-				del S
+				qdel(S)
 			else
 				S.loc = src
 
@@ -207,7 +207,7 @@
 				N.amount = stacksize
 				S.amount -= stacksize
 			if(!S.amount)
-				del S // todo: there's probably something missing here
+				qdel(S) // todo: there's probably something missing here
 		orient2hud(usr)
 		if(usr.s_active)
 			usr.s_active.show_to(usr)

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

@@ -48,7 +48,7 @@
 	// Now make the cardboard
 	user << "<span class='notice'>You fold [src] flat.</span>"
 	new src.foldable(get_turf(src))
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/storage/box/survival/
 	New()

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

@@ -146,8 +146,8 @@
 		new /obj/item/clothing/mask/smokable/cigarette(src)
 	create_reagents(15 * storage_slots)//so people can inject cigarettes without opening a packet, now with being able to inject the whole one
 
-/obj/item/weapon/storage/fancy/cigarettes/Del()
-	del(reagents)
+/obj/item/weapon/storage/fancy/cigarettes/Destroy()
+	qdel(reagents)
 	..()
 
 
@@ -202,8 +202,8 @@
 		new /obj/item/clothing/mask/smokable/cigarette/cigar(src)
 	create_reagents(15 * storage_slots)
 
-/obj/item/weapon/storage/fancy/cigar/Del()
-	del(reagents)
+/obj/item/weapon/storage/fancy/cigar/Destroy()
+	qdel(reagents)
 	..()
 
 /obj/item/weapon/storage/fancy/cigar/update_icon()

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

@@ -9,6 +9,10 @@
 	name = master_item.name
 	verbs -= /obj/item/verb/verb_pickup	//make sure this is never picked up.
 	..()
+	
+/obj/item/weapon/storage/internal/Destroy()
+	master_item = null
+	..()
 
 /obj/item/weapon/storage/internal/attack_hand()
 	return		//make sure this is never picked up

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

@@ -11,6 +11,7 @@
 	w_class = 3
 	var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
 	var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
+	var/list/is_seeing = new/list() //List of mobs which are currently seeing the contents of this item's storage
 	var/max_w_class = 2 //Max size of objects that this object can store (in effect only if can_hold isn't set)
 	var/max_storage_space = 14 //The sum of the storage costs of all the items in this storage item.
 	var/storage_slots = 7 //The number of storage slots in this container.
@@ -23,6 +24,12 @@
 	var/collection_mode = 1;  //0 = pick one at a time, 1 = pick all on tile
 	var/use_sound = "rustle"	//sound played when used. null for no sound.
 
+/obj/item/weapon/storage/Destroy()
+	close_all()
+	qdel(boxes)
+	qdel(closer)
+	..()
+
 /obj/item/weapon/storage/MouseDrop(obj/over_object as obj)
 
 	if(!canremove)
@@ -86,6 +93,7 @@
 	user.client.screen += src.closer
 	user.client.screen += src.contents
 	user.s_active = src
+	is_seeing |= user
 	return
 
 /obj/item/weapon/storage/proc/hide_from(mob/user as mob)
@@ -97,7 +105,7 @@
 	user.client.screen -= src.contents
 	if(user.s_active == src)
 		user.s_active = null
-	return
+	is_seeing -= user
 
 /obj/item/weapon/storage/proc/open(mob/user as mob)
 	if (src.use_sound)
@@ -109,11 +117,24 @@
 	show_to(user)
 
 /obj/item/weapon/storage/proc/close(mob/user as mob)
-
 	src.hide_from(user)
 	user.s_active = null
 	return
 
+/obj/item/weapon/storage/proc/close_all()
+	for(var/mob/M in can_see_contents())
+		close(M)
+		. = 1
+
+/obj/item/weapon/storage/proc/can_see_contents()
+	var/list/cansee = list()
+	for(var/mob/M in is_seeing)
+		if(M.s_active == src && M.client)
+			cansee |= M
+		else
+			is_seeing -= M
+	return cansee
+
 //This proc draws out the inventory and places the items on it. tx and ty are the upper left tile and mx, my are the bottm right.
 //The numbers are calculated from the bottom-left The bottom-left slot being 1,1.
 /obj/item/weapon/storage/proc/orient_objs(tx, ty, mx, my)
@@ -163,7 +184,7 @@
 
 	New(obj/item/sample as obj)
 		if(!istype(sample))
-			del(src)
+			qdel(src)
 		sample_object = sample
 		number = 1
 
@@ -463,4 +484,4 @@
 	return depth
 
 /obj/item/proc/get_storage_cost()
-	return 2**(w_class-1) //1,2,4,8,16,...
+	return 2**(w_class-1) //1,2,4,8,16,...

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

@@ -65,7 +65,7 @@
 			H.update_body()
 			M.updatehealth()
 			M.UpdateDamageIcon()
-			del(src)
+			qdel(src)
 
 			return 1
 		return 0

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

@@ -44,7 +44,7 @@
 					D.open()
 			if(istype(T,/turf/simulated/wall))
 				T.dismantle_wall(1)
-		del(src)
+		qdel(src)
 
 
 /*Detonator, disguised as a lighter*/

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

@@ -20,7 +20,7 @@
 	if (istype(W, /obj/item/weapon/wrench))
 		for(var/material_type in stack_types)
 			new material_type(get_turf(user))
-		del(src)
+		qdel(src)
 		return
 	else
 		if(alter_type && alter_with && istype(W,alter_with))
@@ -28,7 +28,7 @@
 			if (R.use(alter_cost))
 				var/obj/item/new_parts = new alter_type (get_turf(loc))
 				user << "<span class='notice'>You modify \the [name] into \a [new_parts].</span>"
-				del(src)
+				qdel(src)
 			else
 				user << "<span class='warning'>You need at least [alter_cost] sheets to reinforce the [name].</span>"
 			return
@@ -41,7 +41,7 @@
 
 	new build_type( user.loc )
 	user.drop_item()
-	del(src)
+	qdel(src)
 	return
 
 /obj/item/weapon/table_parts/reinforced
@@ -87,7 +87,7 @@
 		new /obj/item/stack/tile/carpet( get_turf(loc) )
 		new /obj/item/weapon/table_parts/wood( get_turf(loc) )
 		user << "<span class='notice'>You pry the carpet out of the table.</span>"
-		del(src)
+		qdel(src)
 	..()
 
 /obj/item/weapon/table_parts/rack

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -63,7 +63,7 @@
 	if(allgases >= 0.005)
 		return 1
 
-	del(G)
+	qdel(G)
 	return
 
 /obj/item/weapon/tank/jetpack/ui_action_click()
@@ -143,5 +143,5 @@
 	var/allgases = G.gas["carbon_dioxide"] + G.gas["nitrogen"] + G.gas["oxygen"] + G.gas["phoron"]
 	if(allgases >= 0.005)
 		return 1
-	del(G)
+	qdel(G)
 	return

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

@@ -31,9 +31,9 @@
 	processing_objects.Add(src)
 	return
 
-/obj/item/weapon/tank/Del()
+/obj/item/weapon/tank/Destroy()
 	if(air_contents)
-		del(air_contents)
+		qdel(air_contents)
 
 	processing_objects.Remove(src)
 
@@ -71,12 +71,12 @@
 	if(prob(50))
 		var/turf/location = src.loc
 		if (!( istype(location, /turf) ))
-			del(src)
+			qdel(src)
 
 		if(src.air_contents)
 			location.assume_air(air_contents)
 
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
@@ -274,7 +274,7 @@
 		//world << "\blue Exploding Pressure: [pressure] kPa, intensity: [range]"
 
 		explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5))
-		del(src)
+		qdel(src)
 
 	else if(pressure > TANK_RUPTURE_PRESSURE)
 		//world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]"
@@ -284,7 +284,7 @@
 				return
 			T.assume_air(air_contents)
 			playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
-			del(src)
+			qdel(src)
 		else
 			integrity--
 

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

@@ -58,7 +58,7 @@
 	user.put_in_hands(stuck)
 	stuck = null
 	overlays = null
-	del(src)
+	qdel(src)
 
 /obj/item/weapon/ducttape/afterattack(var/A, mob/user, flag, params)
 	if(!in_range(user, A) || istype(A, /obj/machinery/door) || !stuck)

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

@@ -112,10 +112,10 @@
 	name = "offhand"
 
 	unwield()
-		del(src)
+		qdel(src)
 
 	wield()
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/twohanded/offhand/update_icon()
 	return
@@ -149,7 +149,7 @@
 			if (W.dir == SOUTHWEST)
 				new /obj/item/weapon/shard( W.loc )
 				if(W.reinf) new /obj/item/stack/rods( W.loc)
-		del(A)
+		qdel(A)
 
 
 /*

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

@@ -177,7 +177,7 @@
 	if(istype(W,/obj/item/weapon/screwdriver))
 		user << "You finish the concealed blade weapon."
 		new /obj/item/weapon/butterfly(user.loc)
-		del(src)
+		qdel(src)
 		return
 
 /obj/item/butterflyblade
@@ -198,8 +198,8 @@
 	if(istype(W,/obj/item/butterflyblade))
 		user << "You attach the two concealed blade parts."
 		new /obj/item/butterflyconstruction(user.loc)
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 		return
 	update_icon(user)
 
@@ -252,8 +252,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 
 		user.put_in_hands(S)
 		user << "<span class='notice'>You fasten the glass shard to the top of the rod with the cable.</span>"
-		del(I)
-		del(src)
+		qdel(I)
+		qdel(src)
 		update_icon(user)
 
 	else if(istype(I, /obj/item/weapon/wirecutters))
@@ -261,8 +261,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 
 		user.put_in_hands(P)
 		user << "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>"
-		del(I)
-		del(src)
+		qdel(I)
+		qdel(src)
 		update_icon(user)
 	update_icon(user)
 
@@ -309,7 +309,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 
 /obj/item/weapon/energy_net/dropped()
 	spawn(10)
-		if(src) del(src)
+		if(src) qdel(src)
 
 /obj/item/weapon/energy_net/throw_impact(atom/hit_atom)
 	..()
@@ -317,7 +317,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 	var/mob/living/M = hit_atom
 
 	if(!istype(M) || locate(/obj/effect/energy_net) in M.loc)
-		del(src)
+		qdel(src)
 		return 0
 
 	var/turf/T = get_turf(M)
@@ -327,11 +327,11 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 		M.captured = 1
 		net.affecting = M
 		T.visible_message("[M] was caught in an energy net!")
-		del(src)
+		qdel(src)
 
 	// If we miss or hit an obstacle, we still want to delete the net.
 	spawn(10)
-		if(src) del(src)
+		if(src) qdel(src)
 
 /obj/effect/energy_net
 	name = "energy net"
@@ -356,7 +356,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 	..()
 	processing_objects |= src
 
-/obj/effect/energy_net/Del()
+/obj/effect/energy_net/Destroy()
 
 	if(affecting)
 		var/mob/living/carbon/M = affecting
@@ -372,13 +372,13 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 	if(health <=0)
 		density = 0
 		src.visible_message("The energy net is torn apart!")
-		del(src)
+		qdel(src)
 	return
 
 /obj/effect/energy_net/process()
 
 	if(isnull(affecting) || affecting.loc != loc)
-		del(src)
+		qdel(src)
 		return
 
 	// Countdown begin set to -1 will stop the teleporter from firing.
@@ -411,7 +411,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob)
 	playsound(affecting.loc, 'sound/effects/sparks2.ogg', 50, 1)
 	anim(affecting.loc,affecting,'icons/mob/mob.dmi',,"phasein",,affecting.dir)
 
-	del(src)
+	qdel(src)
 
 /obj/effect/energy_net/bullet_act(var/obj/item/projectile/Proj)
 	health -= Proj.damage

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

@@ -22,7 +22,7 @@
 			user << "\red That was stupid of you."
 			explosion(get_turf(src),-1,0,2)
 			if(src)
-				del(src)
+				qdel(src)
 			return
 		else
 			if(T.welding)