Misc. Fixes, shuttle_caller_list, autoCall

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

@@ -186,8 +186,8 @@ var/list/ai_verbs_default = list(
 	hud_list[NATIONS_HUD]     = image('icons/mob/hud.dmi', src, "hudblank")
 
 	ai_list += src
+	shuttle_caller_list += src
 	..()
-	return
 
 /mob/living/silicon/ai/proc/on_mob_init()
 	src << "<B>You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras).</B>"
@@ -229,6 +229,8 @@ var/list/ai_verbs_default = list(
 
 /mob/living/silicon/ai/Destroy()
 	ai_list -= src
+	shuttle_caller_list -= src
+	shuttle_master.autoEvac()
 	qdel(eyeobj) // No AI, no Eye
 	return ..()
 

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

@@ -12,36 +12,8 @@
 	see_in_dark = 8
 	see_invisible = SEE_INVISIBLE_LEVEL_TWO
 
-	var/callshuttle = 0
-
-	for(var/obj/machinery/computer/communications/commconsole in world)
-		if((commconsole.z in config.admin_levels))
-			continue
-		if(istype(commconsole.loc,/turf))
-			break
-		callshuttle++
-
-	for(var/obj/item/weapon/circuitboard/communications/commboard in world)
-		if((commboard.z in config.admin_levels))
-			continue
-		if(istype(commboard.loc,/turf) || istype(commboard.loc,/obj/item/weapon/storage))
-			break
-		callshuttle++
-
-	for(var/mob/living/silicon/ai/shuttlecaller in player_list)
-		if((shuttlecaller.z in config.admin_levels))
-			continue
-		if(!shuttlecaller.stat && shuttlecaller.client && istype(shuttlecaller.loc,/turf))
-			break
-		callshuttle++
-
-	if(ticker.mode.name == "revolution" || ticker.mode.name == "AI malfunction" || sent_strike_team)
-		callshuttle = 0
-
-	if(callshuttle == 3) //if all three conditions are met
-		shuttle_master.emergency.request(null, 0.3, null, "All communication consoles, boards, and AI's have been destroyed.")
-		log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.")
-		message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1)
+	shuttle_caller_list -= src
+	shuttle_master.autoEvac()
 
 	if(explosive)
 		spawn(10)