Updates Part Sechs

code/modules/modular_computers/computers/item/modular_computer.dm

@@ -148,6 +148,7 @@
 	STOP_PROCESSING(SSobj, src)
 	for(var/obj/item/weapon/computer_hardware/CH in src.get_all_components())
 		uninstall_component(null, CH)
+		qdel(CH)
 	return ..()
 
 /obj/item/modular_computer/update_icon()
@@ -198,6 +199,8 @@
 		var/list/program = list()
 		program["name"] = P.filename
 		program["desc"] = P.filedesc
+		if(P in idle_threads)
+			program["running"] = 1
 		programs.Add(list(program))
 
 	data["programs"] = programs
@@ -395,10 +398,6 @@
 		if(!active_program || !processor_unit)
 			return
 
-		if(idle_threads.len >= processor_unit.max_idle_programs)
-			user << "<span class='notice'>\The [src] displays a \"Maximal CPU load reached. Unable to minimize another program.\" error</span>"
-			return
-
 		idle_threads.Add(active_program)
 		active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
 		SSnanoui.close_uis(active_program.NM ? active_program.NM : active_program)
@@ -407,6 +406,20 @@
 		if(user && istype(user))
 			ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
 
+	if( href_list["PC_killprogram"] )
+		var/prog = href_list["PC_killprogram"]
+		var/datum/computer_file/program/P = null
+		var/mob/user = usr
+		if(hard_drive)
+			P = hard_drive.find_file_by_name(prog)
+
+		if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED)
+			return
+
+		P.kill_program(1)
+		update_uis()
+		user << "<span class='notice'>Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.</span>"
+
 	if( href_list["PC_runprogram"] )
 		var/prog = href_list["PC_runprogram"]
 		var/datum/computer_file/program/P = null
@@ -431,9 +444,14 @@
 			update_icon()
 			return
 
+		if(idle_threads.len >= processor_unit.max_idle_programs+1)
+			user << "<span class='notice'>\The [src] displays a \"Maximal CPU load reached. Unable to run another program.\" error</span>"
+			return
+
 		if(P.requires_ntnet && !get_ntnet_status(P.requires_ntnet_feature)) // The program requires NTNet connection, but we are not connected to NTNet.
 			user << "<span class='danger'>\The [src]'s screen shows \"NETWORK ERROR - Unable to connect to NTNet. Please retry. If problem persists contact your system administrator.\" warning.</span>"
 			return
+
 		if(P.run_program(user))
 			active_program = P
 			update_icon()

code/modules/modular_computers/computers/item/processor.dm

@@ -16,6 +16,9 @@
 		machinery_computer.cpu = null
 	machinery_computer = null
 
+/obj/item/modular_computer/processor/nano_host()
+	return machinery_computer.nano_host()
+
 // Due to how processes work, we'd receive two process calls - one from machinery type and one from our own type.
 // Since we want this to be in-sync with machinery (as it's hidden type for machinery-based computers) we'll ignore
 // non-relayed process calls.
@@ -100,10 +103,6 @@
 		var/obj/item/weapon/computer_hardware/tesla_link/L = H
 		L.holder = machinery_computer
 		machinery_computer.tesla_link = L
-		// Consoles don't usually have internal power source, so we can't disable tesla link in them.
-		if(istype(machinery_computer, /obj/machinery/modular_computer/console))
-			L.critical = 1
-			L.enabled = 1
 		found = 1
 	..(user, H, found)
 
@@ -111,7 +110,6 @@
 	if(machinery_computer.tesla_link == H)
 		machinery_computer.tesla_link = null
 		var/obj/item/weapon/computer_hardware/tesla_link/L = H
-		L.critical = 0		// That way we can install tesla link from console to laptop and it will be possible to turn it off via config.
 		L.holder = null
 		found = 1
 	..(user, H, found, critical)
@@ -126,4 +124,10 @@
 /obj/item/modular_computer/processor/Adjacent(var/atom/neighbor)
 	if(!machinery_computer)
 		return 0
-	return machinery_computer.Adjacent(neighbor) 
+	return machinery_computer.Adjacent(neighbor)
+
+/obj/item/modular_computer/processor/turn_on(var/mob/user)
+	// If we have a tesla link on our machinery counterpart, enable it automatically. Lets computer without a battery work.
+	if(machinery_computer && machinery_computer.tesla_link)
+		machinery_computer.tesla_link.enabled = 1
+	..() 

code/modules/modular_computers/computers/item/tablet_presets.dm

@@ -5,6 +5,7 @@
 	desc = "A low-end tablet often seen among low ranked station personnel"
 	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
 	battery_module = new/obj/item/weapon/computer_hardware/battery_module/nano(src)
+	battery_module.charge_to_full()
 	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/micro(src)
 	network_card = new/obj/item/weapon/computer_hardware/network_card(src)
 
@@ -13,6 +14,7 @@
 	. = ..()
 	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
 	battery_module = new/obj/item/weapon/computer_hardware/battery_module(src)
+	battery_module.charge_to_full()
 	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
 	network_card = new/obj/item/weapon/computer_hardware/network_card(src)
 	nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)

code/modules/modular_computers/computers/machinery/modular_console.dm

@@ -30,8 +30,6 @@
 	cpu.battery_module = null
 	cpu.network_card = new/obj/item/weapon/computer_hardware/network_card/wired(src)
 	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
-	tesla_link.enabled = 1
-	tesla_link.critical = 1 // Consoles don't usually come with cells, and this prevents people from disabling their only power source, as they wouldn't be able to enable it again.
 	cpu.hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src) // Consoles generally have better HDDs due to lower space limitations
 	var/area/A = get_area(src)
 	// Attempts to set this console's tag according to our area. Since some areas have stuff like "XX - YY" in their names we try to remove that too.