From 16fa622e56dbb3509c4ae23a7b323e136db4773e Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Wed, 8 Jun 2016 23:18:23 -0400 Subject: [PATCH] this is all butts --- code/game/objects/items/robot/robot_parts.dm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 2e23ee7862f..ea083b544fe 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -209,11 +209,11 @@ user << "This MMI does not seem to fit!" return - var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc)) - if(!O) + if(!user.unEquip(W)) return - if(!user.unEquip(W)) + var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc)) + if(!O) return if(M.hacked || M.clockwork) @@ -240,9 +240,10 @@ O.notify_ai(1) if(forced_ai) O.connected_ai = forced_ai - if(!lawsync && !M.hacked) + if(!lawsync) O.lawupdate = 0 - O.make_laws() + if(!M.hacked && !M.clockwork) + O.make_laws() ticker.mode.remove_antag_for_borging(BM.mind) BM.mind.transfer_to(O)