From bb962862cabbcef66644704fc46ab95ce25f9081 Mon Sep 17 00:00:00 2001
From: Spamcat <spamcat@derpy.ru>
Date: Tue, 7 May 2013 20:08:12 +0400
Subject: [PATCH] Posibrains should work correctly in spiderbots. Fixed the key
 transfer issue. (#2534)

---
 code/modules/mob/living/carbon/brain/posibrain.dm          | 1 +
 .../modules/mob/living/simple_animal/friendly/spiderbot.dm | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 3bba11e32d1..731f8ba3bf5 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -50,6 +50,7 @@
 		src.searching = 0
 		src.brainmob.mind = candidate.mind
 		src.brainmob.key = candidate.key
+		src.brainmob.ckey = candidate.ckey
 		src.name = "positronic brain ([src.brainmob.name])"
 
 		src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index 719c9764ce0..30bf04c7ada 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -150,6 +150,7 @@
 
 		src.mind = M.brainmob.mind
 		src.mind.key = M.brainmob.key
+		src.ckey = M.brainmob.ckey
 		src.name = "Spider-bot ([M.brainmob.name])"
 
 /mob/living/simple_animal/spiderbot/proc/explode() //When emagged.
@@ -162,12 +163,13 @@
 
 /mob/living/simple_animal/spiderbot/proc/update_icon()
 	if(mmi)
-		if (istype(mmi,/obj/item/device/mmi))
+		if(istype(mmi,/obj/item/device/mmi))
 			icon_state = "spiderbot-chassis-mmi"
 			icon_living = "spiderbot-chassis-mmi"
-		else
+		if(istype(mmi, /obj/item/device/mmi/posibrain))
 			icon_state = "spiderbot-chassis-posi"
 			icon_living = "spiderbot-chassis-posi"
+
 	else
 		icon_state = "spiderbot-chassis"
 		icon_living = "spiderbot-chassis"
@@ -326,6 +328,7 @@
 				visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.")
 				return held_item
 		src << "\red \The [selection] is too far away."
+		return 0
 
 	src << "\red There is nothing of interest to take."
 	return 0