diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index aead535efea..32af47b31af 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -164,6 +164,9 @@
 
 	if(istype(W, /obj/item/mmi))
 		var/obj/item/mmi/M = W
+		if (isshell(user) && istype(W, /obj/item/mmi/inert/ai_remote))
+			to_chat(user, span_warning("Your hardware prohibits you from self-replicating."))
+			return
 		if(check_completion())
 			if(!istype(loc,/turf))
 				to_chat(user, span_warning("You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise."))
diff --git a/code/global.dm b/code/global.dm
index f7fd886b891..652345f980f 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -140,7 +140,7 @@ var/list/emergency_module_types = list(
 // List of modules available to AI shells
 var/list/shell_module_types = list(
 	"Standard", "Engineering", "Surgeon", "Crisis",
-	"Miner", "Janitor", "Service", "Clerical", "Security"
+	"Miner", "Janitor", "Service", "Clerical", "Security", "Research"
 )
 // List of whitelisted modules
 var/list/whitelisted_module_types = list(