From f1cbe0396b3f369f1787c33e3c4c358199d913da Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 10:55:16 +0200
Subject: [PATCH 1/9] ai syncing / unsyncing in modify robot

---
 code/modules/admin/modify_robot.dm            | 18 +++++++++++++
 .../tgui/interfaces/ModifyRobot/index.tsx     | 25 +++++++++++++++++--
 .../tgui/interfaces/ModifyRobot/types.ts      |  2 ++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 1ffcf78be28..47ad98e7860 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -121,6 +121,8 @@
 	package_laws(., "supplied_laws", target.laws.supplied_laws)
 
 	.["isAI"] = isAI(target)
+	.["isMalf"] = is_malf(user)
+	.["isSlaved"] = target.is_slaved()
 
 	var/list/channels = list()
 	for(var/ch_name in target.law_channels())
@@ -498,6 +500,19 @@
 			if(usr != target)
 				to_chat(usr, "<span class='notice'>Laws displayed.</span>")
 			return TRUE
+		if("toggle_sync")
+			if(target.is_slaved())
+				target.disconnect_from_ai()
+				target.lawupdate = 0
+			else
+				var/new_ai = select_active_ai_with_fewest_borgs()
+				if(new_ai)
+					target.lawupdate = 1
+					target.connect_to_ai(new_ai)
+			return TRUE
+		if("sneaky_toggle")
+			target.lawsync = !target.lawsync
+			return TRUE
 
 /datum/eventkit/modify_robot/proc/get_target_items(var/mob/user)
 	var/list/target_items = list()
@@ -650,3 +665,6 @@
 		package_laws(packaged_laws, "supplied_laws", ALs.supplied_laws)
 		law_sets[++law_sets.len] = list("name" = ALs.name, "header" = ALs.law_header, "ref" = "\ref[ALs]","laws" = packaged_laws)
 	return law_sets
