Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

code/game/antagonist/antagonist.dm

@@ -199,7 +199,7 @@
 			for(var/datum/uplink_item/UI in H.purchase_log)
 				var/obj/I = new UI.path
 				refined_log.Add("[H.purchase_log[UI]]x\icon[I][UI.name]")
-				del(I)
+				qdel(I)
 			purchases = english_list(refined_log, nothing_text = "")
 	if(uplink_true)
 		text += " (used [TC_uses] TC)"
@@ -215,7 +215,7 @@
 		if(antag.current && antag.current.client)
 			for(var/image/I in antag.current.client.images)
 				if(I.icon_state == antag_indicator)
-					del(I)
+					qdel(I)
 			for(var/datum/mind/other_antag in current_antagonists)
 				if(other_antag.current)
 					antag.current.client.images |= image('icons/mob/mob.dmi', loc = other_antag.current, icon_state = antag_indicator)
@@ -241,10 +241,10 @@
 				if(antag.current.client)
 					for(var/image/I in antag.current.client.images)
 						if(I.icon_state == antag_indicator && I.loc == player.current)
-							del(I)
+							qdel(I)
 		if(player.current && player.current.client)
 			for(var/image/I in player.current.client.images)
 				if(I.icon_state == antag_indicator)
-					del(I)
+					qdel(I)
 
 

code/game/antagonist/antagonist_build.dm

@@ -15,7 +15,7 @@
 		var/mob/holder = player.current
 		player.current = new mob_path(get_turf(player.current))
 		player.transfer_to(player.current)
-		if(holder) del(holder)
+		if(holder) qdel(holder)
 
 	player.original = player.current
 	return player.current
@@ -30,7 +30,7 @@
 		for(var/obj/item/thing in player.contents)
 			player.drop_from_inventory(thing)
 			if(thing.loc != player)
-				del(thing)
+				qdel(thing)
 	return 1
 
 	if(flags & ANTAG_SET_APPEARANCE)

code/game/antagonist/station/highlander.dm

@@ -32,7 +32,7 @@ var/datum/antagonist/highlander/highlanders
 	for (var/obj/item/I in player)
 		if (istype(I, /obj/item/weapon/implant))
 			continue
-		del(I)
+		qdel(I)
 
 	player.equip_to_slot_or_del(new /obj/item/clothing/under/kilt(player), slot_w_uniform)
 	player.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(player), slot_l_ear)

code/game/antagonist/station/rogue_ai.dm

@@ -213,7 +213,7 @@ var/datum/antagonist/rogue_ai/malf
 							/client/proc/reactivate_camera)
 
 						current:laws = new /datum/ai_laws/nanotrasen
-						del(current:malf_picker)
+						qdel(current:malf_picker)
 						current:show_laws()
 						current.icon_state = "ai"
 

code/game/area/Space Station 13 areas.dm

@@ -55,7 +55,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	var/list/all_doors = list()		//Added by Strumpetplaya - Alarm Change - Contains a list of doors adjacent to this area
 	var/air_doors_activated = 0
 	var/list/ambience = list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
-	var/sound/forced_ambience = null
+	var/list/forced_ambience = null
 	var/sound_env = 2	//reverb preset for sounds played in this area, see sound datum reference for more
 /*Adding a wizard area teleport list because motherfucking lag -- Urist*/
 /*I am far too lazy to make it a proper list of areas so I'll just make it run the usual telepot routine at the start of the game*/
@@ -1015,10 +1015,8 @@ area/space/atmosalert()
 /area/holodeck/alphadeck
 	name = "\improper Holodeck Alpha"
 
-
 /area/holodeck/source_plating
 	name = "\improper Holodeck - Off"
-	icon_state = "Holodeck"
 
 /area/holodeck/source_emptycourt
 	name = "\improper Holodeck - Empty Court"
@@ -1034,11 +1032,9 @@ area/space/atmosalert()
 
 /area/holodeck/source_courtroom
 	name = "\improper Holodeck - Courtroom"
-	icon_state = "Holodeck"
 
 /area/holodeck/source_beach
 	name = "\improper Holodeck - Beach"
-	icon_state = "Holodeck" // Lazy.
 
 /area/holodeck/source_burntest
 	name = "\improper Holodeck - Atmospheric Burn Test"
@@ -1065,9 +1061,6 @@ area/space/atmosalert()
 	name = "\improper Holodeck - Space"
 	has_gravity = 0
 
-
-
-
 //Engineering
 
 /area/engineering/

code/game/area/areas.dm

@@ -262,13 +262,15 @@ var/list/mob/living/forced_ambiance_list = new
 		L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
 
 	if(forced_ambience)
-		forced_ambiance_list += L
-		L << forced_ambience
+		if(forced_ambience.len)
+			forced_ambiance_list |= L
+			L << sound(pick(forced_ambience), repeat = 1, wait = 0, volume = 25, channel = 1)
+		else
+			L << sound(null, channel = 1)
 	else if(src.ambience.len && prob(35))
 		if((world.time >= L.client.played + 600))
-			var/musVolume = 25
 			var/sound = pick(ambience)
-			L << sound(sound, repeat = 0, wait = 0, volume = musVolume, channel = 1)
+			L << sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1)
 			L.client.played = world.time
 
 /area/proc/gravitychange(var/gravitystate = 0, var/area/A)

code/game/asteroid.dm

@@ -32,7 +32,7 @@ proc/spawn_room(var/atom/start_loc,var/x_size,var/y_size,var/wall,var/floor , va
 			var/cur_loc = locate(start_loc.x+x,start_loc.y+y,start_loc.z)
 			if(clean)
 				for(var/O in cur_loc)
-					del(O)
+					qdel(O)
 
 			var/area/asteroid/artifactroom/A = new
 			if(name)

code/game/atoms.dm

@@ -22,6 +22,18 @@
 	//Detective Work, used for the duplicate data points kept in the scanners
 	var/list/original_atom
 
+/atom/Destroy()
+	. = ..()
+	density = 0
+	SetOpacity(0)
+
+	if(reagents)
+		qdel(reagents)
+		reagents = null
+	for(var/atom/movable/AM in contents)
+		qdel(AM)
+	invisibility = 101
+
 /atom/proc/assume_air(datum/gas_mixture/giver)
 	return null
 
@@ -66,7 +78,6 @@
 		return flags & INSERT_CONTAINER
 */
 
-
 /atom/proc/meteorhit(obj/meteor as obj)
 	return
 
@@ -148,7 +159,7 @@ its easier to just keep the beam vertical.
 
 		for(var/obj/effect/overlay/beam/O in orange(10,src))	//This section erases the previously drawn beam because I found it was easier to
 			if(O.BeamSource==src)				//just draw another instance of the beam instead of trying to manipulate all the
-				del O							//pieces to a new orientation.
+				qdel(O)							//pieces to a new orientation.
 		var/Angle=round(Get_Angle(src,BeamTarget))
 		var/icon/I=new(icon,icon_state)
 		I.Turn(Angle)
@@ -189,7 +200,7 @@ its easier to just keep the beam vertical.
 			X.pixel_y=Pixel_y
 		sleep(3)	//Changing this to a lower value will cause the beam to follow more smoothly with movement, but it will also be more laggy.
 					//I've found that 3 ticks provided a nice balance for my use.
-	for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) del O
+	for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) qdel(O)
 
 
 //All atoms
@@ -229,7 +240,7 @@ its easier to just keep the beam vertical.
 
 /atom/proc/fire_act()
 	return
-    
+
 /atom/proc/melt()
 	return
 
@@ -362,7 +373,7 @@ its easier to just keep the beam vertical.
 
 	//Cleaning up shit.
 	if(fingerprints && !fingerprints.len)
-		del(fingerprints)
+		qdel(fingerprints)
 	return
 
 
@@ -419,7 +430,7 @@ its easier to just keep the beam vertical.
 	src.color = initial(src.color) //paint
 	src.germ_level = 0
 	if(istype(blood_DNA, /list))
-		del(blood_DNA)
+		qdel(blood_DNA)
 		return 1
 
 

code/game/atoms_movable.dm

@@ -14,6 +14,25 @@
 	var/moved_recently = 0
 	var/mob/pulledby = null
 
+/atom/movable/Del()
+	if(isnull(gcDestroyed) && loc)
+		testing("GC: -- [type] was deleted via del() rather than qdel() --")
+		CRASH()	// Debug until I can get a clean server start.
+//	else if(isnull(gcDestroyed))
+//		testing("GC: [type] was deleted via GC without qdel()") //Not really a huge issue but from now on, please qdel()
+//	else
+//		testing("GC: [type] was deleted via GC with qdel()")
+	..()
+
+/atom/movable/Destroy()
+	if(opacity)
+		if(isturf(loc))
+			if(loc:lighting_lumcount > 1)
+				UpdateAffectingLights()
+	loc = null
+
+	..()
+
 /atom/movable/Bump(var/atom/A, yes)
 	if(src.throwing)
 		src.throw_impact(A)

code/game/dna/dna_misc.dm

@@ -420,7 +420,7 @@
 			animation.master = src
 			flick("h2monkey", animation)
 			sleep(48)
-			del(animation)
+			qdel(animation)
 
 
 		var/mob/living/carbon/monkey/O = null
@@ -447,7 +447,7 @@
 
 
 		for(var/obj/T in (M.contents-implants))
-			del(T)
+			qdel(T)
 
 		O.loc = M.loc
 
@@ -469,7 +469,7 @@
 			I.loc = O
 			I.implanted = O
 //		O.update_icon = 1	//queue a full icon update at next life() call
-		del(M)
+		qdel(M)
 		return
 
 	if (!isblockon(getblock(M.dna.struc_enzymes, MONKEYBLOCK,3),MONKEYBLOCK) && !istype(M, /mob/living/carbon/human))
@@ -493,7 +493,7 @@
 			animation.master = src
 			flick("monkey2h", animation)
 			sleep(48)
-			del(animation)
+			qdel(animation)
 
 		var/mob/living/carbon/human/O = new( src )
 		if(Mo.greaterform)
@@ -519,7 +519,7 @@
 			M.viruses -= D
 
 		//for(var/obj/T in M)
-		//	del(T)
+		//	qdel(T)
 
 		O.loc = M.loc
 
@@ -553,7 +553,7 @@
 			I.loc = O
 			I.implanted = O
 //		O.update_icon = 1	//queue a full icon update at next life() call
-		del(M)
+		qdel(M)
 		return
 //////////////////////////////////////////////////////////// Monkey Block
 	if(M)

code/game/dna/dna_modifier.dm

@@ -144,7 +144,7 @@
 		return
 	put_in(G.affecting)
 	src.add_fingerprint(user)
-	del(G)
+	qdel(G)
 	return
 
 /obj/machinery/dna_scannernew/proc/put_in(var/mob/M)
@@ -187,7 +187,7 @@
 				ex_act(severity)
 				//Foreach goto(35)
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
@@ -196,7 +196,7 @@
 					ex_act(severity)
 					//Foreach goto(108)
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(25))
@@ -205,7 +205,7 @@
 					ex_act(severity)
 					//Foreach goto(181)
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		else
 	return
@@ -215,7 +215,7 @@
 	if(prob(75))
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 /obj/machinery/computer/scan_consolenew
 	name = "DNA Modifier Access Console"
@@ -262,12 +262,12 @@
 	switch(severity)
 		if(1.0)
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		else
 	return
@@ -275,7 +275,7 @@
 /obj/machinery/computer/scan_consolenew/blob_act()
 
 	if(prob(75))
-		del(src)
+		qdel(src)
 
 /obj/machinery/computer/scan_consolenew/power_change()
 	..()

code/game/dna/genes/monkey.dm

@@ -33,7 +33,7 @@
 		animation.master = src
 		flick("h2monkey", animation)
 		sleep(48)
-		del(animation)
+		qdel(animation)
 
 
 	var/mob/living/carbon/monkey/O = null
@@ -60,7 +60,7 @@
 
 
 	for(var/obj/T in (M.contents-implants))
-		del(T)
+		qdel(T)
 
 	O.loc = M.loc
 
@@ -82,7 +82,7 @@
 		I.loc = O
 		I.implanted = O
 //		O.update_icon = 1	//queue a full icon update at next life() call
-	del(M)
+	qdel(M)
 	return
 
 /datum/dna/gene/monkey/deactivate(var/mob/living/M, var/connected, var/flags)
@@ -108,7 +108,7 @@
 		animation.master = src
 		flick("monkey2h", animation)
 		sleep(48)
-		del(animation)
+		qdel(animation)
 
 	var/mob/living/carbon/human/O
 	if(Mo.greaterform)
@@ -136,7 +136,7 @@
 		M.viruses -= D
 
 	//for(var/obj/T in M)
-	//	del(T)
+	//	qdel(T)
 
 	O.loc = M.loc
 
@@ -171,5 +171,5 @@
 		I.loc = O
 		I.implanted = O
 //		O.update_icon = 1	//queue a full icon update at next life() call
-	del(M)
+	qdel(M)
 	return

code/game/gamemodes/blob/blobs/core.dm

@@ -14,7 +14,7 @@
 		..(loc, h)
 
 
-	Del()
+	Destroy()
 		blob_cores -= src
 		processing_objects.Remove(src)
 		..()
@@ -24,7 +24,7 @@
 	update_icon()
 		if(health <= 0)
 			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-			del(src)
+			qdel(src)
 			return
 		return
 

code/game/gamemodes/blob/blobs/factory.dm

@@ -12,7 +12,7 @@
 	update_icon()
 		if(health <= 0)
 			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-			del(src)
+			qdel(src)
 			return
 		return
 
@@ -22,6 +22,11 @@
 		new/mob/living/simple_animal/hostile/blobspore(src.loc, src)
 		return 1
 
+/obj/effect/blob/factory/Destroy()
+	for(var/mob/living/simple_animal/hostile/blobspore/spore in spores)
+		if(spore.factory == src)
+			spore.factory = null
+	..()
 
 /mob/living/simple_animal/hostile/blobspore
 	name = "blob"
@@ -58,9 +63,10 @@
 		..(loc)
 		return
 	death()
