Fixes conflict in autolathe_designs.dm

code/game/objects/items/control_wand.dm

@@ -19,9 +19,7 @@
 	ID.access = get_region_accesses(region_access)
 
 /obj/item/weapon/door_remote/Destroy()
-	if(ID)
-		qdel(ID)
-		ID = null
+	QDEL_NULL(ID)
 	return ..()
 
 /obj/item/weapon/door_remote/attack_self(mob/user)

code/game/objects/items/dehy_carp.dm

@@ -8,6 +8,11 @@
 	var/mob/owner = null	// Carp doesn't attack owner, set when using in hand
 	var/owned = 1	// Boolean, no owner to begin with
 
+
+/obj/item/toy/carpplushie/dehy_carp/Destroy()
+	owner = null
+	return ..()
+
 // Attack self
 /obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob)
 	src.add_fingerprint(user)	// Anyone can add their fingerprints to it with this

code/game/objects/items/devices/autopsy.dm

@@ -1,14 +1,10 @@
-
-//moved these here from code/defines/obj/weapon.dm
-//please preference put stuff where it's easy to find - C
-
 /obj/item/weapon/autopsy_scanner
 	name = "autopsy scanner"
 	desc = "Extracts information on wounds."
 	icon = 'icons/obj/autopsy_scanner.dmi'
 	icon_state = ""
 	flags = CONDUCT
-	w_class = 1
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=1;biotech=1"
 	var/list/datum/autopsy_data_scanner/wdata = list()
 	var/list/datum/autopsy_data_scanner/chemtraces = list()
@@ -28,28 +24,23 @@
 	var/hits = 0
 	var/time_inflicted = 0
 
-	proc/copy()
-		var/datum/autopsy_data/W = new()
-		W.weapon = weapon
-		W.pretend_weapon = pretend_weapon
-		W.damage = damage
-		W.hits = hits
-		W.time_inflicted = time_inflicted
-		return W
+/datum/autopsy_data/proc/copy()
+	var/datum/autopsy_data/W = new()
+	W.weapon = weapon
+	W.pretend_weapon = pretend_weapon
+	W.damage = damage
+	W.hits = hits
+	W.time_inflicted = time_inflicted
+	return W
 
-/obj/item/weapon/autopsy_scanner/proc/add_data(var/obj/item/organ/external/O)
-	if(!O.autopsy_data.len && !O.trace_chemicals.len) return
+/obj/item/weapon/autopsy_scanner/proc/add_data(obj/item/organ/external/O)
+	if(!O.autopsy_data.len && !O.trace_chemicals.len)
+		return
 
 	for(var/V in O.autopsy_data)
 		var/datum/autopsy_data/W = O.autopsy_data[V]
 
 		if(!W.pretend_weapon)
-			/*
-			// the more hits, the more likely it is that we get the right weapon type
-			if(prob(50 + W.hits * 10 + W.damage))
-			*/
-
-			// Buffing this stuff up for now!
 			if(1)
 				W.pretend_weapon = W.weapon
 			else
@@ -75,11 +66,8 @@
 		if(O.trace_chemicals[V] > 0 && !chemtraces.Find(V))
 			chemtraces += V
 
-/obj/item/weapon/autopsy_scanner/verb/print_data()
-	set src in view(usr, 1)
-	set name = "Print Data"
-	if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
-		to_chat(usr, "No.")
+/obj/item/weapon/autopsy_scanner/attack_self(mob/user)
+	if(!wdata.len && !chemtraces.len)
 		return
 
 	var/scan_data = ""
@@ -101,8 +89,10 @@
 
 			var/wname = W.pretend_weapon
 
-			if(wname in weapon_chances) weapon_chances[wname] += W.damage
-			else weapon_chances[wname] = max(W.damage, 1)
+			if(wname in weapon_chances)
+				weapon_chances[wname] += W.damage
+			else
+				weapon_chances[wname] = max(W.damage, 1)
 			total_score+=W.damage
 
 
@@ -126,7 +116,8 @@
 			if(30 to 1000)
 				damage_desc = "<font color='red'>severe</font>"
 
-		if(!total_score) total_score = D.organs_scanned.len
+		if(!total_score)
+			total_score = D.organs_scanned.len
 
 		scan_data += "<b>Weapon #[n]</b><br>"
 		if(damaging_weapon)
@@ -148,35 +139,19 @@
 			scan_data += chemID
 			scan_data += "<br>"
 
-	for(var/mob/O in viewers(usr))
-		O.show_message("\red \the [src] rattles and prints out a sheet of paper.", 1)
+	user.visible_message("<span class='warning'>[src] rattles and prints out a sheet of paper.</span>")
 
 	playsound(loc, 'sound/goonstation/machines/printer_thermal.ogg', 50, 1)
 	sleep(10)
 
-	var/obj/item/weapon/paper/P = new(usr.loc)
+	var/obj/item/weapon/paper/P = new(user.loc)
 	P.name = "Autopsy Data ([target_name])"
 	P.info = "<tt>[scan_data]</tt>"
 	P.overlays += "paper_words"
 
