Replaces AI-controlled Maint Drones with AI-controlled Borg Shells

code/controllers/configuration.dm

@@ -60,7 +60,8 @@ var/list/gamemode_cache = list()
 	var/humans_need_surnames = 0
 	var/allow_random_events = 0			// enables random events mid-round when set to 1
 	var/allow_ai = 1					// allow ai job
-	var/allow_ai_drones = 0					// allow ai controlled drones
+	var/allow_ai_shells = FALSE			// allow AIs to enter and leave special borg shells at will, and for those shells to be buildable.
+	var/give_free_ai_shell = FALSE		// allows a specific spawner object to instantiate a premade AI Shell
 	var/hostedby = null
 	var/respawn = 1
 	var/guest_jobban = 1
@@ -410,8 +411,11 @@ var/list/gamemode_cache = list()
 				if ("allow_ai")
 					config.allow_ai = 1
 
-				if ("allow_ai_drones")
-					config.allow_ai_drones = 1
+				if ("allow_ai_shells")
+					config.allow_ai_shells = TRUE
+
+				if("give_free_ai_shell")
+					config.give_free_ai_shell = TRUE
 
 //				if ("authentication")
 //					config.enable_authentication = 1

code/controllers/emergency_shuttle_controller.dm

@@ -195,6 +195,8 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle
 
 //returns 1 if the shuttle is not idle at centcom
 /datum/emergency_shuttle_controller/proc/online()
+	if(!shuttle)
+		return FALSE
 	if (!shuttle.location)	//not at centcom
 		return 1
 	if (wait_for_launch || shuttle.moving_status != SHUTTLE_IDLE)