Merge pull request #7554 from SamHPurp/more-qdel-nulls

Uses more QDEL_NULLs

code/game/objects/effects/effect_system.dm

@@ -440,8 +440,7 @@ steam.start() -- spawns the effect
 	var/obj/chemholder
 
 	Destroy()
-		qdel(chemholder)
-		chemholder = null
+		QDEL_NULL(chemholder)
 		return ..()
 
 	New()

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

@@ -43,8 +43,7 @@
 	if(active_dummy)
 		eject_all()
 		playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
-		qdel(active_dummy)
-		active_dummy = null
+		QDEL_NULL(active_dummy)
 		to_chat(usr, "<span class='notice'>You deactivate \the [src].</span>")
 		var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
 		T.icon = 'icons/effects/effects.dmi'

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

@@ -37,8 +37,7 @@
 	R.hands.icon_state = "nomod"
 	R.icon_state = "robot"
 	R.module.remove_subsystems_and_actions(R)
-	qdel(R.module)
-	R.module = null
+	QDEL_NULL(R.module)
 
 	R.camera.network.Remove(list("Engineering", "Medical", "Mining Outpost"))
 	R.rename_character(R.real_name, R.get_default_name("Default"))

code/game/objects/items/toys.dm

@@ -1288,8 +1288,7 @@ obj/item/toy/cards/deck/syndicate/black
 
 	if(stored_minature)
 		to_chat(user, "<span class='danger'>\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!</span>")
-		qdel(stored_minature)
-		stored_minature = null
+		QDEL_NULL(stored_minature)
 		playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1)
 		cooldown = world.time
 

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

@@ -350,8 +350,7 @@
 					H.key = ghost.key
 					log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), src)
 
-					qdel(ghost)
-					ghost = null
+					QDEL_NULL(ghost)
 				var/tplus = world.time - H.timeofdeath
 				var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds)
 				var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting
@@ -500,8 +499,7 @@
 					H.key = ghost.key
 					log_runtime(EXCEPTION("Ghost of name [ghost.name] is bound to [H.real_name], but lacks a client. Deleting ghost."), H)
 
-					qdel(ghost)
-					ghost = null
+					QDEL_NULL(ghost)
 				var/tplus = world.time - H.timeofdeath
 				var/tlimit = 1800 //past this much time the patient is unrecoverable (in deciseconds)
 				var/tloss = 600 //brain damage starts setting in on the patient after some time left rotting

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

@@ -241,8 +241,7 @@
 /obj/item/weapon/wirecutters/attack(mob/living/carbon/C, mob/user)
 	if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/weapon/restraints/handcuffs/cable))
 		user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
-		qdel(C.handcuffed)
-		C.handcuffed = null
+		QDEL_NULL(C.handcuffed)
 		if(C.buckled && C.buckled.buckle_requires_restraints)
 			C.buckled.unbuckle_mob(C)
 		C.update_handcuffed()

code/game/objects/structures/morgue.dm

@@ -102,8 +102,7 @@
 			if(!( A.anchored ))
 				A.forceMove(src)
 		playsound(loc, open_sound, 50, 1)
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	else
 		playsound(loc, open_sound, 50, 1)
 		connected = new /obj/structure/m_tray( loc )
@@ -118,8 +117,7 @@
 			connected.icon_state = "morguet"
 			connected.dir = dir
 		else
-			qdel(connected)
-			connected = null
+			QDEL_NULL(connected)
 	add_fingerprint(user)
 	update()
 	return
@@ -155,8 +153,7 @@
 			A.forceMove(connected.loc)
 		connected.icon_state = "morguet"
 	else
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	return
 
 /obj/structure/morgue/Destroy()
@@ -306,8 +303,7 @@
 			if(!( A.anchored ))
 				A.forceMove(src)
 		playsound(loc, open_sound, 50, 1)
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	else if(locked == 0)
 		playsound(loc, open_sound, 50, 1)
 		connected = new /obj/structure/c_tray( loc )
@@ -321,8 +317,7 @@
 				A.forceMove(connected.loc)
 			connected.icon_state = "cremat"
 		else
-			qdel(connected)
-			connected = null
+			QDEL_NULL(connected)
 	add_fingerprint(user)
 	update()
 
@@ -355,8 +350,7 @@
 			A.forceMove(connected.loc)
 		connected.icon_state = "cremat"
 	else
-		qdel(connected)
-		connected = null
+		QDEL_NULL(connected)
 	return
 
 /obj/structure/crematorium/proc/cremate(mob/user as mob)

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

@@ -139,5 +139,4 @@
 	to_chat(user, "<span class='notice'>You deploy the roller bed.</span>")
 	var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
 	R.add_fingerprint(user)
-	qdel(held)
-	held = null
+	QDEL_NULL(held)