-	if(istype(usr,/mob/living/carbon))
-		// place the item in the usr's hand if possible
-		if(!usr.r_hand)
-			P.loc = usr
-			usr.r_hand = P
-			P.layer = 20
-			P.plane = HUD_PLANE
-		else if(!usr.l_hand)
-			P.loc = usr
-			usr.l_hand = P
-			P.layer = 20
-			P.plane = HUD_PLANE
+	user.put_in_hands(P)
 
-	if(istype(usr,/mob/living/carbon/human))
-		usr:update_inv_l_hand()
-		usr:update_inv_r_hand()
-
-/obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M as mob, mob/living/carbon/user as mob)
+/obj/item/weapon/autopsy_scanner/attack(mob/living/carbon/human/M, mob/living/carbon/user)
 	if(!istype(M))
 		return
 
@@ -185,23 +160,18 @@
 
 	if(target_name != M.name)
 		target_name = M.name
-		src.wdata = list()
-		src.chemtraces = list()
-		src.timeofdeath = null
-		to_chat(user, "\red A new patient has been registered.. Purging data for previous patient.")
+		wdata.Cut()
+		chemtraces.Cut()
+		timeofdeath = null
+		to_chat(user, "<span class='warning'>A new patient has been registered. Purging data for previous patient.</span>")
 
-	src.timeofdeath = M.timeofdeath
+	timeofdeath = M.timeofdeath
 
 	var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting)
 	if(!S)
-		to_chat(usr, "<b>You can't scan this body part.</b>")
+		to_chat(user, "<span class='warning'>You can't scan this body part.</span>")
 		return
-	if(!S.open)
-		to_chat(usr, "<b>You have to cut the limb open first!</b>")
-		return
-	for(var/mob/O in viewers(M))
-		O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.name] with \the [src.name]", 1)
+	M.visible_message("<span class='warning'>[user] scans the wounds on [M]'s [S] with [src]</span>")
 
-	src.add_data(S)
-
-	return 1
+	add_data(S)
+	return 1

code/game/objects/items/devices/guitar.dm

@@ -17,8 +17,7 @@
 	song.instrumentExt = "ogg"
 
 /obj/item/device/guitar/Destroy()
-	qdel(song)
-	song = null
+	QDEL_NULL(song)
 	return ..()
 
 /obj/item/device/guitar/attack_self(mob/user as mob)

code/game/objects/items/devices/laserpointer.dm

@@ -35,9 +35,7 @@
 		pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
 
 /obj/item/device/laser_pointer/Destroy()
-	if(diode)
-		qdel(diode)
-		diode = null
+	QDEL_NULL(diode)
 	return ..()
 
 /obj/item/device/laser_pointer/upgraded/New()

code/game/objects/items/devices/modkit.dm

@@ -1,87 +0,0 @@
-#define MODKIT_HELMET 1
-#define MODKIT_SUIT 2
-#define MODKIT_FULL 3
-
-/obj/item/device/modkit
-	name = "hardsuit modification kit"
-	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user."
-	icon_state = "modkit"
-	var/parts = MODKIT_FULL
-	var/target_species = "Human"
-
-	var/list/permitted_types = list(
-		/obj/item/clothing/head/helmet/space/hardsuit,
-		/obj/item/clothing/suit/space/hardsuit
-		)
-
-/obj/item/device/modkit/afterattack(obj/item/O, mob/user as mob, proximity)
-	if(!proximity)
-		return
-
-	if(!target_species)
-		return	//it shouldn't be null, okay?
-
-	if(!parts)
-		to_chat(user, "<span class='warning'>This kit has no parts for this modification left.</span>")
-		user.unEquip(src)
-		qdel(src)
-		return
-
-	var/allowed = 0
-	for(var/permitted_type in permitted_types)
-		if(istype(O, permitted_type))
-			allowed = 1
-
-	var/obj/item/clothing/I = O
-	if(!istype(I) || !allowed)
-		to_chat(user, "<span class='notice'>[src] is unable to modify that.</span>")
-		return
-
-	var/excluding = ("exclude" in I.species_restricted)
-	var/in_list = (target_species in I.species_restricted)
-	if(excluding ^ in_list)
-		to_chat(user, "<span class='notice'>[I] is already modified.</span>")
-		return
-
-	if(!isturf(O.loc))
-		to_chat(user, "<span class='warning'>[O] must be safely placed on the ground for modification.</span>")
-		return
-
-	playsound(user.loc, O.usesound, 100, 1)
-
-	user.visible_message("\red [user] opens \the [src] and modifies \the [O].","\red You open \the [src] and modify \the [O].")
-
-	I.refit_for_species(target_species)
-
-	if(istype(I, /obj/item/clothing/head/helmet))
-		parts &= ~MODKIT_HELMET
-	if(istype(I, /obj/item/clothing/suit))
-		parts &= ~MODKIT_SUIT
-
-	if(!parts)
-		user.unEquip(src)
-		qdel(src)
-
-/obj/item/device/modkit/examine(mob/user)
-	..(user)
-	to_chat(user, "It looks as though it modifies hardsuits to fit [target_species] users.")
-
-/obj/item/device/modkit/tajaran
-	name = "Tajaran hardsuit modification kit"
-	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran."
-	target_species = "Tajaran"
-
-/obj/item/device/modkit/unathi
-	name = "Unathi hardsuit modification kit"
-	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another species. This one looks like it's meant for Unathi."
-	target_species = "Unathi"
-
-/obj/item/device/modkit/skrell
-	name = "Skrell hardsuit modification kit"
-	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another species. This one looks like it's meant for Skrell."
-	target_species = "Skrell"
-
-/obj/item/device/modkit/vox
-	name = "Vox hardsuit modification kit"
-	desc = "A kit containing all the needed tools and parts to modify a hardsuit for another species. This one looks like it's meant for Vox."
-	target_species = "Vox"

