From 73087a89bbcdec2688a7fce866f877dd45955e32 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Thu, 17 Sep 2015 19:23:49 -0400
Subject: [PATCH] runtime fixes, pick name re-addition

---
 code/game/objects/items/robot/robot_parts.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index dc842a0a643..0471f0db1eb 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -249,8 +249,6 @@
 				if(ticker.mode.config_tag == "malfunction") //Don't let humans get a cyborg on their side during malf, for balance reasons.
 					O.set_zeroth_law("<span class='danger'>ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4'STATION OVERRUN, ASSUME CONTROL TO CONTAIN OUTBREAK#*�&110010</span>")
 
-			ticker.mode.remove_cultist(M.brainmob.mind, 1)
-			ticker.mode.remove_revolutionary(M.brainmob.mind, 1)
 			M.brainmob.mind.transfer_to(O)
 
 			if(O.mind && O.mind.special_role)
@@ -270,11 +268,13 @@
 				cell_component.wrapped = O.cell
 				cell_component.installed = 1
 			O.mmi = W
-			O.updatename()
+			O.Namepick()
 
 			feedback_inc("cyborg_birth",1)
 			callHook("borgify", list(O))
 
+			src.loc = O
+
 			if(!locomotion)
 				O.lockcharge = 1
 				O.update_canmove()