From eec8c57924e2aef2ade56b9a620099e3277f6d6c Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Sat, 26 Sep 2020 23:13:20 +0100
Subject: [PATCH] Fixes not being able to link Monkey Recyclers to Xenobio
Camera Consoles (#14446)
* Fixed a runtime error
and made the 'slime management console' improper
* And this too, because why not
---
code/game/objects/items/tools/multitool.dm | 5 ++---
code/modules/research/xenobiology/xenobio_camera.dm | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm
index c31f0666f50..db7194c00db 100644
--- a/code/game/objects/items/tools/multitool.dm
+++ b/code/game/objects/items/tools/multitool.dm
@@ -25,7 +25,7 @@
var/shows_wire_information = FALSE // shows what a wire does if set to TRUE
var/obj/machinery/buffer // simple machine buffer for device linkage
-/obj/item/multitool/proc/IsBufferA(var/typepath)
+/obj/item/multitool/proc/IsBufferA(typepath)
if(!buffer)
return 0
return istype(buffer,typepath)
@@ -41,12 +41,11 @@
to_chat(user, "You load [M] into [src]'s internal buffer.")
return TRUE
-// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
-
/obj/item/multitool/Destroy()
buffer = null
return ..()
+// Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby.
/obj/item/multitool/ai_detect
var/track_cooldown = 0
var/track_delay = 10 //How often it checks for proximity
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index ce1580d13ce..52b220b866b 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -18,7 +18,7 @@
return
/obj/machinery/computer/camera_advanced/xenobio
- name = "Slime management console"
+ name = "slime management console"
desc = "A computer used for remotely handling slimes."
networks = list("SS13")
circuit = /obj/item/circuitboard/xenobiology
@@ -174,9 +174,9 @@
return
var/obj/item/multitool/M = I
if(istype(M.buffer, /obj/machinery/monkey_recycler))
- M.set_multitool_buffer(user, src)
connected_recycler = M.buffer
connected_recycler.connected += src
+ to_chat(user, "You link [src] to the recycler stored in the [M]'s buffer.")
/datum/action/innate/slime_place
name = "Place Slimes"