From 85eb273b4fbacf304707918d1617fa06e9a75543 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sat, 28 Aug 2021 21:57:16 +0100
Subject: [PATCH] Review 1

---
 code/modules/arcade/mob_hunt/mob_avatar.dm | 6 ++----
 code/modules/research/rdmachines.dm        | 3 ++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/modules/arcade/mob_hunt/mob_avatar.dm b/code/modules/arcade/mob_hunt/mob_avatar.dm
index 9ce8de159af..815e8a762fa 100644
--- a/code/modules/arcade/mob_hunt/mob_avatar.dm
+++ b/code/modules/arcade/mob_hunt/mob_avatar.dm
@@ -1,4 +1,3 @@
-
 /obj/effect/nanomob
 	name = "Nano-Mob Avatar"					//will be overridden by the mob datum name value when created
 	desc = "A wild Nano-Mob appeared! Hit it with your PDA with the game open to attempt to capture it!"
@@ -23,9 +22,8 @@
 		addtimer(CALLBACK(src, .proc/despawn), mob_info.lifetime)
 
 /obj/effect/nanomob/Destroy()
-	if(SSmob_hunt)
-		SSmob_hunt.trap_spawns -= src
-		SSmob_hunt.normal_spawns -= src
+	SSmob_hunt.trap_spawns -= src
+	SSmob_hunt.normal_spawns -= src
 	return ..()
 
 /obj/effect/nanomob/proc/update_self()
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 8966645ed01..90c52eaea2f 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -40,7 +40,8 @@
 	w -= disable_wire
 
 /obj/machinery/r_n_d/Destroy()
-	QDEL_NULL(loaded_item)
+	loaded_item.forceMove(get_turf(src))
+	loaded_item = null
 	linked_console = null
 	materials = null
 	return ..()