Merge resolution.

code/modules/assembly/bomb.dm

@@ -39,7 +39,7 @@
 		bombtank.master = null
 		bombtank = null
 
-		del(src)
+		qdel(src)
 		return
 	if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
 		if(!status)
@@ -144,8 +144,8 @@
 		ground_zero.hotspot_expose(1000, 125)
 
 	if(master)
-		del(master)
-	del(src)
+		qdel(master)
+	qdel(src)
 
 /obj/item/weapon/tank/proc/release()	//This happens when the bomb is not welded. Tank contents are just spat out.
 	var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles)

code/modules/assembly/holder.dm

@@ -190,7 +190,7 @@
 				a_right:holder = null
 				a_right.loc = T
 			spawn(0)
-				del(src)
+				qdel(src)
 		return
 
 

code/modules/assembly/infrared.dm

@@ -32,7 +32,7 @@
 			processing_objects.Add(src)
 		else
 			on = 0
-			if(first)	del(first)
+			if(first)	qdel(first)
 			processing_objects.Remove(src)
 		update_icon()
 		return secured
@@ -53,7 +53,7 @@
 	process()//Old code
 		if(!on)
 			if(first)
-				del(first)
+				qdel(first)
 				return
 
 		if((!(first) && (secured && (istype(loc, /turf) || (holder && istype(holder.loc, /turf))))))
@@ -77,7 +77,7 @@
 
 
 	attack_hand()
-		del(first)
+		qdel(first)
 		..()
 		return
 
@@ -86,14 +86,14 @@
 		var/t = dir
 		..()
 		set_dir(t)
-		del(first)
+		qdel(first)
 		return
 
 
 	holder_movement()
 		if(!holder)	return 0
 //		set_dir(holder.dir)
-		del(first)
+		qdel(first)
 		return 1
 
 
@@ -175,7 +175,7 @@
 	if(master)
 		//world << "beam hit \ref[src]: calling master \ref[master].hit"
 		master.trigger_beam()
-	del(src)
+	qdel(src)
 	return
 
 /obj/effect/beam/i_beam/proc/vis_spread(v)
@@ -193,7 +193,7 @@
 
 	if((loc.density || !(master)))
 	//	world << "beam hit loc [loc] or no master [master], deleting"
-		del(src)
+		qdel(src)
 		return
 	//world << "proccess: [src.left] left"
 
@@ -233,17 +233,17 @@
 				return
 		else
 			//world << "is a next: \ref[next], deleting beam \ref[I]"
-			del(I)
+			qdel(I)
 	else
 		//world << "step failed, deleting \ref[next]"
-		del(next)
+		qdel(next)
 	spawn(10)
 		process()
 		return
 	return
 
 /obj/effect/beam/i_beam/Bump()
-	del(src)
+	qdel(src)
 	return
 
 /obj/effect/beam/i_beam/Bumped()
@@ -258,7 +258,10 @@
 		return
 	return
 
-/obj/effect/beam/i_beam/Del()
-	del(next)
+/obj/effect/beam/i_beam/Destroy()
+	if(master.first == src)
+		master.first = null
+	if(next)
+		qdel(next)
+		next = null
 	..()
-	return

code/modules/assembly/shock_kit.dm

@@ -8,9 +8,9 @@
 	w_class = 5.0
 	flags = CONDUCT
 
-/obj/item/assembly/shock_kit/Del()
-	del(part1)
-	del(part2)
+/obj/item/assembly/shock_kit/Destroy()
+	qdel(part1)
+	qdel(part2)
 	..()
 	return
 
@@ -25,7 +25,7 @@
 		part2.master = null
 		part1 = null
 		part2 = null
-		del(src)
+		qdel(src)
 		return
 	if(istype(W, /obj/item/weapon/screwdriver))
 		status = !status

code/modules/assembly/signaler.dm

@@ -141,6 +141,8 @@
 
 
 	proc/set_frequency(new_frequency)
+		if(!frequency)
+			return
 		if(!radio_controller)
 			sleep(20)
 		if(!radio_controller)
@@ -171,3 +173,9 @@
 		processing_objects.Add(src)
 		log_and_message_admins("is threatening to trigger a signaler deadman's switch")
 		usr.visible_message("\red [usr] moves their finger over [src]'s signal button...")
+
+/obj/item/device/assembly/signaler/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,frequency)
+	frequency = 0
+	..()