Pass 3

code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm

@@ -49,10 +49,10 @@ obj/machinery/atmospherics/binary
 
 		if(node1)
 			node1.disconnect(src)
-			del(network1)
+			qdel(network1)
 		if(node2)
 			node2.disconnect(src)
-			del(network2)
+			qdel(network2)
 
 		node1 = null
 		node2 = null

code/ATMOSPHERICS/components/omni_devices/omni_base.dm

@@ -229,7 +229,7 @@
 	for(var/datum/omni_port/P in ports)
 		if(P.node)
 			P.node.disconnect(src)
-			del(P.network)
+			qdel(P.network)
 			P.node = null
 
 	return ..()

code/ATMOSPHERICS/components/portables_connector.dm

@@ -68,7 +68,7 @@
 
 	if(node)
 		node.disconnect(src)
-		del(network)
+		qdel(network)
 
 	node = null
 

code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm

@@ -59,13 +59,13 @@ obj/machinery/atmospherics/trinary
 
 		if(node1)
 			node1.disconnect(src)
-			del(network1)
+			qdel(network1)
 		if(node2)
 			node2.disconnect(src)
-			del(network2)
+			qdel(network2)
 		if(node3)
 			node3.disconnect(src)
-			del(network3)
+			qdel(network3)
 
 		node1 = null
 		node2 = null

code/ATMOSPHERICS/components/tvalve.dm

@@ -106,13 +106,13 @@
 
 	if(node1)
 		node1.disconnect(src)
-		del(network_node1)
+		qdel(network_node1)
 	if(node2)
 		node2.disconnect(src)
-		del(network_node2)
+		qdel(network_node2)
 	if(node3)
 		node3.disconnect(src)
-		del(network_node3)
+		qdel(network_node3)
 
 	node1 = null
 	node2 = null

code/ATMOSPHERICS/components/unary/unary_base.dm

@@ -33,7 +33,7 @@
 
 		if(node)
 			node.disconnect(src)
-			del(network)
+			qdel(network)
 
 		node = null
 

code/ATMOSPHERICS/components/valve.dm

@@ -80,10 +80,10 @@
 
 	if(node1)
 		node1.disconnect(src)
-		del(network_node1)
+		qdel(network_node1)
 	if(node2)
 		node2.disconnect(src)
-		del(network_node2)
+		qdel(network_node2)
 
 	node1 = null
 	node2 = null

code/ATMOSPHERICS/datum_pipeline.dm

@@ -12,11 +12,11 @@ datum/pipeline
 
 	Destroy()
 		if(network)
-			del(network)
+			qdel(network)
 
 		if(air && air.volume)
 			temporarily_store_air()
-			del(air)
+			qdel(air)
 
 		return ..()
 

code/ATMOSPHERICS/pipes.dm

@@ -57,7 +57,7 @@
 
 
 /obj/machinery/atmospherics/pipe/Destroy()
-	del(parent)
+	qdel(parent)
 	if(air_temporary && loc)
 		loc.assume_air(air_temporary)
 

code/game/gamemodes/blob/blobs/core.dm

@@ -23,7 +23,7 @@
 	Destroy()
 		blob_cores -= src
 		if(overmind)
-			del(overmind)
+			qdel(overmind)
 		processing_objects.Remove(src)
 		return ..()
 

code/game/gamemodes/blob/overmind.dm

@@ -30,7 +30,7 @@
 /mob/camera/blob/Destroy()
 	if (ghostimage)
 		ghost_darkness_images -= ghostimage
-		del(ghostimage)
+		qdel(ghostimage)
 		ghostimage = null;
 		updateallghostimages()
 	return ..()

code/game/gamemodes/nuclear/pinpointer.dm

@@ -14,6 +14,7 @@
 
 	Destroy()
 		active = 0
+		the_disk = null
 		return ..()
 
 	attack_self()

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -35,7 +35,7 @@
 			update_icon()
 
 	Destroy()
-		del(air_contents)
+		qdel(air_contents)
 
 		return ..()
 

code/game/machinery/camera/camera.dm

@@ -59,7 +59,7 @@
 		if(bug.current == src)
 			bug.current = null
 		bug = null
-	del(wires)
+	qdel(wires)
 	cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that
 	return ..()
 

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

@@ -16,7 +16,7 @@
 	song.instrumentExt = "ogg"
 
 /obj/item/device/guitar/Destroy()
-	del(song)
+	qdel(song)
 	song = null
 	return ..()
 

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

@@ -15,7 +15,7 @@
 	song.instrumentExt = "ogg"
 
 /obj/item/device/violin/Destroy()
-	del(song)
+	qdel(song)
 	song = null
 	return ..()
 

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

@@ -37,8 +37,8 @@ LIGHTERS ARE IN LIGHTERS.DM
 	create_reagents(chem_volume) // making the cigarrete a chemical holder with a maximum volume of 30
 
 /obj/item/clothing/mask/cigarette/Destroy()
-	. = ..()
+	qdel(reagents)
-	del(reagents)
+	return ..()
 
 /obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	..()

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

@@ -165,7 +165,12 @@
 	if(on)
 		var/M = get(paddles, /mob)
 		remove_paddles(M)
-	update_icon()
+	if(paddles)
+		qdel(paddles)
+		paddles = null
+	if(bcell)
+		qdel(bcell)
+		bcell = null
 	return ..()
 
 /obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt)

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

@@ -182,7 +182,7 @@
 
 
 /obj/item/weapon/storage/fancy/cigarettes/Destroy()
-	del(reagents)
+	qdel(reagents)
 	return ..()
 
 

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

@@ -33,7 +33,7 @@
 
 /obj/item/weapon/tank/Destroy()
 	if(air_contents)
-		del(air_contents)
+		qdel(air_contents)
 
 	processing_objects.Remove(src)
 

code/game/objects/structures/musician.dm

@@ -318,7 +318,7 @@
 		icon_state = "piano"
 
 /obj/structure/piano/Destroy()
-	del(song)
+	qdel(song)
 	song = null
 	return ..()
 

code/modules/power/apc.dm

@@ -1330,7 +1330,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
 	area.power_change()
 	if(occupant)
 		malfvacate(1)
-	del(wires)
+	qdel(wires)
 	if(cell)
 		qdel(cell)
 	return ..()

code/modules/power/supermatter/supermatter.dm

@@ -72,7 +72,7 @@
 /obj/machinery/power/supermatter_shard/Destroy()
 	investigate_log("has been destroyed.", "supermatter")
 	qdel(radio)
-	. = ..()
+	return ..()
 
 /obj/machinery/power/supermatter_shard/proc/explode()
 	investigate_log("has exploded.", "supermatter")

code/modules/projectiles/guns/energy/temperature.dm

@@ -19,7 +19,7 @@
 
 	Destroy()
 		processing_objects.Remove(src)
-		..()
+		return ..()
 
 
 	attack_self(mob/living/user as mob)