ai + mech

code/game/objects/effects/landmarks.dm

@@ -205,7 +205,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
 
 /obj/effect/landmark/start/ai/after_round_start()
 	if(latejoin_active && !used)
-		new /obj/structure/AIcore/latejoin_inactive(loc)
+		new /obj/structure/ai_core/latejoin_inactive(loc)
 	return ..()
 
 /obj/effect/landmark/start/ai/secondary

code/game/objects/items/cardboard_cutouts.dm

@@ -19,7 +19,7 @@
 	. = ..()
 	if(possible_appearances)
 		return
-	possible_appearances = sortList(list(
+	possible_appearances = sort_list(list(
 		"Assistant" = image(icon = src.icon, icon_state = "cutout_greytide"),
 		"Clown" = image(icon = src.icon, icon_state = "cutout_clown"),
 		"Mime" = image(icon = src.icon, icon_state = "cutout_mime"),

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -654,7 +654,7 @@
 			display_vending_names_paths = list()
 			for(var/path in vending_names_paths)
 				display_vending_names_paths[vending_names_paths[path]] = path
-		var/choice =  input(user,"Choose a new brand","Select an Item") as null|anything in sortList(display_vending_names_paths)
+		var/choice =  input(user,"Choose a new brand","Select an Item") as null|anything in sort_list(display_vending_names_paths)
 		set_type(display_vending_names_paths[choice])
 	else
 		return ..()

code/game/objects/items/devices/PDA/PDA.dm

@@ -1180,7 +1180,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 		plist[avoid_assoc_duplicate_keys(P.owner, namecounts)] = P
 
-	var/c = input(user, "Please select a PDA") as null|anything in sortList(plist)
+	var/c = input(user, "Please select a PDA") as null|anything in sort_list(plist)
 
 	if (!c)
 		return
@@ -1268,7 +1268,7 @@ GLOBAL_LIST_EMPTY(PDAs)
 
 		plist[avoid_assoc_duplicate_keys(P.owner, namecounts)] = P
 
-	var/c = input(user, "Please select a PDA") as null|anything in sortList(plist)
+	var/c = input(user, "Please select a PDA") as null|anything in sort_list(plist)
 
 	if (!c)
 		return

code/game/objects/items/devices/PDA/cart.dm

@@ -600,7 +600,7 @@ Code:
 			if(!emoji_table)
 				var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 				var/list/collate = list("<br><table>")
-				for(var/emoji in sortList(icon_states(icon('icons/emoji.dmi'))))
+				for(var/emoji in sort_list(icon_states(icon('icons/emoji.dmi'))))
 					var/tag = sheet.icon_tag("emoji-[emoji]")
 					collate += "<tr><td>[emoji]</td><td>[tag]</td></tr>"
 				collate += "</table><br>"

code/game/objects/items/devices/camera_bug.dm

@@ -82,7 +82,7 @@
 				continue
 			if(length(list("ss13","mine", "rd", "labor", "toxins", "minisat")&camera.network))
 				bugged_cameras[camera.c_tag] = camera
-	return sortList(bugged_cameras)
+	return sort_list(bugged_cameras)
 
 
 /obj/item/camera_bug/proc/menu(list/cameras)

code/game/objects/items/devices/scanners.dm

@@ -973,7 +973,7 @@ GENETICS SCANNER
 	for(var/A in buffer)
 		options += get_display_name(A)
 
-	var/answer = input(user, "Analyze Potential", "Sequence Analyzer")  as null|anything in sortList(options)
+	var/answer = input(user, "Analyze Potential", "Sequence Analyzer")  as null|anything in sort_list(options)
 	if(answer && ready && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		var/sequence
 		for(var/A in buffer) //this physically hurts but i dont know what anything else short of an assoc list

code/game/objects/items/holy_weapons.dm

@@ -260,7 +260,7 @@
 			display_names[initial(rodtype.name)] = rodtype
 			nullrod_icons += list(initial(rodtype.name) = image(icon = initial(rodtype.icon), icon_state = initial(rodtype.icon_state)))
 
-	nullrod_icons = sortList(nullrod_icons)
+	nullrod_icons = sort_list(nullrod_icons)
 
 	var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE)
 	if(!choice || !check_menu(L))

code/game/objects/items/robot/ai_upgrades.dm

@@ -25,7 +25,7 @@
 		AI.hack_software = TRUE
 		log_game("[key_name(user)] has upgraded [key_name(AI)] with a [src].")
 		message_admins("[ADMIN_LOOKUPFLW(user)] has upgraded [ADMIN_LOOKUPFLW(AI)] with a [src].")
-	to_chat(user, "<span class='notice'>You upgrade [AI]. [src] is consumed in the process.</span>")
+	to_chat(user, span_notice("You install [src], upgrading [AI]."))
 	qdel(src)
 
 
@@ -46,7 +46,7 @@
 		AI.eyeobj.relay_speech = TRUE
 		to_chat(AI, "<span class='userdanger'>[user] has upgraded you with surveillance software!</span>")
 		to_chat(AI, "Via a combination of hidden microphones and lip reading software, you are able to use your cameras to listen in on conversations.")
-	to_chat(user, "<span class='notice'>You upgrade [AI]. [src] is consumed in the process.</span>")
+	to_chat(user, span_notice("You install [src], upgrading [AI]."))
 	log_game("[key_name(user)] has upgraded [key_name(AI)] with a [src].")
 	message_admins("[ADMIN_LOOKUPFLW(user)] has upgraded [ADMIN_LOOKUPFLW(AI)] with a [src].")
 	qdel(src)

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
  * Plasteel
  */
 GLOBAL_LIST_INIT(plasteel_recipes, list ( \
-	new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = TRUE), \
+	new/datum/stack_recipe("AI core", /obj/structure/ai_core, 4, time = 50, one_per_turf = TRUE), \
 	new/datum/stack_recipe("bomb assembly", /obj/machinery/syndicatebomb/empty, 10, time = 50), \
 	new/datum/stack_recipe("plasteel keg", /obj/structure/custom_keg, 10, time = 50), \
 	new/datum/stack_recipe("micro powered fan assembly", /obj/machinery/fan_assembly, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \

code/game/objects/items/storage/boxes.dm

@@ -886,7 +886,7 @@
 
 /obj/item/storage/box/papersack/Initialize(mapload)
 	. = ..()
-	papersack_designs = sortList(list(
+	papersack_designs = sort_list(list(
 		"None" = image(icon = src.icon, icon_state = "paperbag_None"),
 		"NanotrasenStandard" = image(icon = src.icon, icon_state = "paperbag_NanotrasenStandard"),
 		"SyndiSnacks" = image(icon = src.icon, icon_state = "paperbag_SyndiSnacks"),

code/game/objects/structures/ai_core.dm

@@ -1,4 +1,6 @@
-/obj/structure/AIcore
+#define AI_CORE_BRAIN(X) X.braintype == "Android" ? "brain" : "MMI"
+
+/obj/structure/ai_core
 	density = TRUE
 	anchored = FALSE
 	name = "\improper AI core"
@@ -8,28 +10,76 @@
 	max_integrity = 500
 	var/state = 0
 	var/datum/ai_laws/laws
-	var/obj/item/circuitboard/circuit = null
-	var/obj/item/mmi/brain = null
-	var/can_deconstruct = TRUE
+	var/obj/item/circuitboard/aicore/circuit = null
+	var/obj/item/mmi/core_mmi
 
-/obj/structure/AIcore/Initialize(mapload)
+/obj/structure/ai_core/Initialize(mapload)
 	. = ..()
 	laws = new
 	laws.set_laws_config()
 
-/obj/structure/AIcore/Destroy()
-	if(circuit)
-		qdel(circuit)
+/obj/structure/ai_core/examine(mob/user)
+	. = ..()
+	if(!anchored)
+		if(state != EMPTY_CORE)
+			. += span_notice("It has some <b>bolts</b> that could be tightened.")
+		else
+			. += span_notice("It has some <b>bolts</b> that could be tightened. The frame can be <b>melted</b> down.")
+	else
+		switch(state)
+			if(EMPTY_CORE)
+				. += span_notice("There is a <b>slot</b> for a circuit board, its <b>bolts</b> can be loosened.")
+			if(CIRCUIT_CORE)
+				. += span_notice("The circuit board can be <b>screwed</b> into place or <b>pried</b> out.")
+			if(SCREWED_CORE)
+				. += span_notice("The frame can be <b>wired</b>, the circuit board can be <b>unfastened</b>.")
+			if(CABLED_CORE)
+				if(!core_mmi)
+					. += span_notice("There are wires which could be hooked up to an <b>MMI or positronic brain</b>, or <b>cut</b>.")
+				else
+					var/accept_laws = TRUE
+					if(core_mmi.laws.id != DEFAULT_AI_LAWID || !core_mmi.brainmob || !core_mmi.brainmob?.mind)
+						accept_laws = FALSE
+					. += span_notice("There is a <b>slot</b> for a reinforced glass panel, the [AI_CORE_BRAIN(core_mmi)] could be <b>pried</b> out.[accept_laws ? " A law module can be <b>swiped</b> across." : ""]")
+			if(GLASS_CORE)
+				. += span_notice("The monitor [core_mmi?.brainmob?.mind && !core_mmi?.brainmob?.suiciding ? "and neural interface " : ""]can be <b>screwed</b> in, the panel can be <b>pried</b> out.")
+			if(AI_READY_CORE)
+				. += span_notice("The monitor's connection can be <b>cut</b>[core_mmi?.brainmob?.mind && !core_mmi?.brainmob?.suiciding ? " the neural interface can be <b>screwed</b> in." : "."]")
+
+/obj/structure/ai_core/handle_atom_del(atom/A)
+	if(A == circuit)
 		circuit = null
-	if(brain)
-		qdel(brain)
-		brain = null
+		if((state != GLASS_CORE) && (state != AI_READY_CORE))
+			state = EMPTY_CORE
+			update_appearance()
+	if(A == core_mmi)
+		core_mmi = null
 	return ..()
 
-/obj/structure/AIcore/latejoin_inactive
-	name = "Networked AI core"
+/obj/structure/ai_core/Destroy()
+	QDEL_NULL(circuit)
+	QDEL_NULL(core_mmi)
+	QDEL_NULL(laws)
+	return ..()
+
+/obj/structure/ai_core/deactivated
+	icon_state = "ai-empty"
+	anchored = TRUE
+	state = AI_READY_CORE
+
+/obj/structure/ai_core/deactivated/Initialize(mapload, posibrain = FALSE)
+	. = ..()
+	circuit = new(src)
+	if(posibrain)
+		core_mmi = new/obj/item/mmi/posibrain(src)
+	else
+		core_mmi = new(src)
+		core_mmi.brain = new(core_mmi)
+		core_mmi.update_appearance()
+
+/obj/structure/ai_core/latejoin_inactive
+	name = "networked AI core"
 	desc = "This AI core is connected by bluespace transmitters to NTNet, allowing for an AI personality to be downloaded to it on the fly mid-shift."
-	can_deconstruct = FALSE
 	icon_state = "ai-empty"
 	anchored = TRUE
 	state = AI_READY_CORE
@@ -37,11 +87,24 @@
 	var/safety_checks = TRUE
 	var/active = TRUE
 
-/obj/structure/AIcore/latejoin_inactive/examine(mob/user)
+/obj/structure/ai_core/latejoin_inactive/Initialize(mapload)
 	. = ..()
-	. += "Its transmitter seems to be [active? "on" : "off"]."
+	circuit = new(src)
+	core_mmi = new(src)
+	core_mmi.brain = new(core_mmi)
+	core_mmi.update_appearance()
+	GLOB.latejoin_ai_cores += src
 
-/obj/structure/AIcore/latejoin_inactive/proc/is_available()			//If people still manage to use this feature to spawn-kill AI latejoins ahelp them.
+/obj/structure/ai_core/latejoin_inactive/Destroy()
+	GLOB.latejoin_ai_cores -= src
+	return ..()
+
+/obj/structure/ai_core/latejoin_inactive/examine(mob/user)
+	. = ..()
+	. += "Its transmitter seems to be <b>[active? "on" : "off"]</b>."
+	. += span_notice("You could [active? "deactivate" : "activate"] it with a multitool.")
+
+/obj/structure/ai_core/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them.
 	if(!available)
 		return FALSE
 	if(!safety_checks)
@@ -56,42 +119,61 @@
 		return FALSE
 	if(!SSmapping.level_trait(T.z,ZTRAIT_STATION))
 		return FALSE
-	if(!istype(T, /turf/open/floor))
+	if(!isfloorturf(T))
 		return FALSE
 	return TRUE
 
-/obj/structure/AIcore/latejoin_inactive/attackby(obj/item/P, mob/user, params)
+/obj/structure/ai_core/latejoin_inactive/attackby(obj/item/P, mob/user, params)
 	if(P.tool_behaviour == TOOL_MULTITOOL)
 		active = !active
 		to_chat(user, "You [active? "activate" : "deactivate"] [src]'s transmitters.")
 		return
 	return ..()
 
-/obj/structure/AIcore/latejoin_inactive/Initialize(mapload)
+/obj/structure/ai_core/wrench_act(mob/living/user, obj/item/tool)
 	. = ..()
-	GLOB.latejoin_ai_cores += src
+	default_unfasten_wrench(user, tool)
+	return TRUE
 
-/obj/structure/AIcore/latejoin_inactive/Destroy()
-	GLOB.latejoin_ai_cores -= src
-	return ..()
+/obj/structure/ai_core/screwdriver_act(mob/living/user, obj/item/tool)
+	. = ..()
+	if(state == AI_READY_CORE)
+		if(!core_mmi)
+			balloon_alert(user, "no brain installed!")
+			return TRUE
+		else if(!core_mmi.brainmob?.mind || core_mmi.brainmob?.suiciding)
+			balloon_alert(user, "brain is inactive!")
+			return TRUE
+		else
+			balloon_alert(user, "connecting neural network...")
+			if(!tool.use_tool(src, user, 10 SECONDS))
+				return TRUE
+			if(!ai_structure_to_mob())
+				return TRUE
+			balloon_alert(user, "connected neural network")
+			return TRUE
 
-/obj/structure/AIcore/attackby(obj/item/P, mob/user, params)
-	if(P.tool_behaviour == TOOL_WRENCH)
-		return default_unfasten_wrench(user, P, 20)
+/obj/structure/ai_core/attackby(obj/item/P, mob/user, params)
 	if(!anchored)
-		if(P.tool_behaviour == TOOL_WELDER && can_deconstruct)
+		if(P.tool_behaviour == TOOL_WELDER)
 			if(state != EMPTY_CORE)
-				to_chat(user, "<span class='warning'>The core must be empty to deconstruct it!</span>")
+				balloon_alert(user, "core must be empty to deconstruct it!")
 				return
 
 			if(!P.tool_start_check(user, amount=0))
 				return
 
-			to_chat(user, "<span class='notice'>You start to deconstruct the frame...</span>")
+			balloon_alert(user, "deconstructing frame...")
 			if(P.use_tool(src, user, 20, volume=50) && state == EMPTY_CORE)
-				to_chat(user, "<span class='notice'>You deconstruct the frame.</span>")
+				balloon_alert(user, "deconstructed frame")
 				deconstruct(TRUE)
 			return
+		else
+			if(user.a_intent != INTENT_HARM)
+				balloon_alert(user, "bolt it down first!")
+				return
+			else
+				return ..()
 	else
 		switch(state)
 			if(EMPTY_CORE)
@@ -99,7 +181,7 @@
 					if(!user.transferItemToLoc(P, src))
 						return
 					playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
-					to_chat(user, "<span class='notice'>You place the circuit board inside the frame.</span>")
+					balloon_alert(user, "circuit board inserted")
 					update_icon()
 					state = CIRCUIT_CORE
 					circuit = P
@@ -107,13 +189,13 @@
 			if(CIRCUIT_CORE)
 				if(P.tool_behaviour == TOOL_SCREWDRIVER)
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You screw the circuit board into place.</span>")
+					balloon_alert(user, "board screwed into place")
 					state = SCREWED_CORE
 					update_icon()
 					return
 				if(P.tool_behaviour == TOOL_CROWBAR)
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You remove the circuit board.</span>")
+					balloon_alert(user, "circuit board removed")
 					state = EMPTY_CORE
 					update_icon()
 					circuit.forceMove(loc)
@@ -122,7 +204,7 @@
 			if(SCREWED_CORE)
 				if(P.tool_behaviour == TOOL_SCREWDRIVER && circuit)
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You unfasten the circuit board.</span>")
+					balloon_alert(user, "circuit board unfastened")
 					state = CIRCUIT_CORE
 					update_icon()
 					return
@@ -130,61 +212,73 @@
 					var/obj/item/stack/cable_coil/C = P
 					if(C.get_amount() >= 5)
 						playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
-						to_chat(user, "<span class='notice'>You start to add cables to the frame...</span>")
-						if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use_tool(src, user, 0, 5))
-							to_chat(user, "<span class='notice'>You add cables to the frame.</span>")
+						balloon_alert(user, "adding cables to frame...")
+						if(do_after(user, 20, target = src) && state == SCREWED_CORE && C.use(5))
+							balloon_alert(user, "added cables to frame.")
 							state = CABLED_CORE
 							update_icon()
 					else
-						to_chat(user, "<span class='warning'>You need five lengths of cable to wire the AI core!</span>")
+						balloon_alert(user, "need five lengths of cable!")
 					return
 			if(CABLED_CORE)
 				if(P.tool_behaviour == TOOL_WIRECUTTER)
-					if(brain)
-						to_chat(user, "<span class='warning'>Get that [brain.name] out of there first!</span>")
+					if(core_mmi)
+						balloon_alert(user, "remove the [AI_CORE_BRAIN(core_mmi)] first!")
 					else
 						P.play_tool_sound(src)
-						to_chat(user, "<span class='notice'>You remove the cables.</span>")
+						balloon_alert(user, "cables removed")
 						state = SCREWED_CORE
 						update_icon()
 						new /obj/item/stack/cable_coil(drop_location(), 5)
 					return
 
 				if(istype(P, /obj/item/stack/sheet/rglass))
+					if(!core_mmi)
+						balloon_alert(user, "add a brain first!")
+						return
 					var/obj/item/stack/sheet/rglass/G = P
 					if(G.get_amount() >= 2)
 						playsound(loc, 'sound/items/deconstruct.ogg', 50, 1)
-						to_chat(user, "<span class='notice'>You start to put in the glass panel...</span>")
+						balloon_alert(user, "adding glass panel...")
 						if(do_after(user, 20, target = src) && state == CABLED_CORE && G.use(2))
-							to_chat(user, "<span class='notice'>You put in the glass panel.</span>")
+							balloon_alert(user, "added glass panel")
 							state = GLASS_CORE
 							update_icon()
 					else
-						to_chat(user, "<span class='warning'>You need two sheets of reinforced glass to insert them into the AI core!</span>")
+						balloon_alert(user, "need two sheets of reinforced glass!")
 					return
 
 				if(istype(P, /obj/item/aiModule))
-					if(brain && brain.laws.id != DEFAULT_AI_LAWID)
-						to_chat(user, "<span class='warning'>The installed [brain.name] already has set laws!</span>")
+					if(!core_mmi)
+						balloon_alert(user, "no brain installed!")
+						return
+					if(!core_mmi.brainmob || !core_mmi.brainmob?.mind || core_mmi.brainmob?.suiciding)
+						balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] is inactive!")
+						return
+					if(core_mmi.laws.id != DEFAULT_AI_LAWID)
+						balloon_alert(user, "[AI_CORE_BRAIN(core_mmi)] already has set laws!")
 						return
 					var/obj/item/aiModule/module = P
 					module.install(laws, user)
 					return
 
-				if(istype(P, /obj/item/mmi) && !brain)
+				if(istype(P, /obj/item/mmi) && !core_mmi)
 					var/obj/item/mmi/M = P
-					if(!M.brainmob)
-						to_chat(user, "<span class='warning'>Sticking an empty [M.name] into the frame would sort of defeat the purpose!</span>")
-						return
-					if(M.brainmob.stat == DEAD)
-						to_chat(user, "<span class='warning'>Sticking a dead [M.name] into the frame would sort of defeat the purpose!</span>")
-						return
+					if(!M.brain_check(user))
+						var/install = tgui_alert(user, "This [AI_CORE_BRAIN(M)] is inactive, would you like to make an inactive AI?", "Installing AI [AI_CORE_BRAIN(M)]", list("Yes", "No"))
+						if(install != "Yes")
+							return
+						if(M.brainmob?.suiciding)
+							to_chat(user, span_warning("[M.name] is completely useless!"))
+							return
+						if(!user.transferItemToLoc(M, src))
+							return
+						core_mmi = M
+						balloon_alert(user, "added [AI_CORE_BRAIN(core_mmi)] to frame")
+						update_appearance()
 
-					if(!M.brainmob.client)
-						to_chat(user, "<span class='warning'>Sticking an inactive [M.name] into the frame would sort of defeat the purpose.</span>")
-						return
-
-					if(!CONFIG_GET(flag/allow_ai) || (jobban_isbanned(M.brainmob, "AI") && !QDELETED(src) && !QDELETED(user) && !QDELETED(M) && !QDELETED(user) && Adjacent(user)))
+					var/mob/living/brain/B = M.brainmob
+					if(!CONFIG_GET(flag/allow_ai) || (jobban_isbanned(B, "AI") && !QDELETED(src) && !QDELETED(user) && !QDELETED(M) && !QDELETED(user) && Adjacent(user)))
 						if(!QDELETED(M))
 							to_chat(user, "<span class='warning'>This [M.name] does not seem to fit!</span>")
 						return
@@ -196,47 +290,36 @@
 					if(!user.transferItemToLoc(M,src))
 						return
 
-					brain = M
-					to_chat(user, "<span class='notice'>You add [M.name] to the frame.</span>")
+					core_mmi = M
+					balloon_alert(user, "added [AI_CORE_BRAIN(core_mmi)] to frame")
 					update_icon()
 					return
 
-				if(P.tool_behaviour == TOOL_CROWBAR && brain)
+				if(P.tool_behaviour == TOOL_CROWBAR && core_mmi)
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You remove the brain.</span>")
-					brain.forceMove(loc)
-					brain = null
+					balloon_alert(user, "removed [AI_CORE_BRAIN(core_mmi)]")
+					core_mmi.forceMove(loc)
+					core_mmi = null
 					update_icon()
 					return
 
 			if(GLASS_CORE)
 				if(P.tool_behaviour == TOOL_CROWBAR)
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You remove the glass panel.</span>")
+					balloon_alert(user, "removed glass panel")
 					state = CABLED_CORE
 					update_icon()
 					new /obj/item/stack/sheet/rglass(loc, 2)
 					return
 
 				if(P.tool_behaviour == TOOL_SCREWDRIVER)
+					if(core_mmi?.brainmob?.suiciding)
+						to_chat(user, span_warning("The brain installed is completely useless."))
+						return
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You connect the monitor.</span>")
-					if(brain)
-						SSticker.mode.remove_antag_for_borging(brain.brainmob.mind)
-						if(!istype(brain.laws, /datum/ai_laws/ratvar))
-							remove_servant_of_ratvar(brain.brainmob, TRUE)
-
-						var/mob/living/silicon/ai/A = null
-
-						if (brain.overrides_aicore_laws)
-							A = new /mob/living/silicon/ai(loc, brain.laws, brain.brainmob)
-						else
-							A = new /mob/living/silicon/ai(loc, laws, brain.brainmob)
-
-						if(brain.force_replace_ai_name)
-							A.fully_replace_character_name(A.name, brain.replacement_ai_name())
-						SSblackbox.record_feedback("amount", "ais_created", 1)
-						qdel(src)
+					balloon_alert(user, "connected monitor[core_mmi?.brainmob?.mind ? " and neural network" : ""]")
+					if(core_mmi.brainmob?.mind)
+						ai_structure_to_mob()
 					else
 						state = AI_READY_CORE
 						update_icon()
@@ -247,15 +330,39 @@
 					P.transfer_ai("INACTIVE", "AICARD", src, user)
 					return
 
-				if(P.tool_behaviour == TOOL_SCREWDRIVER)
+				if(P.tool_behaviour == TOOL_WIRECUTTER)
 					P.play_tool_sound(src)
-					to_chat(user, "<span class='notice'>You disconnect the monitor.</span>")
+					balloon_alert(user, "disconnected monitor")
 					state = GLASS_CORE
 					update_icon()
 					return
 	return ..()
 
-/obj/structure/AIcore/update_icon_state()
+/obj/structure/ai_core/proc/ai_structure_to_mob()
+	var/mob/living/brain/the_brainmob = core_mmi.brainmob
+	if(!the_brainmob.mind || the_brainmob.suiciding)
+		return FALSE
+	the_brainmob.mind.remove_antags_for_borging()
+	if(!the_brainmob.mind.has_ever_been_ai)
+		SSblackbox.record_feedback("amount", "ais_created", 1)
+	var/mob/living/silicon/ai/ai_mob = null
+
+	if(core_mmi.overrides_aicore_laws)
+		ai_mob = new /mob/living/silicon/ai(loc, core_mmi.laws, the_brainmob)
+		core_mmi.laws = null //MMI's law datum is being donated, so we need the MMI to let it go or the GC will eat it
+	else
+		ai_mob = new /mob/living/silicon/ai(loc, laws, the_brainmob)
+		laws = null //we're giving the new AI this datum, so let's not delete it when we qdel(src) 5 lines from now
+
+	if(core_mmi.force_replace_ai_name)
+		ai_mob.fully_replace_character_name(ai_mob.name, core_mmi.replacement_ai_name())
+	if(core_mmi.braintype == "Android")
+		ai_mob.posibrain_inside = TRUE
+	deadchat_broadcast(" has been brought online at <b>[get_area_name(ai_mob, format_text = TRUE)]</b>.", span_name("[ai_mob]"), follow_target = ai_mob, message_type = DEADCHAT_ANNOUNCEMENT)
+	qdel(src)
+	return TRUE
+
+/obj/structure/ai_core/update_icon_state()
 	switch(state)
 		if(EMPTY_CORE)
 			icon_state = "0"
@@ -264,7 +371,7 @@
 		if(SCREWED_CORE)
 			icon_state = "2"
 		if(CABLED_CORE)
-			if(brain)
+			if(core_mmi)
 				icon_state = "3b"
 			else
 				icon_state = "3"
@@ -273,8 +380,8 @@
 		if(AI_READY_CORE)
 			icon_state = "ai-empty"
 
-/obj/structure/AIcore/deconstruct(disassembled = TRUE)
-	if(state == GLASS_CORE)
+/obj/structure/ai_core/deconstruct(disassembled = TRUE)
+	if(state >= GLASS_CORE)
 		new /obj/item/stack/sheet/rglass(loc, 2)
 	if(state >= CABLED_CORE)
 		new /obj/item/stack/cable_coil(loc, 5)
@@ -284,13 +391,13 @@
 	new /obj/item/stack/sheet/plasteel(loc, 4)
 	qdel(src)
 
-/obj/structure/AIcore/deactivated
+/obj/structure/ai_core/deactivated
 	name = "inactive AI"
 	icon_state = "ai-empty"
 	anchored = TRUE
 	state = AI_READY_CORE
 
-/obj/structure/AIcore/deactivated/New()
+/obj/structure/ai_core/deactivated/New()
 	..()
 	circuit = new(src)
 
@@ -310,20 +417,35 @@ That prevents a few funky behaviors.
 			return 0
 	return 1
 
-/obj/structure/AIcore/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
+/obj/structure/ai_core/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/aicard/card)
 	if(state != AI_READY_CORE || !..())
 		return
- //Transferring a carded AI to a core.
+	if(core_mmi && core_mmi.brainmob)
+		if(core_mmi.brainmob.mind)
+			to_chat(user, span_warning("[src] already contains an active mind!"))
+			return
+		else if(core_mmi.brainmob.suiciding)
+			to_chat(user, span_warning("[AI_CORE_BRAIN(core_mmi)] installed in [src] is completely useless!"))
+			return
+	//Transferring a carded AI to a core.
 	if(interaction == AI_TRANS_FROM_CARD)
-		AI.control_disabled = 0
-		AI.radio_enabled = 1
+		AI.control_disabled = FALSE
+		AI.radio_enabled = TRUE
 		AI.forceMove(loc) // to replace the terminal.
-		to_chat(AI, "You have been uploaded to a stationary terminal. Remote device connection restored.")
-		to_chat(user, "<span class='boldnotice'>Transfer successful</span>: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.")
+		to_chat(AI, span_notice("You have been uploaded to a stationary terminal. Remote device connection restored."))
+		to_chat(user, "[span_boldnotice("Transfer successful")]: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.")
 		card.AI = null
+		AI.battery = circuit.battery
+		if(core_mmi.braintype == "Android")
+			AI.posibrain_inside = TRUE
+		else
+			AI.posibrain_inside = FALSE
 		qdel(src)
 	else //If for some reason you use an empty card on an empty AI terminal.
-		to_chat(user, "There is no AI loaded on this terminal!")
+		to_chat(user, span_alert("There is no AI loaded on this terminal."))
 
 /obj/item/circuitboard/aicore
 	name = "AI core (AI Core Board)" //Well, duh, but best to be consistent
+	var/battery = 200 //backup battery for when the AI loses power. Copied to/from AI mobs when carding, and placed here to avoid recharge via deconning the core
+
+#undef AI_CORE_BRAIN

code/game/objects/structures/janicart.dm

@@ -110,7 +110,7 @@
 
 	if(!length(items))
 		return
-	items = sortList(items)
+	items = sort_list(items)
 	var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 38, require_near = TRUE)
 	if(!pick)
 		return