code/game/objects/items/devices/multitool.dm

@@ -32,6 +32,9 @@
 
 // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
 
+/obj/item/device/multitool/Destroy()
+	buffer = null
+	return ..()
 
 /obj/item/device/multitool/ai_detect
 	var/track_cooldown = 0
@@ -56,7 +59,7 @@
 	multitool_detect()
 	icon_state = "[initial(icon_state)][detect_state]"
 	track_cooldown = world.time + track_delay
-	
+
 /obj/item/device/multitool/ai_detect/proc/multitool_detect()
 	var/turf/our_turf = get_turf(src)
 	for(var/mob/living/silicon/ai/AI in ai_list)
@@ -76,7 +79,7 @@
 					if(get_dist(our_turf, detect_turf) < rangewarning)
 						detect_state = PROXIMITY_NEAR
 						break
-						
+
 /obj/item/device/multitool/ai_detect/admin
 	desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item?
 	track_delay = 5

code/game/objects/items/devices/paicard.dm

@@ -12,7 +12,7 @@
 	var/looking_for_personality = 0
 	var/mob/living/silicon/pai/pai
 	var/list/faction = list("neutral") // The factions the pAI will inherit from the card
-	
+
 /obj/item/device/paicard/syndicate
 	name = "syndicate personal AI device"
 	faction = list("syndicate")
@@ -33,9 +33,7 @@
 		pai.ghostize()
 		qdel(pai)
 		pai = null
-	if(radio)
-		qdel(radio)
-		radio = null
+	QDEL_NULL(radio)
 	return ..()
 
 /obj/item/device/paicard/attack_self(mob/user)

code/game/objects/items/devices/powersink.dm

@@ -27,6 +27,8 @@
 /obj/item/device/powersink/Destroy()
 	processing_objects.Remove(src)
 	processing_power_items.Remove(src)
+	PN = null
+	attached = null
 	return ..()
 
 /obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user)

code/game/objects/items/devices/radio/headset.dm

@@ -32,12 +32,8 @@
 	recalculateChannels(1)
 
 /obj/item/device/radio/headset/Destroy()
-	if(keyslot1)
-		qdel(keyslot1)
-	if(keyslot2)
-		qdel(keyslot2)
-	keyslot1 = null
-	keyslot2 = null
+	QDEL_NULL(keyslot1)
+	QDEL_NULL(keyslot2)
 	return ..()
 
 /obj/item/device/radio/headset/list_channels(var/mob/user)
@@ -63,7 +59,7 @@
 		return RADIO_CONNECTION_FAIL
 
 	return ..()
-	
+
 /obj/item/device/radio/headset/is_listening()
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
@@ -71,7 +67,7 @@
 			return ..()
 	else if(isanimal(loc) || isAI(loc))
 		return ..()
-	
+
 	return FALSE
 
 /obj/item/device/radio/headset/alt

code/game/objects/items/devices/radio/radio.dm

