cavalry's here

modular_sand/code/modules/jobs/job_types/ai.dm

@@ -1,6 +1,21 @@
 /datum/job/ai/after_spawn(mob/living/silicon/ai/AI, client/player_client, latejoin)
 	. = ..()
-	if(!istype(AI))
+	setup_silicon_law_prefs(AI, player_client)
+
+	if(latejoin)
 		return
 
-	setup_silicon_law_prefs(AI, player_client)
+	var/free_shells = CONFIG_GET(number/roundstart_ai_shells)
+	if(!free_shells)
+		return
+
+	var/turf/open/turf = locate() in RANGE_TURFS(1, AI)
+
+	// Why the fuck is the station AI completely blocked
+	var/turf/where = turf || get_turf(AI)
+
+	// Creating AI shells for the AI.
+	for(var/iteration in 1 to free_shells)
+		var/mob/living/silicon/robot/free_borg = new(where)
+		free_borg.shell = TRUE
+		free_borg.TryConnectToAI(AI)

modular_sand/code/modules/mob/living/silicon/ai/ai.dm

@@ -1,16 +1,2 @@
 /mob/living/silicon/ai
 	vore_flags = NO_VORE
-
-/mob/living/silicon/ai/Initialize(mapload, datum/ai_laws/L, mob/target_ai)
-	. = ..()
-	if (!mapload)
-		return
-
-	// Creating a AI shell for the AI.
-	var/turf/open/T = locate() in RANGE_TURFS(1, src)
-	if (T)
-		new /mob/living/silicon/robot/shell(T)
-		return
-
-	// Why the fuck is the station AI completely blocked
-	new /mob/living/silicon/robot/shell(get_turf(src))