-		..()
-		if(factory)
-			factory.spores -= src
-		..()
-		del(src)
+		qdel(src)
 
+/mob/living/simple_animal/hostile/blobspore/Destroy()
+	if(factory)
+		factory.spores -= src
+		factory = null
+	..()

code/game/gamemodes/blob/blobs/node.dm

@@ -14,7 +14,7 @@
 		..(loc, h)
 
 
-	Del()
+	Destroy()
 		blob_nodes -= src
 		processing_objects.Remove(src)
 		..()
@@ -24,7 +24,7 @@
 	update_icon()
 		if(health <= 0)
 			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-			del(src)
+			qdel(src)
 			return
 		return
 

code/game/gamemodes/blob/blobs/shield.dm

@@ -14,7 +14,7 @@
 	update_icon()
 		if(health <= 0)
 			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-			del(src)
+			qdel(src)
 			return
 		return
 

code/game/gamemodes/blob/theblob.dm

@@ -31,7 +31,7 @@
 		return
 
 
-	Del()
+	Destroy()
 		blobs -= src
 		..()
 		return
@@ -110,7 +110,7 @@
 			B.loc = T
 		else
 			T.blob_act()//If we cant move in hit the turf
-			del(B)
+			qdel(B)
 		for(var/atom/A in T)//Hit everything in the turf
 			A.blob_act()
 		return 1
@@ -134,7 +134,7 @@
 	update_icon()//Needs to be updated with the types
 		if(health <= 0)
 			playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
-			del(src)
+			qdel(src)
 			return
 		if(health <= 15)
 			icon_state = "blob_damaged"
@@ -182,7 +182,7 @@
 				new/obj/effect/blob/factory(src.loc,src.health)
 			if("Shield")
 				new/obj/effect/blob/shield(src.loc,src.health*2)
-		del(src)
+		qdel(src)
 		return
 
 //////////////////////////////****IDLE BLOB***/////////////////////////////////////
@@ -201,7 +201,7 @@
 
 	proc/update_idle()
 		if(health<=0)
-			del(src)
+			qdel(src)
 			return
 		if(health<4)
 			icon_state = "blobc0"
@@ -212,7 +212,7 @@
 		icon_state = "blobidle0"
 
 
-	Del()
+	Destroy()
 		var/obj/effect/blob/B = new /obj/effect/blob( src.loc )
 		spawn(30)
 			B.Life()

code/game/gamemodes/changeling/changeling_powers.dm

@@ -385,7 +385,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
 	animation.master = src
 	flick("monkey2h", animation)
 	sleep(48)
-	del(animation)
+	qdel(animation)
 
 	for(var/obj/item/W in src)
 		C.drop_from_inventory(W)
@@ -400,7 +400,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
 	O.real_name = chosen_dna.real_name
 
 	for(var/obj/T in C)
-		del(T)
+		qdel(T)
 
 	O.loc = C.loc
 
@@ -420,7 +420,7 @@ var/global/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","E
 	O.changeling_update_languages(changeling.absorbed_languages)
 
 	feedback_add_details("changeling_powers","LFT")
-	del(C)
+	qdel(C)
 	return 1
 
 

code/game/gamemodes/cult/cult_structures.dm

@@ -155,7 +155,7 @@
 		if(istype(M, /mob/living/silicon/robot))
 			var/mob/living/silicon/robot/Robot = M
 			if(Robot.mmi)
-				del(Robot.mmi)
+				qdel(Robot.mmi)
 		else
 			for(var/obj/item/W in M)
 				if(istype(W, /obj/item/weapon/implant))

code/game/gamemodes/cult/cultify/mob.dm

@@ -32,11 +32,11 @@
 	else
 		dust()
 
-/mob/proc/see_narsie(var/obj/machinery/singularity/narsie/large/N, var/dir)
+/mob/proc/see_narsie(var/obj/singularity/narsie/large/N, var/dir)
 	if(N.chained)
 		if(narsimage)
-			del(narsimage)
-			del(narglow)
+			qdel(narsimage)
+			qdel(narglow)
 		return
 	if((N.z == src.z)&&(get_dist(N,src) <= (N.consume_range+10)) && !(N in view(src)))
 		if(!narsimage) //Create narsimage
@@ -59,5 +59,5 @@
 		src << narglow
 	else
 		if(narsimage)
-			del(narsimage)
-			del(narglow)
+			qdel(narsimage)
+			qdel(narglow)

code/game/gamemodes/cult/cultify/obj.dm

@@ -65,8 +65,11 @@
 	new /obj/structure/cult/tome(loc)
 	qdel(src)
 
-/obj/machinery/door/cultify()
+/obj/machinery/door/airlock/external/cultify()
 	new /obj/structure/mineral_door/wood(loc)
+	..()
+
+/obj/machinery/door/cultify()
 	icon_state = "null"
 	density = 0
 	c_animation = new /atom/movable/overlay(src.loc)
@@ -79,7 +82,7 @@
 	c_animation.icon_state = "breakdoor"
 	flick("cultification",c_animation)
 	spawn(10)
-		del(c_animation)
+		qdel(c_animation)
 		qdel(src)
 
 /obj/machinery/door/firedoor/cultify()
@@ -125,7 +128,7 @@
 /obj/structure/mineral_door/wood/cultify()
 	return
 
-/obj/machinery/singularity/cultify()
+/obj/singularity/cultify()
 	var/dist = max((current_size - 2), 1)
 	explosion(get_turf(src), dist, dist * 2, dist * 4)
 	qdel(src)

code/game/gamemodes/cult/hell_universe.dm

@@ -40,6 +40,7 @@ In short:
 // Apply changes when entering state
 /datum/universal_state/hell/OnEnter()
 	set background = 1
+	garbage_collector.garbage_collect = 0
 	escape_list = get_area_turfs(locate(/area/hallway/secondary/exit))
 
 	//Separated into separate procs for profiling

code/game/gamemodes/cult/ritual.dm

@@ -74,7 +74,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 				AI.client.images += blood_image
 		rune_list.Add(src)
 
-	Del()
+	Destroy()
 		for(var/mob/living/silicon/ai/AI in player_list)
 			if(AI.client)
 				AI.client.images -= blood_image
@@ -92,11 +92,11 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 	attackby(I as obj, user as mob)
 		if(istype(I, /obj/item/weapon/book/tome) && iscultist(user))
 			user << "You retrace your steps, carefully undoing the lines of the rune."
-			del(src)
+			qdel(src)
 			return
 		else if(istype(I, /obj/item/weapon/nullrod))
 			user << "\blue You disrupt the vile magic with the deadening field of the null rod!"
-			del(src)
+			qdel(src)
 			return
 		return
 

code/game/gamemodes/cult/runes.dm

@@ -24,7 +24,7 @@ var/list/sacrificed = list()
 				user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
 				if (istype(user, /mob/living))
 					user.take_overall_damage(5, 0)
