diff --git a/code/modules/mob/living/silicon/ai/ai_remote_control.dm b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
index 3c2b3ad4489..bc20236850a 100644
--- a/code/modules/mob/living/silicon/ai/ai_remote_control.dm
+++ b/code/modules/mob/living/silicon/ai/ai_remote_control.dm
@@ -30,6 +30,17 @@
 	modules += new /obj/item/device/healthanalyzer(src)
 	modules += new /obj/item/extinguisher/mini(src)
 	modules += new /obj/item/device/advanced_healthanalyzer(src)
+	modules += new /obj/item/tank/jetpack/carbondioxide/synthetic(src)
+	modules += new /obj/item/inflatable_dispenser(src)
+	modules += new /obj/item/device/gps(src)
+	modules += new /obj/item/taperoll/medical(src)
+	modules += new /obj/item/taperoll/engineering(src)
+	modules += new /obj/item/taperoll/police(src)
+	modules += new /obj/item/taperoll/science(src)
+	modules += new /obj/item/pen/robopen(src)
+	modules += new /obj/item/form_printer(src)
+	modules += new /obj/item/gripper/paperwork(src)
+	modules += new /obj/item/device/flash(src)
 
 /mob/living/silicon/robot/shell
 	spawn_module = /obj/item/robot_module/aicontrol
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 950cfa079cc..c88016198ae 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -567,7 +567,7 @@ var/global/list/robot_modules = list(
 	modules += new /obj/item/device/lightreplacer/advanced(src)
 	modules += new /obj/item/reagent_containers/glass/bucket(src) // a hydroponist's bucket
 	modules += new /obj/item/matter_decompiler(src) // free drone remains for all
-	modules += new /obj/item/taperoll/engineering(src) // To enable 'borgs to telegraph danger visually.
+	modules += new /obj/item/taperoll/custodial(src) // To enable 'borgs to telegraph danger visually.
 	modules += new /obj/item/inflatable_dispenser(src) // To enable 'borgs to protect Crew from danger in direct hazards.
 	modules += new /obj/item/device/gps(src) // For being located while disabled and coordinating with life sensor consoles.
 	modules += new /obj/item/extinguisher/mini(src) // For navigating space and/or low grav, and just being useful.
diff --git a/html/changelogs/kermit-aitoolset.yml b/html/changelogs/kermit-aitoolset.yml
new file mode 100644
index 00000000000..7f425b286c4
--- /dev/null
+++ b/html/changelogs/kermit-aitoolset.yml
@@ -0,0 +1,7 @@
+author: kermit
+
+delete-after: True
+
+changes:
+  - rscadd: "AI shells now, in addition to having the universal borg equipment (tape, GPS, a flash), have an inflatables dispenser, jetpack and paperwork essentials."
+  - tweak: "Custodial borgs now have custodial tape instead of engineering tape."