From 04c25a2bfd7c8971d7bc5638d90a464b5d0c7aea Mon Sep 17 00:00:00 2001
From: Doxxmedearly <38594443+Doxxmedearly@users.noreply.github.com>
Date: Thu, 9 Jun 2022 11:39:19 -0400
Subject: [PATCH] Intellicarded AIs can no longer access the AI shell borg
 (#14259)

---
 code/game/objects/items/devices/aicard.dm           | 4 ++++
 code/modules/mob/living/silicon/ai/ai.dm            | 3 +++
 html/changelogs/doxxmedearly-intellicardcontrol.yml | 4 ++++
 3 files changed, 11 insertions(+)
 create mode 100644 html/changelogs/doxxmedearly-intellicardcontrol.yml

diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 330a5896e82..5b3fc4aa2c8 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -135,6 +135,10 @@
 	admin_attack_log(user, ai, "Carded with [src.name]", "Was carded with [src.name]", "used the [src.name] to card")
 	src.name = "[initial(name)] - [ai.name]"
 
+	if(ai.vr_mob) //Kick the AI out of its shell before we stuff it in a card.
+		var/mob/living/silicon/shell = ai.vr_mob
+		if(istype(shell))
+			shell.body_return()
 	ai.forceMove(src)
 	ai.destroy_eyeobj(src)
 	ai.cancel_camera()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index d30ac6c3c5d..285ff603127 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -788,6 +788,9 @@ var/list/ai_verbs_default = list(
 	set name = "Remote Control Shell"
 	set category = "AI Commands"
 	set desc = "Remotely control any active shells on your AI shell network."
+
+	if(check_unable(AI_CHECK_WIRELESS))
+		return
 	SSvirtualreality.bound_selection(src, REMOTE_AI_ROBOT)
 
 /mob/living/silicon/ai/proc/toggle_hologram_movement()
diff --git a/html/changelogs/doxxmedearly-intellicardcontrol.yml b/html/changelogs/doxxmedearly-intellicardcontrol.yml
new file mode 100644
index 00000000000..054b7d88838
--- /dev/null
+++ b/html/changelogs/doxxmedearly-intellicardcontrol.yml
@@ -0,0 +1,4 @@
+author: Doxxmedearly
+delete-after: True
+changes:
+  - bugfix: "Intellicarded AIs can no longer remote control the AI shell. When carded, they will be kicked out of the shell, if they are in it."