-				del(src)
+				qdel(src)
 			if(allrunesloc && index != 0)
 				if(istype(src,/obj/effect/rune))
 					user.say("Sas[pick("'","`")]so c'arta forbici!")//Only you can stop auto-muting
@@ -61,7 +61,7 @@ var/list/sacrificed = list()
 				user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric"
 				if (istype(user, /mob/living))
 					user.take_overall_damage(5, 0)
-				del(src)
+				qdel(src)
 			for(var/mob/living/carbon/C in orange(1,src))
 				if(iscultist(C) && !C.stat)
 					culcount++
@@ -94,7 +94,7 @@ var/list/sacrificed = list()
 				new /obj/item/weapon/book/tome(src.loc)
 			else
 				new /obj/item/weapon/book/tome(usr.loc)
-			del(src)
+			qdel(src)
 			return
 
 
@@ -190,7 +190,7 @@ var/list/sacrificed = list()
 					cultists += 1
 			if(cultists.len >= 9)
 				log_and_message_admins_many(cultists, "summoned Nar-sie.")
-				new /obj/machinery/singularity/narsie/large(src.loc)
+				new /obj/singularity/narsie/large(src.loc)
 				return
 			else
 				return fizzle()
@@ -209,7 +209,7 @@ var/list/sacrificed = list()
 				T.hotspot_expose(700,125)
 			var/rune = src // detaching the proc - in theory
 			empulse(U, (range_red - 2), range_red)
-			del(rune)
+			qdel(rune)
 			return
 
 /////////////////////////////////////////SIXTH RUNE
@@ -369,7 +369,7 @@ var/list/sacrificed = list()
 					usr.say("Kla[pick("'","`")]atu barada nikt'o!")
 					for (var/mob/V in viewers(src))
 						V.show_message("\red The rune turns into gray dust, veiling the surrounding runes.", 3)
-					del(src)
+					qdel(src)
 				else
 					usr.whisper("Kla[pick("'","`")]atu barada nikt'o!")
 					usr << "\red Your talisman turns into gray dust, veiling the surrounding runes."
@@ -545,8 +545,8 @@ var/list/sacrificed = list()
 				for (var/mob/V in viewers(src))
 					V.show_message("\red The runes turn into dust, which then forms into an arcane image on the paper.", 3)
 				usr.say("H'drak v[pick("'","`")]loso, mir'kanas verbot!")
-				del(imbued_from)
-				del(newtalisman)
+				qdel(imbued_from)
+				qdel(newtalisman)
 			else
 				return fizzle()
 
@@ -593,7 +593,7 @@ var/list/sacrificed = list()
 			for(var/datum/mind/H in cult.current_antagonists)
 				if (H.current)
 					H.current << "\red \b [input]"
-			del(src)
+			qdel(src)
 			return 1
 
 /////////////////////////////////////////FIFTEENTH RUNE
@@ -745,7 +745,7 @@ var/list/sacrificed = list()
 					usr.say("Nikt[pick("'","`")]o barada kla'atu!")
 					for (var/mob/V in viewers(src))
 						V.show_message("\red The rune turns into red dust, reveaing the surrounding runes.", 3)
-					del(src)
+					qdel(src)
 					return
 				if(istype(W,/obj/item/weapon/paper/talisman))
 					usr.whisper("Nikt[pick("'","`")]o barada kla'atu!")
@@ -818,7 +818,7 @@ var/list/sacrificed = list()
 				for(var/mob/living/carbon/C in users)
 					user.take_overall_damage(dam, 0)
 					C.say("Khari[pick("'","`")]d! Gual'te nikka!")
-				del(src)
+				qdel(src)
 			return fizzle()
 
 /////////////////////////////////////////NINETEENTH RUNE
@@ -858,7 +858,7 @@ var/list/sacrificed = list()
 				user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \
 				"\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
 				"\red You hear a pop and smell ozone.")
-				del(src)
+				qdel(src)
 			return fizzle()
 
 /////////////////////////////////////////TWENTIETH RUNES
@@ -881,7 +881,7 @@ var/list/sacrificed = list()
 					usr.say("Sti[pick("'","`")] kaliedir!")
 					usr << "\red The world becomes quiet as the deafening rune dissipates into fine dust."
 					admin_attacker_log_many_victims(usr, affected, "Used a deafen rune.", "Was victim of a deafen rune.", "used a deafen rune on")
-					del(src)
+					qdel(src)
 				else
 					return fizzle()
 			else
@@ -926,7 +926,7 @@ var/list/sacrificed = list()
 					usr.say("Sti[pick("'","`")] kaliesin!")
 					usr << "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust."
 					admin_attacker_log_many_victims(usr, affected, "Used a blindness rune.", "Was victim of a blindness rune.", "used a blindness rune on")
-					del(src)
+					qdel(src)
 				else
 					return fizzle()
 			else
@@ -984,7 +984,7 @@ var/list/sacrificed = list()
 						C.take_overall_damage(15, 0)
 				admin_attacker_log_many_victims(usr, victims, "Used a blood boil rune.", "Was the victim of a blood boil rune.", "used a blood boil rune on")
 				log_and_message_admins_many(cultists - usr, "assisted activating a blood boil rune.")
-				del(src)
+				qdel(src)
 			else
 				return fizzle()
 			return
@@ -1014,8 +1014,8 @@ var/list/sacrificed = list()
 							M << "\red Blood suddenly ignites, burning you!"
 							var/turf/T = get_turf(B)
 							T.hotspot_expose(700,125)
-							del(B)
-				del(src)
+							qdel(B)
+				qdel(src)
 
 //////////             Rune 24 (counting burningblood, which kinda doesnt work yet.)
 
@@ -1038,7 +1038,7 @@ var/list/sacrificed = list()
 						S.Weaken(5)
 						S.show_message("\red BZZZT... The rune has exploded in a bright flash.", 3)
 						admin_attack_log(usr, S, "Used a stun rune.", "Was victim of a stun rune.", "used a stun rune on")
-				del(src)
+				qdel(src)
 			else                        ///When invoked as talisman, stun and mute the target mob.
 				usr.say("Dream sign ''Evil sealing talisman'[pick("'","`")]!")
 				var/obj/item/weapon/nullrod/N = locate() in T
@@ -1081,5 +1081,5 @@ var/list/sacrificed = list()
 			//the below calls update_icons() at the end, which will update overlay icons by using the (now updated) cache
 			user.put_in_hands(new /obj/item/weapon/melee/cultblade(user))	//put in hands or on floor
 
-			del(src)
+			qdel(src)
 			return

code/game/gamemodes/cult/talisman.dm

@@ -35,7 +35,7 @@
 			user.take_organ_damage(5, 0)
 			if(src && src.imbue!="supply" && src.imbue!="runestun")
 				if(delete)
-					del(src)
+					qdel(src)
 			return
 		else
 			user << "You see strange symbols on the paper. Are they supposed to mean something?"
@@ -47,7 +47,7 @@
 			if(imbue == "runestun")
 				user.take_organ_damage(5, 0)
 				call(/obj/effect/rune/proc/runestun)(T)
-				del(src)
+				qdel(src)
 			else
 				..()   ///If its some other talisman, use the generic attack code, is this supposed to work this way?
 		else
@@ -56,7 +56,7 @@
 
 	proc/supply(var/key)
 		if (!src.uses)
-			del(src)
+			qdel(src)
 			return
 
 		var/dat = "<B>There are [src.uses] bloody runes on the parchment.</B><BR>"

code/game/gamemodes/endgame/supermatter_cascade/blob.dm

@@ -49,7 +49,8 @@
 			for(var/atom/movable/A in T)
 				if(A)
 					if(istype(A,/mob/living))
-						del(A)
+						qdel(A)
+						continue
 					else if(istype(A,/mob)) // Observers, AI cameras.
 						continue
 					qdel(A)
@@ -114,4 +115,4 @@
 	if(istype(user,/mob/dead/observer))
 		return
 
-	del(user)
+	qdel(user)

code/game/gamemodes/endgame/supermatter_cascade/portal.dm

@@ -1,6 +1,6 @@
 /*** EXIT PORTAL ***/
 
-/obj/machinery/singularity/narsie/large/exit
+/obj/singularity/narsie/large/exit
 	name = "Bluespace Rift"
 	desc = "NO TIME TO EXPLAIN, JUMP IN"
 	icon = 'icons/obj/rift.dmi'
@@ -14,23 +14,23 @@
 
 	consume_range = 6
 
-/obj/machinery/singularity/narsie/large/exit/New()
+/obj/singularity/narsie/large/exit/New()
 	..()
 	processing_objects.Add(src)
 
-/obj/machinery/singularity/narsie/large/exit/update_icon()
+/obj/singularity/narsie/large/exit/update_icon()
 	overlays = 0
 
-/obj/machinery/singularity/narsie/large/exit/process()
+/obj/singularity/narsie/large/exit/process()
 	for(var/mob/M in player_list)
 		if(M.client)
 			M.see_rift(src)
 	eat()
 
-/obj/machinery/singularity/narsie/large/exit/acquire(var/mob/food)
+/obj/singularity/narsie/large/exit/acquire(var/mob/food)
 	return
 
-/obj/machinery/singularity/narsie/large/exit/consume(const/atom/A)
+/obj/singularity/narsie/large/exit/consume(const/atom/A)
 	if(!(A.singuloCanEat()))
 		return 0
 
@@ -62,7 +62,7 @@
 	//thou shall always be able to see the rift
 	var/image/riftimage = null
 
-/mob/proc/see_rift(var/obj/machinery/singularity/narsie/large/exit/R)
+/mob/proc/see_rift(var/obj/singularity/narsie/large/exit/R)
 	if((R.z == src.z) && (get_dist(R,src) <= (R.consume_range+10)) && !(R in view(src)))
 		if(!riftimage)
 			riftimage = image('icons/obj/rift.dmi',src.loc,"rift",LIGHTING_LAYER+2,1)
@@ -78,4 +78,4 @@
 
 	else
 		if(riftimage)
-			del(riftimage)
+			qdel(riftimage)

code/game/gamemodes/endgame/supermatter_cascade/universe.dm

@@ -33,6 +33,7 @@
 // Apply changes when entering state
 /datum/universal_state/supermatter_cascade/OnEnter()
 	set background = 1
+	garbage_collector.garbage_collect = 0
 	world << "<span class='sinister' style='font-size:22pt'>You are blinded by a brilliant flash of energy.</span>"
 
 	world << sound('sound/effects/cascade.ogg')
@@ -54,7 +55,7 @@
 	cult.allow_narsie = 0
 	PlayerSet()
 
-	new /obj/machinery/singularity/narsie/large/exit(pick(endgame_exits))
+	new /obj/singularity/narsie/large/exit(pick(endgame_exits))
 	spawn(rand(30,60) SECONDS)
 		var/txt = {"
 There's been a galaxy-wide electromagnetic pulse.  All of our systems are heavily damaged and many personnel are dead or dying. We are seeing increasing indications of the universe itself beginning to unravel.

code/game/gamemodes/events.dm

@@ -49,7 +49,7 @@
 			var/turf/T = pick(blobstart)
 			var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
 			spawn(rand(50, 300))
-				del(bh)
+				qdel(bh)
 		/*
 		if(3) //Leaving the code in so someone can try and delag it, but this event can no longer occur randomly, per SoS's request. --NEO
 			command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
@@ -71,7 +71,7 @@
 						P.icon_state = "anom"
 						P.name = "wormhole"
 						spawn(rand(300,600))
-							del(P)
+							qdel(P)
 		*/
 		if(3)
 			if((world.time/10)>=3600 && config.ninjas_allowed && !sent_ninja_to_station)//If an hour has passed, relatively speaking. Also, if ninjas are allowed to spawn and if there is not already a ninja for the round.

code/game/gamemodes/events/PortalStorm.dm

@@ -1,26 +1,26 @@
-/datum/event/portalstorm
-
-	Announce()
-		command_alert("Subspace disruption detected around the vessel", "Anomaly Alert")
-		LongTerm()
-
-		var/list/turfs = list(	)
-		var/turf/picked
-
-		for(var/turf/T in world)
-			if(T.z < 5 && istype(T,/turf/simulated/floor))
-				turfs += T
-
-		for(var/turf/T in world)
-			if(prob(10) && T.z < 5 && istype(T,/turf/simulated/floor))
-				spawn(50+rand(0,3000))
-					picked = pick(turfs)
-					var/obj/portal/P = new /obj/portal( T )
-					P.target = picked
-					P.creator = null
-					P.icon = 'icons/obj/objects.dmi'
-					P.failchance = 0
-					P.icon_state = "anom"
-					P.name = "wormhole"
-					spawn(rand(100,150))
-						del(P)
+/datum/event/portalstorm
+
+	Announce()
+		command_alert("Subspace disruption detected around the vessel", "Anomaly Alert")
+		LongTerm()
+
+		var/list/turfs = list(	)
+		var/turf/picked
+
+		for(var/turf/T in world)
+			if(T.z < 5 && istype(T,/turf/simulated/floor))
+				turfs += T
+
+		for(var/turf/T in world)
+			if(prob(10) && T.z < 5 && istype(T,/turf/simulated/floor))
+				spawn(50+rand(0,3000))
+					picked = pick(turfs)
+					var/obj/portal/P = new /obj/portal( T )
+					P.target = picked
+					P.creator = null
+					P.icon = 'icons/obj/objects.dmi'
+					P.failchance = 0
+					P.icon_state = "anom"
+					P.name = "wormhole"
+					spawn(rand(100,150))
+						qdel(P)

code/game/gamemodes/events/black_hole.dm

@@ -1,88 +1,88 @@
-/obj/effect/bhole
-	name = "black hole"
-	icon = 'icons/obj/objects.dmi'
-	desc = "FUCK FUCK FUCK AAAHHH"
-	icon_state = "bhole3"
-	opacity = 1
-	unacidable = 1
-	density = 0
-	anchored = 1
-
-/obj/effect/bhole/New()
-	spawn(4)
-		controller()
-
-/obj/effect/bhole/proc/controller()
-	while(src)
-
-		if(!isturf(loc))
-			del(src)
-			return
-
-		//DESTROYING STUFF AT THE EPICENTER
-		for(var/mob/living/M in orange(1,src))
-			del(M)
-		for(var/obj/O in orange(1,src))
-			del(O)
-		for(var/turf/simulated/ST in orange(1,src))
-			ST.ChangeTurf(/turf/space)
-
-		sleep(6)
-		grav(10, 4, 10, 0 )
-		sleep(6)
-		grav( 8, 4, 10, 0 )
-		sleep(6)
-		grav( 9, 4, 10, 0 )
-		sleep(6)
-		grav( 7, 3, 40, 1 )
-		sleep(6)
-		grav( 5, 3, 40, 1 )
-		sleep(6)
-		grav( 6, 3, 40, 1 )
-		sleep(6)
-		grav( 4, 2, 50, 6 )
-		sleep(6)
-		grav( 3, 2, 50, 6 )
-		sleep(6)
-		grav( 2, 2, 75,25 )
-		sleep(6)
-
-
-
-		//MOVEMENT
-		if( prob(50) )
-			src.anchored = 0
-			step(src,pick(alldirs))
-			src.anchored = 1
-
-/obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
-	if(!isturf(loc))	//blackhole cannot be contained inside anything. Weird stuff might happen
-		del(src)
-		return
-	for(var/t = -r, t < r, t++)
-		affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance)
-		affect_coord(x-t, y+r, ex_act_force, pull_chance, turf_removal_chance)
-		affect_coord(x+r, y+t, ex_act_force, pull_chance, turf_removal_chance)
-		affect_coord(x-r, y-t, ex_act_force, pull_chance, turf_removal_chance)
-	return
-
-/obj/effect/bhole/proc/affect_coord(var/x, var/y, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
-	//Get turf at coordinate
-	var/turf/T = locate(x, y, z)
-	if(isnull(T))	return
-
-	//Pulling and/or ex_act-ing movable atoms in that turf
-	if( prob(pull_chance) )
-		for(var/obj/O in T.contents)
-			if(O.anchored)
-				O.ex_act(ex_act_force)
-			else
-				step_towards(O,src)
-		for(var/mob/living/M in T.contents)
-			step_towards(M,src)
-
-	//Destroying the turf
-	if( T && istype(T,/turf/simulated) && prob(turf_removal_chance) )
-		var/turf/simulated/ST = T
-		ST.ChangeTurf(/turf/space)
+/obj/effect/bhole
+	name = "black hole"
+	icon = 'icons/obj/objects.dmi'
+	desc = "FUCK FUCK FUCK AAAHHH"
+	icon_state = "bhole3"
+	opacity = 1
+	unacidable = 1
+	density = 0
+	anchored = 1
+
+/obj/effect/bhole/New()
+	spawn(4)
+		controller()
+
+/obj/effect/bhole/proc/controller()
+	while(src)
+
+		if(!isturf(loc))
+			qdel(src)
+			return
+
+		//DESTROYING STUFF AT THE EPICENTER
+		for(var/mob/living/M in orange(1,src))
+			qdel(M)
+		for(var/obj/O in orange(1,src))
+			qdel(O)
+		for(var/turf/simulated/ST in orange(1,src))
+			ST.ChangeTurf(/turf/space)
+
+		sleep(6)
+		grav(10, 4, 10, 0 )
+		sleep(6)
+		grav( 8, 4, 10, 0 )
+		sleep(6)
+		grav( 9, 4, 10, 0 )
+		sleep(6)
+		grav( 7, 3, 40, 1 )
+		sleep(6)
+		grav( 5, 3, 40, 1 )
+		sleep(6)
+		grav( 6, 3, 40, 1 )
+		sleep(6)
+		grav( 4, 2, 50, 6 )
+		sleep(6)
+		grav( 3, 2, 50, 6 )
+		sleep(6)
+		grav( 2, 2, 75,25 )
+		sleep(6)
+
+
+
+		//MOVEMENT
+		if( prob(50) )
+			src.anchored = 0
+			step(src,pick(alldirs))
+			src.anchored = 1
+
+/obj/effect/bhole/proc/grav(var/r, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
+	if(!isturf(loc))	//blackhole cannot be contained inside anything. Weird stuff might happen
+		qdel(src)
+		return
+	for(var/t = -r, t < r, t++)
+		affect_coord(x+t, y-r, ex_act_force, pull_chance, turf_removal_chance)
+		affect_coord(x-t, y+r, ex_act_force, pull_chance, turf_removal_chance)
+		affect_coord(x+r, y+t, ex_act_force, pull_chance, turf_removal_chance)
+		affect_coord(x-r, y-t, ex_act_force, pull_chance, turf_removal_chance)
+	return
+
+/obj/effect/bhole/proc/affect_coord(var/x, var/y, var/ex_act_force, var/pull_chance, var/turf_removal_chance)
+	//Get turf at coordinate
+	var/turf/T = locate(x, y, z)
+	if(isnull(T))	return
+
+	//Pulling and/or ex_act-ing movable atoms in that turf
+	if( prob(pull_chance) )
+		for(var/obj/O in T.contents)
+			if(O.anchored)
+				O.ex_act(ex_act_force)
+			else
+				step_towards(O,src)
+		for(var/mob/living/M in T.contents)
+			step_towards(M,src)
+
+	//Destroying the turf
+	if( T && istype(T,/turf/simulated) && prob(turf_removal_chance) )
+		var/turf/simulated/ST = T
+		ST.ChangeTurf(/turf/space)
 	return

code/game/gamemodes/events/clang.dm

@@ -36,7 +36,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 			if(clong.density || prob(10))
 				clong.meteorhit(src)
 		else
-			del(src)
+			qdel(src)
 
 		if(clong && prob(25))
 			src.loc = clong.loc
@@ -81,7 +81,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
 		if (isNotStationLevel(immrod.z))
 			immrod.z = pick(config.station_levels)
 		if(immrod.loc == end)
-			del(immrod)
+			qdel(immrod)
 		sleep(10)
 	for(var/obj/effect/immovablerod/imm in world)
 		return

code/game/gamemodes/events/dust.dm

@@ -37,7 +37,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 	density = 1
 	anchored = 1
 	var/strength = 2 //ex_act severity number
-	var/life = 2 //how many things we hit before del(src)
+	var/life = 2 //how many things we hit before qdel(src)
 
 	weak
 		strength = 3
@@ -107,8 +107,7 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 				life--
 				if(life <= 0)
 					walk(src,0)
-					spawn(1)
-						del(src)
+					qdel(src)
 					return 0
 		return
 
@@ -119,5 +118,5 @@ The "dust" will damage the hull of the station causin minor hull breaches.
 
 
 	ex_act(severity)
-		del(src)
+		qdel(src)
 		return

code/game/gamemodes/events/holidays/Christmas.dm

@@ -14,7 +14,7 @@
 		evil_tree.icon_living = evil_tree.icon_state
 		evil_tree.icon_dead = evil_tree.icon_state
 		evil_tree.icon_gib = evil_tree.icon_state
-		del(xmas)
+		qdel(xmas)
 
 /obj/item/weapon/toy/xmas_cracker
 	name = "xmas cracker"

code/game/gamemodes/events/wormholes.dm

@@ -59,4 +59,4 @@
 	P.icon_state = "anom"
 	P.name = "wormhole"
 	spawn(rand(300,600))
-		del(P)
+		qdel(P)

code/game/gamemodes/gameticker.dm

@@ -135,7 +135,7 @@ var/global/datum/controller/gameticker/ticker
 		for(var/obj/effect/landmark/start/S in landmarks_list)
 			//Deleting Startpoints but we need the ai point to AI-ize people later
 			if (S.name != "AI")
-				del(S)
+				qdel(S)
 		world << "<FONT color='blue'><B>Enjoy the game!</B></FONT>"
 		world << sound('sound/AI/welcome.ogg') // Skie
 		//Holiday Round-start stuff	~Carn
@@ -265,8 +265,8 @@ var/global/datum/controller/gameticker/ticker
 		//Otherwise if its a verb it will continue on afterwards.
 		sleep(300)
 
-		if(cinematic)	del(cinematic)		//end the cinematic
-		if(temp_buckle)	del(temp_buckle)	//release everybody
+		if(cinematic)	qdel(cinematic)		//end the cinematic
+		if(temp_buckle)	qdel(temp_buckle)	//release everybody
 		return
 
 
@@ -280,7 +280,7 @@ var/global/datum/controller/gameticker/ticker
 					continue
 				else
 					player.create_character()
-					del(player)
+					qdel(player)
 
 
 	proc/collect_minds()

code/game/gamemodes/heist/heist.dm

@@ -26,6 +26,6 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind'
 	var/area/skipjack = locate(/area/shuttle/skipjack/station)
 	for (var/mob/living/M in skipjack.contents)
 		//maybe send the player a message that they've gone home/been kidnapped? Someone responsible for vox lore should write that.
-		del(M)
+		qdel(M)
 	for (var/obj/O in skipjack.contents)
-		del(O)	//no hiding in lockers or anything
+		qdel(O)	//no hiding in lockers or anything

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -89,7 +89,7 @@ rcd light flash thingy on matter drain
 					V.show_message("\blue You hear a loud electrical buzzing sound!", 2)
 				spawn(50)
 					explosion(get_turf(M), 0,1,2,3)
-					del(M)
+					qdel(M)
 			else usr << "Out of uses."
 	else usr << "That's not a machine."
 

code/game/gamemodes/meme/meme.dm

@@ -93,7 +93,7 @@
 		M.enter_host(first_host.current)
 		forge_meme_objectives(meme, first_host)
 
-		del original
+		qdel(original)
 
 	log_admin("Created [memes.len] memes.")
 

code/game/gamemodes/meteor/meteors.dm

@@ -97,6 +97,10 @@
 	pass_flags = PASSTABLE | PASSGRILLE
 	power = 2
 
+/obj/effect/meteor/Destroy()
+	walk(src,0) //this cancels the walk_towards() proc
+	..()
+
 /obj/effect/meteor/Bump(atom/A)
 	spawn(0)
 
@@ -111,14 +115,14 @@
 				!istype(A,/obj/machinery/field_generator) && \
 				prob(detonation_chance))
 				explosion(loc, power, power + power_step, power + power_step * 2, power + power_step * 3, 0)
-			del(src)
+			qdel(src)
 	return
 
 
 /obj/effect/meteor/ex_act(severity)
 
 	if (severity < 4)
-		del(src)
+		qdel(src)
 	return
 
 /obj/effect/meteor/big
@@ -136,7 +140,7 @@
 			if(!istype(A,/obj/machinery/power/emitter) && \
 				!istype(A,/obj/machinery/field_generator))
 				if(--src.hits <= 0)
-					del(src) //Dont blow up singularity containment if we get stuck there.
+					qdel(src) //Dont blow up singularity containment if we get stuck there.
 
 			if (A)
 				for(var/mob/M in player_list)
@@ -150,11 +154,11 @@
 			if (--src.hits <= 0)
 				if(prob(detonation_chance) && !istype(A, /obj/structure/grille))
 					explosion(loc, power, power + power_step, power + power_step * 2, power + power_step * 3, 0)
-				del(src)
+				qdel(src)
 		return
 
 /obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/pickaxe))
-		del(src)
+		qdel(src)
 		return
-	..()
+	..()

code/game/gamemodes/nuclear/pinpointer.dm

@@ -48,6 +48,9 @@
 			if(bomb.timing)
 				user << "Extreme danger.  Arming signal detected.   Time remaining: [bomb.timeleft]"
 
+/obj/item/weapon/pinpointer/Destroy()
+	active = 0
+	..()
 
 /obj/item/weapon/pinpointer/advpinpointer
 	name = "Advanced Pinpointer"

code/game/gamemodes/objective.dm

@@ -13,7 +13,7 @@ datum/objective
 		if(text)
 			explanation_text = text
 
-	Del()
+	Destroy()
 		all_objectives -= src
 		..()
 
@@ -541,7 +541,7 @@ datum/objective/steal
 			if (!custom_target) return
 			var/tmp_obj = new custom_target
 			var/custom_name = tmp_obj:name
-			del(tmp_obj)
+			qdel(tmp_obj)
 			custom_name = sanitize(input("Enter target name:", "Objective target", custom_name) as text|null)
 			if (!custom_name) return
 			target_name = custom_name
@@ -916,7 +916,7 @@ datum/objective/heist/salvage
 	explanation_text = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it. The convert rune is join blood self."
 
 /datum/objective/cult/eldergod/check_completion()
-	return (locate(/obj/machinery/singularity/narsie/large) in machines)
+	return (locate(/obj/singularity/narsie/large) in machines)
 
 /datum/objective/cult/sacrifice
 	explanation_text = "Conduct a ritual sacrifice for the glory of Nar-Sie."

code/game/gamemodes/sandbox/h_sandbox.dm

@@ -120,7 +120,7 @@ datum/hSB
 				if("hsbtoolbox")
 					var/obj/item/weapon/storage/hsb = new/obj/item/weapon/storage/toolbox/mechanical
 					for(var/obj/item/device/radio/T in hsb)
-						del(T)
+						qdel(T)
 					new/obj/item/weapon/crowbar (hsb)
 					hsb.loc = usr.loc
 				if("hsbmedkit")

code/game/gamemodes/setupgame.dm

@@ -151,7 +151,7 @@
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
 			M.real_name = "Corpse"
 			M.death()
-			del(A)
+			qdel(A)
 			continue
 		if (A.name == "Corpse-Engineer")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
@@ -173,7 +173,7 @@
 			else
 				if (prob(50))
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head)
-			del(A)
+			qdel(A)
 			continue
 		if (A.name == "Corpse-Engineer-Space")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
@@ -196,7 +196,7 @@
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head)
 				else
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space(M), slot_head)
-			del(A)
+			qdel(A)
 			continue
 		if (A.name == "Corpse-Engineer-Chief")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
@@ -217,7 +217,7 @@
 			else
 				if (prob(50))
 					M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head)
-			del(A)
+			qdel(A)
 			continue
 		if (A.name == "Corpse-Syndicate")
 			var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc)
@@ -239,6 +239,6 @@
 			else
 				M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit)
 				M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head)
-			del(A)
+			qdel(A)
 			continue
 */

code/game/jobs/jobprocs.dm

@@ -44,7 +44,7 @@
 	timeleft -= (world.time - last_process)
 	if(timeleft <= 0)
 		processing_objects.Remove(src)
-		del(src)
+		qdel(src)
 
 ///////////////////////////////
 

code/game/machinery/Beacon.dm

@@ -1,55 +1,55 @@
-/obj/machinery/bluespace_beacon
-
-	icon = 'icons/obj/objects.dmi'
-	icon_state = "floor_beaconf"
-	name = "Bluespace Gigabeacon"
-	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
-	level = 1		// underfloor
-	layer = 2.5
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 0
-	var/obj/item/device/radio/beacon/Beacon
-
-	New()
-		..()
-		var/turf/T = loc
-		Beacon = new /obj/item/device/radio/beacon
-		Beacon.invisibility = INVISIBILITY_MAXIMUM
-		Beacon.loc = T
-
-		hide(T.intact)
-
-	Del()
-		if(Beacon)
-			del(Beacon)
-		..()
-
-	// update the invisibility and icon
-	hide(var/intact)
-		invisibility = intact ? 101 : 0
-		updateicon()
-
-	// update the icon_state
-	proc/updateicon()
-		var/state="floor_beacon"
-
-		if(invisibility)
-			icon_state = "[state]f"
-
-		else
-			icon_state = "[state]"
-
-	process()
-		if(!Beacon)
-			var/turf/T = loc
-			Beacon = new /obj/item/device/radio/beacon
-			Beacon.invisibility = INVISIBILITY_MAXIMUM
-			Beacon.loc = T
-		if(Beacon)
-			if(Beacon.loc != loc)
-				Beacon.loc = loc
-
-		updateicon()
-
-
+/obj/machinery/bluespace_beacon
+
+	icon = 'icons/obj/objects.dmi'
+	icon_state = "floor_beaconf"
+	name = "Bluespace Gigabeacon"
+	desc = "A device that draws power from bluespace and creates a permanent tracking beacon."
+	level = 1		// underfloor
+	layer = 2.5
+	anchored = 1
+	use_power = 1
+	idle_power_usage = 0
+	var/obj/item/device/radio/beacon/Beacon
+
+	New()
+		..()
+		var/turf/T = loc
+		Beacon = new /obj/item/device/radio/beacon
+		Beacon.invisibility = INVISIBILITY_MAXIMUM
+		Beacon.loc = T
+
+		hide(T.intact)
+
+	Destroy()
+		if(Beacon)
+			qdel(Beacon)
+		..()
+
+	// update the invisibility and icon
+	hide(var/intact)
+		invisibility = intact ? 101 : 0
+		updateicon()
+
+	// update the icon_state
+	proc/updateicon()
+		var/state="floor_beacon"
+
+		if(invisibility)
+			icon_state = "[state]f"
+
+		else
+			icon_state = "[state]"
+
+	process()
+		if(!Beacon)
+			var/turf/T = loc
+			Beacon = new /obj/item/device/radio/beacon
+			Beacon.invisibility = INVISIBILITY_MAXIMUM
+			Beacon.loc = T
+		if(Beacon)
+			if(Beacon.loc != loc)
+				Beacon.loc = loc
+
+		updateicon()
+
+

code/game/machinery/OpTable.dm

@@ -28,12 +28,12 @@
 	switch(severity)
 		if(1.0)
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(25))
@@ -43,14 +43,14 @@
 
 /obj/machinery/optable/blob_act()
 	if(prob(75))
