Fix non-icon merge conflicts

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

@@ -157,7 +157,7 @@
 		if(health <= 0)
 			for(var/atom/movable/A as mob|obj in src)
 				A.loc = src.loc
-			del(src)
+			qdel(src)
 	return
 
 /obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
@@ -166,14 +166,14 @@
 		visible_message("\red [user] destroys the [src]. ")
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 // this should probably use dump_contents()
 /obj/structure/closet/blob_act()
 	if(prob(75))
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 /obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/rcs) && !src.opened)
@@ -254,7 +254,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

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

@@ -41,7 +41,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)
@@ -57,7 +57,7 @@
 	if (timer <= 0)
 		dump_contents()
 		processing_objects.Remove(src)
-		del(src)
+		qdel(src)
 
 /obj/structure/closet/statue/dump_contents()
 
@@ -151,7 +151,7 @@
 		user.dust()
 	dump_contents()
 	visible_message("\red [src] shatters!. ")
-	del(src)
+	qdel(src)
 
 
 /obj/structure/statue

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

@@ -48,7 +48,7 @@
 
 		// 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")

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

@@ -160,7 +160,7 @@
 			return
 		user  << "<span class='notice'>You rig [src].</span>"
 		user.drop_item()
-		del(W)
+		qdel(W)
 		rigged = 1
 		return
 	else if(istype(W, /obj/item/device/radio/electropack))

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

@@ -43,7 +43,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)