Merge pull request #2335 from Fox-McCloud/fix-dem-destroys

Last Few Destroy Fixes

code/game/objects/effects/effect_system.dm

@@ -454,6 +454,11 @@ steam.start() -- spawns the effect
 	var/direction
 	var/obj/chemholder
 
+	Destroy()
+		qdel(chemholder)
+		chemholder = null
+		return ..()
+
 	New()
 		..()
 		chemholder = new/obj()
@@ -548,35 +553,6 @@ steam.start() -- spawns the effect
 					if(smoke) smoke.delete()
 					src.total_smoke--
 
-// Goon compat.
-/datum/effect/effect/system/chem_smoke_spread/fart
-
-	set_up(var/mob/M, n = 5, c = 0, loca, direct)
-		if(n > 20)
-			n = 20
-		number = n
-		cardinals = c
-
-		chemholder.reagents.add_reagent("space_drugs", rand(1,10))
-
-		if(istype(loca, /turf/))
-			location = loca
-		else
-			location = get_turf(loca)
-		if(direct)
-			direction = direct
-
-		var/contained = "\[[chemholder.reagents.get_reagent_ids()]\]"
-		var/area/A = get_area(location)
-
-		var/where = "[A.name] | [location.x], [location.y]"
-		var/whereLink=formatJumpTo(location,where)
-
-		var/more = "(<A HREF='?_src_=holder;adminmoreinfo=\ref[M]'>?</a>)"
-		message_admins("[M][more] produced a toxic fart in ([whereLink])[contained].", 0, 1)
-		log_game("[M][more] produced a toxic fart in ([where])[contained].")
-
-
 /////////////////////////////////////////////
 // Sleep smoke
 /////////////////////////////////////////////
@@ -777,6 +753,10 @@ steam.start() -- spawns the effect
 	var/processing = 1
 	var/on = 1
 
+/datum/effect/effect/system/ion_trail_follow/Destroy()
+	oldposition = null
+	return ..()
+
 /datum/effect/effect/system/ion_trail_follow/set_up(atom/atom)
 	attach(atom)
 
@@ -810,6 +790,12 @@ steam.start() -- spawns the effect
 /datum/effect/effect/system/ion_trail_follow/space_trail
 	var/turf/oldloc // secondary ion trail loc
 	var/turf/currloc
+
+/datum/effect/effect/system/ion_trail_follow/space_trail/Destroy()
+	oldloc = null
+	currloc = null
+	return ..()
+
 /datum/effect/effect/system/ion_trail_follow/space_trail/start()
 	if(!src.on)
 		src.on = 1
@@ -870,6 +856,10 @@ steam.start() -- spawns the effect
 	var/processing = 1
 	var/on = 1
 
+	Destroy()
+		oldposition = null
+		return ..()
+
 	set_up(atom/atom)
 		attach(atom)
 		oldposition = get_turf(atom)

code/game/objects/items/devices/PDA/cart.dm

@@ -114,6 +114,10 @@
 	radio = new /obj/item/radio/integrated/signal(src)
 	..()
 
+/obj/item/weapon/cartridge/signal/Destroy()
+	qdel(radio)
+	return ..()
+
 /obj/item/weapon/cartridge/quartermaster
 	name = "Space Parts & Space Vendors Cartridge"
 	desc = "Perfect for the Quartermaster on the go!"

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

@@ -10,6 +10,10 @@
 	verbs -= /obj/item/verb/verb_pickup	//make sure this is never picked up.
 	..()
 
+/obj/item/weapon/storage/internal/Destroy()
+	master_item = null
+	return ..()
+
 /obj/item/weapon/storage/internal/attack_hand()
 	return		//make sure this is never picked up
 

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

@@ -19,6 +19,10 @@
 	src.ion_trail.set_up(src)
 	return
 
+/obj/item/weapon/tank/jetpack/Destroy()
+	qdel(ion_trail)
+	ion_trail = null
+	return ..()
 
 /obj/item/weapon/tank/jetpack/examine(mob/user)
 	if(!..(user, 0))