Converts Most Destroys to use QDEL_NULL

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

@@ -59,8 +59,7 @@ RCD
 	return
 
 /obj/item/weapon/rcd/Destroy()
-	qdel(spark_system)
-	spark_system = null
+	QDEL_NULL(spark_system)
 	rcd_list -= src
 	return ..()
 

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

@@ -62,9 +62,7 @@
 		to_chat(user, "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>")
 
 /obj/item/weapon/twohanded/rcl/Destroy()
-	if(loaded)
-		qdel(loaded)
-		loaded = null
+	QDEL_NULL(loaded)
 	last = null
 	active = 0
 	return ..()

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

@@ -46,9 +46,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	reagents.set_reacting(FALSE) // so it doesn't react until you light it
 
 /obj/item/clothing/mask/cigarette/Destroy()
-	if(reagents)
-		qdel(reagents)
-		reagents = null
+	QDEL_NULL(reagents)
 	processing_objects -= src
 	return ..()
 

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

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

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

@@ -18,9 +18,7 @@
 	..()
 
 /obj/item/weapon/grenade/plastic/Destroy()
-	if(nadeassembly)
-		qdel(nadeassembly)
-		nadeassembly = null
+	QDEL_NULL(nadeassembly)
 	target = null
 	return ..()
 

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

@@ -25,15 +25,9 @@
 
 
 /obj/item/weapon/flamethrower/Destroy()
-	if(weldtool)
-		qdel(weldtool)
-		weldtool = null
-	if(igniter)
-		qdel(igniter)
-		igniter = null
-	if(ptank)
-		qdel(ptank)
-		ptank = null
+	QDEL_NULL(weldtool)
+	QDEL_NULL(igniter)
+	QDEL_NULL(ptank)
 	previousturf = null
 	return ..()
 

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

@@ -27,9 +27,7 @@
 	update_icon()
 
 /obj/item/weapon/grenade/chem_grenade/Destroy()
-	if(nadeassembly)
-		qdel(nadeassembly)
-		nadeassembly = null
+	QDEL_NULL(nadeassembly)
 	for(var/thing in beakers)
 		qdel(thing)
 	beakers.Cut()

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

@@ -27,12 +27,8 @@
 	icon_state = "[initial(icon_state)][armed]"
 
 /obj/item/weapon/restraints/legcuffs/beartrap/Destroy()
-	if(IED)
-		qdel(IED)
-		IED = null
-	if(sig)
-		qdel(sig)
-		sig = null
+	QDEL_NULL(IED)
+	QDEL_NULL(sig)
 	return ..()
 
 /obj/item/weapon/restraints/legcuffs/beartrap/suicide_act(mob/user)

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

@@ -17,9 +17,7 @@
 	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
 
 /obj/item/weapon/pneumatic_cannon/Destroy()
-	if(tank)
-		qdel(tank)
-		tank = null
+	QDEL_NULL(tank)
 	for(var/obj/item/I in loadedItems)
 		qdel(I)
 	loadedItems.Cut()

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

@@ -17,9 +17,7 @@
 
 
 /obj/item/weapon/melee/powerfist/Destroy()
-	if(tank)
-		qdel(tank)
-		tank = null
+	QDEL_NULL(tank)
 	return ..()
 
 /obj/item/weapon/melee/powerfist/examine(mob/user)

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

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

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

@@ -454,8 +454,8 @@
 	for(var/obj/O in contents)
 		O.mouse_opacity = initial(O.mouse_opacity)
 
-	qdel(boxes)
-	qdel(closer)
+	QDEL_NULL(boxes)
+	QDEL_NULL(closer)
 	return ..()
 
 /obj/item/weapon/storage/emp_act(severity)

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

@@ -24,9 +24,7 @@
 	return
 
 /obj/item/weapon/melee/baton/Destroy()
-	if(bcell)
-		qdel(bcell)
-		bcell = null
+	QDEL_NULL(bcell)
 	return ..()
 
 /obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
@@ -208,9 +206,7 @@
 	sparkler = new(src)
 
 /obj/item/weapon/melee/baton/cattleprod/Destroy()
-	if(sparkler)
-		qdel(sparkler)
-		sparkler = null
+	QDEL_NULL(sparkler)
 	return ..()
 
 /obj/item/weapon/melee/baton/cattleprod/baton_stun()

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

@@ -19,8 +19,7 @@
 	ion_trail.set_up(src)
 
 /obj/item/weapon/tank/jetpack/Destroy()
-	qdel(ion_trail)
-	ion_trail = null
+	QDEL_NULL(ion_trail)
 	return ..()
 
 /obj/item/weapon/tank/jetpack/ui_action_click(mob/user, actiontype)
@@ -82,7 +81,7 @@
 
 	var/datum/gas_mixture/removed = air_contents.remove(num)
 	if(removed.total_moles() < 0.005)
-		turn_off()
+		turn_off()
 		return 0
 
 	var/turf/T = get_turf(user)

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

@@ -33,9 +33,7 @@
 	return
 
 /obj/item/weapon/tank/Destroy()
-	if(air_contents)
-		qdel(air_contents)
-		air_contents = null
+	QDEL_NULL(air_contents)
 
 	processing_objects.Remove(src)