-		del(src)
+		qdel(src)
 
 /obj/machinery/optable/attack_hand(mob/user as mob)
 	if (HULK in usr.mutations)
 		usr << text("\blue You destroy the table.")
 		visible_message("\red [usr] destroys the operating table!")
 		src.density = 0
-		del(src)
+		qdel(src)
 	return
 
 /obj/machinery/optable/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
@@ -130,7 +130,7 @@
 		var/obj/item/weapon/grab/G = W
 		if(iscarbon(G.affecting) && check_table(G.affecting))
 			take_victim(G.affecting,usr)
-			del(W)
+			qdel(W)
 			return
 
 /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob)

code/game/machinery/Sleeper.dm

@@ -25,12 +25,12 @@
 	switch(severity)
 		if(1.0)
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		else
 	return
@@ -204,7 +204,7 @@
 			for(var/atom/movable/A as mob|obj in src)
 				A.loc = src.loc
 				A.blob_act()
-			del(src)
+			qdel(src)
 		return
 
 	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
@@ -252,7 +252,7 @@
 					icon_state = "sleeper_1-r"
 
 				src.add_fingerprint(user)
-				del(G)
+				qdel(G)
 			return
 		return
 
@@ -265,21 +265,21 @@
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = src.loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 			if(2.0)
 				if(prob(50))
 					for(var/atom/movable/A as mob|obj in src)
 						A.loc = src.loc
 						ex_act(severity)
-					del(src)
+					qdel(src)
 					return
 			if(3.0)
 				if(prob(25))
 					for(var/atom/movable/A as mob|obj in src)
 						A.loc = src.loc
 						ex_act(severity)
-					del(src)
+					qdel(src)
 					return
 		return
 	emp_act(severity)
@@ -435,7 +435,7 @@
 				icon_state = "sleeper_1-r"
 
 			for(var/obj/O in src)
-				del(O)
+				qdel(O)
 			src.add_fingerprint(usr)
 			return
 		return

code/game/machinery/adv_med.dm

@@ -56,7 +56,7 @@
 	src.icon_state = "body_scanner_1"
 	for(var/obj/O in src)
 		//O = null
-		del(O)
+		qdel(O)
 		//Foreach goto(124)
 	src.add_fingerprint(usr)
 	return
@@ -98,7 +98,7 @@
 		//Foreach goto(154)
 	src.add_fingerprint(user)
 	//G = null
-	del(G)
+	qdel(G)
 	return
 
 /obj/machinery/bodyscanner/ex_act(severity)
@@ -109,7 +109,7 @@
 				ex_act(severity)
 				//Foreach goto(35)
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
@@ -118,7 +118,7 @@
 					ex_act(severity)
 					//Foreach goto(108)
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if (prob(25))
@@ -127,7 +127,7 @@
 					ex_act(severity)
 					//Foreach goto(181)
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		else
 	return
@@ -136,19 +136,19 @@
 	if(prob(50))
 		for(var/atom/movable/A as mob|obj in src)
 			A.loc = src.loc
-		del(src)
+		qdel(src)
 
 /obj/machinery/body_scanconsole/ex_act(severity)
 
 	switch(severity)
 		if(1.0)
 			//SN src = null
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(50))
 				//SN src = null
-				del(src)
+				qdel(src)
 				return
 		else
 	return
@@ -156,7 +156,7 @@
 /obj/machinery/body_scanconsole/blob_act()
 
 	if(prob(50))
-		del(src)
+		qdel(src)
 
 /obj/machinery/body_scanconsole/power_change()
 	..()

code/game/machinery/alarm.dm

@@ -98,6 +98,10 @@
 	TLV["temperature"] =	list(20, 40, 140, 160) // K
 	target_temperature = 90
 
