Merge pull request #7297 from Fox-McCloud/more-gc-defines

More GC Define Transitions

code/game/objects/items.dm

@@ -85,8 +85,8 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
 	if(ismob(loc))
 		var/mob/m = loc
 		m.unEquip(src, 1)
-	for(var/X in actions)
-		qdel(X)
+	QDEL_LIST(actions)
+	master = null
 	return ..()
 
 /obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)

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

@@ -31,8 +31,7 @@
 /obj/item/device/paicard/Destroy()
 	if(pai)
 		pai.ghostize()
-		qdel(pai)
-		pai = null
+		QDEL_NULL(pai)
 	QDEL_NULL(radio)
 	return ..()
 

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

@@ -267,6 +267,7 @@ var/global/list/default_medbay_channels = list(
 /mob/living/automatedannouncer/Destroy()
 	if(lifetime_timer)
 		deltimer(lifetime_timer)
+		lifetime_timer = null
 	return ..()
 
 /mob/living/automatedannouncer/proc/autocleanup()

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

@@ -28,9 +28,7 @@
 
 /obj/item/weapon/grenade/chem_grenade/Destroy()
 	QDEL_NULL(nadeassembly)
-	for(var/thing in beakers)
-		qdel(thing)
-	beakers.Cut()
+	QDEL_LIST(beakers)
 	return ..()
 
 /obj/item/weapon/grenade/chem_grenade/examine(mob/user)

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

@@ -1,12 +1,11 @@
 /obj/item/weapon/grenade/empgrenade
-	name = "classic emp grenade"
+	name = "classic EMP grenade"
+	desc = "It is designed to wreak havoc on electronic systems."
 	icon_state = "emp"
 	item_state = "emp"
 	origin_tech = "materials=2;magnets=3"
 
-	prime()
-		..()
-		if(empulse(src, 4, 10))
-			qdel(src)
-		return
-
+/obj/item/weapon/grenade/empgrenade/prime()
+	update_mob()
+	empulse(src, 4, 10)
+	qdel(src)

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

@@ -14,9 +14,7 @@
 	var/max_signs = 20
 
 /obj/item/weapon/holosign_creator/Destroy()
-	for(var/sign in signs)
-		qdel(sign)
-	signs.Cut()
+	QDEL_LIST(signs)
 	return ..()
 
 /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)

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

@@ -18,9 +18,7 @@
 
 /obj/item/weapon/pneumatic_cannon/Destroy()
 	QDEL_NULL(tank)
-	for(var/obj/item/I in loadedItems)
-		qdel(I)
-	loadedItems.Cut()
+	QDEL_LIST(loadedItems)
 	return ..()
 
 /obj/item/weapon/pneumatic_cannon/examine(mob/user)

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

@@ -69,8 +69,7 @@
 /obj/item/weapon/watertank/Destroy()
 	if(on)
 		remove_noz()
-		qdel(noz)
-		noz = null
+		QDEL_NULL(noz)
 	return ..()
 
 /obj/item/weapon/watertank/attack_hand(mob/user as mob)

code/game/objects/structures/transit_tubes/transit_tube_pod.dm

@@ -22,7 +22,6 @@
 /obj/structure/transit_tube_pod/Destroy()
 	for(var/atom/movable/AM in contents)
 		AM.forceMove(get_turf(src))
-
 	return ..()
 
 /obj/structure/transit_tube_pod/Process_Spacemove()