Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research

code/game/objects/items/robot/robot_parts.dm

@@ -210,10 +210,15 @@
 			if(!user.unEquip(W))
 				return
 
-			if(M.syndiemmi)
+			if(M.hacked || M.clockwork)
 				aisync = 0
 				lawsync = 0
-				O.laws = new /datum/ai_laws/syndicate_override
+				if(M.clockwork)
+					O.laws = new/datum/ai_laws/ratvar
+					spawn(1)
+						add_servant_of_ratvar(O)
+				else
+					O.laws = new/datum/ai_laws/syndicate_override
 
 			O.invisibility = 0
 			//Transfer debug settings to new mob
@@ -226,7 +231,7 @@
 				O.notify_ai(1)
 				if(forced_ai)
 					O.connected_ai = forced_ai
-			if(!lawsync && !M.syndiemmi)
+			if(!lawsync && !M.hacked)
 				O.lawupdate = 0
 				O.make_laws()