Merge remote-tracking branch 'citadel/master' into unarmed_parry

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

@@ -37,9 +37,9 @@
 	if (!ui)
 		var/datum/asset/assets = get_asset_datum(/datum/asset/simple/headers)
 		assets.send(user)
-
-		ui = new(user, src, ui_key, "ntos_main", "NtOS Main menu", 400, 500, master_ui, state)
-		ui.set_style("ntos")
+		assets = get_asset_datum(/datum/asset/simple/arcade)
+		assets.send(user)
+		ui = new(user, src, ui_key, "NtosMain", "NtOS Main menu", 400, 500, master_ui, state)
 		ui.open()
 		ui.set_autoupdate(state = 1)
 

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

@@ -85,3 +85,4 @@
 	var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
 	hard_drive.store_file(new/datum/computer_file/program/chatclient())
 	hard_drive.store_file(new/datum/computer_file/program/nttransfer())
+	hard_drive.store_file(new/datum/computer_file/program/arcade())