Merge pull request #6186 from Citadel-Station-13/upstream-merge-36785

[MIRROR] Fixes staff of change borgs recieving AI laws
2018-03-31 18:41:24 -05:00
parent 8dfefe3037 ad14567dd3
commit 043f05e466
1 changed files with 4 additions and 3 deletions
@@ -159,11 +159,12 @@
 				new_mob.invisibility = 0
 				new_mob.job = "Cyborg"
 				var/mob/living/silicon/robot/Robot = new_mob
+				Robot.lawupdate = FALSE
+				Robot.connected_ai = null
 				Robot.mmi.transfer_identity(M)	//Does not transfer key/client.
 				Robot.clear_inherent_laws(0)
-				Robot.clear_zeroth_law(0, 0)
-				Robot.connected_ai = null
-
+				Robot.clear_zeroth_law(0)
+        
 		if("slime")
 			new_mob = new /mob/living/simple_animal/slime/random(M.loc)