+/obj/machinery/alarm/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src, frequency)
+	..()
 
 /obj/machinery/alarm/New(var/loc, var/dir, var/building = 0)
 	..()
@@ -831,7 +835,7 @@
 		if(0)
 			if(istype(W, /obj/item/weapon/airalarm_electronics))
 				user << "You insert the circuit!"
-				del(W)
+				qdel(W)
 				buildstage = 1
 				update_icon()
 				return
@@ -841,7 +845,7 @@
 				var/obj/item/alarm_frame/frame = new /obj/item/alarm_frame()
 				frame.loc = user.loc
 				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-				del(src)
+				qdel(src)
 
 	return ..()
 
@@ -884,7 +888,7 @@ Code shamelessly copied from apc_frame
 /obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 )
-		del(src)
+		qdel(src)
 		return
 	..()
 
@@ -910,7 +914,7 @@ Code shamelessly copied from apc_frame
 		return
 
 	new /obj/machinery/alarm(loc, ndir, 1)
-	del(src)
+	qdel(src)
 
 /*
 FIRE ALARM
@@ -1015,7 +1019,7 @@ FIRE ALARM
 			if(0)
 				if(istype(W, /obj/item/weapon/firealarm_electronics))
 					user << "You insert the circuit!"
-					del(W)
+					qdel(W)
 					buildstage = 1
 					update_icon()
 
@@ -1024,7 +1028,7 @@ FIRE ALARM
 					var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame()
 					frame.loc = user.loc
 					playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
-					del(src)
+					qdel(src)
 		return
 
 	src.alarm()
@@ -1206,7 +1210,7 @@ Code shamelessly copied from apc_frame
 /obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))
 		new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 )
-		del(src)
+		qdel(src)
 		return
 	..()
 
@@ -1233,7 +1237,7 @@ Code shamelessly copied from apc_frame
 
 	new /obj/machinery/firealarm(loc, ndir, 1)
 
-	del(src)
+	qdel(src)
 
 
 /obj/machinery/partyalarm

code/game/machinery/atmo_control.dm

@@ -73,6 +73,11 @@
 	if(radio_controller)
 		set_frequency(frequency)
 
+obj/machinery/air_sensor/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,frequency)
+	..()
+
 /obj/machinery/computer/general_air_control
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "tank"
@@ -86,6 +91,11 @@
 	var/datum/radio_frequency/radio_connection
 	circuit = /obj/item/weapon/circuitboard/air_management
 
+obj/machinery/computer/general_air_control/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src, frequency)
+	..()
+
 /obj/machinery/computer/general_air_control/attack_hand(mob/user)
 	if(..(user))
 		return

code/game/machinery/atmoalter/meter.dm

@@ -104,7 +104,7 @@
 			"\blue You have unfastened \the [src].", \
 			"You hear ratchet.")
 		new /obj/item/pipe_meter(src.loc)
-		del(src)
+		qdel(src)
 
 // TURF METER - REPORTS A TILE'S AIR CONTENTS
 

code/game/machinery/atmoalter/portable_atmospherics.dm

@@ -20,6 +20,10 @@
 
 	return 1
 
+/obj/machinery/portable_atmospherics/Destroy()
+	del(air_contents)
+	..()
+
 /obj/machinery/portable_atmospherics/initialize()
 	. = ..()
 	spawn()
@@ -35,8 +39,8 @@
 	else
 		update_icon()
 
-/obj/machinery/portable_atmospherics/Del()
-	del(air_contents)
+/obj/machinery/portable_atmospherics/Destroy()
+	qdel(air_contents)
 
 	..()
 

code/game/machinery/autolathe.dm

@@ -190,7 +190,7 @@
 		stack.use(max(1, round(total_used/mass_per_sheet))) // Always use at least 1 to prevent infinite materials.
 	else
 		user.remove_from_mob(O)
-		del(O)
+		qdel(O)
 
 	updateUsrDialog()
 	return

code/game/machinery/autolathe_datums.dm

@@ -16,7 +16,7 @@
 			recipe.resources = list()
 			for(var/material in I.matter)
 				recipe.resources[material] = I.matter[material]*1.25 // More expensive to produce than they are to recycle.
-			del(I)
+			qdel(I)
 
 /datum/autolathe/recipe
 	var/name = "object"

code/game/machinery/bees_items.dm

@@ -20,7 +20,7 @@
 	for(var/mob/living/simple_animal/bee/B in T)
 		if(B.feral < 0)
 			caught_bees += B.strength
-			del(B)
+			qdel(B)
 			user.visible_message("\blue [user] nets some bees.","\blue You net up some of the becalmed bees.")
 		else
 			user.visible_message("\red [user] swings at some bees, they don't seem to like it.","\red You swing at some bees, they don't seem to like it.")

code/game/machinery/biogenerator.dm

@@ -151,7 +151,7 @@
 		if(I.reagents.get_reagent_amount("nutriment") < 0.1)
 			points += 1
 		else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff
-		del(I)
+		qdel(I)
 	if(S)
 		processing = 1
 		update_icon()

code/game/machinery/bioprinter.dm

@@ -70,7 +70,7 @@
 		stored_matter += 50
 		user.drop_item()
 		user << "<span class='info'>\The [src] processes \the [W]. Levels of stored biomass now: [stored_matter]</span>"
-		del(W)
+		qdel(W)
 		return
 	// Steel for matter.
 	else if(prints_prosthetics && istype(W, /obj/item/stack/sheet/metal))
@@ -78,7 +78,7 @@
 		stored_matter += M.amount * 10
 		user.drop_item()
 		user << "<span class='info'>\The [src] processes \the [W]. Levels of stored matter now: [stored_matter]</span>"
-		del(W)
+		qdel(W)
 		return
 	else
 		return..()

code/game/machinery/bots/bots.dm

@@ -15,7 +15,6 @@
 	var/locked = 1
 	//var/emagged = 0 //Urist: Moving that var to the general /bot tree as it's used by most bots
 
-
 /obj/machinery/bot/proc/turn_on()
 	if(stat)	return 0
 	on = 1
@@ -27,7 +26,7 @@
 	SetLuminosity(0)
 
 /obj/machinery/bot/proc/explode()
-	del(src)
+	qdel(src)
 
 /obj/machinery/bot/proc/healthcheck()
 	if (src.health <= 0)
@@ -117,7 +116,7 @@
 /obj/machinery/bot/emp_act(severity)
 	var/was_on = on
 	stat |= EMPED
-	var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+	var/obj/effect/overlay/pulse2 = PoolOrNew(/obj/effect/overlay, src.loc )
 	pulse2.icon = 'icons/effects/effects.dmi'
 	pulse2.icon_state = "empdisable"
 	pulse2.name = "emp sparks"
@@ -125,7 +124,7 @@
 	pulse2.set_dir(pick(cardinal))
 
 	spawn(10)
-		pulse2.delete()
+		qdel(pulse2)
 	if (on)
 		turn_off()
 	spawn(severity*300)

code/game/machinery/bots/cleanbot.dm

@@ -58,6 +58,10 @@
 	if(radio_controller)
 		radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
 
+/obj/machinery/bot/cleanbot/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,beacon_freq)
+	..()
 
 /obj/machinery/bot/cleanbot/turn_on()
 	. = ..()
@@ -319,7 +323,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
 			var/turf/simulated/f = loc
 			f.dirt = 0
 		cleaning = 0
-		del(target)
+		qdel(target)
 		icon_state = "cleanbot[on]"
 		anchored = 0
 		target = null
@@ -339,20 +343,20 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
-	del(src)
+	qdel(src)
 	return
 
 /obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob)
 	..()
 	if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
 		user.drop_item()
-		del(W)
+		qdel(W)
 		var/turf/T = get_turf(src.loc)
 		var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
 		A.name = src.created_name
 		user << "<span class='notice'>You add the robot arm to the bucket and sensor assembly. Beep boop!</span>"
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 
 	else if (istype(W, /obj/item/weapon/pen))
 		var/t = sanitizeSafe(input(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN)

code/game/machinery/bots/ed209bot.dm

@@ -68,7 +68,7 @@
 		if(0,1)
 			if( istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg) )
 				user.drop_item()
-				del(W)
+				qdel(W)
 				build_step++
 				user << "<span class='notice'>You add the robot leg to [src].</span>"
 				name = "legs/frame assembly"
@@ -86,7 +86,7 @@
 				lasercolor = "b"
 			if( lasercolor || istype(W, /obj/item/clothing/suit/storage/vest) )
 				user.drop_item()
-				del(W)
+				qdel(W)
 				build_step++
 				user << "<span class='notice'>You add the armor to [src].</span>"
 				name = "vest/legs/frame assembly"
@@ -103,7 +103,7 @@
 		if(4)
 			if( istype(W, /obj/item/clothing/head/helmet) )
 				user.drop_item()
-				del(W)
+				qdel(W)
 				build_step++
 				user << "<span class='notice'>You add the helmet to [src].</span>"
 				name = "covered and shielded frame assembly"
@@ -113,7 +113,7 @@
 		if(5)
 			if( isprox(W) )
 				user.drop_item()
-				del(W)
+				qdel(W)
 				build_step++
 				user << "<span class='notice'>You add the prox sensor to [src].</span>"
 				name = "covered, shielded and sensored frame assembly"
@@ -155,7 +155,7 @@
 			src.item_state = "[lasercolor]ed209_taser"
 			src.icon_state = "[lasercolor]ed209_taser"
 			user.drop_item()
-			del(W)
+			qdel(W)
 
 		if(8)
 			if( istype(W, /obj/item/weapon/screwdriver) )
@@ -175,16 +175,16 @@
 				var/turf/T = get_turf(src)
 				new /obj/machinery/bot/secbot/ed209(T,created_name,lasercolor)
 				user.drop_item()
-				del(W)
+				qdel(W)
 				user.drop_from_inventory(src)
-				del(src)
+				qdel(src)
 
 
 /obj/machinery/bot/secbot/ed209/bullet_act(var/obj/item/projectile/Proj)
 	if((src.lasercolor == "b") && (src.disabled == 0))
 		if(istype(Proj, /obj/item/projectile/beam/lastertag/red))
 			src.disabled = 1
-			del (Proj)
+			qdel (Proj)
 			sleep(100)
 			src.disabled = 0
 		else
@@ -192,7 +192,7 @@
 	else if((src.lasercolor == "r") && (src.disabled == 0))
 		if(istype(Proj, /obj/item/projectile/beam/lastertag/blue))
 			src.disabled = 1
-			del (Proj)
+			qdel (Proj)
 			sleep(100)
 			src.disabled = 0
 		else
@@ -202,9 +202,9 @@
 
 /obj/machinery/bot/secbot/ed209/bluetag/New()//If desired, you spawn red and bluetag bots easily
 	new /obj/machinery/bot/secbot/ed209(get_turf(src),null,"b")
-	del(src)
+	qdel(src)
 
 
 /obj/machinery/bot/secbot/ed209/redtag/New()
 	new /obj/machinery/bot/secbot/ed209(get_turf(src),null,"r")
-	del(src)
+	qdel(src)

code/game/machinery/bots/farmbot.dm

@@ -220,7 +220,7 @@
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
-	del(src)
+	qdel(src)
 	return
 
 /obj/machinery/bot/farmbot/process()
@@ -407,7 +407,7 @@
 		tray.nutrilevel = 10
 		tray.yieldmod = fert.yieldmod
 		tray.mutmod = fert.mutmod
-		del fert
+		qdel(fert)
 		tray.updateicon()
 		icon_state = "farmbot_fertile"
 		mode = FARMBOT_MODE_WAITING
@@ -543,7 +543,7 @@
 	user << "You add the robot arm to the [src]"
 	src.loc = A //Place the water tank into the assembly, it will be needed for the finished bot
 	user.remove_from_mob(S)
-	del(S)
+	qdel(S)
 
 /obj/item/weapon/farmbot_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
@@ -552,21 +552,21 @@
 		user << "You add the plant analyzer to [src]!"
 		src.name = "farmbot assembly"
 		user.remove_from_mob(W)
-		del(W)
+		qdel(W)
 
 	else if(( istype(W, /obj/item/weapon/reagent_containers/glass/bucket)) && (src.build_step == 1))
 		src.build_step++
 		user << "You add a bucket to [src]!"
 		src.name = "farmbot assembly with bucket"
 		user.remove_from_mob(W)
-		del(W)
+		qdel(W)
 
 	else if(( istype(W, /obj/item/weapon/minihoe)) && (src.build_step == 2))
 		src.build_step++
 		user << "You add a minihoe to [src]!"
 		src.name = "farmbot assembly with bucket and minihoe"
 		user.remove_from_mob(W)
-		del(W)
+		qdel(W)
 
 	else if((isprox(W)) && (src.build_step == 3))
 		src.build_step++
@@ -578,8 +578,8 @@
 		S.loc = get_turf(src)
 		S.name = src.created_name
 		user.remove_from_mob(W)
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 
 	else if(istype(W, /obj/item/weapon/pen))
 		var/t = input(user, "Enter new robot name", src.name, src.created_name) as text

code/game/machinery/bots/floorbot.dm

@@ -329,7 +329,7 @@
 			T.use(i)
 		else
 			src.amount += T.get_amount()
-			del(T)
+			qdel(T)
 		src.updateicon()
 		src.target = null
 		src.repairing = 0
@@ -349,7 +349,7 @@
 		var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
 		T.amount = 4
 		T.loc = M.loc
-		del(M)
+		qdel(M)
 		src.target = null
 		src.repairing = 0
 
@@ -385,7 +385,7 @@
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
-	del(src)
+	qdel(src)
 	return
 
 
@@ -403,7 +403,7 @@
 		user.put_in_hands(B)
 		user << "<span class='notice'>You add the tiles into the empty toolbox. They protrude from the top.</span>"
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 	else
 		user << "<span class='warning'>You need 10 floortiles for a floorbot.</span>"
 	return
@@ -411,13 +411,13 @@
 /obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
 	..()
 	if(isprox(W))
-		del(W)
+		qdel(W)
 		var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
 		B.created_name = src.created_name
 		user.put_in_hands(B)
 		user << "<span class='notice'>You add the sensor to the toolbox and tiles!</span>"
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 
 	else if (istype(W, /obj/item/weapon/pen))
 		var/t = sanitizeSafe(input(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN)
@@ -431,13 +431,13 @@
 /obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
 	..()
 	if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
-		del(W)
+		qdel(W)
 		var/turf/T = get_turf(user.loc)
 		var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
 		A.name = src.created_name
 		user << "<span class='notice'>You add the robot arm to the odd looking toolbox assembly! Boop beep!</span>"
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 	else if (istype(W, /obj/item/weapon/pen))
 		var/t = sanitizeSafe(input(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN)
 

code/game/machinery/bots/medbot.dm

@@ -479,7 +479,7 @@
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
-	del(src)
+	qdel(src)
 	return
 
 /obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened!
@@ -554,11 +554,11 @@
 	else if(istype(src,/obj/item/weapon/storage/firstaid/o2))
 		A.skin = "o2"
 
-	del(S)
+	qdel(S)
 	user.put_in_hands(A)
 	user << "<span class='notice'>You add the robot arm to the first aid kit.</span>"
 	user.drop_from_inventory(src)
-	del(src)
+	qdel(src)
 
 
 /obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -575,7 +575,7 @@
 			if(0)
 				if(istype(W, /obj/item/device/healthanalyzer))
 					user.drop_item()
-					del(W)
+					qdel(W)
 					src.build_step++
 					user << "<span class='notice'>You add the health sensor to [src].</span>"
 					src.name = "First aid/robot arm/health analyzer assembly"
@@ -584,7 +584,7 @@
 			if(1)
 				if(isprox(W))
 					user.drop_item()
-					del(W)
+					qdel(W)
 					src.build_step++
 					user << "<span class='notice'>You complete the Medibot! Beep boop.</span>"
 					var/turf/T = get_turf(src)
@@ -592,5 +592,5 @@
 					S.skin = src.skin
 					S.name = src.created_name
 					user.drop_from_inventory(src)
-					del(src)
+					qdel(src)
 

code/game/machinery/bots/mulebot.dm

@@ -76,6 +76,12 @@
 			suffix = "#[count]"
 		name = "Mulebot ([suffix])"
 
+/obj/machinery/bot/mulebot/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,beacon_freq)
+		radio_controller.remove_object(src,control_freq)
+	..()
+
 // attack by item
 // emag : lock/unlock,
 // screwdriver: open/close hatch
@@ -876,4 +882,4 @@
 
 	new /obj/effect/decal/cleanable/blood/oil(src.loc)
 	unload(0)
-	del(src)
+	qdel(src)

code/game/machinery/bots/secbot.dm

@@ -107,6 +107,11 @@
 			if((lasercolor == "r") && (name == created_name))
 				name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT")
 
+/obj/machinery/bot/mulebot/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,beacon_freq)
+		radio_controller.remove_object(src,control_freq)
+	..()
 
 /obj/machinery/bot/secbot/update_icon()
 	if(on && is_attacking)
@@ -773,7 +778,7 @@ Auto Patrol: []"},
 	s.start()
 
 	new /obj/effect/decal/cleanable/blood/oil(src.loc)
-	del(src)
+	qdel(src)
 
 
 /obj/machinery/bot/secbot/proc/on_explosion(var/turf/Tsec)
@@ -793,12 +798,12 @@ Auto Patrol: []"},
 		return
 
 	if(S.secured)
-		del(S)
+		qdel(S)
 		var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
 		user.put_in_hands(A)
 		user << "You add the signaler to the helmet."
 		user.drop_from_inventory(src)
-		del(src)
+		qdel(src)
 	else
 		return
 
@@ -817,7 +822,7 @@ Auto Patrol: []"},
 		user << "You add the prox sensor to [src]!"
 		src.overlays += image('icons/obj/aibots.dmi', "hs_eye")
 		src.name = "helmet/signaler/prox sensor assembly"
-		del(W)
+		qdel(W)
 
 	else if(((istype(W, /obj/item/robot_parts/l_arm)) || (istype(W, /obj/item/robot_parts/r_arm))) && (src.build_step == 2))
 		user.drop_item()
@@ -825,7 +830,7 @@ Auto Patrol: []"},
 		user << "You add the robot arm to [src]!"
 		src.name = "helmet/signaler/prox sensor/robot arm assembly"
 		src.overlays += image('icons/obj/aibots.dmi', "hs_arm")
-		del(W)
+		qdel(W)
 
 	else if((istype(W, /obj/item/weapon/melee/baton)) && (src.build_step >= 3))
 		user.drop_item()
@@ -834,8 +839,8 @@ Auto Patrol: []"},
 		var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot
 		S.loc = get_turf(src)
 		S.name = src.created_name
-		del(W)
-		del(src)
+		qdel(W)
+		qdel(src)
 
 	else if(istype(W, /obj/item/weapon/pen))
 		var/t = sanitizeSafe(input(user, "Enter new robot name", src.name, src.created_name), MAX_NAME_LEN)
@@ -892,14 +897,14 @@ Auto Patrol: []"},
 	if(severity==2 && prob(70))
 		..(severity-1)
 	else
-		var/obj/effect/overlay/pulse2 = new/obj/effect/overlay ( src.loc )
+		var/obj/effect/overlay/pulse2 = PoolOrNew(/obj/effect/overlay, src.loc)
 		pulse2.icon = 'icons/effects/effects.dmi'
 		pulse2.icon_state = "empdisable"
 		pulse2.name = "emp sparks"
 		pulse2.anchored = 1
 		pulse2.set_dir(pick(cardinal))
 		spawn(10)
-			pulse2.delete()
+			qdel(pulse2)
 		var/list/mob/living/carbon/targets = new
 		for(var/mob/living/carbon/C in view(12,src))
 			if(C.stat==2)

code/game/machinery/camera/camera.dm

@@ -53,6 +53,14 @@
 		ASSERT(src.network.len > 0)
 	..()
 
+/obj/machinery/camera/Destroy()
+	deactivate(null, 0) //kick anyone viewing out
+	if(assembly)
+		qdel(assembly)
+		assembly = null
+	qdel(wires)
+	..()
+
 /obj/machinery/camera/emp_act(severity)
 	if(!isEmpProof())
 		if(prob(100/severity))
@@ -136,7 +144,7 @@
 				assembly.loc = src.loc
 				assembly.state = 1
 				new /obj/item/stack/cable_coil(src.loc, length=2)
-			del(src)
+			qdel(src)
 
 	// OTHER
 	else if (can_use() && (istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user))

code/game/machinery/camera/presets.dm

@@ -1,22 +1,4 @@
 // PRESETS
-#define NETWORK_CRESCENT "Crescent"
-#define NETWORK_CIVILIAN_EAST "Civilian East"
-#define NETWORK_CIVILIAN_WEST "Civilian West"
-#define NETWORK_COMMAND "Command"
-#define NETWORK_ENGINE "Engine"
-#define NETWORK_ENGINEERING "Engineering"
-#define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
-#define NETWORK_ERT "ERT"
-#define NETWORK_EXODUS "Exodus"
-#define NETWORK_MEDBAY "Medbay"
-#define NETWORK_MINE "MINE"
-#define NETWORK_RESEARCH "Research"
-#define NETWORK_RESEARCH_OUTPOST "Research Outpost"
-#define NETWORK_PRISON "Prison"
-#define NETWORK_SECURITY "Security"
-#define NETWORK_TELECOM "Tcomsat"
-#define NETWORK_THUNDER "thunder"
-
 var/global/list/station_networks = list(
 										NETWORK_CIVILIAN_EAST,
 										NETWORK_CIVILIAN_WEST,
@@ -25,7 +7,7 @@ var/global/list/station_networks = list(
 										NETWORK_ENGINEERING,
 										NETWORK_ENGINEERING_OUTPOST,
 										NETWORK_EXODUS,
-										NETWORK_MEDBAY,
+										NETWORK_MEDICAL,
 										NETWORK_MINE,
 										NETWORK_RESEARCH,
 										NETWORK_RESEARCH_OUTPOST,
@@ -73,7 +55,7 @@ var/global/list/engineering_networks = list(
 	network = list(NETWORK_PRISON)
 
 /obj/machinery/camera/network/medbay
-	network = list(NETWORK_MEDBAY)
+	network = list(NETWORK_MEDICAL)
 
 /obj/machinery/camera/network/research
 	network = list(NETWORK_RESEARCH)
@@ -105,7 +87,7 @@ var/global/list/engineering_networks = list(
 	network = list(NETWORK_SECURITY)
 
 /obj/machinery/camera/xray/medbay
-	network = list(NETWORK_MEDBAY)
+	network = list(NETWORK_MEDICAL)
 
 /obj/machinery/camera/xray/research
 	network = list(NETWORK_RESEARCH)
@@ -191,21 +173,3 @@ var/global/list/engineering_networks = list(
 	if (isMotion())
 		mult++
 	active_power_usage = mult*initial(active_power_usage)
-
-#undef NETWORK_CENTRAL_CRESCENT
-#undef NETWORK_CIVILIAN_EAST
-#undef NETWORK_CIVILIAN_WEST
-#undef NETWORK_COMMAND
-#undef NETWORK_ENGINE
-#undef NETWORK_ENGINEERING
-#undef NETWORK_ENGINEERING_OUTPOST
-#undef NETWORK_ERT
-#undef NETWORK_EXODUS
-#undef NETWORK_MEDBAY
-#undef NETWORK_MINE
-#undef NETWORK_RESEARCH
-#undef NETWORK_RESEARCH_OUTPOST
-#undef NETWORK_PRISON
-#undef NETWORK_SECURITY
-#undef NETWORK_TELECOM
-#undef NETWORK_THUNDER

code/game/machinery/cloning.dm

@@ -235,7 +235,7 @@
 		user << "<span class='notice'>\The [src] processes \the [W].</span>"
 		biomass += 50
 		user.drop_item()
-		del(W)
+		qdel(W)
 		return
 	else if(istype(W, /obj/item/weapon/wrench))
 		if(locked && (anchored || occupant))
@@ -328,7 +328,7 @@
 		update_icon()
 		occupant.ghostize()
 		spawn(5)
-			del(occupant)
+			qdel(occupant)
 	return
 
 /obj/machinery/clonepod/relaymove(mob/user as mob)
@@ -348,21 +348,21 @@
 			for(var/atom/movable/A as mob|obj in src)
 				A.loc = loc
 				ex_act(severity)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if(prob(50))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 		if(3.0)
 			if(prob(25))
 				for(var/atom/movable/A as mob|obj in src)
 					A.loc = loc
 					ex_act(severity)
-				del(src)
+				qdel(src)
 				return
 		else
 	return

code/game/machinery/computer/ai_core.dm

@@ -30,7 +30,7 @@
 					if(!src || !WT.remove_fuel(0, user)) return
 					user << "\blue You deconstruct the frame."
 					new /obj/item/stack/sheet/plasteel( loc, 4)
-					del(src)
+					qdel(src)
 		if(1)
 			if(istype(P, /obj/item/weapon/wrench))
 				playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -178,7 +178,7 @@
 					if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created
 						A.rename_self("ai", 1)
 				feedback_inc("cyborg_ais_created",1)
-				del(src)
+				qdel(src)
 
 /obj/structure/AIcore/deactivated
 	name = "inactive AI"
@@ -187,7 +187,7 @@
 	anchored = 1
 	state = 20//So it doesn't interact based on the above. Not really necessary.
 
-/obj/structure/AIcore/deactivated/Del()
+/obj/structure/AIcore/deactivated/Destroy()
 	if(src in empty_playable_ai_cores)
 		empty_playable_ai_cores -= src
 	..()
@@ -208,7 +208,7 @@
 	if(card)
 		card.clear()
 
-	del(src)
+	qdel(src)
 
 /obj/structure/AIcore/deactivated/proc/check_malf(var/mob/living/silicon/ai/ai)
 	if(!ai) return

code/game/machinery/computer/atmos_alert.dm

@@ -14,7 +14,7 @@ var/global/list/minor_air_alarms = list()
 	..()
 	atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon)
 
-/obj/machinery/computer/atmos_alert/Del()
+/obj/machinery/computer/atmos_alert/Destroy()
     atmosphere_alarm.unregister(src)
     ..()
 

code/game/machinery/computer/atmos_control.dm

@@ -9,11 +9,12 @@
 	density = 1
 	anchored = 1.0
 	circuit = "/obj/item/weapon/circuitboard/atmoscontrol"
-	var/overridden = 0 //not set yet, can't think of a good way to do it
 	req_access = list(access_ce)
 	var/list/monitored_alarm_ids = null
-	var/list/monitored_alarms = null
-	var/ui_ref
+	var/obj/nano_module/atmos_control/atmos_control
+
+/obj/machinery/computer/atmoscontrol/New()
+	..()
 
 /obj/machinery/computer/atmoscontrol/laptop
 	name = "Atmospherics Laptop"
@@ -21,77 +22,24 @@
 	icon_state = "medlaptop"
 	density = 0
 
-/obj/machinery/computer/atmoscontrol/initialize()
-	..()
-	if(!monitored_alarms && monitored_alarm_ids)
-		monitored_alarms = new
-		for(var/obj/machinery/alarm/alarm in machines)
-			if(alarm.alarm_id && alarm.alarm_id in monitored_alarm_ids)
-				monitored_alarms += alarm
-		// machines may not yet be ordered at this point
-		monitored_alarms = dd_sortedObjectList(monitored_alarms)
-
 /obj/machinery/computer/atmoscontrol/attack_ai(var/mob/user as mob)
-	return ui_interact(user)
+	ui_interact(user)
 
 /obj/machinery/computer/atmoscontrol/attack_hand(mob/user)
 	if(..())
-		return
-	return ui_interact(user)
-
-/obj/machinery/computer/atmoscontrol/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
-	var/data[0]
-	var/alarms[0]
-
-	// TODO: Move these to a cache, similar to cameras
-	for(var/obj/machinery/alarm/alarm in (monitored_alarms ? monitored_alarms : machines))
-		alarms[++alarms.len] = list("name" = sanitize(alarm.name), "ref"= "\ref[alarm]", "danger" = max(alarm.danger_level, alarm.alarm_area.atmosalm))
-	data["alarms"] = alarms
-
-	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
-	if(!ui)
-		ui = new(user, src, ui_key, "atmos_control.tmpl", src.name, 625, 625)
-		ui.set_initial_data(data)
-		ui.open()
-		ui.set_auto_update(1)
-	ui_ref = ui
+		return 1
+	ui_interact(user)
 
 /obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob)
 	if(istype(I, /obj/item/weapon/card/emag) && !emagged)
 		user.visible_message("\red \The [user] swipes \a [I] through \the [src], causing the screen to flash!",\
 			"\red You swipe your [I] through \the [src], the screen flashing as you gain full control.",\
 			"You hear the swipe of a card through a reader, and an electronic warble.")
-		emagged = 1
-		overridden = 1
+		atmos_control.emagged = 1
 		return
 	return ..()
 
-//a bunch of this is copied from atmos alarms
-/obj/machinery/computer/atmoscontrol/Topic(href, href_list)
-	if(..())
-		return 1
-
-	if(href_list["alarm"])
-		if(ui_ref)
-			var/obj/machinery/alarm/alarm = locate(href_list["alarm"]) in (monitored_alarms ? monitored_alarms : machines)
-			if(alarm)
-				var/datum/topic_state/TS = generate_state(alarm)
-				alarm.ui_interact(usr, master_ui = ui_ref, state = TS)
-		return 1
-
-/obj/machinery/computer/atmoscontrol/proc/generate_state(var/alarm)
-	var/datum/topic_state/air_alarm/state = new()
-	state.atmos_control = src
-	state.air_alarm = alarm
-	return state
-
-/datum/topic_state/air_alarm
-	var/obj/machinery/computer/atmoscontrol/atmos_control = null
-	var/obj/machinery/alarm/air_alarm	= null
-
-/datum/topic_state/air_alarm/href_list(var/mob/user)
-	var/list/extra_href = list()
-	extra_href["remote_connection"] = 1
-	extra_href["remote_access"] = user && (user.isAI() || atmos_control.allowed(user) || atmos_control.emagged || air_alarm.rcon_setting == RCON_YES || (air_alarm.alarm_area.atmosalm && air_alarm.rcon_setting == RCON_AUTO))
-
-	return extra_href
+/obj/machinery/computer/atmoscontrol/ui_interact(var/mob/user)
+	if(!atmos_control)
+		atmos_control = new(src, req_access, req_one_access, monitored_alarm_ids)
+	atmos_control.ui_interact(user)

code/game/machinery/computer/buildandrepair.dm

@@ -29,7 +29,7 @@
 					if(!src || !WT.isOn()) return
 					user << "\blue You deconstruct the frame."
 					new /obj/item/stack/sheet/metal( src.loc, 5 )
-					del(src)
+					qdel(src)
 		if(1)
 			if(istype(P, /obj/item/weapon/wrench))
 				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -111,4 +111,4 @@
 				user << "\blue You connect the monitor."
 				var/B = new src.circuit.build_path ( src.loc )
 				src.circuit.construct(B)
-				del(src)
+				qdel(src)

code/game/machinery/computer/cloning.dm

@@ -221,7 +221,7 @@
 		src.active_record = locate(href_list["view_rec"])
 		if(istype(src.active_record,/datum/dna2/record))
 			if ((isnull(src.active_record.ckey)))
-				del(src.active_record)
+				qdel(src.active_record)
 				src.temp = "ERROR: Record Corrupt"
 			else
 				src.menu = 3
@@ -241,7 +241,7 @@
 			if (istype(C)||istype(C, /obj/item/device/pda))
 				if(src.check_access(C))
 					src.records.Remove(src.active_record)
-					del(src.active_record)
+					qdel(src.active_record)
 					src.temp = "Record deleted."
 					src.menu = 2
 				else
@@ -313,7 +313,7 @@
 				else if(pod.growclone(C))
 					temp = "Initiating cloning cycle..."
 					records.Remove(C)
-					del(C)
+					qdel(C)
 					menu = 1
 				else
 
@@ -323,7 +323,7 @@
 					if(answer != "No" && pod.growclone(C))
 						temp = "Initiating cloning cycle..."
 						records.Remove(C)
-						del(C)
+						qdel(C)
 						menu = 1
 					else
 						temp = "Initiating cloning cycle...<br>Error: Post-initialisation failed. Cloning cycle aborted."

code/game/machinery/computer/communications.dm

@@ -551,7 +551,7 @@
 	frequency.post_signal(src, status_signal)
 
 
-/obj/machinery/computer/communications/Del()
+/obj/machinery/computer/communications/Destroy()
 
 	for(var/obj/machinery/computer/communications/commconsole in world)
 		if(istype(commconsole.loc,/turf) && commconsole != src)
@@ -574,7 +574,7 @@
 
 	..()
 
-/obj/item/weapon/circuitboard/communications/Del()
+/obj/item/weapon/circuitboard/communications/Destroy()
 
 	for(var/obj/machinery/computer/communications/commconsole in world)
 		if(istype(commconsole.loc,/turf))

code/game/machinery/computer/computer.dm

@@ -41,11 +41,11 @@
 /obj/machinery/computer/ex_act(severity)
 	switch(severity)
 		if(1.0)
-			del(src)
+			qdel(src)
 			return
 		if(2.0)
 			if (prob(25))
-				del(src)
+				qdel(src)
 				return
 			if (prob(50))
 				for(var/x in verbs)
@@ -129,7 +129,7 @@
 				A.state = 4
 				A.icon_state = "4"
 			M.deconstruct(src)
-			del(src)
+			qdel(src)
 	else
 		src.attack_hand(user)
 	return

code/game/machinery/computer/medical.dm

@@ -240,7 +240,7 @@
 			if (href_list["del_all2"])
 				for(var/datum/data/record/R in data_core.medical)
 					//R = null
-					del(R)
+					qdel(R)
 					//Foreach goto(494)
 				src.temp = "All records deleted."
 
@@ -408,7 +408,7 @@
 			if (href_list["del_r2"])
 				if (src.active2)
 					//src.active2 = null
-					del(src.active2)
+					qdel(src.active2)
 
 			if (href_list["d_rec"])
 				var/datum/data/record/R = locate(href_list["d_rec"])
@@ -542,7 +542,7 @@
 			continue
 
 		else if(prob(1))
-			del(R)
+			qdel(R)
 			continue
 
 	..(severity)

code/game/machinery/computer/pod.dm

@@ -77,7 +77,7 @@
 				A.state = 3
 				A.icon_state = "3"
 				A.anchored = 1
-				del(src)
+				qdel(src)
 			else
 				user << "\blue You disconnect the monitor."
 				var/obj/structure/computerframe/A = new /obj/structure/computerframe( loc )
@@ -100,7 +100,7 @@
 				A.state = 4
 				A.icon_state = "4"
 				A.anchored = 1
-				del(src)
+				qdel(src)
 	else
 		attack_hand(user)
 	return

code/game/machinery/computer/prisonshuttle.dm

@@ -45,7 +45,7 @@ var/prison_shuttle_timeleft = 0
 					A.state = 4
 					A.icon_state = "4"
 
-				del(src)
+				qdel(src)
 		else if(istype(I,/obj/item/weapon/card/emag) && (!hacked))
 			hacked = 1
 			user << "\blue You disable the lock."
@@ -194,7 +194,7 @@ var/prison_shuttle_timeleft = 0
 					for(var/atom/movable/AM as mob|obj in T)
 						AM.Move(D)
 					if(istype(T, /turf/simulated))
-						del(T)
+						qdel(T)
 				start_location.move_contents_to(end_location)
 
 			if(1)
@@ -224,7 +224,7 @@ var/prison_shuttle_timeleft = 0
 					for(var/atom/movable/AM as mob|obj in T)
 						AM.Move(D)
 					if(istype(T, /turf/simulated))
-						del(T)
+						qdel(T)
 
 				for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
 					bug.gib()

code/game/machinery/computer/security.dm

@@ -377,7 +377,7 @@ What a mess.*/
 
 			if ("Purge All Records")
 				for(var/datum/data/record/R in data_core.security)
