Merge pull request #12153 from duncathan/destroyfixes

Destroy() fixes

code/modules/awaymissions/maploader/reader.dm

@@ -309,6 +309,10 @@ var/global/dmm_suite/preloader/_preloader = null
 
 	. = ..()
 
+/dmm_suite/Destroy()
+	..()
+	return QDEL_HINT_HARDDEL_NOW
+
 //////////////////
 //Preloader datum
 //////////////////
@@ -321,7 +325,7 @@ var/global/dmm_suite/preloader/_preloader = null
 /dmm_suite/preloader/New(list/the_attributes, path)
 	.=..()
 	if(!the_attributes.len)
-		Del()
+		qdel(src)
 		return
 	attributes = the_attributes
 	target_path = path
@@ -329,4 +333,4 @@ var/global/dmm_suite/preloader/_preloader = null
 /dmm_suite/preloader/proc/load(atom/what)
 	for(var/attribute in attributes)
 		what.vars[attribute] = attributes[attribute]
-	Del()
+	qdel(src)

code/modules/awaymissions/maploader/swapmaps.dm

@@ -163,7 +163,7 @@ swapmap
 		z2=z?(z):1
 		AllocateSwapMap()
 
-	Del()
+	Destroy()
 		// a temporary datum for a chunk can be deleted outright
 		// for others, some cleanup is necessary
 		if(!ischunk)
@@ -186,6 +186,7 @@ swapmap
 				if(x2>=world.maxx || y2>=world.maxy || z2>=world.maxz) CutXYZ()
 				qdel(areas)
 		..()
+		return QDEL_HINT_HARDDEL_NOW
 
 	/*
 		Savefile format:

code/modules/mob/living/bloodcrawl.dm

@@ -27,6 +27,7 @@ obj/effect/dummy/slaughter/relaymove(mob/user, direction)
 	return
 
 /obj/effect/dummy/slaughter/Destroy()
+	..()
 	return QDEL_HINT_PUTINPOOL
 
 

code/modules/ninja/energy_katana.dm

@@ -69,12 +69,6 @@
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
-
-/obj/item/weapon/katana/energy/Del()
-	qdel(spark_system)
-	spark_system = null
-	..()
-
 /obj/item/weapon/katana/energy/Destroy()
 	qdel(spark_system)
 	spark_system = null

code/modules/projectiles/projectile/beams.dm

@@ -64,6 +64,7 @@
 	return //don't want the emitters to miss
 
 /obj/item/projectile/beam/emitter/Destroy()
+	..()
 	return QDEL_HINT_PUTINPOOL
 
 /obj/item/projectile/lasertag

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

@@ -332,7 +332,7 @@
 		lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
 		lowertemp.react()
 		T.assume_air(lowertemp)
-		hotspot.Kill()
+		qdel(hotspot)
 
 /datum/reagent/consumable/enzyme
 	name = "Universal Enzyme"

code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm

@@ -127,7 +127,7 @@
 			var/datum/gas_mixture/G = T.air
 			G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0)
 			G.react()
-			hotspot.Kill()
+			qdel(hotspot)
 	return
 
 /*