Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

code/game/objects/structures/crates_lockers/closets.dm

@@ -146,19 +146,19 @@
 			for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
 				A.loc = src.loc
 				A.ex_act(severity++)
-			del(src)
+			qdel(src)
 		if(2)
 			if(prob(50))
 				for (var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					A.ex_act(severity++)
-				del(src)
+				qdel(src)
 		if(3)
 			if(prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					A.ex_act(severity++)
-				del(src)
+				qdel(src)
 
 /obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
 	if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN))
@@ -169,7 +169,7 @@
 	if(health <= 0)
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 	return
 
@@ -178,14 +178,14 @@
 	if(prob(75))
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 /obj/structure/closet/meteorhit(obj/O as obj)
 	if(O.icon_state == "flaming")
 		for(var/mob/M in src)
 			M.meteorhit(O)
 		src.dump_contents()
-		del(src)
+		qdel(src)
 
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(src.opened)
@@ -202,7 +202,7 @@
 			new /obj/item/stack/sheet/metal(src.loc)
 			for(var/mob/M in viewers(src))
 				M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
-			del(src)
+			qdel(src)
 			return
 		if(isrobot(user))
 			return
@@ -310,5 +310,5 @@
 		return
 	visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
 	dump_contents()
-	spawn(1) del(src)
+	spawn(1) qdel(src)
 	return 1

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -18,6 +18,7 @@
 
 /obj/structure/closet/l3closet/general/New()
 	..()
+	qdel(contents)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/general( src )
 	new /obj/item/clothing/head/bio_hood/general( src )
@@ -30,6 +31,7 @@
 
 /obj/structure/closet/l3closet/virology/New()
 	..()
+	qdel(contents)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/virology( src )
 	new /obj/item/clothing/head/bio_hood/virology( src )
@@ -44,6 +46,7 @@
 
 /obj/structure/closet/l3closet/security/New()
 	..()
+	qdel(contents)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/security( src )
 	new /obj/item/clothing/head/bio_hood/security( src )
@@ -56,6 +59,7 @@
 
 /obj/structure/closet/l3closet/janitor/New()
 	..()
+	qdel(contents)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/janitor( src )
 	new /obj/item/clothing/head/bio_hood/janitor( src )
@@ -68,6 +72,7 @@
 
 /obj/structure/closet/l3closet/scientist/New()
 	..()
+	qdel(contents)
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/scientist( src )
 	new /obj/item/clothing/head/bio_hood/scientist( src )

code/game/objects/structures/crates_lockers/closets/secure/personal.dm

@@ -23,7 +23,7 @@
 	spawn(4)
 		// Not really the best way to do this, but it's better than "contents = list()"!
 		for(var/atom/movable/AM in contents)
-			del(AM)
+			qdel(AM)
 		new /obj/item/clothing/under/color/white( src )
 		new /obj/item/clothing/shoes/white( src )
 	return
@@ -55,7 +55,7 @@
 	spawn(4)
 		// Not really the best way to do this, but it's better than "contents = list()"!
 		for(var/atom/movable/AM in contents)
-			del(AM)
+			qdel(AM)
 		new /obj/item/weapon/storage/backpack/satchel/withwallet( src )
 		new /obj/item/device/radio/headset( src )
 	return

code/game/objects/structures/crates_lockers/closets/statue.dm

@@ -40,7 +40,7 @@
 			desc = "If it takes forever, I will wait for you..."
 
 	if(health == 0) //meaning if the statue didn't find a valid target
-		del(src)
+		qdel(src)
 		return
 
 	processing_objects.Add(src)
@@ -56,7 +56,7 @@
 	if (timer <= 0)
 		dump_contents()
 		processing_objects.Remove(src)
-		del(src)
+		qdel(src)
 
 /obj/structure/closet/statue/dump_contents()
 
@@ -130,4 +130,4 @@
 		user.dust()
 	dump_contents()
 	visible_message("<span class='warning'>[src] shatters!.</span>")
-	del(src)
+	qdel(src)

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -56,12 +56,12 @@
 
 		// teehee - Ah, tg coders...
 		if ("delete")