-					del(R)
+					qdel(R)
 				temp = "All Security records deleted."
 
 			if ("Add Entry")
@@ -549,17 +549,17 @@ What a mess.*/
 
 					if ("Delete Record (Security) Execute")
 						if (active2)
-							del(active2)
+							qdel(active2)
 
 					if ("Delete Record (ALL) Execute")
 						if (active1)
 							for(var/datum/data/record/R in data_core.medical)
 								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
-									del(R)
+									qdel(R)
 								else
-							del(active1)
+							qdel(active1)
 						if (active2)
-							del(active2)
+							qdel(active2)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
 
@@ -605,7 +605,7 @@ What a mess.*/
 			continue
 
 		else if(prob(1))
-			del(R)
+			qdel(R)
 			continue
 
 	..(severity)

code/game/machinery/computer/shuttle.dm

@@ -43,7 +43,7 @@
 						world << "\blue <B>Alert: Shuttle launch time shortened to 10 seconds!</B>"
 						emergency_shuttle.set_launch_countdown(10)
 						//src.authorized = null
-						del(src.authorized)
+						qdel(src.authorized)
 						src.authorized = list(  )
 
 				if("Repeal")

code/game/machinery/computer/skills.dm

@@ -289,7 +289,7 @@ What a mess.*/
 				if(PDA_Manifest.len)
 					PDA_Manifest.Cut()
 				for(var/datum/data/record/R in data_core.security)
