Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt

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/taperecorder.dm

@@ -1,40 +0,0 @@
-/datum/wires/taperecorder
-	wire_count = 2
-	holder_type = /obj/item/device/taperecorder
-
-var/const/WIRE_PLAY = 1
-var/const/WIRE_RECORD = 2
-
-
-/datum/wires/taperecorder/UpdatePulsed(var/index)
-	switch(index)
-		if(WIRE_PLAY)
-			play()
-		if(WIRE_RECORD)
-			record()
-
-/datum/wires/taperecorder/CanUse(var/mob/living/L)
-	var/obj/item/device/taperecorder/T = holder
-	if(T.open_panel)
-		return 1
-	return 0
-
-
-/datum/wires/taperecorder/proc/play()
-	var/obj/item/device/taperecorder/T = holder
-	T.stop()
-	T.play()
-
-/datum/wires/taperecorder/proc/record()
-	var/obj/item/device/taperecorder/T = holder
-	if(T.recording)
-		T.stop()
-	else
-		T.record()
-
-//helpers
-/datum/wires/taperecorder/proc/get_play()
-	return !(wires_status & WIRE_PLAY)
-
-/datum/wires/taperecorder/proc/get_record()
-	return !(wires_status & WIRE_RECORD)

code/datums/wires/wires.dm

@@ -46,6 +46,11 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 			var/list/wires = same_wires[holder_type]
 			src.wires = wires // Reference the wires list.
 
+/datum/wires/Destroy()
+	holder = null
+	..()
+	return QDEL_HINT_QUEUE
+
 /datum/wires/proc/GenerateWires()
 	var/list/colours_to_pick = wireColours.Copy() // Get a copy, not a reference.
 	var/list/indexes_to_pick = list()