-			del(src)
+			qdel(src)
 
 		//If you want to re-add fire, just add "fire" = 15 to the pick list.
 		/*if ("fire")
 			new /obj/structure/closet/firecloset(src.loc)
-			del(src)*/
+			qdel(src)*/
 
 /obj/structure/closet/emcloset/legacy/New()
 	..()

code/game/objects/structures/crates_lockers/crates.dm

@@ -105,18 +105,18 @@
 	switch(severity)
 		if(1.0)
 			for(var/obj/O in src.contents)
-				del(O)
-			del(src)
+				qdel(O)
+			qdel(src)
 			return
 		if(2.0)
 			for(var/obj/O in src.contents)
 				if(prob(50))
-					del(O)
-			del(src)
+					qdel(O)
+			qdel(src)
 			return
 		if(3.0)
 			if (prob(50))
-				del(src)
+				qdel(src)
 			return
 		else
 	return

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -18,7 +18,7 @@
 		user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
 							 "<span class='notice'>You pry open \the [src].</span>", \
 							 "<span class='notice'>You hear splitting wood.</span>")
-		del(src)
+		qdel(src)
 	else
 		return attack_hand(user)
 

code/game/objects/structures/curtains.dm

@@ -17,7 +17,7 @@
 /obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
 	if(!P.nodamage)
 		visible_message("<span class='warning'>[P] tears [src] down!</span>")
-		del(src)
+		qdel(src)
 	else
 		..(P, def_zone)
 

code/game/objects/structures/displaycase.dm

@@ -17,7 +17,7 @@
 			if (occupied)
 				new /obj/item/weapon/gun/energy/captain( src.loc )
 				occupied = 0
-			del(src)
+			qdel(src)
 		if (2)
 			if (prob(50))
 				src.health -= 15
@@ -41,13 +41,13 @@
 		if (occupied)
 			new /obj/item/weapon/gun/energy/captain( src.loc )
 			occupied = 0
-		del(src)
+		qdel(src)
 
 
 /obj/structure/displaycase/meteorhit(obj/O as obj)
 		new /obj/item/weapon/shard( src.loc )
 		new /obj/item/weapon/gun/energy/captain( src.loc )
-		del(src)
+		qdel(src)
 
 
 /obj/structure/displaycase/proc/healthcheck()

code/game/objects/structures/door_assembly.dm

@@ -166,7 +166,7 @@
 					if(!src || !WT.isOn()) return
 					user << "\blue You dissasembled the airlock assembly!"
 					new /obj/item/stack/sheet/metal(src.loc, 4)
-					del (src)
+					qdel (src)
 		else
 			user << "\blue You need more welding fuel."
 			return
@@ -277,7 +277,7 @@
 
 			var/obj/machinery/door/new_airlock = new path(src.loc, src)
 			new_airlock.dir = src.dir
-			del(src)
+			qdel(src)
 	else
 		..()
 	update_state()

code/game/objects/structures/electricchair.dm

@@ -19,7 +19,7 @@
 		part.loc = loc
 		part.master = null
 		part = null
-		del(src)
+		qdel(src)
 		return
 	return
 

code/game/objects/structures/false_walls.dm

@@ -13,7 +13,7 @@
 	relativewall_neighbours()
 	..()
 
-/obj/structure/falsewall/Del()
+/obj/structure/falsewall/Destroy()
 
 	var/temploc = src.loc
 
@@ -98,7 +98,7 @@
 				T.ChangeTurf(/turf/simulated/wall)
 			else
 				T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
-			del(src)
+			qdel(src)
 
 		if( istype(W, /obj/item/weapon/weldingtool) )
 			var/obj/item/weapon/weldingtool/WT = W
@@ -110,7 +110,7 @@
 				if(mineral != "phoron")//Stupid shit keeps me from pushing the attackby() to phoron walls -Sieve
 					T = get_turf(src)
 					T.attackby(W,user)
-				del(src)
+				qdel(src)
 	else
 		user << "\blue You can't reach, close it first!"
 
@@ -123,7 +123,7 @@
 		if(mineral != "phoron")
 			T = get_turf(src)
 			T.attackby(W,user)
-		del(src)
+		qdel(src)
 
 	//DRILLING
 	else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
@@ -134,7 +134,7 @@
 			T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[mineral]"))
 		T = get_turf(src)
 		T.attackby(W,user)
