From 29a16d31167bdbf2f08e4dd652162ec3a05aed96 Mon Sep 17 00:00:00 2001
From: Kyep <Kyep@users.noreply.github.com>
Date: Mon, 29 Jun 2020 18:14:19 -0700
Subject: [PATCH] Fixes dnamodifier bugs

---
 code/game/dna/dna_modifier.dm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index eae6edd3bd4..2df4a929ceb 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -124,11 +124,11 @@
 	add_fingerprint(usr)
 
 /obj/machinery/dna_scannernew/Destroy()
-	eject_occupant()
+	eject_occupant(TRUE)
 	return ..()
 
-/obj/machinery/dna_scannernew/proc/eject_occupant()
-	go_out()
+/obj/machinery/dna_scannernew/proc/eject_occupant(force)
+	go_out(force)
 	for(var/obj/O in src)
 		if(!istype(O,/obj/item/circuitboard/clonescanner) && \
 		   !istype(O,/obj/item/stock_parts) && \
@@ -271,15 +271,16 @@
 
 		occupant.notify_ghost_cloning(source = src)
 
-/obj/machinery/dna_scannernew/proc/go_out()
+/obj/machinery/dna_scannernew/proc/go_out(force)
 	if(!occupant)
-		to_chat(usr, "<span class='warning'>The scanner is empty!</span>")
+		if(usr)
+			to_chat(usr, "<span class='warning'>The scanner is empty!</span>")
 		return
-
 	if(locked)
-		to_chat(usr, "<span class='warning'>The scanner is locked!</span>")
-		return
-
+		if(usr)
+			to_chat(usr, "<span class='warning'>The scanner is locked!</span>")
+		if(!force)
+			return
 	occupant.forceMove(loc)
 	occupant = null
 	icon_state = "scanner_open"