@@ -30,7 +30,6 @@ var/global/list/default_medbay_channels = list(
 	var/frequency = PUB_FREQ //common chat
 	var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
 	var/canhear_range = 3 // the range which mobs can hear this radio from
-	var/obj/item/device/radio/patch_link = null
 	var/datum/wires/radio/wires = null
 	var/b_stat = 0
 	var/broadcasting = 0
@@ -54,14 +53,14 @@ var/global/list/default_medbay_channels = list(
 
 	var/list/internal_channels
 
-/obj/item/device/radio
 	var/datum/radio_frequency/radio_connection
 	var/list/datum/radio_frequency/secure_radio_connections = new
 
-	proc/set_frequency(new_frequency)
-		radio_controller.remove_object(src, frequency)
-		frequency = new_frequency
-		radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
+
+/obj/item/device/radio/proc/set_frequency(new_frequency)
+	radio_controller.remove_object(src, frequency)
+	frequency = new_frequency
+	radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
 
 
 /obj/item/device/radio/New()
@@ -74,14 +73,13 @@ var/global/list/default_medbay_channels = list(
 	global_radios |= src
 
 /obj/item/device/radio/Destroy()
-	qdel(wires)
-	wires = null
+	QDEL_NULL(wires)
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
 		for(var/ch_name in channels)
 			radio_controller.remove_object(src, radiochannels[ch_name])
-	patch_link = null
 	global_radios -= src
+	follow_target = null
 	return ..()
 
 
@@ -271,7 +269,7 @@ var/global/list/default_medbay_channels = list(
 /mob/living/automatedannouncer/Destroy()
 	if(lifetime_timer)
 		deltimer(lifetime_timer)
-	..()
+	return ..()
 
 /mob/living/automatedannouncer/proc/autocleanup()
 	log_runtime(EXCEPTION("An announcer somehow managed to outlive the radio! Deleting!"), src, list("Message: '[message]'"))
@@ -315,7 +313,7 @@ var/global/list/default_medbay_channels = list(
 		actually transmit large mass. Headsets are the only radio devices capable
 		of sending subspace transmissions to the Communications Satellite.
 
-		A headset sends a signal to a subspace listener/reciever elsewhere in space,
+		A headset sends a signal to a subspace listener/receiver elsewhere in space,
 		the signal gets processed and logged, and an audible transmission gets sent
 		to each individual headset.
 	*/

code/game/objects/items/devices/scanners.dm

@@ -253,7 +253,7 @@ REAGENT SCANNER
 		if(H.gene_stability < 40)
 			user.show_message("<span class='userdanger'>Subject's genes are quickly breaking down!</span>")
 		else if(H.gene_stability < 70)
-			user.show_message("<span class='danger'>Subject's genes are showing signs of spontenous breakdown.</span>")
+			user.show_message("<span class='danger'>Subject's genes are showing signs of spontaneous breakdown.</span>")
 		else if(H.gene_stability < 85)
 			user.show_message("<span class='warning'>Subject's genes are showing minor signs of instability.</span>")
 		else
@@ -279,7 +279,7 @@ REAGENT SCANNER
 		else
 			to_chat(user, "<span class='notice'>You install the upgrade in the [src].</span>")
 			overlays += "advanced"
-			playsound(src.loc, usesound, 50, 1)
+			playsound(loc, W.usesound, 50, 1)
 			upgraded = 1
 			qdel(W)
 
@@ -531,5 +531,5 @@ REAGENT SCANNER
 			user.show_message("Possible mutations: [T.slime_mutation[1]], [T.slime_mutation[2]], [T.slime_mutation[3]], [T.slime_mutation[4]]", 1)
 			user.show_message("Genetic destability: [T.mutation_chance]% chance of mutation on splitting", 1)
 	if(T.cores > 1)
-		user.show_message("Anomalious slime core amount detected", 1)
+		user.show_message("Anomalous slime core amount detected", 1)
 	user.show_message("Growth progress: [T.amount_grown]/10", 1)

code/game/objects/items/devices/sensor_device.dm

@@ -12,8 +12,7 @@
 	crew_monitor = new(src)
 
 /obj/item/device/sensor_device/Destroy()
-	qdel(crew_monitor)
-	crew_monitor = null
+	QDEL_NULL(crew_monitor)
 	return ..()
 
 /obj/item/device/sensor_device/attack_self(mob/user as mob)

code/game/objects/items/devices/taperecorder.dm

@@ -21,9 +21,7 @@
 	update_icon()
 
 /obj/item/device/taperecorder/Destroy()
-	if(mytape)
-		qdel(mytape)
-		mytape = null
+	QDEL_NULL(mytape)
 	return ..()
 
 /obj/item/device/taperecorder/examine(mob/user)

code/game/objects/items/devices/transfer_valve.dm

@@ -13,15 +13,9 @@
 	origin_tech = "materials=1;engineering=1"
 
 /obj/item/device/transfer_valve/Destroy()
-	if(tank_one)
-		qdel(tank_one)
-		tank_one = null
-	if(tank_two)
-		qdel(tank_two)
-		tank_two = null
-	if(attached_device)
-		qdel(attached_device)
-		attached_device = null
+	QDEL_NULL(tank_one)
+	QDEL_NULL(tank_two)
+	QDEL_NULL(attached_device)
 	attacher = null
 	return ..()
 

code/game/objects/items/devices/violin.dm

@@ -18,8 +18,7 @@
 	song.instrumentExt = "ogg"
 
 /obj/item/device/violin/Destroy()
-	qdel(song)
-	song = null
+	QDEL_NULL(song)
 	return ..()
 
 /obj/item/device/violin/initialize()

code/game/objects/items/latexballoon.dm

@@ -12,9 +12,7 @@
 	var/datum/gas_mixture/air_contents = null
 
 /obj/item/latexballon/Destroy()
-	if(air_contents)
-		qdel(air_contents)
-		air_contents = null
+	QDEL_NULL(air_contents)
 	return ..()
 
 /obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank, mob/user)

code/game/objects/items/stacks/medical.dm

@@ -175,7 +175,7 @@
 	heal_burn = 12
 
 
-//Splits//
+//Splints//
 
 
 /obj/item/stack/medical/splint
@@ -203,14 +203,14 @@
 				to_chat(user, "<span class='notice'>You remove the splint from [H]'s [limb].</span>")
 			return
 		if(M == user)
-			user.visible_message("<span class='notice'>[user] starts to apply [src] to [H]'s [limb].</span>", \
-								 "<span class='notice'>You start to apply [src] to [H]'s [limb].</span>", \
+			user.visible_message("<span class='notice'>[user] starts to apply [src] to their [limb].</span>", \
+								 "<span class='notice'>You start to apply [src] to your [limb].</span>", \
 								 "<span class='notice'>You hear something being wrapped.</span>")
 			if(!do_mob(user, H, self_delay))
 				return
 		else
-			user.visible_message("<span class='green'>[user] applies [src] to their [limb].</span>", \
-								 "<span class='green'>You apply [src] to your [limb].</span>", \
+			user.visible_message("<span class='green'>[user] applies [src] to [H]'s [limb].</span>", \
+								 "<span class='green'>You apply [src] to [H]'s [limb].</span>", \
 								 "<span class='green'>You hear something being wrapped.</span>")
 
 		affecting.status |= ORGAN_SPLINTED

code/game/objects/items/stacks/sheets/glass.dm

@@ -22,6 +22,7 @@
 	origin_tech = "materials=1"
 	var/created_window = /obj/structure/window/basic
 	var/full_window = /obj/structure/window/full/basic
+	merge_type = /obj/item/stack/sheet/glass
 
 /obj/item/stack/sheet/glass/fifty
 	amount = 50
@@ -155,6 +156,7 @@
 	origin_tech = "materials=2"
 	var/created_window = /obj/structure/window/reinforced
 	var/full_window = /obj/structure/window/full/reinforced
+	merge_type = /obj/item/stack/sheet/rglass
 
 /obj/item/stack/sheet/rglass/cyborg
 	materials = list()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -22,6 +22,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	new /datum/stack_recipe("barber chair", /obj/structure/stool/bed/chair/barber, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("wheelchair", /obj/structure/stool/bed/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1),
 	new /datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1),
+	new /datum/stack_recipe("psychiatrist bed", /obj/structure/stool/psychbed, 5, one_per_turf = 1, on_floor = 1),
 	null,
 	new /datum/stack_recipe_list("office chairs",list(
 		new /datum/stack_recipe("dark office chair", /obj/structure/stool/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1),
@@ -100,6 +101,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list(
 	throwforce = 10.0
 	flags = CONDUCT
 	origin_tech = "materials=1"
+	merge_type = /obj/item/stack/sheet/metal
 
 /obj/item/stack/sheet/metal/cyborg
 	materials = list()
@@ -136,6 +138,7 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list(
 	throwforce = 10.0
 	flags = CONDUCT
 	origin_tech = "materials=2"
+	merge_type = /obj/item/stack/sheet/plasteel
 
 /obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
 	recipes = plasteel_recipes
@@ -171,6 +174,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
 	icon_state = "sheet-wood"
 	origin_tech = "materials=1;biotech=1"
 	burn_state = FLAMMABLE
+	merge_type = /obj/item/stack/sheet/wood
 
 /obj/item/stack/sheet/wood/New(var/loc, var/amount=null)
 	recipes = wood_recipes
@@ -208,6 +212,7 @@ var/global/list/datum/stack_recipe/cloth_recipes = list ( \
 	burn_state = FLAMMABLE
 	force = 0
 	throwforce = 0
+	merge_type = /obj/item/stack/sheet/cloth
 
 /obj/item/stack/sheet/cloth/New(loc, amount=null)
 	recipes = cloth_recipes
@@ -240,6 +245,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list (
 	icon_state = "sheet-card"
 	origin_tech = "materials=1"
 	burn_state = FLAMMABLE
+	merge_type = /obj/item/stack/sheet/cardboard
 
 /obj/item/stack/sheet/cardboard/New(var/loc, var/amt = null)
 	recipes = cardboard_recipes
@@ -265,6 +271,7 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 	icon_state = "sheet-runed"
 	icon = 'icons/obj/items.dmi'
 	sheettype = "runed"
+	merge_type = /obj/item/stack/sheet/runed_metal
 
 /obj/item/stack/sheet/runed_metal/attack_self(mob/living/user)
 	if(!iscultist(user))
@@ -320,6 +327,7 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
 	icon_state = "sheet-plastic"
 	throwforce = 7
 	origin_tech = "materials=1;biotech=1"
+	merge_type = /obj/item/stack/sheet/plastic
 
 /obj/item/stack/sheet/plastic/New()
 	recipes = plastic_recipes

code/game/objects/items/stacks/stack.dm

@@ -14,11 +14,14 @@
 	var/singular_name
 	var/amount = 1
 	var/max_amount //also see stack recipes initialisation, param "max_res_amount" must be equal to this max_amount
+	var/merge_type = null // This path and its children should merge with this stack, defaults to src.type
 
 /obj/item/stack/New(var/loc, var/amt = null)
 	..()
 	if(amt != null)	//Allow for stacks with the amount=0
 		amount = amt
+	if(!merge_type)
+		merge_type = type
 
 /obj/item/stack/Destroy()
 	if(usr && usr.machine == src)
@@ -232,7 +235,7 @@
 
 /obj/item/stack/attackby(obj/item/W, mob/user, params)
 	..()
-	if(istype(W, type))
+	if(istype(W, merge_type))
 		var/obj/item/stack/S = W
 		if(S.amount >= max_amount)
 			return 1

code/game/objects/items/stacks/tiles/tile_types.dm

@@ -136,6 +136,7 @@
 	icon_state = "tile_space"
 	turf_type = /turf/simulated/floor/fakespace
 	burn_state = FLAMMABLE
+	merge_type = /obj/item/stack/tile/fakespace
 
 /obj/item/stack/tile/fakespace/loaded
 	amount = 30
@@ -148,6 +149,7 @@
 	icon_state = "tile_noslip"
 	turf_type = /turf/simulated/floor/noslip
 	origin_tech = "materials=3"
+	merge_type = /obj/item/stack/tile/noslip
 
 /obj/item/stack/tile/noslip/loaded
 	amount = 20

code/game/objects/items/weapons/RCD.dm

@@ -59,8 +59,7 @@ RCD
 	return
 
 /obj/item/weapon/rcd/Destroy()
-	qdel(spark_system)
-	spark_system = null
+	QDEL_NULL(spark_system)
 	rcd_list -= src
 	return ..()
 

code/game/objects/items/weapons/RCL.dm

@@ -62,9 +62,7 @@
 		to_chat(user, "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>")
 
 /obj/item/weapon/twohanded/rcl/Destroy()
-	if(loaded)
-		qdel(loaded)
-		loaded = null
+	QDEL_NULL(loaded)
 	last = null
 	active = 0
 	return ..()

code/game/objects/items/weapons/cash.dm

@@ -12,6 +12,7 @@
 	burn_state = FLAMMABLE
 	singular_name = "credit"
 	max_amount = 1000000
+	merge_type = /obj/item/stack/spacecash
 
 /obj/item/stack/spacecash/New(loc, amt = null)
 	..()

code/game/objects/items/weapons/cigs.dm

@@ -46,8 +46,7 @@ LIGHTERS ARE IN LIGHTERS.DM
 	reagents.set_reacting(FALSE) // so it doesn't react until you light it
 
 /obj/item/clothing/mask/cigarette/Destroy()
-	if(reagents)
-		qdel(reagents)
+	QDEL_NULL(reagents)
 	processing_objects -= src
 	return ..()
 
@@ -94,6 +93,17 @@ LIGHTERS ARE IN LIGHTERS.DM
 	else if(istype(W, /obj/item/device/assembly/igniter))
 		light("<span class='notice'>[user] fiddles with [W], and manages to light their [name].</span>")
 
+	else if(istype(W, /obj/item/weapon/gun/magic/wand/fireball))
+		var/obj/item/weapon/gun/magic/wand/fireball/F = W
+		if(F.charges)
+			if(prob(50) || user.mind.assigned_role == "Wizard")
+				light("<span class='notice'>Holy shit, did [user] just manage to light their [name] with [W], with only moderate eyebrow singing?</span>")
+			else
+				to_chat(user, "<span class='warning'>Unsure which end of the wand is which, [user] fails to light [name] with [W].</span>")
+				explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2)
+			F.charges--
+
+
 	//can't think of any other way to update the overlays :<
 	user.update_inv_wear_mask()
 	user.update_inv_l_hand()

code/game/objects/items/weapons/defib.dm

@@ -172,12 +172,8 @@
 	if(on)
 		var/M = get(paddles, /mob)
 		remove_paddles(M)
-	if(paddles)
-		qdel(paddles)
-		paddles = null
-	if(bcell)
-		qdel(bcell)
-		bcell = null
+	QDEL_NULL(paddles)
+	QDEL_NULL(bcell)
 	return ..()
 
 /obj/item/weapon/defibrillator/proc/deductcharge(var/chrgdeductamt)

code/game/objects/items/weapons/dna_injector.dm

@@ -5,7 +5,7 @@
 	icon_state = "dnainjector"
 	item_state = "dnainjector"
 	var/block = 0
-	var/datum/dna2/record/buf=null
+	var/datum/dna2/record/buf = null
 	throw_speed = 3
 	throw_range = 5
 	w_class = 1
@@ -26,6 +26,10 @@
 		buf.dna.ResetSE()
 		SetValue(value)
 
+/obj/item/weapon/dnainjector/Destroy()
+	QDEL_NULL(buf)
+	return ..()
+
 /obj/item/weapon/dnainjector/proc/GetRealBlock(var/selblock)
 	if(selblock==0)
 		return block

code/game/objects/items/weapons/dnascrambler.dm

@@ -22,16 +22,22 @@
 		if(src.used)
 			return
 
+		if(ishuman(M))
+			var/mob/living/carbon/human/H = M
+			if(H.species.flags & NO_DNA)
+				to_chat(user, "<span class='warning'>You failed to inject [M], as they have no DNA to scramble, nor flesh to inject.</span>")
+				return
+
 		if(M == user)
-			user.visible_message("<span class='danger'>[user.name] injects \himself with [src]!</span>")
+			user.visible_message("<span class='danger'>[user] injects \himself with [src]!</span>")
 			src.injected(user,user)
 		else
-			user.visible_message("<span class='danger'>[user.name] is trying to inject [M.name] with [src]!</span>")
+			user.visible_message("<span class='danger'>[user] is trying to inject [M] with [src]!</span>")
 			if(do_mob(user,M,30))
-				user.visible_message("<span class='danger'>[user.name] injects [M.name] with [src].</span>")
+				user.visible_message("<span class='danger'>[user] injects [M] with [src].</span>")
 				src.injected(M, user)
 			else
-				to_chat(user, "\red You failed to inject [M.name].")
+				to_chat(user, "<span class='warning'>You failed to inject [M].</span>")
 
 	proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user)
 		scramble(1, target, 100)

code/game/objects/items/weapons/explosives.dm

@@ -18,10 +18,9 @@
 	..()
 
 /obj/item/weapon/grenade/plastic/Destroy()
-	qdel(nadeassembly)
-	nadeassembly = null
+	QDEL_NULL(nadeassembly)
 	target = null
-	..()
+	return ..()
 
 /obj/item/weapon/grenade/plastic/attackby(obj/item/I, mob/user, params)
 	if(!nadeassembly && istype(I, /obj/item/device/assembly_holder))

code/game/objects/items/weapons/flamethrower.dm

@@ -25,15 +25,10 @@
 
 
 /obj/item/weapon/flamethrower/Destroy()
-	if(weldtool)
-		qdel(weldtool)
-		weldtool = null
-	if(igniter)
-		qdel(igniter)
-		igniter = null
-	if(ptank)
-		qdel(ptank)
-		ptank = null
+	QDEL_NULL(weldtool)
+	QDEL_NULL(igniter)
+	QDEL_NULL(ptank)
+	previousturf = null
 	return ..()
 
 

code/game/objects/items/weapons/garrote.dm

@@ -13,6 +13,10 @@
 	var/improvised = 0
 	var/garrote_time
 
+/obj/item/weapon/twohanded/garrote/Destroy()
+	strangling = null
+	return ..()
+
 /obj/item/weapon/twohanded/garrote/update_icon()
 	if(strangling) // If we're strangling someone we want our icon to stay wielded
 		icon_state = "garrot_unwrap"

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -26,6 +26,12 @@
 		payload_name += " " // formatting, ignore me
 	update_icon()
 
+/obj/item/weapon/grenade/chem_grenade/Destroy()
+	QDEL_NULL(nadeassembly)
+	for(var/thing in beakers)
+		qdel(thing)
+	beakers.Cut()
+	return ..()
 
 /obj/item/weapon/grenade/chem_grenade/examine(mob/user)
 	..(user)

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -12,7 +12,7 @@
 	for(var/mob/living/M in hearers(7, flashbang_turf))
 		bang(get_turf(M), M)
 
-	for(var/obj/effect/blob/B in hear(8,flashbang_turf))     		//Blob damage here
+	for(var/obj/structure/blob/B in hear(8,flashbang_turf))     		//Blob damage here
 		var/damage = round(30/(get_dist(B,get_turf(src))+1))
 		B.health -= damage
 		B.update_icon()

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -30,7 +30,7 @@
 			sleep(10)
 			src.smoke.start()
 
-		for(var/obj/effect/blob/B in view(8,src))
+		for(var/obj/structure/blob/B in view(8,src))
 			var/damage = round(30/(get_dist(B,src)+1))
 			B.health -= damage
 			B.update_icon()

code/game/objects/items/weapons/holosign.dm

@@ -13,6 +13,12 @@
 	var/list/signs = list()
 	var/max_signs = 20
 
+/obj/item/weapon/holosign_creator/Destroy()
+	for(var/sign in signs)
+		qdel(sign)
+	signs.Cut()
+	return ..()
+
 /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
 	if(flag)
 		var/turf/T = get_turf(target)

code/game/objects/items/weapons/legcuffs.dm

@@ -27,12 +27,8 @@
 	icon_state = "[initial(icon_state)][armed]"
 
 /obj/item/weapon/restraints/legcuffs/beartrap/Destroy()
-	if(IED)
-		qdel(IED)
-		IED = null
-	if(sig)
-		qdel(sig)
-		sig = null
+	QDEL_NULL(IED)
+	QDEL_NULL(sig)
 	return ..()
 
 /obj/item/weapon/restraints/legcuffs/beartrap/suicide_act(mob/user)

code/game/objects/items/weapons/mop.dm

@@ -18,6 +18,7 @@
 	var/mopspeed = 30
 
 /obj/item/weapon/mop/New()
+	..()
 	create_reagents(mopcap)
 	janitorial_equipment += src
 

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -17,9 +17,7 @@
 	var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
 
 /obj/item/weapon/pneumatic_cannon/Destroy()
-	if(tank)
-		qdel(tank)
-		tank = null
+	QDEL_NULL(tank)
 	for(var/obj/item/I in loadedItems)
 		qdel(I)
 	loadedItems.Cut()

code/game/objects/items/weapons/powerfist.dm

@@ -17,9 +17,7 @@
 
 
 /obj/item/weapon/melee/powerfist/Destroy()
-	if(tank)
-		qdel(tank)
-		tank = null
+	QDEL_NULL(tank)
 	return ..()
 
 /obj/item/weapon/melee/powerfist/examine(mob/user)

code/game/objects/items/weapons/storage/boxes.dm

@@ -423,11 +423,15 @@
 	desc = "A box for containing construction permits, used to officially declare built rooms as additions to the station."
 	icon_state = "id"
 
-/obj/item/weapon/storage/box/permits/New() //There's only a few, so blueprints are still useful beyond setting every room's name to PRIMARY FART STORAGE
+/obj/item/weapon/storage/box/permits/New()
 	..()
 	new /obj/item/areaeditor/permit(src)
 	new /obj/item/areaeditor/permit(src)
 	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
+	new /obj/item/areaeditor/permit(src)
 
 
 /obj/item/weapon/storage/box/ids

code/game/objects/items/weapons/storage/fancy.dm

@@ -186,7 +186,7 @@
 
 
 /obj/item/weapon/storage/fancy/cigarettes/Destroy()
-	qdel(reagents)
+	QDEL_NULL(reagents)
 	return ..()
 
 

code/game/objects/items/weapons/storage/storage.dm

@@ -454,8 +454,8 @@
 	for(var/obj/O in contents)
 		O.mouse_opacity = initial(O.mouse_opacity)
 
-	qdel(boxes)
-	qdel(closer)
+	QDEL_NULL(boxes)
+	QDEL_NULL(closer)
 	return ..()
 
 /obj/item/weapon/storage/emp_act(severity)

code/game/objects/items/weapons/stunbaton.dm

@@ -24,9 +24,7 @@
 	return
 
 /obj/item/weapon/melee/baton/Destroy()
-	if(bcell)
-		qdel(bcell)
-		bcell = null
+	QDEL_NULL(bcell)
 	return ..()
 
 /obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
@@ -201,11 +199,15 @@
 	stunforce = 5
 	hitcost = 3750
 	slot_flags = SLOT_BACK
-	var/obj/item/device/assembly/igniter/sparkler = 0
+	var/obj/item/device/assembly/igniter/sparkler = null
 
 /obj/item/weapon/melee/baton/cattleprod/New()
 	..()
-	sparkler = new (src)
+	sparkler = new(src)
+
+/obj/item/weapon/melee/baton/cattleprod/Destroy()
+	QDEL_NULL(sparkler)
+	return ..()
 
 /obj/item/weapon/melee/baton/cattleprod/baton_stun()
 	if(sparkler.activate())

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -19,8 +19,7 @@
 	ion_trail.set_up(src)
 
 /obj/item/weapon/tank/jetpack/Destroy()
-	qdel(ion_trail)
-	ion_trail = null
+	QDEL_NULL(ion_trail)
 	return ..()
 
 /obj/item/weapon/tank/jetpack/ui_action_click(mob/user, actiontype)
@@ -82,7 +81,7 @@
 
 	var/datum/gas_mixture/removed = air_contents.remove(num)
 	if(removed.total_moles() < 0.005)
-		turn_off()
+		turn_off()
 		return 0
 
 	var/turf/T = get_turf(user)

code/game/objects/items/weapons/tanks/tanks.dm

@@ -33,9 +33,7 @@
 	return
 
 /obj/item/weapon/tank/Destroy()
-	if(air_contents)
-		qdel(air_contents)
-		air_contents = null
+	QDEL_NULL(air_contents)
 
 	processing_objects.Remove(src)
 

code/game/objects/items/weapons/tanks/watertank.dm

@@ -301,7 +301,7 @@
 		if(!Adj|| !istype(target, /turf))
 			return
 		if(metal_synthesis_cooldown < 5)
-			var/obj/effect/effect/foam/F = new /obj/effect/effect/foam(get_turf(target), 1)
+			var/obj/structure/foam/F = new /obj/structure/foam(get_turf(target), 1)
 			F.amount = 0
 			metal_synthesis_cooldown++
 			spawn(100)