-		del(src)
+		qdel(src)
 
 	else if( istype(W, /obj/item/weapon/melee/energy/blade) )
 		var/turf/T = get_turf(src)
@@ -145,7 +145,7 @@
 		if(mineral != "phoron")
 			T = get_turf(src)
 			T.attackby(W,user)
-		del(src)
+		qdel(src)
 
 /obj/structure/falsewall/update_icon()//Calling icon_update will refresh the smoothwalls if it's closed, otherwise it will make sure the icon is correct if it's open
 	..()
@@ -232,7 +232,7 @@
 		var/turf/T = get_turf(src)
 		user.visible_message("[user] tightens some bolts on the r wall.", "You tighten the bolts on the wall.")
 		T.ChangeTurf(/turf/simulated/wall) //Intentionally makes a regular wall instead of an r-wall (no cheap r-walls for you).
-		del(src)
+		qdel(src)
 
 	if( istype(W, /obj/item/weapon/weldingtool) )
 		var/obj/item/weapon/weldingtool/WT = W
@@ -241,14 +241,14 @@
 			T.ChangeTurf(/turf/simulated/wall)
 			T = get_turf(src)
 			T.attackby(W,user)
-			del(src)
+			qdel(src)
 
 	else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
 		var/turf/T = get_turf(src)
 		T.ChangeTurf(/turf/simulated/wall)
 		T = get_turf(src)
 		T.attackby(W,user)
-		del(src)
+		qdel(src)
 
 	//DRILLING
 	else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
@@ -256,14 +256,14 @@
 		T.ChangeTurf(/turf/simulated/wall)
 		T = get_turf(src)
 		T.attackby(W,user)
-		del(src)
+		qdel(src)
 
 	else if( istype(W, /obj/item/weapon/melee/energy/blade) )
 		var/turf/T = get_turf(src)
 		T.ChangeTurf(/turf/simulated/wall)
 		T = get_turf(src)
 		T.attackby(W,user)