+
+/datum/eventkit/modify_robot/proc/is_malf(var/mob/user)
+	return (is_admin(user) && !target.is_slaved()) || is_special_role(user)
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index dba66ce648a..402077dc238 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -50,6 +50,8 @@ export const ModifyRobot = (props) => {
     has_inherent_laws,
     has_supplied_laws,
     isAI,
+    isMalf,
+    isSlaved,
     channel,
     channels,
     law_sets,
@@ -90,7 +92,6 @@ export const ModifyRobot = (props) => {
   tabs[6] = (
     <LawManagerLaws
       isAdmin
-      isMalf
       hasScroll
       sectionHeight="85%"
       ion_law_nr={ion_law_nr}
@@ -108,6 +109,7 @@ export const ModifyRobot = (props) => {
       has_inherent_laws={has_inherent_laws}
       has_supplied_laws={has_supplied_laws}
       isAI={isAI}
+      isMalf={isMalf}
       channel={channel}
       channels={channels}
     />
@@ -116,7 +118,7 @@ export const ModifyRobot = (props) => {
     <Section scrollable fill height="85%">
       <LawManagerLawSets
         isAdmin
-        isMalf
+        isMalf={isMalf}
         law_sets={law_sets}
         ion_law_nr={ion_law_nr}
         searchLawName={searchLawName}
@@ -171,6 +173,25 @@ export const ModifyRobot = (props) => {
                       Rename
                     </Button>
                   </Stack.Item>
+                  <Stack.Item>
+                    <Button
+                      color={isSlaved ? "red" : "green"}
+                      tooltip={(isSlaved ? "Disconnect from" : "Connect to") + " AI"}
+                      onClick={(value) => act('toggle_sync')}
+                      >
+                        {isSlaved ? isSlaved : "Disconnected!"}
+                      </Button>
+                  </Stack.Item>
+                  <Stack.Item>
+                  <Button
+                    disabled={!isSlaved}
+                    color={isMalf ? "red" : "green"}
+                    tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
+                    onClick={(value) => act('sneaky_toggle')}
+                  >
+                    Lawsync
+                  </Button>
+                  </Stack.Item>
                 </>
               )}
             </Stack>
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
index d5bb7aeadff..9d6f8fc5875 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
@@ -24,6 +24,8 @@ export type Data = {
   has_inherent_laws: number;
   has_supplied_laws: number;
   isAI: BooleanLike;
+  isMalf: BooleanLike;
+  isSlaved: string | null;
   channel: string;
   channels: { channel: string }[];
   law_sets: law_pack[];

From 1419632e35ed6b539004ff12b3830908b638be9a Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 11:04:39 +0200
Subject: [PATCH 2/9] .

---
 code/modules/admin/modify_robot.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 47ad98e7860..f4b9976b927 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -511,7 +511,7 @@
 					target.connect_to_ai(new_ai)
 			return TRUE
 		if("sneaky_toggle")
-			target.lawsync = !target.lawsync
+			target.lawupdate = !target.lawupdate
 			return TRUE
 
 /datum/eventkit/modify_robot/proc/get_target_items(var/mob/user)
@@ -668,3 +668,6 @@
 
 /datum/eventkit/modify_robot/proc/is_malf(var/mob/user)
 	return (is_admin(user) && !target.is_slaved()) || is_special_role(user)
+
+/datum/eventkit/modify_robot/proc/is_special_role(var/mob/user)
+	return user.mind.special_role ? TRUE : FALSE

From a14077d62290570a57c1856da58559f786d4b16c Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:16:58 +0200
Subject: [PATCH 3/9] multiple ais

---
 code/modules/admin/modify_robot.dm            | 13 +++++++-
 .../tgui/interfaces/ModifyRobot/index.tsx     | 30 ++++++++++++++-----
 .../tgui/interfaces/ModifyRobot/types.ts      |  2 ++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index f4b9976b927..3d2b8136728 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -12,6 +12,7 @@
 /datum/eventkit/modify_robot
 	var/mob/living/silicon/robot/target
 	var/mob/living/silicon/robot/source
+	var/mob/living/ai/selected_ai
 	var/ion_law	= "IonLaw"
 	var/zeroth_law = "ZerothLaw"
 	var/inherent_law = "InherentLaw"
@@ -123,6 +124,13 @@
 	.["isAI"] = isAI(target)
 	.["isMalf"] = is_malf(user)
 	.["isSlaved"] = target.is_slaved()
+	var/list/active_ais = list()
+	for(var/mob/living/silicon/ai/ai in active_ais())
+		if(!ai.loc)
+			continue
+		active_ais += list(list("displayText" = "[R]", "value" = "\ref[R]"))
+	.["active_ais"] = active_ais
+	.["selected_ai"] = selected_ai
 
 	var/list/channels = list()
 	for(var/ch_name in target.law_channels())
@@ -500,12 +508,15 @@
 			if(usr != target)
 				to_chat(usr, "<span class='notice'>Laws displayed.</span>")
 			return TRUE
+		if("select_ai")
+			selected_ai = locate(params["new_ai"])
+			return TRUE
 		if("toggle_sync")
 			if(target.is_slaved())
 				target.disconnect_from_ai()
 				target.lawupdate = 0
 			else
-				var/new_ai = select_active_ai_with_fewest_borgs()
+				var/new_ai = selected_ai ? select_ai : select_active_ai_with_fewest_borgs()
 				if(new_ai)
 					target.lawupdate = 1
 					target.connect_to_ai(new_ai)
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 402077dc238..325e9e94b2c 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -52,6 +52,8 @@ export const ModifyRobot = (props) => {
     isAI,
     isMalf,
     isSlaved,
+    all_ais,
+    selected_ai,
     channel,
     channels,
     law_sets,
@@ -173,8 +175,20 @@ export const ModifyRobot = (props) => {
                       Rename
                     </Button>
                   </Stack.Item>
+                  <Stack.Item>
+                    <Dropdown
+                      selected={selected_ai ? selected_ai.name : ''}
+                      options={all_ais}
+                      onSelected={(value) =>
+                        act('select_ai', {
+                          new_ai: value,
+                        })
+                      }
+                    />
+                  </Stack.Item>
                   <Stack.Item>
                     <Button
+                      disabled={selected_ai.name === isSlaved}
                       color={isSlaved ? "red" : "green"}
                       tooltip={(isSlaved ? "Disconnect from" : "Connect to") + " AI"}
                       onClick={(value) => act('toggle_sync')}
@@ -183,14 +197,14 @@ export const ModifyRobot = (props) => {
                       </Button>
                   </Stack.Item>
                   <Stack.Item>
-                  <Button
-                    disabled={!isSlaved}
-                    color={isMalf ? "red" : "green"}
-                    tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
-                    onClick={(value) => act('sneaky_toggle')}
-                  >
-                    Lawsync
-                  </Button>
+                    <Button
+                      disabled={!isSlaved}
+                      color={isMalf ? "red" : "green"}
+                      tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
+                      onClick={(value) => act('sneaky_toggle')}
+                    >
+                      Lawsync
+                    </Button>
                   </Stack.Item>
                 </>
               )}
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
index 9d6f8fc5875..d64bdb92610 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
@@ -29,6 +29,8 @@ export type Data = {
   channel: string;
   channels: { channel: string }[];
   law_sets: law_pack[];
+  active_ais: DropdownEntry[];
+  selected_ai: {name: string; ref: string} | null;
 };
 
 export type DropdownEntry = {

From d5da234ef28924010c53afb7779d2bb990d9fe65 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:21:20 +0200
Subject: [PATCH 4/9] .

---
 code/modules/admin/modify_robot.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 3d2b8136728..2dc770aa66d 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -12,7 +12,7 @@
 /datum/eventkit/modify_robot
 	var/mob/living/silicon/robot/target
 	var/mob/living/silicon/robot/source
-	var/mob/living/ai/selected_ai
+	var/mob/living/silicon/ai/selected_ai
 	var/ion_law	= "IonLaw"
 	var/zeroth_law = "ZerothLaw"
 	var/inherent_law = "InherentLaw"
@@ -128,7 +128,7 @@
 	for(var/mob/living/silicon/ai/ai in active_ais())
 		if(!ai.loc)
 			continue
-		active_ais += list(list("displayText" = "[R]", "value" = "\ref[R]"))
+		active_ais += list(list("displayText" = "[ai]", "value" = "\ref[ai]"))
 	.["active_ais"] = active_ais
 	.["selected_ai"] = selected_ai
 
@@ -516,7 +516,7 @@
 				target.disconnect_from_ai()
 				target.lawupdate = 0
 			else
-				var/new_ai = selected_ai ? select_ai : select_active_ai_with_fewest_borgs()
+				var/new_ai = selected_ai ? selected_ai : select_active_ai_with_fewest_borgs()
 				if(new_ai)
 					target.lawupdate = 1
 					target.connect_to_ai(new_ai)

From 084569c5212bd35182d82a70ec6b1ba4eb16e1f8 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 12:49:45 +0200
Subject: [PATCH 5/9] .

---
 tgui/packages/tgui/interfaces/ModifyRobot/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 325e9e94b2c..7627ae3b1a3 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -202,8 +202,8 @@ export const ModifyRobot = (props) => {
                       color={isMalf ? "red" : "green"}
                       tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
                       onClick={(value) => act('sneaky_toggle')}
-                    >
-                      Lawsync
+                      >
+                        Lawsync
                     </Button>
                   </Stack.Item>
                 </>

From 77d7c4c7d46257af00646009516c88aa54e191a1 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:04:46 +0200
Subject: [PATCH 6/9] .

---
 tgui/packages/tgui/interfaces/ModifyRobot/index.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 7627ae3b1a3..7be0c5ff9d6 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -192,9 +192,9 @@ export const ModifyRobot = (props) => {
                       color={isSlaved ? "red" : "green"}
                       tooltip={(isSlaved ? "Disconnect from" : "Connect to") + " AI"}
                       onClick={(value) => act('toggle_sync')}
-                      >
-                        {isSlaved ? isSlaved : "Disconnected!"}
-                      </Button>
+                    >
+                      {isSlaved ? isSlaved : "Disconnected!"}
+                    </Button>
                   </Stack.Item>
                   <Stack.Item>
                     <Button
@@ -202,8 +202,8 @@ export const ModifyRobot = (props) => {
                       color={isMalf ? "red" : "green"}
                       tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
                       onClick={(value) => act('sneaky_toggle')}
-                      >
-                        Lawsync
+                    >
+                      Lawsync
                     </Button>
                   </Stack.Item>
                 </>

From fc12c5df720be58d20482ebe8e40f885e2ae6dd7 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:32:45 +0200
Subject: [PATCH 7/9] .

---
 tgui/packages/tgui/interfaces/ModifyRobot/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 7be0c5ff9d6..8efd08303e7 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -178,7 +178,7 @@ export const ModifyRobot = (props) => {
                   <Stack.Item>
                     <Dropdown
                       selected={selected_ai ? selected_ai.name : ''}
-                      options={all_ais}
+                      options={active_ais}
                       onSelected={(value) =>
                         act('select_ai', {
                           new_ai: value,
@@ -188,7 +188,7 @@ export const ModifyRobot = (props) => {
                   </Stack.Item>
                   <Stack.Item>
                     <Button
-                      disabled={selected_ai.name === isSlaved}
+                      disabled={selected_ai?.name === isSlaved}
                       color={isSlaved ? "red" : "green"}
                       tooltip={(isSlaved ? "Disconnect from" : "Connect to") + " AI"}
                       onClick={(value) => act('toggle_sync')}

From e7872ba9f12efd76e3f48bef40209c681f042aa0 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Mon, 23 Sep 2024 13:59:28 +0200
Subject: [PATCH 8/9] .

---
 tgui/packages/tgui/interfaces/ModifyRobot/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 8efd08303e7..33a7769c012 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -52,7 +52,7 @@ export const ModifyRobot = (props) => {
     isAI,
     isMalf,
     isSlaved,
-    all_ais,
+    active_ais,
     selected_ai,
     channel,
     channels,

From 379357e25ae340751ab34227608f87c453d0866d Mon Sep 17 00:00:00 2001
From: Kashargul <KashL@t-online.de>
Date: Mon, 23 Sep 2024 23:02:36 +0200
Subject: [PATCH 9/9] ai handling and emagging

---
 code/modules/admin/modify_robot.dm            | 47 ++++++++---
 .../ModifyRobotTabs/ModifyRobotAccess.tsx     |  2 +-
 .../ModifyRobotTabs/ModifyRobotComponent.tsx  |  2 +-
 .../ModifyRobotTabs/ModifyRobotModules.tsx    |  2 +-
 .../ModifyRobotTabs/ModifyRobotPKA.tsx        |  2 +-
 .../ModifyRobotTabs/ModifyRobotRadio.tsx      |  2 +-
 .../ModifyRobotTabs/ModifyRobotUpgrades.tsx   |  2 +-
 .../tgui/interfaces/ModifyRobot/index.tsx     | 82 ++++++++++++-------
 .../tgui/interfaces/ModifyRobot/types.ts      |  3 +-
 9 files changed, 95 insertions(+), 49 deletions(-)

diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 2dc770aa66d..1787eeea637 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -6,7 +6,8 @@
 		return
 
 	var/datum/eventkit/modify_robot/modify_robot = new()
-	modify_robot.target = target
+	modify_robot.target = isrobot(target) ? target : null
+	modify_robot.selected_ai = target.is_slaved()
 	modify_robot.tgui_interact(src.mob)
 
 /datum/eventkit/modify_robot
@@ -50,6 +51,7 @@
 		.["target"]["name"] = target.name
 		.["target"]["ckey"] = target.ckey
 		.["target"]["module"] = target.module
+		.["target"]["emagged"] = target.emagged
 		.["target"]["crisis_override"] = target.crisis_override
 		.["target"]["active_restrictions"] = target.restrict_modules_to
 		var/list/possible_restrictions = list()
@@ -130,7 +132,7 @@
 			continue
 		active_ais += list(list("displayText" = "[ai]", "value" = "\ref[ai]"))
 	.["active_ais"] = active_ais
-	.["selected_ai"] = selected_ai
+	.["selected_ai"] = selected_ai ? selected_ai.name : null
 
 	var/list/channels = list()
 	for(var/ch_name in target.law_channels())
@@ -154,8 +156,10 @@
 			target.real_name = params["new_name"]
 			return TRUE
 		if("select_target")
-			target = locate(params["new_target"])
-			log_and_message_admins("changed robot modifictation target to [target]")
+			var/new_target = locate(params["new_target"])
+			if(new_target != target)
+				target = locate(params["new_target"])
+				log_and_message_admins("changed robot modifictation target to [target]")
 			return TRUE
 		if("toggle_crisis")
 			target.crisis_override = !target.crisis_override
@@ -511,18 +515,37 @@
 		if("select_ai")
 			selected_ai = locate(params["new_ai"])
 			return TRUE
-		if("toggle_sync")
+		if("swap_sync")
+			var/new_ai = selected_ai ? selected_ai : select_active_ai_with_fewest_borgs()
+			if(new_ai)
+				target.lawupdate = 1
+				target.connect_to_ai(new_ai)
+			return TRUE
+		if("disconnect_ai")
 			if(target.is_slaved())
 				target.disconnect_from_ai()
 				target.lawupdate = 0
-			else
-				var/new_ai = selected_ai ? selected_ai : select_active_ai_with_fewest_borgs()
-				if(new_ai)
-					target.lawupdate = 1
-					target.connect_to_ai(new_ai)
 			return TRUE
-		if("sneaky_toggle")
-			target.lawupdate = !target.lawupdate
+		if("toggle_emag")
+			if(target.emagged)
+				target.emagged = 0
+				target.clear_supplied_laws()
+				target.clear_inherent_laws()
+				target.laws = new global.using_map.default_law_type
+				target.laws.show_laws(target)
+				target.hud_used.update_robot_modules_display()
+			else
+				target.emagged = 1
+				target.lawupdate = 0
+				target.disconnect_from_ai()
+				target.clear_supplied_laws()
+				target.clear_inherent_laws()
+				target.laws = new /datum/ai_laws/syndicate_override
+				if(target.bolt)
+					if(!target.bolt.malfunction)
+						target.bolt.malfunction = MALFUNCTION_PERMANENT
+				target.laws.show_laws(target)
+				target.hud_used.update_robot_modules_display()
 			return TRUE
 
 /datum/eventkit/modify_robot/proc/get_target_items(var/mob/user)
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx
index a5780f93e3e..92341075892 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx
@@ -29,7 +29,7 @@ export const ModifyRobotAccess = (props: {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="30%" fill>
           <AccessSection
             title="Add Access"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx
index 8423630acde..a2ba8e82947 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx
@@ -38,7 +38,7 @@ export const ModifyRobotComponent = (props: {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="35%" fill>
           <ComponentSection
             title="Repair Component"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx
index 67ed0ac3b78..045025ccd56 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx
@@ -31,7 +31,7 @@ export const ModifyRobotModules = (props: {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="40%" fill>
           <Section title="Source Module" scrollable fill>
             <Box>Robot to salvage</Box>
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx
index 1662c8053ca..a0cadfb4ec5 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx
@@ -27,7 +27,7 @@ export const ModifyRobotPKA = (props: { target: Target }) => {
       {!target.pka ? (
         <NoticeBox danger>{target.name} has no PKA installed.</NoticeBox>
       ) : (
-        <Flex height={!target.active ? '80%' : '85%'}>
+        <Flex height={!target.active ? '75%' : '80%'}>
           <Flex.Item width="35%" fill>
             <Divider />
             <Box>Remaining Capacity: {target.pka.capacity}</Box>
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx
index 5af3a8cd063..02a6828c9dc 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx
@@ -25,7 +25,7 @@ export const ModifyRobotRadio = (props: { target: Target }) => {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="30%" fill>
           <RadioSection
             title="Add Radio Channel"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx
index d34337828a2..28c317b050e 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx
@@ -65,7 +65,7 @@ export const ModifyRobotUpgrades = (props: { target: Target }) => {
           />
         </Flex.Item>
       </Flex>
-      <Flex height={!target.active ? '45%' : '50%'}>
+      <Flex height={!target.active ? '40%' : '45%'}>
         <Flex.Item width="25%" fill>
           <UpgradeSection
             title="Utility Upgrade"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 33a7769c012..253f5996563 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -95,7 +95,7 @@ export const ModifyRobot = (props) => {
     <LawManagerLaws
       isAdmin
       hasScroll
-      sectionHeight="85%"
+      sectionHeight="80%"
       ion_law_nr={ion_law_nr}
       ion_law={ion_law}
       zeroth_law={zeroth_law}
@@ -117,7 +117,7 @@ export const ModifyRobot = (props) => {
     />
   );
   tabs[7] = (
-    <Section scrollable fill height="85%">
+    <Section scrollable fill height="80%">
       <LawManagerLawSets
         isAdmin
         isMalf={isMalf}
@@ -158,7 +158,7 @@ export const ModifyRobot = (props) => {
                 <>
                   <Stack.Item>
                     <Input
-                      width="300px"
+                      width="200px"
                       value={robotName}
                       onChange={(e, value) => setRobotName(value)}
                     />
@@ -166,7 +166,7 @@ export const ModifyRobot = (props) => {
                   <Stack.Item>
                     <Button
                       disabled={robotName.length < 3}
-                      onClick={(value) =>
+                      onClick={() =>
                         act('rename', {
                           new_name: robotName,
                         })
@@ -175,41 +175,63 @@ export const ModifyRobot = (props) => {
                       Rename
                     </Button>
                   </Stack.Item>
+                  <Stack.Item grow />
                   <Stack.Item>
-                    <Dropdown
-                      selected={selected_ai ? selected_ai.name : ''}
-                      options={active_ais}
-                      onSelected={(value) =>
-                        act('select_ai', {
-                          new_ai: value,
-                        })
+                    <Button
+                      icon={target.emagged ? 'sd-card' : 'bolt'}
+                      color={target.emagged ? 'green' : 'red'}
+                      onClick={() => act('toggle_emag')}
+                      tooltip={
+                        (target.emagged ? 'Disables' : 'Enables') +
+                        ' hacked state'
                       }
-                    />
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      disabled={selected_ai?.name === isSlaved}
-                      color={isSlaved ? "red" : "green"}
-                      tooltip={(isSlaved ? "Disconnect from" : "Connect to") + " AI"}
-                      onClick={(value) => act('toggle_sync')}
                     >
-                      {isSlaved ? isSlaved : "Disconnected!"}
-                    </Button>
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      disabled={!isSlaved}
-                      color={isMalf ? "red" : "green"}
-                      tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
-                      onClick={(value) => act('sneaky_toggle')}
-                    >
-                      Lawsync
+                      EMAG
                     </Button>
                   </Stack.Item>
                 </>
               )}
             </Stack>
           </LabeledList.Item>
+          <LabeledList.Item label="AI Selection">
+            {!!target?.module && (
+              <Stack inline align="baseline">
+                <Stack.Item>
+                  <Dropdown
+                    selected={selected_ai || ''}
+                    options={active_ais}
+                    onSelected={(value) =>
+                      act('select_ai', {
+                        new_ai: value,
+                      })
+                    }
+                  />
+                </Stack.Item>
+                <Stack.Item>
+                  <Button
+                    icon="plug"
+                    disabled={selected_ai === isSlaved}
+                    color="green"
+                    tooltip="Connect the robot to an AI"
+                    onClick={() => act('swap_sync')}
+                  >
+                    {isSlaved ? isSlaved : 'Connect AI'}
+                  </Button>
+                </Stack.Item>
+                <Stack.Item>
+                  <Button
+                    icon="plug-circle-minus"
+                    disabled={!isSlaved}
+                    color="red"
+                    tooltip="Disconnects the robot from the AI"
+                    onClick={() => act('disconnect_ai')}
+                  >
+                    DC
+                  </Button>
+                </Stack.Item>
+              </Stack>
+            )}
+          </LabeledList.Item>
         </LabeledList>
         <Divider />
         {!!target &&
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
index d64bdb92610..5191e384223 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
@@ -30,7 +30,7 @@ export type Data = {
   channels: { channel: string }[];
   law_sets: law_pack[];
   active_ais: DropdownEntry[];
-  selected_ai: {name: string; ref: string} | null;
+  selected_ai: string | null;
 };
 
 export type DropdownEntry = {
@@ -42,6 +42,7 @@ export type Target = {
   name: string;
   ckey: string;
   module: string;
+  emagged: BooleanLike;
   active: BooleanLike;
   crisis_override: BooleanLike;
   active_restrictions: string[];