-					del(R)
+					qdel(R)
 				temp = "All Employment records deleted."
 
 			if ("Delete Record (ALL)")
@@ -373,9 +373,9 @@ What a mess.*/
 								PDA_Manifest.Cut()
 							for(var/datum/data/record/R in data_core.medical)
 								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
-									del(R)
+									qdel(R)
 								else
-							del(active1)
+							qdel(active1)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
 
@@ -408,7 +408,7 @@ What a mess.*/
 			continue
 
 		else if(prob(1))
-			del(R)
+			qdel(R)
 			continue
 
 	..(severity)

code/game/machinery/computer/specops_shuttle.dm

@@ -75,7 +75,7 @@ var/specops_shuttle_timeleft = 0
 		for(var/atom/movable/AM as mob|obj in T)
 			AM.Move(D)
 		if(istype(T, /turf/simulated))
-			del(T)
+			qdel(T)
 
 	for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
 		bug.gib()
@@ -94,7 +94,7 @@ var/specops_shuttle_timeleft = 0
 	for(var/obj/machinery/computer/specops_shuttle/S in world)
 		S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY
 
-	del(announcer)
+	qdel(announcer)
 
 /proc/specops_process()
 	var/area/centcom/specops/special_ops = locate()//Where is the specops area located?
@@ -224,7 +224,7 @@ var/specops_shuttle_timeleft = 0
 		for(var/atom/movable/AM as mob|obj in T)
 			AM.Move(D)
 		if(istype(T, /turf/simulated))
-			del(T)
+			qdel(T)
 
 	start_location.move_contents_to(end_location)
 
@@ -235,7 +235,7 @@ var/specops_shuttle_timeleft = 0
 	for(var/obj/machinery/computer/specops_shuttle/S in world)
 		S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY
 
-	del(announcer)
+	qdel(announcer)
 
 /proc/specops_can_move()
 	if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom)

code/game/machinery/computer/station_alert.dm

@@ -16,7 +16,7 @@
 	alarm_monitor = new monitor_type(src)
 	alarm_monitor.register(src, /obj/machinery/computer/station_alert/update_icon)
 
-/obj/machinery/computer/station_alert/Del()
+/obj/machinery/computer/station_alert/Destroy()
 	alarm_monitor.unregister(src)
 	..()
 

code/game/machinery/computer/syndicate_specops_shuttle.dm

@@ -160,7 +160,7 @@ var/syndicate_elite_shuttle_timeleft = 0
 		for(var/atom/movable/AM as mob|obj in T)
 			AM.Move(D)
 		if(istype(T, /turf/simulated))
-			del(T)
+			qdel(T)
 
 	for(var/mob/living/carbon/bug in end_location) // If someone somehow is still in the shuttle's docking area...
 		bug.gib()

code/game/machinery/computer3/buildandrepair.dm

@@ -95,7 +95,7 @@
 					if(!src || !WT.isOn()) return
 					user << "\blue You deconstruct the frame."
 					new /obj/item/stack/sheet/metal( src.loc, 5 )
-					del(src)
+					qdel(src)
 		if(1)
 			if(istype(P, /obj/item/weapon/wrench))
 				playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -160,7 +160,7 @@
 					if(do_after(user, 20))
 						if(P)
 							P:amount -= 5
-							if(!P:amount) del(P)
+							if(!P:amount) qdel(P)
 							user << "\blue You add cables to the frame."
 							src.state = 3
 							src.icon_state = "3"
@@ -212,7 +212,7 @@
 				if(circuit.OS)
 					circuit.OS.computer = B
 				B.RefreshParts()		// todo
