From 3d55a1e109fc7be34b0aa9f3986ebfb883ec9bd5 Mon Sep 17 00:00:00 2001
From: Jazz23 <justinfrauenhofer@gmail.com>
Date: Fri, 1 Mar 2019 09:18:05 -0800
Subject: [PATCH] Added slime_scan()

---
 code/game/objects/items/devices/scanners.dm         | 3 +++
 code/modules/research/xenobiology/xenobio_camera.dm | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index dd214c7a673..9c9ad45e9ba 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -526,6 +526,9 @@ REAGENT SCANNER
 	materials = list(MAT_METAL=30, MAT_GLASS=20)
 
 /obj/item/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
+	slime_scan(M, user)
+
+/proc/slime_scan(mob/living/simple_animal/slime/M, mob/living/user)
 	if(!isslime(M))
 		user.show_message("<span class='warning'>This device can only scan slimes!</span>", 1)
 		return
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 3f187224f19..76e2692e4d0 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -34,7 +34,6 @@
 	var/max_slimes = 5
 	var/monkeys = 0
 	var/obj/item/slimepotion/slime/current_potion
-	var/obj/item/slime_scanner/scanner = new /obj/item/slime_scanner
 	var/obj/machinery/monkey_recycler/connected_recycler
 
 	icon_screen = "slime_comp"
@@ -55,7 +54,6 @@
 
 /obj/machinery/computer/camera_advanced/xenobio/Destroy()
 	QDEL_NULL(current_potion)
-	qdel(scanner)
 	for(var/mob/living/carbon/slime/S in stored_slimes)
 		S.forceMove(drop_location())
 	stored_slimes.Cut()
@@ -296,11 +294,10 @@
 		return
 	var/mob/living/C = owner
 	var/mob/camera/aiEye/remote/xenobio/remote_eye = C.remote_control
-	var/obj/machinery/computer/camera_advanced/xenobio/X = target
 
 	if(cameranet.checkTurfVis(remote_eye.loc))
 		for(var/mob/living/carbon/slime/S in remote_eye.loc)
-			X.scanner.attack(S, C)
+			slime_scan(S, C)
 	else
 		to_chat(owner, "<span class='warning'>Target is not near a camera. Cannot proceed.</span>")
 
@@ -346,7 +343,7 @@
 	var/mob/camera/aiEye/remote/xenobio/E = C.remote_control
 	var/area/mobarea = get_area(S.loc)
 	if(mobarea.name == E.allowed_area || mobarea.xenobiology_compatible)
-		scanner.attack(S, C)
+		slime_scan(S, C)
 
 //Feeds a potion to slime
 /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickAlt(mob/living/user, mob/living/carbon/slime/S)