-		del(src)
+		qdel(src)
 
 
 /*

code/game/objects/structures/girders.dm

@@ -31,7 +31,7 @@
 	..()
 	if(health <= 0)
 		new /obj/item/stack/sheet/metal(get_turf(src))
-		del(src)
+		qdel(src)
 
 	return
 
@@ -50,7 +50,7 @@
 			if(get_turf(user, 40))
 				user << "\blue You secured the girder!"
 				new/obj/structure/girder( src.loc )
-				del(src)
+				qdel(src)
 
 	else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
 		user << "\blue Now slicing apart the girder"
@@ -78,7 +78,7 @@
 			if(!src) return
 			user << "\blue You removed the support struts!"
 			new/obj/structure/girder( src.loc )
-			del(src)
+			qdel(src)
 
 	else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored )
 		playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
@@ -87,7 +87,7 @@
 			if(!src) return
 			user << "\blue You dislodged the girder!"
 			new/obj/structure/girder/displaced( src.loc )
-			del(src)
+			qdel(src)
 
 	else if(istype(W, /obj/item/stack/sheet))
 
@@ -99,7 +99,7 @@
 					if(S.use(2))
 						user << "<span class='notice'>You create a false wall! Push on it to open or close the passage.</span>"
 						new /obj/structure/falsewall (src.loc)
-						del(src)
+						qdel(src)
 				else
 					if(S.get_amount() < 2) return ..()
 					user << "<span class='notice'>Now adding plating...</span>"
@@ -110,7 +110,7 @@
 							Tsrc.ChangeTurf(/turf/simulated/wall)
 							for(var/turf/simulated/wall/X in Tsrc.loc)
 								if(X)	X.add_hiddenprint(usr)
-							del(src)
+							qdel(src)
 					return
 
 			if(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/plasteel/cyborg)
@@ -118,7 +118,7 @@
 					if(S.use(2))
 						user << "\blue You create a false wall! Push on it to open or close the passage."
 						new /obj/structure/falserwall (src.loc)
-						del(src)
+						qdel(src)
 				else
 					if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
 						if(S.get_amount() < 1) return ..()
@@ -130,7 +130,7 @@
 								Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
 								for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
 									if(X)	X.add_hiddenprint(usr)
-								del(src)
+								qdel(src)
 						return
 					else
 						if(S.get_amount() < 1) return ..()
@@ -139,7 +139,7 @@
 							if(S.use(1))
 								user << "<span class='notice'>Girders reinforced!</span>"
 								new/obj/structure/girder/reinforced( src.loc )
-								del(src)
+								qdel(src)
 						return
 
 		if(S.sheettype)
@@ -154,7 +154,7 @@
 				user << "\blue You create a false wall! Push on it to open or close the passage."
 				var/F = text2path("/obj/structure/falsewall/[M]")
 				new F (src.loc)
-				del(src)
+				qdel(src)
 			else
 				if(S.amount < 2) return ..()
 				user << "\blue Now adding plating..."
@@ -166,7 +166,7 @@
 					Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
 					for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
 						if(X)	X.add_hiddenprint(usr)
-					del(src)
+					qdel(src)
 				return
 
 		add_hiddenprint(usr)
@@ -182,7 +182,7 @@
 
 /obj/structure/girder/proc/dismantle()
 	new /obj/item/stack/sheet/metal(get_turf(src))
-	del(src)
+	qdel(src)
 
 /obj/structure/girder/attack_hand(mob/user as mob)
 	if (HULK in user.mutations)
@@ -193,25 +193,25 @@
 
 /obj/structure/girder/blob_act()
 	if(prob(40))
-		del(src)
+		qdel(src)
 
 
 /obj/structure/girder/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(30))
 				var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
 				new remains(loc)
-				del(src)
+				qdel(src)
 			return
 		if(3.0)
 			if (prob(5))
 				var/remains = pick(/obj/item/stack/rods,/obj/item/stack/sheet/metal)
 				new remains(loc)
-				del(src)
+				qdel(src)
 			return
 		else
 	return
@@ -246,7 +246,7 @@
 
 /obj/structure/cultgirder/proc/dismantle()
 	new /obj/effect/decal/remains/human(get_turf(src))
-	del(src)
+	qdel(src)
 
 /obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
@@ -289,7 +289,7 @@
 /obj/structure/cultgirder/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(30))

code/game/objects/structures/grille.dm

@@ -14,13 +14,13 @@
 
 
 /obj/structure/grille/ex_act(severity)
-	del(src)
+	qdel(src)
 
 /obj/structure/grille/blob_act()
-	del(src)
+	qdel(src)
 
 /obj/structure/grille/meteorhit(var/obj/M)
-	del(src)
+	qdel(src)
 
 /obj/structure/grille/update_icon()
 	if(destroyed)
@@ -104,7 +104,7 @@
 		if(!shock(user, 100))
 			playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
 			new /obj/item/stack/rods(loc, 2)
-			del(src)
+			qdel(src)
 	else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
 		if(!shock(user, 90))
 			playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -178,7 +178,7 @@
 		else
 			if(health <= -6)
 				new /obj/item/stack/rods(loc)
-				del(src)
+				qdel(src)
 				return
 	return
 

code/game/objects/structures/inflatable.dm

@@ -11,7 +11,7 @@
 		var/obj/structure/inflatable/R = new /obj/structure/inflatable(user.loc)
 		src.transfer_fingerprints_to(R)
 		R.add_fingerprint(user)
-		del(src)
+		qdel(src)
 
 /obj/structure/inflatable
 	name = "inflatable wall"
@@ -30,7 +30,7 @@
 	..()
 	update_nearby_tiles(need_rebuild=1)
 
-/obj/structure/inflatable/Del()
+/obj/structure/inflatable/Destroy()
 	update_nearby_tiles()
 	..()
 
@@ -50,7 +50,7 @@
 /obj/structure/inflatable/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			deflate(1)
@@ -94,14 +94,14 @@
 		visible_message("[src] rapidly deflates!")
 		var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc)
 		src.transfer_fingerprints_to(R)
-		del(src)
+		qdel(src)
 	else
 		//user << "\blue You slowly deflate the inflatable wall."
 		visible_message("[src] slowly deflates.")
 		spawn(50)
 			var/obj/item/inflatable/R = new /obj/item/inflatable(loc)
 			src.transfer_fingerprints_to(R)
-			del(src)
+			qdel(src)
 
 /obj/structure/inflatable/verb/hand_deflate()
 	set name = "Deflate"
@@ -134,7 +134,7 @@
 		var/obj/structure/inflatable/door/R = new /obj/structure/inflatable/door(user.loc)
 		src.transfer_fingerprints_to(R)
 		R.add_fingerprint(user)
-		del(src)
+		qdel(src)
 
 /obj/structure/inflatable/door //Based on mineral door code
 	name = "inflatable door"
@@ -219,13 +219,13 @@
 		visible_message("[src] rapidly deflates!")
 		var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc)
 		src.transfer_fingerprints_to(R)
-		del(src)
+		qdel(src)
 	else
 		visible_message("[src] slowly deflates.")
 		spawn(50)
 			var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc)
 			src.transfer_fingerprints_to(R)
-			del(src)
+			qdel(src)
 
 /obj/item/inflatable/torn
 	name = "torn inflatable wall"

code/game/objects/structures/kitchen_spike.dm

@@ -20,8 +20,8 @@
 	else
 		if(spike(G.affecting))
 			visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>")
-			del(G.affecting)
-			del(G)
+			qdel(G.affecting)
+			qdel(G)
 		else
 			user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
 

code/game/objects/structures/lamarr_cage.dm

@@ -15,7 +15,7 @@
 		if (1)
 			new /obj/item/weapon/shard( src.loc )
 			Break()
-			del(src)
+			qdel(src)
 		if (2)
 			if (prob(50))
 				src.health -= 15
@@ -37,13 +37,13 @@
 	if (prob(75))
 		new /obj/item/weapon/shard( src.loc )
 		Break()
-		del(src)
+		qdel(src)
 
 
 /obj/structure/lamarr/meteorhit(obj/O as obj)
 		new /obj/item/weapon/shard( src.loc )
 		Break()
-		del(src)
+		qdel(src)
 
 
 /obj/structure/lamarr/proc/healthcheck()

code/game/objects/structures/lattice.dm

@@ -13,10 +13,10 @@
 ///// Z-Level Stuff
 	if(!(istype(src.loc, /turf/space) || istype(src.loc, /turf/simulated/floor/open)))
 ///// Z-Level Stuff
-		del(src)
+		qdel(src)
 	for(var/obj/structure/lattice/LAT in src.loc)
 		if(LAT != src)
-			del(LAT)
+			qdel(LAT)
 	icon = 'icons/obj/smoothlattice.dmi'
 	icon_state = "latticeblank"
 	updateOverlays()
@@ -26,7 +26,7 @@
 			L = locate(/obj/structure/lattice, get_step(src, dir))
 			L.updateOverlays()
 
-/obj/structure/lattice/Del()
+/obj/structure/lattice/Destroy()
 	for (var/dir in cardinal)
 		var/obj/structure/lattice/L
 		if(locate(/obj/structure/lattice, get_step(src, dir)))
@@ -35,16 +35,16 @@
 	..()
 
 /obj/structure/lattice/blob_act()
-	del(src)
+	qdel(src)
 	return
 
 /obj/structure/lattice/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
-			del(src)
+			qdel(src)
 			return
 		if(3.0)
 			return
@@ -62,13 +62,13 @@
 		if(WT.remove_fuel(0, user))
 			user << "\blue Slicing lattice joints ..."
 		new /obj/item/stack/rods(src.loc)
-		del(src)
+		qdel(src)
 
 	return
 
 /obj/structure/lattice/proc/updateOverlays()
 	//if(!(istype(src.loc, /turf/space)))
-	//	del(src)
+	//	qdel(src)
 	spawn(1)
 		overlays = list()
 

code/game/objects/structures/mineral_doors.dm

@@ -22,7 +22,7 @@
 		name = "[mineralType] door"
 		update_nearby_tiles(need_rebuild=1)
 
-	Del()
+	Destroy()
 		update_nearby_tiles()
 		..()
 
@@ -137,7 +137,7 @@
 				var/ore = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
 				for(var/i = 3, i <= oreAmount, i++)
 					new ore(get_turf(src))
-		del(src)
+		qdel(src)
 
 	ex_act(severity = 1)
 		switch(severity)
@@ -239,7 +239,7 @@
 		if(!devastated)
 			for(var/i = 1, i <= oreAmount, i++)
 				new/obj/item/stack/sheet/wood(get_turf(src))
-		del(src)
+		qdel(src)
 
 /obj/structure/mineral_door/resin
 	mineralType = "resin"
@@ -279,7 +279,7 @@
 		isSwitchingStates = 0
 
 	Dismantle(devastated = 0)
-		del(src)
+		qdel(src)
 
 	CheckHardness()
 		playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)

code/game/objects/structures/mirror.dm

@@ -91,5 +91,5 @@
 					vox.real_name = newname
 					vox.name = vox.real_name
 					raiders.update_access(vox)
-				del(user)
+				qdel(user)
 	..()

code/game/objects/structures/morgue.dm

@@ -36,21 +36,21 @@
 			for(var/atom/movable/A as mob|obj in src)
 				A.loc = src.loc
 				ex_act(severity)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 	return
 
@@ -64,7 +64,7 @@
 				A.loc = src
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		//src.connected = null
-		del(src.connected)
+		qdel(src.connected)
 	else
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		src.connected = new /obj/structure/m_tray( src.loc )
@@ -80,7 +80,7 @@
 			src.connected.set_dir(src.dir)
 		else
 			//src.connected = null
-			del(src.connected)
+			qdel(src.connected)
 	src.add_fingerprint(user)
 	update()
 	return
@@ -116,7 +116,7 @@
 		src.connected.icon_state = "morguet"
 	else
 		//src.connected = null
-		del(src.connected)
+		qdel(src.connected)
 	return
 
 
@@ -144,7 +144,7 @@
 		src.connected.update()
 		add_fingerprint(user)
 		//SN src = null
-		del(src)
+		qdel(src)
 		return
 	return
 
@@ -195,21 +195,21 @@
 			for(var/atom/movable/A as mob|obj in src)
 				A.loc = src.loc
 				ex_act(severity)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(5))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 	return
 
@@ -232,7 +232,7 @@
 				A.loc = src
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		//src.connected = null
-		del(src.connected)
+		qdel(src.connected)
 	else if (src.locked == 0)
 		playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
 		src.connected = new /obj/structure/c_tray( src.loc )
@@ -247,7 +247,7 @@
 			src.connected.icon_state = "cremat"
 		else
 			//src.connected = null
-			del(src.connected)
+			qdel(src.connected)
 	src.add_fingerprint(user)
 	update()
 
@@ -282,7 +282,7 @@
 		src.connected.icon_state = "cremat"
 	else
 		//src.connected = null
-		del(src.connected)
+		qdel(src.connected)
 	return
 
 /obj/structure/crematorium/proc/cremate(atom/A, mob/user as mob)
@@ -323,10 +323,10 @@
 			//log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> cremated <b>[M]/[M.ckey]</b>")
 			M.death(1)
 			M.ghostize()
-			del(M)
+			qdel(M)
 
 		for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up
-			del(O)
+			qdel(O)
 
 		new /obj/effect/decal/cleanable/ash(src)
 		sleep(30)
@@ -360,7 +360,7 @@
 		src.connected.update()
 		add_fingerprint(user)
 		//SN src = null
-		del(src)
+		qdel(src)
 		return
 	return
 

code/game/objects/structures/signs.dm

@@ -8,19 +8,19 @@
 /obj/structure/sign/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
-			del(src)
+			qdel(src)
 			return
 		if(3.0)
-			del(src)
+			qdel(src)
 			return
 		else
 	return
 
 /obj/structure/sign/blob_act()
-	del(src)
+	qdel(src)
 	return
 
 /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob)	//deconstruction
@@ -33,7 +33,7 @@
 		//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
 		//S.icon = I.Scale(24, 24)
 		S.sign_state = icon_state
-		del(src)
+		qdel(src)
 	else ..()
 
 /obj/item/sign
@@ -62,7 +62,7 @@
 		S.desc = desc
 		S.icon_state = sign_state
 		user << "You fasten \the [S] with your [tool]."
-		del(src)
+		qdel(src)
 	else ..()
 
 /obj/structure/sign/double/map

code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

@@ -79,5 +79,5 @@
 /obj/structure/bed/nest/proc/healthcheck()
 	if(health <=0)
 		density = 0
-		del(src)
+		qdel(src)
 	return

code/game/objects/structures/stool_bed_chair_nest/bed.dm

@@ -20,27 +20,27 @@
 /obj/structure/bed/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(5))
-				del(src)
+				qdel(src)
 				return
 
 /obj/structure/bed/blob_act()
 	if(prob(75))
 		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
+		qdel(src)
 
 /obj/structure/bed/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
+		qdel(src)
 	else
 		..()
 
@@ -71,7 +71,7 @@
 			visible_message("[user] collapses \the [src.name].")
 			new/obj/item/roller(get_turf(src))
 			spawn(0)
-				del(src)
+				qdel(src)
 		return
 	..()
 
@@ -85,7 +85,7 @@
 /obj/item/roller/attack_self(mob/user)
 		var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
 		R.add_fingerprint(user)
-		del(src)
+		qdel(src)
 
 /obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob)
 
@@ -119,7 +119,7 @@
 	user << "\blue You deploy the roller bed."
 	var/obj/structure/bed/roller/R = new /obj/structure/bed/roller(user.loc)
 	R.add_fingerprint(user)
-	del(held)
+	qdel(held)
 	held = null
 
 
@@ -153,5 +153,5 @@
 		visible_message("[usr] collapses \the [src.name].")
 		new/obj/item/roller(get_turf(src))
 		spawn(0)
-			del(src)
+			qdel(src)
 		return

code/game/objects/structures/stool_bed_chair_nest/chairs.dm

@@ -26,7 +26,7 @@
 		E.part = SK
 		SK.loc = E
 		SK.master = E
-		del(src)
+		qdel(src)
 
 /obj/structure/bed/chair/attack_tk(mob/user as mob)
 	if(buckled_mob)
@@ -79,7 +79,7 @@
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		new /obj/item/stack/sheet/wood(src.loc)
-		del(src)
+		qdel(src)
 	else
 		..()
 

code/game/objects/structures/stool_bed_chair_nest/stools.dm

@@ -13,7 +13,7 @@
 		user.remove_from_mob(src)
 		var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
 		m.loc = get_turf(src)
-		del src
+		qdel(src)
 		var/mob/living/T = M
 		T.Weaken(10)
 		T.apply_damage(20)
@@ -23,25 +23,25 @@
 /obj/item/weapon/stool/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(5))
-				del(src)
+				qdel(src)
 				return
 
 /obj/item/weapon/stool/blob_act()
 	if(prob(75))
 		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
+		qdel(src)
 
 /obj/item/weapon/stool/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/wrench))
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		new /obj/item/stack/sheet/metal(src.loc)
-		del(src)
+		qdel(src)
 	..()

code/game/objects/structures/tables_racks.dm

@@ -59,11 +59,11 @@
 	..()
 	for(var/obj/structure/table/T in src.loc)
 		if(T != src)
-			del(T)
+			qdel(T)
 	update_icon()
 	update_adjacent()
 
-/obj/structure/table/Del()
+/obj/structure/table/Destroy()
 	update_adjacent()
 	..()
 
@@ -328,7 +328,7 @@
 				return 0
 			else
 				visible_message("<span class='warning'>[src] breaks down!</span>")
-				destroy()
+				qdel(src)
 				return 1
 	return 1
 
@@ -375,7 +375,7 @@
 				G.affecting.loc = src.loc
 				G.affecting.Weaken(5)
 				visible_message("<span class='danger'>[G.assailant] puts [G.affecting] on \the [src].</span>")
-			del(W)
+			qdel(W)
 			return
 
 	// Handle dissembly.
@@ -386,7 +386,7 @@
 		user << "<span class='notice'>You locate the bolts and begin disassembling \the [src]...</span>"
 		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
 		if(do_after(user,50))
-			destroy()
+			qdel(src)
 		return
 
 	// Handle weakening.
@@ -429,7 +429,7 @@
 		playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
 		playsound(src.loc, "sparks", 50, 1)
 		user.visible_message("<span class='danger'>The [src] was sliced apart by [user]!</span>")
-		destroy()
+		qdel(src)
 
 	user.drop_item(src.loc)
 	return

code/game/objects/structures/transit_tubes.dm

@@ -47,7 +47,7 @@
 
 
 
-/obj/structure/transit_tube_pod/Del()
+/obj/structure/transit_tube_pod/Destroy()
 	for(var/atom/movable/AM in contents)
 		AM.loc = loc
 
@@ -63,7 +63,7 @@ obj/structure/ex_act(severity)
 				AM.loc = loc
 				AM.ex_act(severity++)
 
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if(prob(50))
@@ -71,7 +71,7 @@ obj/structure/ex_act(severity)
 					AM.loc = loc
 					AM.ex_act(severity++)
 
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			return

code/game/objects/structures/watercloset.dm

@@ -173,7 +173,7 @@
 /obj/machinery/shower/update_icon()	//this is terribly unreadable, but basically it makes the shower mist up
 	overlays.Cut()					//once it's been on for a while, in addition to handling the water overlay.
 	if(mymist)
-		del(mymist)
+		qdel(mymist)
 
 	if(on)
 		overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
@@ -183,16 +183,16 @@
 			spawn(50)
 				if(src && on)
 					ismist = 1
-					mymist = new /obj/effect/mist(loc)
+					mymist = PoolOrNew(/obj/effect/mist,loc)
 		else
 			ismist = 1
-			mymist = new /obj/effect/mist(loc)
+			mymist = PoolOrNew(/obj/effect/mist,loc)
 	else if(ismist)
 		ismist = 1
-		mymist = new /obj/effect/mist(loc)
+		mymist = PoolOrNew(/obj/effect/mist,loc)
 		spawn(250)
 			if(src && !on)
-				del(mymist)
+				qdel(mymist)
 				ismist = 0
 
 /obj/machinery/shower/Crossed(atom/movable/O)
@@ -292,7 +292,7 @@
 		loc.clean_blood()
 		for(var/obj/effect/E in tile)
 			if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
-				del(E)
+				qdel(E)
 
 /obj/machinery/shower/process()
 	if(!on) return

code/game/objects/structures/windoor_assembly.dm

@@ -37,7 +37,7 @@ obj/structure/windoor_assembly/New(Loc, start_dir=NORTH, constructed=0)
 	
 	update_nearby_tiles(need_rebuild=1)
 
-obj/structure/windoor_assembly/Del()
+obj/structure/windoor_assembly/Destroy()
 	density = 0
 	update_nearby_tiles()
 	..()
@@ -79,7 +79,7 @@ obj/structure/windoor_assembly/Del()
 						new /obj/item/stack/sheet/glass/reinforced(get_turf(src), 5)
 						if(secure)
 							new /obj/item/stack/rods(get_turf(src), 4)
-						del(src)
+						qdel(src)
 				else
 					user << "\blue You need more welding fuel to dissassemble the windoor assembly."
 					return
@@ -249,7 +249,7 @@ obj/structure/windoor_assembly/Del()
 						src.electronics.loc = windoor
 
 
-					del(src)
+					qdel(src)
 
 
 			else

code/game/objects/structures/window.dm

@@ -93,7 +93,7 @@
 	else
 		new shardtype(loc)
 		if(reinf) new /obj/item/stack/rods(loc)
-	del(src)
+	qdel(src)
 	return
 
 
@@ -111,7 +111,7 @@
 /obj/structure/window/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			shatter(0)
@@ -216,7 +216,7 @@
 		if(istype(G.affecting,/mob/living))
 			var/mob/living/M = G.affecting
 			var/state = G.state
-			del(W)	//gotta delete it here because if window breaks, it won't get deleted
+			qdel(W)	//gotta delete it here because if window breaks, it won't get deleted
 			switch (state)
 				if(1)
 					M.visible_message("<span class='warning'>[user] slams [M] against \the [src]!</span>")
@@ -266,7 +266,7 @@
 				mats.amount = is_fulltile() ? 4 : 2
 			else
 				new glasstype(loc)
-			del(src)
+			qdel(src)
 	else
 		if(W.damtype == BRUTE || W.damtype == BURN)
 			hit(W.force)
@@ -334,7 +334,7 @@
 	update_nearby_icons()
 
 
-/obj/structure/window/Del()
+/obj/structure/window/Destroy()
 	density = 0
 	update_nearby_tiles()
 	update_nearby_icons()