Merge pull request #2115 from Fox-McCloud/GC-datums

GC a few Datums

code/datums/material_container.dm

@@ -41,7 +41,8 @@
 
 /datum/material_container/Destroy()
 	owner = null
-	return ..()
+	..()
+	return QDEL_HINT_QUEUE
 
 //For inserting an amount of material
 /datum/material_container/proc/insert_amount(amt, material_type = null)

code/datums/wires/wires.dm

@@ -48,7 +48,8 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 
 /datum/wires/Destroy()
 	holder = null
-	return ..()
+	..()
+	return QDEL_HINT_QUEUE
 
 /datum/wires/proc/GenerateWires()
 	var/list/colours_to_pick = wireColours.Copy() // Get a copy, not a reference.

code/game/machinery/recycler.dm

@@ -27,6 +27,11 @@ var/const/SAFETY_COOLDOWN = 100
 	RefreshParts()
 	update_icon()
 
+/obj/machinery/recycler/Destroy()
+	qdel(materials)
+	materials = null
+	return ..()
+
 /obj/machinery/recycler/RefreshParts()
 	var/amt_made = 0
 	var/mat_mod = 0

code/game/objects/structures/musician.dm

@@ -21,7 +21,8 @@
 
 /datum/song/Destroy()
 	instrumentObj = null
-	return ..()
+	..()
+	return QDEL_HINT_QUEUE
 
 // note is a number from 1-7 for A-G
 // acc is either "b", "n", or "#"

code/modules/power/powernet.dm

@@ -29,7 +29,8 @@
 		M.powernet = null
 
 	powernets -= src
-	return ..()
+	..()
+	return QDEL_HINT_QUEUE
 
 //Returns the amount of excess power (before refunding to SMESs) from last tick.
 //This is for machines that might adjust their power consumption using this data.
@@ -51,7 +52,7 @@
 	cables -= C
 	C.powernet = null
 	if(is_empty())//the powernet is now empty...
-		del(src)///... delete it - qdel
+		qdel(src)///... delete it - qdel
 
 //add a cable to the current powernet
 //Warning : this proc DON'T check if the cable exists
@@ -71,7 +72,7 @@
 	nodes -=M
 	M.powernet = null
 	if(is_empty())//the powernet is now empty...
-		del(src)///... delete it - qdel
+		qdel(src)///... delete it - qdel
 
 
 //add a power machine to the current powernet

code/modules/research/protolathe.dm

@@ -62,6 +62,7 @@ Note: Must be placed west/left of and R&D console to function.
 
 /obj/machinery/r_n_d/protolathe/Destroy()
 	qdel(materials)
+	materials = null
 	return ..()
 
 /obj/machinery/r_n_d/protolathe/RefreshParts()