-				del(src)
+				qdel(src)
 
 /*
 	This will remove peripherals if you specify one, but the main function is to

code/game/machinery/computer3/computer.dm

@@ -215,11 +215,11 @@
 	ex_act(severity)
 		switch(severity)
 			if(1.0)
-				del(src)
+				qdel(src)
 				return
 			if(2.0)
 				if (prob(25))
-					del(src)
+					qdel(src)
 					return
 				if (prob(50))
 					for(var/x in verbs)

code/game/machinery/computer3/computers/HolodeckControl.dm

@@ -160,7 +160,7 @@
 		if(!silent)
 			var/obj/oldobj = obj
 			obj.visible_message("The [oldobj.name] fades away!")
-		del(obj)
+		qdel(obj)
 
 	proc/checkInteg(var/area/A)
 		for(var/turf/T in A)
@@ -213,10 +213,10 @@
 			derez(item)
 
 		for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
-			del(B)
+			qdel(B)
 
 		for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck)
-			del(C)
+			qdel(C)
 
 		holographic_items = A.copy_contents_to(linkedholodeck , 1)
 

code/game/machinery/computer3/computers/medical.dm

@@ -254,7 +254,7 @@
 			if (href_list["del_all2"])
 				for(var/datum/data/record/R in data_core.medical)
 					//R = null
-					del(R)
+					qdel(R)
 					//Foreach goto(494)
 				src.temp = "All records deleted."
 
@@ -422,7 +422,7 @@
 			if (href_list["del_r2"])
 				if (src.active2)
 					//src.active2 = null
-					del(src.active2)
+					qdel(src.active2)
 
 			if (href_list["d_rec"])
 				var/datum/data/record/R = locate(href_list["d_rec"])

code/game/machinery/computer3/computers/security.dm

@@ -397,7 +397,7 @@ What a mess.*/
 
 			if ("Purge All Records")
 				for(var/datum/data/record/R in data_core.security)
-					del(R)
+					qdel(R)
 				temp = "All Security records deleted."
 
 			if ("Add Entry")
@@ -558,17 +558,17 @@ What a mess.*/
 
 					if ("Delete Record (Security) Execute")
 						if (active2)
-							del(active2)
+							qdel(active2)
 
 					if ("Delete Record (ALL) Execute")
 						if (active1)
 							for(var/datum/data/record/R in data_core.medical)
 								if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
-									del(R)
+									qdel(R)
 								else
-							del(active1)
+							qdel(active1)
 						if (active2)
-							del(active2)
+							qdel(active2)
 					else
 						temp = "This function does not appear to be working at the moment. Our apologies."
 
@@ -601,7 +601,7 @@ What a mess.*/
 			continue
 
 		else if(prob(1))
-			del(R)
+			qdel(R)
 			continue
 
 	..(severity)

code/game/machinery/computer3/laptop.dm

@@ -52,7 +52,7 @@
 					O.loc = loc
 			usr << "\The [src] crumbles to pieces."
 			spawn(5)
-				del src
+				qdel(src)
 			return
 
 		if(!stored_computer.manipulating)
@@ -65,7 +65,7 @@
 
 			spawn(5)
 				stored_computer.manipulating = 0
-				del src
+				qdel(src)
 		else
 			usr << "\red You are already opening the computer!"
 
@@ -185,12 +185,12 @@
 		else
 			stat &= ~NOPOWER
 
-	Del()
+	Destroy()
 		if(istype(loc,/obj/item/device/laptop))
 			var/obj/O = loc
 			spawn(5)
 				if(O)
-					del O
+					qdel(O)
 		..()
 
 

code/game/machinery/computer3/lapvend.dm

@@ -31,7 +31,7 @@
 /obj/machinery/lapvend/blob_act()
 	if (prob(50))
 		spawn(0)
-			del(src)
+			qdel(src)
 		return
 
 	return
@@ -202,10 +202,10 @@
 	if (network == 3)
 		newlap.spawn_parts += (/obj/item/part/computer/networking/cable)
 	if (power == 1)
-		del(newlap.battery)
+		qdel(newlap.battery)
 		newlap.battery = new /obj/item/weapon/cell/high(newlap)
 	if (power == 2)
-		del(newlap.battery)
+		qdel(newlap.battery)
 		newlap.battery = new /obj/item/weapon/cell/super(newlap)
 
 	newlap.spawn_parts()
@@ -404,7 +404,7 @@
 	T.time = worldtime2text()
 	vendor_account.transaction_log.Add(T)
 
-	del(relap)
+	qdel(relap)
 	vendmode = 0
 	cardreader = 0
 	floppy = 0

code/game/machinery/computer3/program.dm

@@ -111,7 +111,7 @@ Programs are a file that can be executed
 	update_icon()
 	if(popup)
 		popup.close()
-		del popup
+		qdel(popup)
 	return
 
 /*

code/game/machinery/constructable_frame.dm

@@ -53,7 +53,7 @@
 						playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 						user << "\blue You dismantle the frame"
 						new /obj/item/stack/sheet/metal(src.loc, 5)
-						del(src)
+						qdel(src)
 			if(2)
 				if(istype(P, /obj/item/weapon/circuitboard))
 					var/obj/item/weapon/circuitboard/B = P
@@ -129,7 +129,7 @@
 							else
 								circuit.loc = null
 							new_machine.RefreshParts()
-							del(src)
+							qdel(src)
 					else
 						if(istype(P, /obj/item))
 							for(var/I in req_components)

code/game/machinery/cryo.dm

@@ -24,9 +24,11 @@
 	..()
 	initialize_directions = dir
 
-/obj/machinery/atmospherics/unary/cryo_cell/Del()
-	if(occupant)
-		occupant.loc = loc
+/obj/machinery/atmospherics/unary/cryo_cell/Destroy()
+	var/turf/T = loc
+	T.contents += contents
+	if(beaker)
+		beaker.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
 	..()
 
 /obj/machinery/atmospherics/unary/cryo_cell/initialize()
@@ -190,7 +192,7 @@
 				return
 		var/mob/M = G:affecting
 		if(put_mob(M))
-			del(G)
+			qdel(G)
 	return
 
 /obj/machinery/atmospherics/unary/cryo_cell/update_icon()

code/game/machinery/cryopod.dm

@@ -234,7 +234,7 @@
 
 	..()
 
-/obj/machinery/cryopod/Del()
+/obj/machinery/cryopod/Destroy()
 	if(occupant)
 		occupant.loc = loc
 		occupant.resting = 1
@@ -291,12 +291,12 @@
 	var/mob/living/silicon/robot/R = occupant
 	if(!istype(R)) return ..()
 
-	del(R.mmi)
+	qdel(R.mmi)
 	for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
 		for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
 			O.loc = R
-		del(I)
-	del(R.module)
+		qdel(I)
+	qdel(R.module)
 
 	return ..()
 
@@ -308,7 +308,7 @@
 		occupant.drop_from_inventory(W)
 		W.loc = src
 
-		if(W.contents.len) //Make sure we catch anything not handled by del() on the items.
+		if(W.contents.len) //Make sure we catch anything not handled by qdel() on the items.
 			for(var/obj/item/O in W.contents)
 				if(istype(O,/obj/item/weapon/storage/internal)) //Stop eating pockets, you fuck!
 					continue
@@ -328,7 +328,7 @@
 				break
 
 		if(!preserve)
-			del(W)
+			qdel(W)
 		else
 			if(control_computer && control_computer.allow_items)
 				control_computer.frozen_items += W
@@ -341,7 +341,7 @@
 		// We don't want revs to get objectives that aren't for heads of staff. Letting
 		// them win or lose based on cryo is silly so we remove the objective.
 		if(istype(O,/datum/objective/mutiny) && O.target == occupant.mind)
-			del(O)
+			qdel(O)
 		else if(O.target && istype(O.target,/datum/mind))
 			if(O.target == occupant.mind)
 				if(O.owner && O.owner.current)
@@ -353,7 +353,7 @@
 					if(!(O.target))
 						all_objectives -= O
 						O.owner.objectives -= O
-						del(O)
+						qdel(O)
 
 	//Handle job slot/tater cleanup.
 	var/job = occupant.mind.assigned_role
@@ -361,7 +361,7 @@
 	job_master.FreeRole(job)
 
 	if(occupant.mind.objectives.len)
-		del(occupant.mind.objectives)
+		qdel(occupant.mind.objectives)
 		occupant.mind.special_role = null
 	//else
 		//if(ticker.mode.name == "AutoTraitor")
@@ -374,13 +374,13 @@
 		PDA_Manifest.Cut()
 	for(var/datum/data/record/R in data_core.medical)
 		if ((R.fields["name"] == occupant.real_name))
-			del(R)
+			qdel(R)
 	for(var/datum/data/record/T in data_core.security)
 		if ((T.fields["name"] == occupant.real_name))
-			del(T)
+			qdel(T)
 	for(var/datum/data/record/G in data_core.general)
 		if ((G.fields["name"] == occupant.real_name))
-			del(G)
+			qdel(G)
 
 	if(orient_right)
 		icon_state = "[base_icon_state]-r"
@@ -399,7 +399,7 @@
 	visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3)
 
 	// Delete the mob.
-	del(occupant)
+	qdel(occupant)
 	set_occupant(null)
 
 

code/game/machinery/deployable.dm

@@ -91,14 +91,14 @@ for reference:
 				new /obj/item/stack/sheet/wood(get_turf(src))
 				new /obj/item/stack/sheet/wood(get_turf(src))
 				new /obj/item/stack/sheet/wood(get_turf(src))
-				del(src)
+				qdel(src)
 			..()
 
 	ex_act(severity)
 		switch(severity)
 			if(1.0)
 				visible_message("\red <B>The barricade is blown apart!</B>")
-				del(src)
+				qdel(src)
 				return
 			if(2.0)
 				src.health -= 25
@@ -107,7 +107,7 @@ for reference:
 					new /obj/item/stack/sheet/wood(get_turf(src))
 					new /obj/item/stack/sheet/wood(get_turf(src))
 					new /obj/item/stack/sheet/wood(get_turf(src))
-					del(src)
+					qdel(src)
 				return
 
 	meteorhit()
@@ -115,14 +115,14 @@ for reference:
 		new /obj/item/stack/sheet/wood(get_turf(src))
 		new /obj/item/stack/sheet/wood(get_turf(src))
 		new /obj/item/stack/sheet/wood(get_turf(src))
-		del(src)
+		qdel(src)
 		return
 
 	blob_act()
 		src.health -= 25
 		if (src.health <= 0)
 			visible_message("\red <B>The blob eats through the barricade!</B>")
-			del(src)
+			qdel(src)
 		return
 
 	CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff.
@@ -272,4 +272,4 @@ for reference:
 
 		explosion(src.loc,-1,-1,0)
 		if(src)
-			del(src)
+			qdel(src)

code/game/machinery/doors/airlock.dm

@@ -264,13 +264,13 @@
 	for(var/obj/structure/falsewall/phoron/F in range(3,src))//Hackish as fuck, but until temperature_expose works, there is nothing I can do -Sieve
 		var/turf/T = get_turf(F)
 		T.ChangeTurf(/turf/simulated/wall/mineral/phoron/)
-		del (F)
+		qdel (F)
 	for(var/turf/simulated/wall/mineral/phoron/W in range(3,src))
 		W.ignite((temperature/4))//Added so that you can't set off a massive chain reaction with a small flame
 	for(var/obj/machinery/door/airlock/phoron/D in range(3,src))
 		D.ignite(temperature/4)
 	new/obj/structure/door_assembly( src.loc )
-	del (src)
+	qdel(src)
 
 /obj/machinery/door/airlock/sandstone
 	name = "Sandstone Airlock"
@@ -770,7 +770,7 @@ About the new airlock wires panel:
 					electronics.loc = src.loc
 					electronics = null
 
-				del(src)
+				qdel(src)
 				return
 		else if(arePowerSystemsOn())
 			user << "\blue The airlock's motors resist your efforts to force it."
@@ -882,7 +882,7 @@ About the new airlock wires panel:
 				S.victim = M
 				S.loc = M.loc
 				spawn(20)
-					del(S)
+					qdel(S)
 				if (iscarbon(M))
 					var/mob/living/carbon/C = M
 					if (!(C.species && (C.species.flags & NO_PAIN)))

code/game/machinery/doors/airlock_control.dm

@@ -30,7 +30,7 @@ obj/machinery/door/airlock/proc/execute_current_command()
 
 	if (!cur_command)
 		return
-	
+
 	do_command(cur_command)
 	if (command_completed(cur_command))
 		cur_command = null
@@ -63,7 +63,7 @@ obj/machinery/door/airlock/proc/do_command(var/command)
 
 			lock()
 			sleep(2)
-	
+
 	send_status()
 
 obj/machinery/door/airlock/proc/command_completed(var/command)
@@ -85,7 +85,7 @@ obj/machinery/door/airlock/proc/command_completed(var/command)
 
 		if("secure_close")
 			return (locked && density)
-	
+
 	return 1	//Unknown command. Just assume it's completed.
 
 obj/machinery/door/airlock/proc/send_status(var/bumped = 0)
@@ -97,7 +97,7 @@ obj/machinery/door/airlock/proc/send_status(var/bumped = 0)
 
 		signal.data["door_status"] = density?("closed"):("open")
 		signal.data["lock_status"] = locked?("locked"):("unlocked")
-		
+
 		if (bumped)
 			signal.data["bumped_with_access"] = 1
 
@@ -142,8 +142,10 @@ obj/machinery/door/airlock/New()
 	if(radio_controller)
 		set_frequency(frequency)
 
-
-
+obj/machinery/door/airlock/Destroy()
+	if(frequency && radio_controller)
+		radio_controller.remove_object(src,frequency)
+	..()
 
 obj/machinery/airlock_sensor
 	icon = 'icons/obj/airlock_machines.dmi'
@@ -215,6 +217,10 @@ obj/machinery/airlock_sensor/New()
 	if(radio_controller)
 		set_frequency(frequency)
 
+obj/machinery/airlock_sensor/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,frequency)
+	..()
 
 obj/machinery/airlock_sensor/airlock_interior
 	command = "cycle_interior"
@@ -283,6 +289,11 @@ obj/machinery/access_button/New()
 	if(radio_controller)
 		set_frequency(frequency)
 
+obj/machinery/access_button/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src, frequency)
+	..()
+
 obj/machinery/access_button/airlock_interior
 	frequency = 1379
 	command = "cycle_interior"

code/game/machinery/doors/alarmlock.dm

@@ -13,6 +13,11 @@
 	..()
 	air_connection = new
 
+/obj/machinery/door/airlock/alarmlock/Destroy()
+	if(radio_controller)
+		radio_controller.remove_object(src,air_frequency)
+	..()
+
 /obj/machinery/door/airlock/alarmlock/initialize()
 	..()
 	radio_controller.remove_object(src, air_frequency)