Merge branch 'master' of https://github.com/tgstation/-tg-station into returnQDEL_HINT_LETMEDIE

Conflicts:
	code/game/objects/effects/landmarks.dm

code/modules/assembly/assembly.dm

@@ -25,13 +25,6 @@
 	var/const/WIRE_RADIO_RECEIVE = 8		//Allows Pulsed(1) to call Activate()
 	var/const/WIRE_RADIO_PULSE = 16		//Allows Pulse(1) to send a radio message
 
-/obj/item/device/assembly/Destroy()
-	qdel(connected)
-	connected = null
-	qdel(holder)
-	holder = null
-	return ..()
-
 /obj/item/device/assembly/proc/holder_movement()							//Called when the holder is moved
 	return
 
@@ -58,7 +51,7 @@
 
 //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
 /obj/item/device/assembly/proc/pulsed(radio = 0)
-	if(holder && (wires & WIRE_RECEIVE))
+	if(wires & WIRE_RECEIVE)
 		spawn(0)
 			activate()
 	if(radio && (wires & WIRE_RADIO_RECEIVE))

code/modules/assembly/igniter.dm

@@ -12,6 +12,11 @@
 	sparks.set_up(2, 0, src)
 	sparks.attach(src)
 
+/obj/item/device/assembly/igniter/Destroy()
+	qdel(sparks)
+	sparks = null
+	return ..()
+
 
 /obj/item/device/assembly/igniter/activate()
 	if(!..())	return 0//Cooldown check