Merge pull request #6961 from Fox-McCloud/garbage-collect-stuffs

Garbage Collection and Code Cleanup

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

@@ -48,6 +48,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 /obj/item/clothing/mask/cigarette/Destroy()
 	if(reagents)
 		qdel(reagents)
+		reagents = null
 	processing_objects -= src
 	return ..()
 

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

@@ -18,10 +18,11 @@
 	..()
 
 /obj/item/weapon/grenade/plastic/Destroy()
-	qdel(nadeassembly)
-	nadeassembly = null
+	if(nadeassembly)
+		qdel(nadeassembly)
+		nadeassembly = null
 	target = null
-	..()
+	return ..()
 
 /obj/item/weapon/grenade/plastic/attackby(obj/item/I, mob/user, params)
 	if(!nadeassembly && istype(I, /obj/item/device/assembly_holder))

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

@@ -34,6 +34,7 @@
 	if(ptank)
 		qdel(ptank)
 		ptank = null
+	previousturf = null
 	return ..()
 
 

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

@@ -13,6 +13,10 @@
 	var/improvised = 0
 	var/garrote_time
 
+/obj/item/weapon/twohanded/garrote/Destroy()
+	strangling = null
+	return ..()
+
 /obj/item/weapon/twohanded/garrote/update_icon()
 	if(strangling) // If we're strangling someone we want our icon to stay wielded
 		icon_state = "garrot_unwrap"

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

@@ -26,6 +26,14 @@
 		payload_name += " " // formatting, ignore me
 	update_icon()
 
+/obj/item/weapon/grenade/chem_grenade/Destroy()
+	if(nadeassembly)
+		qdel(nadeassembly)
+		nadeassembly = null
+	for(var/thing in beakers)
+		qdel(thing)
+	beakers.Cut()
+	return ..()
 
 /obj/item/weapon/grenade/chem_grenade/examine(mob/user)
 	..(user)

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

@@ -13,6 +13,12 @@
 	var/list/signs = list()
 	var/max_signs = 20
 
+/obj/item/weapon/holosign_creator/Destroy()
+	for(var/sign in signs)
+		qdel(sign)
+	signs.Cut()
+	return ..()
+
 /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
 	if(flag)
 		var/turf/T = get_turf(target)

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

@@ -18,6 +18,7 @@
 	var/mopspeed = 30
 
 /obj/item/weapon/mop/New()
+	..()
 	create_reagents(mopcap)
 	janitorial_equipment += src
 

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

@@ -201,11 +201,17 @@
 	stunforce = 5
 	hitcost = 3750
 	slot_flags = SLOT_BACK
-	var/obj/item/device/assembly/igniter/sparkler = 0
+	var/obj/item/device/assembly/igniter/sparkler = null
 
 /obj/item/weapon/melee/baton/cattleprod/New()
 	..()
-	sparkler = new (src)
+	sparkler = new(src)
+
+/obj/item/weapon/melee/baton/cattleprod/Destroy()
+	if(sparkler)
+		qdel(sparkler)
+		sparkler = null
+	return ..()
 
 /obj/item/weapon/melee/baton/cattleprod/baton_stun()
 	if(sparkler.activate())