Record computers to modular computers (#7797)

Things this does:

    Refactors _app_preset_name to use a type name instead. This makes it validate the presets at compile time, making it much more secure.
    Removes all records computers from the code, along with the CMC.
    Replaces all records computers with appropriate modular computers
    Each head of staff now has 1 departmental computer, 1 head-specific computer, 1 head laptop
    Removes the C&C program from the heads that had it, because you're supposed to use the bridge for it.

aurorastation.dme

@@ -625,7 +625,6 @@
 #include "code\game\machinery\computer\camera.dm"
 #include "code\game\machinery\computer\cloning.dm"
 #include "code\game\machinery\computer\computer.dm"
-#include "code\game\machinery\computer\crew.dm"
 #include "code\game\machinery\computer\guestpass.dm"
 #include "code\game\machinery\computer\law.dm"
 #include "code\game\machinery\computer\message.dm"
@@ -633,7 +632,6 @@
 #include "code\game\machinery\computer\pod.dm"
 #include "code\game\machinery\computer\prisoner.dm"
 #include "code\game\machinery\computer\RCON_Console.dm"
-#include "code\game\machinery\computer\records.dm"
 #include "code\game\machinery\computer\robot.dm"
 #include "code\game\machinery\computer\sentencing.dm"
 #include "code\game\machinery\computer\shuttle.dm"

code/game/machinery/computer/crew.dm

@@ -1,38 +0,0 @@
-/obj/machinery/computer/crew
-	name = "crew monitoring computer"
-	desc = "Used to monitor active health sensors built into most of the crew's uniforms."
-
-	icon_screen = "crew"
-	light_color = "#315ab4"
-	use_power = 1
-	idle_power_usage = 250
-	active_power_usage = 500
-	circuit = /obj/item/circuitboard/crew
-	var/datum/nano_module/crew_monitor/crew_monitor
-
-/obj/machinery/computer/crew/Initialize()
-	. = ..()
-	crew_monitor = new(src)
-
-/obj/machinery/computer/crew/Destroy()
-	qdel(crew_monitor)
-	crew_monitor = null
-	return ..()
-
-/obj/machinery/computer/crew/attack_ai(mob/user)
-	ui_interact(user)
-
-/obj/machinery/computer/crew/attack_hand(mob/user)
-	add_fingerprint(user)
-	if(stat & (BROKEN|NOPOWER))
-		return
-	ui_interact(user)
-
-/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
-	crew_monitor.ui_interact(user, ui_key, ui, force_open, state)
-
-/obj/machinery/computer/crew/nano_container()
-	return crew_monitor
-
-/obj/machinery/computer/crew/interact(mob/user)
-	crew_monitor.ui_interact(user)

code/game/machinery/computer/records.dm

@@ -1,311 +0,0 @@
-/obj/machinery/computer/records
-	name = "records console"
-	desc = "Used to view, edit and maintain records."
-	var/records_type = RECORD_GENERAL | RECORD_MEDICAL | RECORD_SECURITY | RECORD_VIRUS | RECORD_WARRANT | RECORD_LOCKED
-	var/edit_type = RECORD_GENERAL | RECORD_MEDICAL | RECORD_SECURITY | RECORD_VIRUS | RECORD_WARRANT | RECORD_LOCKED
-	var/datum/record/general/active
-	var/datum/record/virus/active_virus
-	var/listener/record/rconsole/listener
-	var/isEditing = FALSE
-	var/authenticated = 0
-	var/default_screen = "general"
-	var/typechoices = list(
-		"physical_status" = list("Active", "*Deceased*", "*SSD*", "Physically Unfit", "Disabled"),
-		"mental_status" = list("Stable", "*Insane*", "*Unstable*", "*Watch*"),
-		"medical" = list(
-			"blood_type" = list("A-", "B-", "AB-", "O-", "A+", "B+", "AB+", "O+")
-		)
-	)
-
-/obj/machinery/computer/records/medical
-	name = "medical records console"
-	desc = "Used to view, edit and maintain medical records."
-
-	icon_screen = "medcomp"
-	light_color = "#315ab4"
-	req_one_access = list(access_medical_equip, access_forensics_lockers, access_detective, access_hop)
-	circuit = /obj/item/circuitboard/med_data
-	records_type = RECORD_MEDICAL | RECORD_VIRUS
-	edit_type = RECORD_MEDICAL
-	default_screen = "medical"
-
-/obj/machinery/computer/records/medical/laptop
-	name = "medical laptop"
-	desc = "A cheap laptop."
-
-	icon_state = "medlaptop0"
-	icon_screen = "medlaptop"
-	is_holographic = FALSE
-	density = 0 // so you can walk through them. because, well, they're goddamn laptops.
-
-/obj/machinery/computer/records/security
-	name = "security records console"
-	desc = "Used to view, edit and maintain security records"
-
-	icon_screen = "security"
-	light_color = LIGHT_COLOR_ORANGE
-	req_one_access = list(access_security, access_forensics_lockers, access_lawyer, access_hop)
-	circuit = /obj/item/circuitboard/secure_data
-	records_type = RECORD_SECURITY
-	edit_type = RECORD_SECURITY
-	default_screen = "security"
-
-/obj/machinery/computer/records/security/detective
-	icon_state = "messyfiles"
-	icon_screen = null
-	light_range_on = 0
-	light_power_on = 0
-
-/obj/machinery/computer/records/employment
-	name = "employment records console"
-	desc = "Used to view, edit and maintain employment records."
-
-	icon_state = "medlaptop0"
-	icon_screen = "medlaptop"
-	light_color = "#00b000"
-	req_one_access = list(access_heads)
-	circuit = /obj/item/circuitboard/skills
-	records_type = RECORD_GENERAL | RECORD_SECURITY
-	edit_type = RECORD_GENERAL
-
-/obj/machinery/computer/records/New()
-	. = ..()
-	listener = new(src)
-
-/obj/machinery/computer/records/ui_interact(mob/user as mob)
-	var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
-	if (!ui)
-		ui = new(user, src, "records-main", 450, 520, capitalize(src.name))
-		if(!authenticated)
-			ui.activeui = "records-login"
-	ui.open()
-
-/obj/machinery/computer/records/attack_ai(mob/user as mob)
-	return attack_hand(user)
-
-/obj/machinery/computer/records/attack_hand(mob/user)
-	user.set_machine(src)
-	ui_interact(user)
-
-/obj/machinery/computer/records/vueui_data_change(list/data, mob/user, datum/vueui/ui)
-	if(!data)
-		. = data = list(
-			"activeview" = "list",
-			"defaultview" = default_screen,
-			"editingvalue" = "",
-			"choices" = typechoices
-			)
-
-	if(!authenticated)
-		VUEUI_SET_CHECK(ui.activeui, "records-login", ., data)
-	else
-		VUEUI_SET_CHECK(ui.activeui, "records-main", ., data)
-
-	VUEUI_SET_CHECK(data["avaivabletypes"], records_type, ., data)
-	VUEUI_SET_CHECK(data["editable"], edit_type, ., data)
-	LAZYINITLIST(data["allrecords"])
-	LAZYINITLIST(data["allrecords_locked"])
-	LAZYINITLIST(data["record_viruses"])
-	if(authenticated)
-		if(data["allrecords"].len != SSrecords.records.len)
-			data["allrecords"].Cut()
-		for(var/tR in sortRecord(SSrecords.records))
-			var/datum/record/general/R = tR
-			LAZYINITLIST(data["allrecords"][R.id])
-			VUEUI_SET_CHECK(data["allrecords"][R.id]["id"], R.id, ., data)
-			VUEUI_SET_CHECK(data["allrecords"][R.id]["name"], R.name, ., data)
-			VUEUI_SET_CHECK(data["allrecords"][R.id]["rank"], R.rank, ., data)
-			VUEUI_SET_CHECK(data["allrecords"][R.id]["sex"], R.sex, ., data)
-			VUEUI_SET_CHECK(data["allrecords"][R.id]["age"], R.age, ., data)
-			VUEUI_SET_CHECK(data["allrecords"][R.id]["fingerprint"], R.fingerprint, ., data)
-			if(R.medical)
-				VUEUI_SET_CHECK(data["allrecords"][R.id]["blood"], R.medical.blood_type, ., data)
-				VUEUI_SET_CHECK(data["allrecords"][R.id]["dna"], R.medical.blood_dna, ., data)
-
-
-		if(records_type & RECORD_LOCKED)
-			if(data["allrecords_locked"].len != SSrecords.records_locked.len)
-				data["allrecords_locked"].Cut()
-			for(var/tR in sortRecord(SSrecords.records_locked))
-				var/datum/record/general/R = tR
-				LAZYINITLIST(data["allrecords_locked"][R.id])
-				VUEUI_SET_CHECK(data["allrecords_locked"][R.id]["id"], R.id, ., data)
-				VUEUI_SET_CHECK(data["allrecords_locked"][R.id]["name"], R.name, ., data)
-				VUEUI_SET_CHECK(data["allrecords_locked"][R.id]["rank"], R.rank, ., data)
-
-		if(records_type & RECORD_VIRUS)
-			if(data["record_viruses"].len != SSrecords.viruses.len)
-				data["record_viruses"].Cut()
-			for(var/tR in sortRecord(SSrecords.viruses))
-				var/datum/record/virus/R = tR
-				LAZYINITLIST(data["record_viruses"]["[R.id]"])
-				VUEUI_SET_CHECK(data["record_viruses"]["[R.id]"]["id"], R.id, ., data)
-				VUEUI_SET_CHECK(data["record_viruses"]["[R.id]"]["name"], R.name, ., data)
-		if(active_virus)
-			var/returned = active_virus.Listify(1, list(), data["active_virus"])
-			if(returned)
-				data["active_virus"] = returned
-				. = data
-		else
-			if(data["activeview"] == "virus")
-				VUEUI_SET_CHECK(data["activeview"], "list", ., data)
-			VUEUI_SET_CHECK(data["active_virus"], 0, ., data)
-
-		if(active)
-			if(!ui.assets["front"] || !ui.assets["side"])
-				ui.add_asset("front", active.photo_front)
-				ui.add_asset("side", active.photo_side)
-			var/excluded = list()
-			if(!(records_type & RECORD_GENERAL))
-				excluded += active.advanced_fields
-			if(!(records_type & RECORD_SECURITY))
-				excluded += "security"
-			if(!(records_type & RECORD_MEDICAL))
-				excluded += "medical"
-			var/returned = active.Listify(1, excluded, data["active"])
-			if(returned)
-				data["active"] = returned
-				. = data
-		else
-			if(data["activeview"] in list("general", "medical", "security"))
-				VUEUI_SET_CHECK(data["activeview"], "list", ., data)
-			VUEUI_SET_CHECK(data["active"], 0, ., data)
-	else
-		VUEUI_SET_CHECK(data["active_virus"], 0, ., data)
-		VUEUI_SET_CHECK(data["active"], 0, ., data)
-
-/obj/machinery/computer/records/Topic(href, href_list)
-	var/datum/vueui/ui = href_list["vueui"]
-	if(!istype(ui))
-		return
-	if(href_list["login"])
-		var/obj/item/card/id/id = usr.GetIdCard()
-		if(id && check_access(id))
-			authenticated = id.registered_name
-		else
-			to_chat(usr, "[src] beeps: Access Denied")
-		SSvueui.check_uis_for_change(src)
-	if(href_list["logout"])
-		authenticated = 0
-		active = null
-		active_virus = null
-		ui.remove_asset("front")
-		ui.remove_asset("side")
-		ui.data = null
-		SSvueui.check_uis_for_change(src)
-	if(!authenticated)
-		return
-	if(href_list["setactive"])
-		active = SSrecords.find_record("id", href_list["setactive"])
-		if(active)
-			ui.add_asset("front", active.photo_front)
-			ui.add_asset("side", active.photo_side)
-			ui.send_asset("front")
-			ui.send_asset("side")
-		else
-			ui.remove_asset("front")
-			ui.remove_asset("side")
-		SSvueui.check_uis_for_change(src)
-	if(href_list["setactive_locked"] && (records_type & RECORD_LOCKED))
-		active = SSrecords.find_record("id", href_list["setactive_locked"], RECORD_GENERAL | RECORD_LOCKED)
-		SSvueui.check_uis_for_change(src)
-	if(href_list["setactive_virus"] && (records_type & RECORD_VIRUS))
-		active_virus = SSrecords.find_record("id", text2num(href_list["setactive_virus"]), RECORD_VIRUS)
-		SSvueui.check_uis_for_change(src)
-	if(href_list["editrecord"])
-		var/list/key = href_list["editrecord"]["key"]
-		var/value = sanitize(href_list["editrecord"]["value"], encode = 0, extra = 0)
-		if(key.len >= 2 && canEdit(key))
-			if(isnum(obj_query_get(null, src, null, key)))
-				value = text2num(value)
-			isEditing = TRUE
-			obj_query_set(null, src, value, null, key)
-			obj_query_set(null, ui.data, value, null, key)
-			SSrecords.onModify(vars[key[1]])
-			isEditing = FALSE
-			. = TRUE
-	if(href_list["deleterecord"])
-		if(canEdit(list("active", "name")))
-			var/confirm = alert("Are you sure you want to delete this record?", "Confirm Deletion", "No", "Yes")
-			if(confirm == "Yes")
-				isEditing = TRUE
-				SSrecords.remove_record(active)
-				ui.data["allrecords"] -= active.id
-				active = null
-				ui.data["activeview"] = default_screen
-				isEditing = FALSE
-			SSvueui.check_uis_for_change(src)
-	if(href_list["newrecord"])
-		if(edit_type & RECORD_GENERAL)
-			active = new /datum/record/general()
-			SSrecords.add_record(active)
-			ui.add_asset("front", active.photo_front)
-			ui.add_asset("side", active.photo_side)
-			ui.send_asset("front")
-			ui.send_asset("side")
-			SSvueui.check_uis_for_change(src)
-	if(href_list["addtorecord"])
-		var/list/key = href_list["addtorecord"]["key"]
-		var/value = sanitize(href_list["addtorecord"]["value"], encode = 0, extra = 0)
-		if(key.len >= 2 && canEdit(key))
-			isEditing = TRUE
-			obj_query_set(null, src, obj_query_get(null, src, null, key) + value, null, key)
-			obj_query_set(null, ui.data, obj_query_get(null, ui.data, null, key) + value, null, key)
-			SSrecords.onModify(vars[key[1]])
-			isEditing = FALSE
-			. = TRUE
-	if(href_list["removefromrecord"])
-		var/list/key = href_list["removefromrecord"]["key"]
-		var/value = sanitize(href_list["removefromrecord"]["value"], encode = 0, extra = 0)
-		if(key.len >= 2 && canEdit(key))
-			isEditing = TRUE
-			obj_query_set(null, src, obj_query_get(null, src, null, key) - value, null, key)
-			obj_query_set(null, ui.data, obj_query_get(null, ui.data, null, key) - value, null, key)
-			SSrecords.onModify(vars[key[1]])
-			isEditing = FALSE
-			. = TRUE
-
-/obj/machinery/computer/records/proc/canEdit(list/key)
-	if(!(key[1] in list("active", "active_virus")))
-		return FALSE
-	if(vars[key[1]] == null)
-		return FALSE
-	if(key[1] == "active_virus" && !(edit_type & RECORD_VIRUS))
-		return FALSE
-	if(key[1] == "active")
-		switch(key[2])
-			if("security")
-				if(!(edit_type & RECORD_SECURITY))
-					return FALSE
-			if("medical")
-				if(!(edit_type & RECORD_MEDICAL))
-					return FALSE
-			else
-				if(key.len == 2 && !(edit_type & RECORD_GENERAL))
-					return FALSE
-	return TRUE
-
-/*
- * Listener for record changes
- */
-
-
-/*
-/listener/record/rconsole/on_delete(var/datum/record/r)
-	. = FALSE
-	var/obj/machinery/computer/records/t = target
-	if(istype(t) && !t.isEditing)
-		if(t.active == r)
-			t.active = null
-			. = TRUE
-		if(t.active_virus == r)
-			t.active_virus = null
-			. = TRUE
-		if(.)
-			SSvueui.check_uis_for_change(t)
-
-/listener/record/rconsole/on_modify(var/datum/record/r)
-	var/obj/machinery/computer/records/t = target
-	if(istype(t) && !t.isEditing)
-		if(t.active == r || t.active_virus == r)
-			SSvueui.check_uis_for_change(t)*/

code/game/objects/items/weapons/circuitboards/computer/computer.dm

@@ -17,10 +17,6 @@
 	build_path = /obj/machinery/computer/borgupload
 	origin_tech = list(TECH_DATA = 4)
 
-/obj/item/circuitboard/med_data
-	name = T_BOARD("medical records console")
-	build_path = /obj/machinery/computer/records/medical
-
 /obj/item/circuitboard/pandemic
 	name = T_BOARD("PanD.E.M.I.C. 2200")
 	build_path = /obj/machinery/computer/pandemic
@@ -36,14 +32,6 @@
 	build_path = /obj/machinery/computer/teleporter
 	origin_tech = list(TECH_DATA = 2, TECH_BLUESPACE = 2)
 
-/obj/item/circuitboard/secure_data
-	name = T_BOARD("security records console")
-	build_path = /obj/machinery/computer/records/security
-
-/obj/item/circuitboard/skills
-	name = T_BOARD("employment records console")
-	build_path = /obj/machinery/computer/records/employment
-
 /obj/item/circuitboard/sentencing
 	name = T_BOARD("criminal sentencing console")
 	build_path = /obj/machinery/computer/sentencing
@@ -115,11 +103,6 @@
 	name = T_BOARD("R&D server control console")
 	build_path = /obj/machinery/computer/rdservercontrol
 
-/obj/item/circuitboard/crew
-	name = T_BOARD("crew monitoring console")
-	build_path = /obj/machinery/computer/crew
-	origin_tech = list(TECH_DATA = 3, TECH_BIO = 2, TECH_MAGNET = 2)
-
 /obj/item/circuitboard/operating
 	name = T_BOARD("patient monitoring console")
 	build_path = /obj/machinery/computer/operating

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

@@ -38,9 +38,9 @@
 		playsound(loc, "computerbeep", 30, 1, 10, required_preferences = SOUND_AMBIENCE)
 		ambience_last_played = world.time
 
-/obj/item/modular_computer/proc/get_preset_programs(var/app_preset_name)
+/obj/item/modular_computer/proc/get_preset_programs(preset_type)
 	for (var/datum/modular_computer_app_presets/prs in ntnet_global.available_software_presets)
-		if(prs.name == app_preset_name)
+		if(prs.type == preset_type)
 			return prs.return_install_programs()
 
 // Used to perform preset-specific hardware changes.
@@ -50,7 +50,7 @@
 // Used to install preset-specific programs
 /obj/item/modular_computer/proc/install_default_programs()
 	if(enrolled)
-		var/programs = get_preset_programs(_app_preset_name)
+		var/programs = get_preset_programs(_app_preset_type)
 		for (var/datum/computer_file/program/prog in programs)
 			hard_drive.store_file(prog)
 

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

@@ -18,7 +18,7 @@
 	var/base_active_power_usage = 50						// Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too.
 	var/base_idle_power_usage = 5							// Power usage when the computer is idle and screen is off (currently only applies to laptops)
 	var/enrolled = 0										// Weather the computer is enrolled in the company device management or not. 0 - unconfigured 1 - enrolled (work device) 2 - unenrolled (private device)
-	var/_app_preset_name = ""								// Used for specifying the software preset of the console
+	var/_app_preset_type = null								// Used for specifying the software preset of the console
 	var/ambience_last_played								// Last time sound was played
 
 	// Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..)

code/modules/modular_computers/computers/subtypes/preset_console.dm

@@ -19,23 +19,32 @@
 /obj/item/modular_computer/console/preset/install_default_programs()
 	..()
 
-
 // Engineering
 /obj/item/modular_computer/console/preset/engineering/
 	name = "engineering console"
-	_app_preset_name = "engineering"
+	_app_preset_type = /datum/modular_computer_app_presets/engineering
+	enrolled = 1
+
+/obj/item/modular_computer/console/preset/engineering/ce
+	name = "engineering console"
+	_app_preset_type = /datum/modular_computer_app_presets/engineering/ce
 	enrolled = 1
 
 // Medical
 /obj/item/modular_computer/console/preset/medical/
 	name = "medical console"
-	_app_preset_name = "medical"
+	_app_preset_type = /datum/modular_computer_app_presets/medical
+	enrolled = 1
+
+/obj/item/modular_computer/console/preset/medical/cmo
+	name = "medical console"
+	_app_preset_type = /datum/modular_computer_app_presets/medical/cmo
 	enrolled = 1
 
 // Research
 /obj/item/modular_computer/console/preset/research/
 	name = "research console"
-	_app_preset_name = "research"
+	_app_preset_type = /datum/modular_computer_app_presets/research
 	enrolled = 1
 
 /obj/item/modular_computer/console/preset/research/install_default_hardware()
@@ -45,7 +54,7 @@
 // Command
 /obj/item/modular_computer/console/preset/command/
 	name = "command console"
-	_app_preset_name = "command"
+	_app_preset_type = /datum/modular_computer_app_presets/command
 	enrolled = 1
 
 /obj/item/modular_computer/console/preset/command/install_default_hardware()
@@ -55,44 +64,42 @@
 	nano_printer.stored_paper = 20
 	card_slot = new/obj/item/computer_hardware/card_slot(src)
 
-/obj/item/modular_computer/console/preset/captain/
+/obj/item/modular_computer/console/preset/command/captain
 	name = "captain's console"
-	_app_preset_name = "captain"
+	_app_preset_type = /datum/modular_computer_app_presets/captain
 	enrolled = 1
 
-/obj/item/modular_computer/console/preset/captain/install_default_hardware()
-	..()
-	nano_printer = new/obj/item/computer_hardware/nano_printer(src)
-	nano_printer.max_paper = 25
-	nano_printer.stored_paper = 20
-	card_slot = new/obj/item/computer_hardware/card_slot(src)
+/obj/item/modular_computer/console/preset/command/hop
+	name = "command console"
+	_app_preset_type = /datum/modular_computer_app_presets/command/hop
+	enrolled = 1
 
 // Security
 /obj/item/modular_computer/console/preset/security/
 	name = "security console"
-	_app_preset_name = "security"
+	_app_preset_type = /datum/modular_computer_app_presets/security
 	enrolled = 1
 
 /obj/item/modular_computer/console/preset/security/investigations
 	name = "investigations console"
-	_app_preset_name = "security_inv"
+	_app_preset_type = /datum/modular_computer_app_presets/security/investigations
 	enrolled = 1
 
 /obj/item/modular_computer/console/preset/security/hos
 	name = "head of security's console"
-	_app_preset_name = "security_head"
+	_app_preset_type = /datum/modular_computer_app_presets/security/hos
 	enrolled = 1
 
 // Civilian
 /obj/item/modular_computer/console/preset/civilian/
 	name = "civilian console"
-	_app_preset_name = "civilian"
+	_app_preset_type = /datum/modular_computer_app_presets/civilian
 	enrolled = 1
 
 // Supply
 /obj/item/modular_computer/console/preset/supply/
 	name = "supply console"
-	_app_preset_name = "supply"
+	_app_preset_type = /datum/modular_computer_app_presets/supply
 	enrolled = 1
 
 /obj/item/modular_computer/console/preset/supply/install_default_hardware()
@@ -112,13 +119,13 @@
 	card_slot = new/obj/item/computer_hardware/card_slot(src)
 
 /obj/item/modular_computer/console/preset/ert/
-	_app_preset_name = "ert"
+	_app_preset_type = /datum/modular_computer_app_presets/ert
 	enrolled = 2
 	computer_emagged = TRUE
 
 // Mercenary
 /obj/item/modular_computer/console/preset/mercenary/
-	_app_preset_name = "merc"
+	_app_preset_type = /datum/modular_computer_app_presets/merc
 	computer_emagged = TRUE
 	enrolled = 2
 
@@ -131,7 +138,7 @@
 
 // Merchant
 /obj/item/modular_computer/console/preset/merchant
-	_app_preset_name = "merchant"
+	_app_preset_type = /datum/modular_computer_app_presets/merchant
 	enrolled = 2
 
 /obj/item/modular_computer/console/preset/merchant/install_default_hardware()
@@ -143,5 +150,5 @@
 
 // AI
 /obj/item/modular_computer/console/preset/ai
-	_app_preset_name = "ai"
+	_app_preset_type = /datum/modular_computer_app_presets/ai
 	enrolled = 2

code/modules/modular_computers/computers/subtypes/preset_laptop.dm

@@ -21,31 +21,31 @@
 /obj/item/modular_computer/laptop/preset/engineering/
 	name = "engineering laptop"
 	desc = "A portable computer belonging to the engineering department. It appears to have been used as a door stop at one point or another."
-	_app_preset_name = "engineering"
+	_app_preset_type = /datum/modular_computer_app_presets/engineering
 	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/engineering/ce/
 	name = "chief engineer's laptop"
 	desc = "A portable computer belonging to the chief engineer."
-	_app_preset_name = "engineering_head"
+	_app_preset_type = /datum/modular_computer_app_presets/engineering/ce
 
 // Medical
 /obj/item/modular_computer/laptop/preset/medical/
 	name = "medical laptop"
 	desc = "A portable computer belonging to the medical department."
-	_app_preset_name = "medical"
+	_app_preset_type = /datum/modular_computer_app_presets/medical
 	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/medical/cmo/
 	name = "chief medical officer's laptop"
 	desc = "A portable computer belonging to the chief medical officer."
-	_app_preset_name = "medical_head"
+	_app_preset_type = /datum/modular_computer_app_presets/medical/cmo
 
 // Research
 /obj/item/modular_computer/laptop/preset/research/
 	name = "research laptop"
 	desc = "A portable computer belonging to the research department."
-	_app_preset_name = "research"
+	_app_preset_type = /datum/modular_computer_app_presets/research
 	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/research/install_default_hardware()
@@ -55,53 +55,53 @@
 /obj/item/modular_computer/laptop/preset/research/rd/
 	name = "research director's laptop"
 	desc = "A portable computer belonging to the research director. The edges are stained and partially melted."
-	_app_preset_name = "research_head"
+	_app_preset_type = /datum/modular_computer_app_presets/research/rd
 
 // Command
 /obj/item/modular_computer/laptop/preset/command/
 	name = "command laptop"
-	_app_preset_name = "command"
+	_app_preset_type = /datum/modular_computer_app_presets/command
 	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/command/hop/
 	name = "head of personnel's laptop"
 	desc = "A portable computer beloning to the head of personnel. The fan is filled with dog hair."
-	_app_preset_name = "command_hop"
+	_app_preset_type = /datum/modular_computer_app_presets/command/hop
 
 /obj/item/modular_computer/laptop/preset/command/captain/
 	name = "captain's laptop"
 	desc = "A portable computer belonging to the captain."
-	_app_preset_name = "captain"
+	_app_preset_type = /datum/modular_computer_app_presets/captain
 
 // Security
 /obj/item/modular_computer/laptop/preset/security/
 	name = "security laptop"
 	desc = "A portable computer belonging to the security department."
-	_app_preset_name = "security"
+	_app_preset_type = /datum/modular_computer_app_presets/security
 	enrolled = 1
 
 /obj/item/modular_computer/laptop/preset/security/hos/
 	name = "head of security's laptop"
 	desc = "A portable computer belonging to the head of security. It smells faintly of gunpowder."
-	_app_preset_name = "security_head"
+	_app_preset_type = /datum/modular_computer_app_presets/security/hos
 
 // Civilian
 /obj/item/modular_computer/laptop/preset/civilian/
-	_app_preset_name = "civilian"
+	_app_preset_type = /datum/modular_computer_app_presets/civilian
 	enrolled = 1
 
 // Supply
 /obj/item/modular_computer/laptop/preset/supply/
 	name = "supply laptop"
 	desc = "A portable computer belonging to cargo."
-	_app_preset_name = "supply"
+	_app_preset_type = /datum/modular_computer_app_presets/supply
 	enrolled = 1
 
 // Representative
 /obj/item/modular_computer/laptop/preset/representative/
 	name = "representative's laptop"
 	desc = "A portable computer belonging to the representative's office."
-	_app_preset_name = "representative"
+	_app_preset_type = /datum/modular_computer_app_presets/representative
 	enrolled = 1
 
 

code/modules/modular_computers/computers/subtypes/preset_tablet.dm

@@ -19,5 +19,5 @@
 
 // Cargo Delivery
 /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery/
-	_app_preset_name = "cargo_delivery"
-	enrolled = 1
+	_app_preset_type = /datum/modular_computer_app_presets/cargo_delivery
+	enrolled = 1

code/modules/modular_computers/computers/subtypes/preset_telescreen.dm

@@ -6,9 +6,9 @@
 	network_card = new/obj/item/computer_hardware/network_card(src)
 
 /obj/item/modular_computer/telescreen/preset/generic/
-	_app_preset_name = "wallgeneric"
+	_app_preset_type = /datum/modular_computer_app_presets/wall_generic
 	enrolled = 1
 
 /obj/item/modular_computer/telescreen/preset/trashcompactor/
-	_app_preset_name = "trashcompactor"
+	_app_preset_type = /datum/modular_computer_app_presets/trashcompactor
 	enrolled = 1

code/modules/modular_computers/file_system/programs/app_presets.dm

@@ -54,7 +54,6 @@
 		new/datum/computer_file/program/rcon_console(),
 		new/datum/computer_file/program/camera_monitor(),
 		new/datum/computer_file/program/lighting_control(),
-		new/datum/computer_file/program/comm(),
 		new/datum/computer_file/program/records/employment()
 	)
 	return _prg_list
@@ -85,7 +84,6 @@
 		new/datum/computer_file/program/chatclient(),
 		new/datum/computer_file/program/civilian/cargoorder(),
 		new/datum/computer_file/program/suit_sensors(),
-		new/datum/computer_file/program/comm(),
 		new/datum/computer_file/program/records/employment(),
 		new/datum/computer_file/program/records/medical()
 	)
@@ -118,8 +116,6 @@
 		new/datum/computer_file/program/civilian/cargoorder(),
 		new/datum/computer_file/program/ntnetmonitor(),
 		new/datum/computer_file/program/aidiag(),
-		//new/datum/computer_file/program/exosuit_monitor(),
-		new/datum/computer_file/program/comm(1),
 		new/datum/computer_file/program/records/employment()
 	)
 	return _prg_list
@@ -152,7 +148,6 @@
 		new/datum/computer_file/program/civilian/cargoorder(),
 		new/datum/computer_file/program/civilian/cargocontrol(),
 		new/datum/computer_file/program/card_mod(),
-		new/datum/computer_file/program/comm(),
 		new/datum/computer_file/program/records/employment(),
 		new/datum/computer_file/program/records/security()
 	)
@@ -193,8 +188,7 @@
 		new/datum/computer_file/program/camera_monitor(),
 		new/datum/computer_file/program/comm(),
 		new/datum/computer_file/program/digitalwarrant(),
-		new/datum/computer_file/program/records/security(),
-		new/datum/computer_file/program/records/employment()
+		new/datum/computer_file/program/records/security()
 	)
 	return _prg_list
 
@@ -220,16 +214,15 @@
 	display_name = "Security - HoS"
 	description = "Contains the most common security programs and command software."
 	available = 0
+
 /datum/modular_computer_app_presets/security/hos/return_install_programs()
 	var/list/_prg_list = list(
 		new/datum/computer_file/program/filemanager(),
 		new/datum/computer_file/program/chatclient(),
 		new/datum/computer_file/program/civilian/cargoorder(),
 		new/datum/computer_file/program/camera_monitor(),
-		new/datum/computer_file/program/comm(),
 		new/datum/computer_file/program/digitalwarrant(),
 		new/datum/computer_file/program/records/security(),
-		new/datum/computer_file/program/comm(1),
 		new/datum/computer_file/program/records/employment()
 	)
 	return _prg_list

code/modules/modular_computers/file_system/programs/command/comm.dm

@@ -3,6 +3,7 @@
 #define STATE_VIEWMESSAGE	3
 #define STATE_STATUSDISPLAY	4
 #define STATE_ALERT_LEVEL	5
+
 /datum/computer_file/program/comm
 	filename = "comm"
 	filedesc = "Command and communications program."
@@ -446,3 +447,9 @@ Command action procs
 	message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1)
 
 	return
+
+#undef STATE_DEFAULT
+#undef STATE_MESSAGELIST
+#undef STATE_VIEWMESSAGE
+#undef STATE_STATUSDISPLAY
+#undef STATE_ALERT_LEVEL

code/modules/research/designs/circuit_designs.dm

@@ -43,24 +43,12 @@
 	build_path = /obj/item/circuitboard/security
 	sort_string = "DAAAA"
 
-/datum/design/circuit/secdata
-	name = "security records console"
-	id = "sec_data"
-	build_path = /obj/item/circuitboard/secure_data
-	sort_string = "DABAA"
-
 /datum/design/circuit/prisonmanage
 	name = "prisoner management console"
 	id = "prisonmanage"
 	build_path = /obj/item/circuitboard/prisoner
 	sort_string = "DACAA"
 
-/datum/design/circuit/med_data
-	name = "medical records console"
-	id = "med_data"
-	build_path = /obj/item/circuitboard/med_data
-	sort_string = "FAAAA"
-
 /datum/design/circuit/sentencing
 	name = "criminal sentencing console"
 	id = "sentencing"
@@ -79,13 +67,6 @@
 	build_path = /obj/item/circuitboard/pandemic
 	sort_string = "FAEAA"
 
-/datum/design/circuit/crewconsole
-	name = "crew monitoring console"
-	id = "crewconsole"
-	req_tech = list(TECH_DATA = 3, TECH_MAGNET = 2, TECH_BIO = 2)
-	build_path = /obj/item/circuitboard/crew
-	sort_string = "FAGAI"
-
 /datum/design/circuit/teleconsole
 	name = "teleporter control console"
 	id = "teleconsole"
@@ -423,12 +404,6 @@
 	build_path = /obj/item/circuitboard/biogenerator
 	sort_string = "KBAAA"
 
-/datum/design/circuit/emp_data
-	name = "employment records console"
-	id = "emp_data"
-	build_path = /obj/item/circuitboard/skills
-	sort_string = "LAAAC"
-
 /datum/design/circuit/shield
 	req_tech = list(TECH_BLUESPACE = 4, TECH_PHORON = 3)
 	materials = list("glass" = 2000, "gold" = 1000)
@@ -576,4 +551,4 @@
 	id = "hacker_rig_target"
 	req_tech = list(TECH_DATA = 6, TECH_COMBAT = 3, TECH_ILLEGAL = 3)
 	build_path = /obj/item/circuitboard/rig_assembly/illegal/targeting/hacker
-	sort_string = "WAAAP"
+	sort_string = "WAAAP"

html/changelogs/skull132_records-mapping.yml

@@ -0,0 +1,8 @@
+author: Skull132
+
+delete-after: True
+
+changes:
+  - maptweak: "All CMCs are replaced with medical preset computers."
+  - maptweak: "Replaced all records computers with modular computers. All heads of staff get their job specific version with employment records too."
+  - maptweak: "Gave all heads of staff a command laptop with employment records."

maps/aurora/aurora-1_centcomm.dmm

@@ -6672,7 +6672,7 @@
 /turf/simulated/wall/shuttle/dark/cardinal,
 /area/shuttle/administration/centcom)
 "aqH" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/shuttle/dark_red,
 /area/shuttle/administration/centcom)
 "aqI" = (
@@ -6691,7 +6691,7 @@
 /turf/simulated/floor/shuttle/dark_red,
 /area/shuttle/administration/centcom)
 "aqL" = (
-/obj/machinery/computer/records/medical,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/shuttle/dark_red,
 /area/shuttle/administration/centcom)
 "aqM" = (
@@ -6859,10 +6859,6 @@
 	icon_state = "floor6"
 	},
 /area/shuttle/administration/centcom)
-"arp" = (
-/obj/machinery/computer/crew,
-/turf/simulated/floor/shuttle/dark_red,
-/area/shuttle/administration/centcom)
 "arq" = (
 /obj/structure/bed/chair{
 	dir = 8
@@ -10307,12 +10303,6 @@
 /obj/item/storage/box/drinkingglasses,
 /turf/simulated/floor/shuttle/red,
 /area/skipjack_station/start)
-"azs" = (
-/obj/machinery/computer/crew,
-/turf/unsimulated/floor{
-	icon_state = "floor"
-	},
-/area/centcom/control)
 "azt" = (
 /turf/unsimulated/floor{
 	icon_state = "bluecorner";
@@ -10678,7 +10668,7 @@
 	},
 /area/centcom/control)
 "aAd" = (
-/obj/machinery/computer/records/medical,
+/obj/item/modular_computer/console/preset/medical,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -10919,7 +10909,7 @@
 	},
 /area/centcom/control)
 "aAD" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -11813,11 +11803,11 @@
 /turf/unsimulated/floor,
 /area/centcom/holding)
 "aCn" = (
-/obj/machinery/computer/records/security,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "red"
@@ -12313,12 +12303,12 @@
 	},
 /area/centcom/holding)
 "aDz" = (
-/obj/machinery/computer/records/security,
 /obj/machinery/camera/network/crescent{
 	c_tag = "Crescent Arrivals North";
 	dir = 8
 	},
 /obj/structure/sign/christmas/lights,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -12386,11 +12376,6 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop";
-	pixel_x = 3;
-	pixel_y = 4
-	},
 /obj/structure/window/reinforced,
 /turf/unsimulated/floor{
 	icon_state = "floor"
@@ -13069,7 +13054,6 @@
 /turf/simulated/floor/holofloor/wood,
 /area/holodeck/source_battlemonsters)
 "aFn" = (
-/obj/machinery/computer/records/medical,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -13116,7 +13100,7 @@
 	},
 /area/centcom/holding)
 "aFq" = (
-/obj/item/modular_computer/console/preset/captain,
+/obj/item/modular_computer/console/preset/command/captain,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 1
@@ -13138,7 +13122,6 @@
 /turf/simulated/floor/shuttle/red,
 /area/shuttle/escape/centcom)
 "aFt" = (
-/obj/machinery/computer/records/security,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -13190,10 +13173,6 @@
 	},
 /area/centcom/holding)
 "aFz" = (
-/obj/structure/bed/chair/office/bridge{
-	icon_state = "bridge";
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	icon_state = "rwindow";
 	dir = 4
@@ -13329,10 +13308,6 @@
 	},
 /area/centcom/holding)
 "aFO" = (
-/obj/structure/bed/chair/office/bridge{
-	icon_state = "bridge";
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -17582,6 +17557,10 @@
 /area/skipjack_station/start)
 "aPi" = (
 /obj/structure/window/reinforced,
+/obj/structure/bed/chair/office/bridge{
+	icon_state = "bridge";
+	dir = 1
+	},
 /turf/simulated/floor/shuttle/white,
 /area/shuttle/escape/centcom)
 "aPj" = (
@@ -18349,7 +18328,7 @@
 	},
 /area/centcom/spawning)
 "aQT" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -20521,8 +20500,8 @@
 /turf/simulated/floor/shuttle/white,
 /area/shuttle/escape/centcom)
 "aVZ" = (
-/obj/machinery/computer/records/security,
 /obj/structure/sign/christmas/lights,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -20715,11 +20694,11 @@
 	},
 /area/centcom/checkpoint/aft)
 "aWz" = (
-/obj/machinery/computer/records/security,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 1
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -25369,11 +25348,11 @@
 /area/centcom/legion/hangar5)
 "iIs" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 1
 	},
+/obj/item/modular_computer/laptop/preset/command,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -65367,7 +65346,7 @@ aqC
 aqL
 aqT
 aqU
-arp
+aqL
 aqG
 aqG
 aqG
@@ -71565,7 +71544,7 @@ avh
 ayf
 ayw
 ayU
-azs
+aAd
 avh
 aAd
 aAq

maps/aurora/aurora-3_sublevel.dmm

@@ -29744,7 +29744,6 @@
 /area/mine/unexplored)
 "eCB" = (
 /obj/effect/floor_decal/corner/white/diagonal,
-/obj/machinery/computer/crew,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 1
@@ -30634,18 +30633,17 @@
 /turf/simulated/floor/plating,
 /area/medical/patient_wing_post2)
 "gut" = (
-/obj/structure/table/standard,
 /obj/machinery/light{
 	dir = 8;
 	icon_state = "tube1";
 	pixel_y = 0
 	},
 /obj/effect/floor_decal/corner/grey/diagonal,
-/obj/machinery/computer/records/medical/laptop,
 /obj/machinery/light_switch{
 	pixel_x = -22;
 	pixel_y = 8
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing_post1)
 "gyi" = (
@@ -31460,8 +31458,6 @@
 /obj/machinery/door/firedoor,
 /obj/structure/disposalpipe/segment,
 /obj/structure/window/reinforced,
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/item/device/radio{
 	anchored = 1;
 	broadcasting = 0;
@@ -31482,6 +31478,7 @@
 	name = "Quarantine Processing Shutters";
 	opacity = 0
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/dark,
 /area/medical/quarantineaccess)
 "iIQ" = (
@@ -31814,12 +31811,11 @@
 /area/medical/patient_wing_post2)
 "jkR" = (
 /obj/effect/floor_decal/corner/white/diagonal,
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 1
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/patient_wing_post2)
 "jlY" = (
@@ -31953,8 +31949,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/engineering/backup_SMES)
 "jMg" = (
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/effect/floor_decal/corner/lime/full{
 	icon_state = "corner_white_full";
 	dir = 1
@@ -31965,6 +31959,7 @@
 	pixel_x = 24;
 	req_one_access = list(24,11,55)
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/virologytesting)
 "jMR" = (
@@ -82925,7 +82920,7 @@ aJA
 aKB
 gsX
 eCB
-oUd
+nTr
 nTr
 aRD
 aaa

maps/aurora/aurora-4_mainlevel.dmm

@@ -8605,7 +8605,6 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/machinery/computer/records/medical/laptop,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aqW" = (
@@ -9454,7 +9453,6 @@
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aso" = (
-/obj/machinery/computer/records/medical,
 /obj/effect/floor_decal/corner/lime{
 	dir = 6
 	},
@@ -9462,6 +9460,7 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "asp" = (
@@ -10432,12 +10431,12 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/item/modular_computer/console/preset/medical,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
 	icon_state = "4-8"
 	},
+/obj/item/modular_computer/console/preset/command,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "atI" = (
@@ -13363,18 +13362,6 @@
 	},
 /turf/simulated/floor/plating,
 /area/bridge)
-"ayD" = (
-/obj/machinery/computer/records/security,
-/obj/effect/floor_decal/corner/blue{
-	icon_state = "corner_white";
-	dir = 9
-	},
-/obj/effect/floor_decal/corner/blue{
-	icon_state = "corner_white";
-	dir = 6
-	},
-/turf/simulated/floor/tiled,
-/area/bridge)
 "ayE" = (
 /obj/effect/floor_decal/corner/blue{
 	icon_state = "corner_white";
@@ -14778,7 +14765,7 @@
 	icon_state = "corner_white";
 	dir = 6
 	},
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aBb" = (
@@ -15032,12 +15019,6 @@
 /area/lawoffice)
 "aBu" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment{
-	density = 0;
-	icon_state = "medlaptop";
-	pixel_y = 4;
-	req_one_access = list(19,38)
-	},
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 1
@@ -16209,9 +16190,6 @@
 /area/crew_quarters/captain)
 "aDw" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 4;
@@ -16221,6 +16199,7 @@
 	icon_state = "xmaslights";
 	dir = 1
 	},
+/obj/item/modular_computer/laptop/preset/command/captain,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain)
 "aDx" = (
@@ -16888,7 +16867,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "aEx" = (
-/obj/machinery/computer/records/security,
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "aEy" = (
@@ -20120,7 +20098,6 @@
 /turf/simulated/floor/plating,
 /area/security/brig)
 "aJF" = (
-/obj/machinery/computer/records/security,
 /obj/structure/cable/green{
 	d1 = 1;
 	d2 = 2;
@@ -20138,6 +20115,7 @@
 	icon_state = "xmaslights";
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aJG" = (
@@ -22268,7 +22246,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/ai_monitored/storage/eva)
 "aNe" = (
-/obj/machinery/computer/records/security,
 /obj/structure/sign/goldenplaque{
 	pixel_x = -32
 	},
@@ -22281,6 +22258,7 @@
 	c_tag = "Security - Head of Security's Office";
 	dir = 4
 	},
+/obj/item/modular_computer/console/preset/security/hos,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hos)
 "aNf" = (
@@ -22937,7 +22915,7 @@
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain)
 "aOn" = (
-/obj/item/modular_computer/console/preset/captain,
+/obj/item/modular_computer/console/preset/command/captain,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/captain)
 "aOo" = (
@@ -23262,7 +23240,7 @@
 /area/crew_quarters/heads/hos)
 "aOS" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment,
+/obj/item/modular_computer/laptop/preset/security/hos,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "aOT" = (
@@ -24083,7 +24061,7 @@
 	d2 = 2;
 	icon_state = "1-2"
 	},
-/obj/machinery/computer/records/employment,
+/obj/item/modular_computer/laptop/preset/engineering/ce,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/chief)
 "aQi" = (
@@ -25972,10 +25950,10 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/chief)
 "aTj" = (
-/obj/item/modular_computer/console/preset/engineering,
 /obj/machinery/light_switch{
 	pixel_y = -28
 	},
+/obj/item/modular_computer/console/preset/engineering/ce,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/chief)
 "aTk" = (
@@ -26839,11 +26817,11 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "aUy" = (
-/obj/machinery/computer/records/security,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/command/hop,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop)
 "aUz" = (
@@ -27601,11 +27579,11 @@
 /area/hallway/primary/starboard)
 "aVG" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/employment,
 /obj/structure/sign/christmas/lights{
 	icon_state = "xmaslights";
 	dir = 8
 	},
+/obj/item/modular_computer/laptop/preset/command/hop,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/hop)
 "aVH" = (
@@ -30744,7 +30722,6 @@
 /area/crew_quarters/heads/hop)
 "bba" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hop)
 "bbb" = (
@@ -32741,18 +32718,10 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/secure_data{
-	pixel_x = -2;
-	pixel_y = 2
-	},
 /obj/item/circuitboard/security{
 	pixel_x = 1;
 	pixel_y = -1
 	},
-/obj/item/circuitboard/skills{
-	pixel_x = 4;
-	pixel_y = -3
-	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "beB" = (
@@ -33135,7 +33104,7 @@
 /area/medical/icu)
 "bff" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/carpet/blue,
 /area/medical/exam_room{
 	name = "\improper Medical - Exam Room 2"
@@ -34403,14 +34372,6 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/crew{
-	pixel_x = -1;
-	pixel_y = 1
-	},
-/obj/item/circuitboard/crew{
-	pixel_x = -1;
-	pixel_y = 1
-	},
 /obj/item/circuitboard/arcade/battle,
 /obj/item/circuitboard/arcade/orion_trail,
 /turf/simulated/floor/plating,
@@ -34425,10 +34386,6 @@
 	},
 /obj/item/circuitboard/clonescanner,
 /obj/item/circuitboard/clonepod,
-/obj/item/circuitboard/med_data{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "bhk" = (
@@ -34697,10 +34654,10 @@
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/structure/sign/nosmoking_1{
 	pixel_y = 32
 	},
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/reception)
 "bhE" = (
@@ -34745,12 +34702,12 @@
 /area/medical/pharmacy)
 "bhG" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/machinery/firealarm/south,
 /obj/effect/floor_decal/corner/beige{
 	icon_state = "corner_white";
 	dir = 10
 	},
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/pharmacy)
 "bhH" = (
@@ -35770,11 +35727,11 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "bjr" = (
-/obj/machinery/computer/records/medical,
 /obj/effect/floor_decal/corner/paleblue{
 	icon_state = "corner_white";
 	dir = 5
 	},
+/obj/item/modular_computer/console/preset/medical/cmo,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "bjs" = (
@@ -37207,7 +37164,6 @@
 /area/crew_quarters/heads/cmo)
 "blH" = (
 /obj/structure/table/glass,
-/obj/machinery/computer/records/employment,
 /obj/effect/floor_decal/corner/paleblue{
 	icon_state = "corner_white";
 	dir = 6
@@ -37217,6 +37173,7 @@
 	icon_state = "tube1";
 	pixel_x = 0
 	},
+/obj/item/modular_computer/laptop/preset/medical/cmo,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "blI" = (
@@ -39929,8 +39886,8 @@
 	name = "\improper Medical - Exam Room 1"
 	})
 "bpH" = (
-/obj/machinery/computer/records/medical/laptop,
 /obj/structure/table/standard,
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/carpet/blue,
 /area/medical/exam_room{
 	name = "\improper Medical - Exam Room 1"
@@ -40498,7 +40455,7 @@
 	},
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/reception)
 "bqC" = (
@@ -40519,15 +40476,14 @@
 /area/medical/reception)
 "bqD" = (
 /obj/effect/floor_decal/corner/white/diagonal,
-/obj/machinery/computer/crew,
 /obj/structure/window/reinforced,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/reception)
 "bqE" = (
 /obj/structure/window/reinforced,
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/machinery/light{
 	dir = 4;
 	icon_state = "tube1";
@@ -40537,6 +40493,7 @@
 	icon_state = "xmaslights";
 	dir = 4
 	},
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/reception)
 "bqF" = (
@@ -46833,7 +46790,7 @@
 	pixel_x = 0;
 	pixel_y = -24
 	},
-/obj/machinery/computer/crew,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/dark,
 /area/medical/emt)
 "bBc" = (
@@ -47020,9 +46977,7 @@
 /area/rnd/rdoffice)
 "bBz" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
+/obj/item/modular_computer/laptop/preset/research/rd,
 /turf/simulated/floor/carpet/blue,
 /area/rnd/rdoffice)
 "bBA" = (
@@ -67608,13 +67563,6 @@
 /area/maintenance/vault)
 "maP" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment{
-	density = 0;
-	icon_state = "medlaptop";
-	pixel_x = 1;
-	pixel_y = 6;
-	req_one_access = list(19,38)
-	},
 /obj/machinery/button/remote/airlock{
 	id = "rep_office";
 	name = "Office Door Control";
@@ -67630,6 +67578,7 @@
 	req_access = list(38);
 	specialfunctions = 4
 	},
+/obj/item/modular_computer/laptop/preset/representative,
 /turf/simulated/floor/carpet,
 /area/lawoffice)
 "mbc" = (
@@ -67714,6 +67663,17 @@
 /obj/item/paper,
 /turf/simulated/floor/tiled/white,
 /area/maintenance/research_port)
+"mjl" = (
+/obj/effect/floor_decal/corner/blue{
+	icon_state = "corner_white";
+	dir = 9
+	},
+/obj/effect/floor_decal/corner/blue{
+	icon_state = "corner_white";
+	dir = 6
+	},
+/turf/simulated/floor/tiled,
+/area/bridge)
 "mlB" = (
 /turf/simulated/floor/tiled/white,
 /area/assembly/robotics_cyborgification)
@@ -116939,8 +116899,8 @@ aqP
 ash
 atx
 avi
+mjl
 awM
-ayD
 aAa
 aBx
 aBx

maps/aurora/aurora-5_interstitial.dmm

@@ -2159,11 +2159,7 @@
 /turf/simulated/floor/plating,
 /area/security/detectives_office)
 "eD" = (
-/obj/machinery/computer/records/medical,
-/turf/simulated/floor/lino,
-/area/security/detectives_office)
-"eE" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/lino,
 /area/security/detectives_office)
 "eF" = (
@@ -4174,7 +4170,6 @@
 /area/maintenance/interstitial_cargo)
 "im" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -4928,8 +4923,6 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/psych)
 "jH" = (
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/effect/floor_decal/corner/green/full{
 	icon_state = "corner_white_full";
 	dir = 1
@@ -4937,6 +4930,7 @@
 /obj/machinery/alarm{
 	pixel_y = 24
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/psych)
 "jI" = (
@@ -5087,12 +5081,11 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/psych)
 "jT" = (
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/effect/floor_decal/corner/green{
 	icon_state = "corner_white_full";
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/psych)
 "jU" = (
@@ -6028,7 +6021,11 @@
 	pixel_y = 32
 	},
 /obj/structure/table/wood,
-/obj/machinery/computer/records/medical/laptop,
+/obj/item/book/manual/psych,
+/obj/item/paper_bin{
+	pixel_x = 4;
+	pixel_y = 7
+	},
 /turf/simulated/floor/carpet,
 /area/medical/psych)
 "lx" = (
@@ -6090,16 +6087,11 @@
 /turf/simulated/floor/carpet,
 /area/medical/psych)
 "lC" = (
-/obj/structure/table/wood,
-/obj/item/book/manual/psych,
-/obj/item/paper_bin{
-	pixel_x = 4;
-	pixel_y = 7
-	},
 /obj/machinery/light_switch{
 	pixel_x = 26;
 	pixel_y = -2
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/carpet,
 /area/medical/psych)
 "lD" = (
@@ -7142,6 +7134,7 @@
 	c_tag = "Security - Forensics Autopsy Chamber";
 	dir = 1
 	},
+/obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -7185,12 +7178,11 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "qu" = (
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/effect/floor_decal/corner/pink{
 	icon_state = "corner_white";
 	dir = 9
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "qz" = (
@@ -11749,13 +11741,13 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/machinery/computer/records/security,
 /obj/machinery/requests_console{
 	department = "Forensic Technician";
 	departmentType = 5;
 	pixel_x = -32;
 	pixel_y = 0
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
 "Pm" = (
@@ -12767,7 +12759,7 @@
 	icon_state = "corner_white";
 	dir = 9
 	},
-/obj/machinery/computer/records/medical,
+/obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
 "Uq" = (
@@ -48744,7 +48736,7 @@ dW
 eg
 ep
 ev
-eE
+fo
 eQ
 fb
 fl

maps/aurora/aurora-6_surface.dmm

@@ -6467,9 +6467,6 @@
 /area/security/checkpoint2)
 "lq" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -6537,9 +6534,6 @@
 /area/security/checkpoint2)
 "lu" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/structure/window/reinforced{
 	dir = 1
 	},
@@ -6866,7 +6860,6 @@
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "lW" = (
-/obj/machinery/computer/records/security,
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -6875,6 +6868,7 @@
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "lX" = (
@@ -6891,10 +6885,10 @@
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "lY" = (
-/obj/machinery/computer/records/security,
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "lZ" = (

maps/exodus/exodus-1_station.dmm

@@ -1485,14 +1485,6 @@
 /obj/structure/cable/green,
 /turf/simulated/floor/plating,
 /area/security/main)
-"acK" = (
-/obj/machinery/computer/records/security,
-/obj/effect/floor_decal/corner/blue{
-	icon_state = "corner_white";
-	dir = 8
-	},
-/turf/simulated/floor/tiled,
-/area/security/main)
 "acL" = (
 /obj/effect/floor_decal/corner/blue{
 	icon_state = "corner_white";
@@ -4409,9 +4401,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/obj/machinery/computer/records/employment{
-	pixel_y = 4
-	},
+/obj/item/modular_computer/laptop/preset/security/hos,
 /turf/simulated/floor/carpet,
 /area/crew_quarters/heads/hos)
 "aih" = (
@@ -4603,10 +4593,10 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "aiC" = (
-/obj/machinery/computer/records/security,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "aiD" = (
@@ -4929,7 +4919,6 @@
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "ajf" = (
-/obj/machinery/computer/records/security,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 9
 	},
@@ -4937,6 +4926,7 @@
 	dir = 9;
 	pixel_y = 0
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "ajg" = (
@@ -4951,7 +4941,7 @@
 	pixel_x = 0;
 	pixel_y = -30
 	},
-/obj/item/modular_computer/console/preset/security,
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled/dark,
 /area/security/warden)
 "ajh" = (
@@ -5108,7 +5098,7 @@
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hos)
 "ajv" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security/hos,
 /turf/simulated/floor/tiled/dark,
 /area/crew_quarters/heads/hos)
 "ajw" = (
@@ -6363,7 +6353,6 @@
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
 "als" = (
-/obj/machinery/computer/records/medical,
 /obj/effect/floor_decal/corner/blue{
 	icon_state = "corner_white";
 	dir = 6
@@ -6373,6 +6362,7 @@
 	pixel_x = 28;
 	pixel_y = 12
 	},
+/obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
 "alu" = (
@@ -6570,11 +6560,11 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/computer/records/security,
 /obj/effect/floor_decal/corner/blue/full{
 	icon_state = "corner_white_full";
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/security/brig)
 "alN" = (
@@ -6787,7 +6777,6 @@
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
 "amd" = (
-/obj/machinery/computer/records/security,
 /obj/effect/floor_decal/corner/blue{
 	icon_state = "corner_white";
 	dir = 6
@@ -6805,6 +6794,7 @@
 	icon_state = "tube1";
 	dir = 4
 	},
+/obj/structure/table/standard,
 /turf/simulated/floor/tiled,
 /area/security/forensics_office)
 "amf" = (
@@ -7070,11 +7060,7 @@
 /turf/simulated/wall,
 /area/lawoffice)
 "amG" = (
-/obj/machinery/computer/records/medical,
-/turf/simulated/floor/lino,
-/area/security/detectives_office)
-"amH" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/lino,
 /area/security/detectives_office)
 "amI" = (
@@ -15986,7 +15972,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/security/checkpoint2)
 "aDD" = (
-/obj/machinery/computer/records/security,
 /obj/effect/floor_decal/corner/blue{
 	dir = 5
 	},
@@ -17520,9 +17505,6 @@
 /area/security/checkpoint2)
 "aGs" = (
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/effect/floor_decal/corner/blue{
 	dir = 10
 	},
@@ -24690,7 +24672,7 @@
 	icon_state = "corner_white";
 	dir = 5
 	},
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aTR" = (
@@ -24698,7 +24680,6 @@
 	icon_state = "corner_white_full";
 	dir = 1
 	},
-/obj/item/modular_computer/console/preset/security,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aTS" = (
@@ -25351,12 +25332,7 @@
 /area/journalistoffice)
 "aVj" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment{
-	density = 0;
-	icon_state = "medlaptop";
-	pixel_y = 4;
-	req_one_access = list(19,38)
-	},
+/obj/item/modular_computer/laptop/preset/representative,
 /turf/simulated/floor/carpet,
 /area/lawoffice)
 "aVk" = (
@@ -26401,13 +26377,6 @@
 /area/lawoffice)
 "aWZ" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment{
-	density = 0;
-	icon_state = "medlaptop";
-	pixel_x = 1;
-	pixel_y = 6;
-	req_one_access = list(19,38)
-	},
 /obj/structure/cable/green{
 	d1 = 4;
 	d2 = 8;
@@ -26515,15 +26484,14 @@
 	dir = 8
 	},
 /obj/structure/table/reinforced,
-/obj/machinery/computer/records/medical/laptop,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aXl" = (
-/obj/machinery/computer/records/medical,
 /obj/effect/floor_decal/corner/lime{
 	icon_state = "corner_white";
 	dir = 5
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled,
 /area/bridge)
 "aXm" = (
@@ -26532,7 +26500,6 @@
 	dir = 4
 	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
-/obj/item/modular_computer/console/preset/medical,
 /obj/effect/floor_decal/corner/lime/full{
 	icon_state = "corner_white_full";
 	dir = 1
@@ -34433,10 +34400,8 @@
 /area/crew_quarters/captain)
 "blF" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/item/hand_tele,
+/obj/item/modular_computer/laptop/preset/command/captain,
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "blG" = (
@@ -36081,7 +36046,7 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "boE" = (
-/obj/item/modular_computer/console/preset/captain,
+/obj/item/modular_computer/console/preset/command/captain,
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "boF" = (
@@ -38282,7 +38247,6 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
-/obj/machinery/computer/records/medical/laptop,
 /obj/structure/table/standard{
 	name = "plastic table frame"
 	},
@@ -38290,6 +38254,7 @@
 	icon_state = "corner_white";
 	dir = 5
 	},
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/reception)
 "bsE" = (
@@ -39290,7 +39255,6 @@
 /turf/simulated/floor/tiled,
 /area/medical/exam_room)
 "buu" = (
-/obj/machinery/computer/records/medical/laptop,
 /obj/item/device/radio/intercom{
 	dir = 1;
 	name = "Station Intercom (General)";
@@ -39299,13 +39263,11 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 8
 	},
-/obj/structure/table/standard{
-	name = "plastic table frame"
-	},
 /obj/effect/floor_decal/corner/white/diagonal{
 	icon_state = "corner_white_diagonal";
 	dir = 4
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled,
 /area/medical/exam_room)
 "buv" = (
@@ -40023,9 +39985,6 @@
 /turf/simulated/floor/tiled,
 /area/hallway/primary/central_three)
 "bvB" = (
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
@@ -40044,6 +40003,7 @@
 	icon_state = "corner_white_full";
 	dir = 8
 	},
+/obj/item/modular_computer/laptop/preset/command/hop,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "bvC" = (
@@ -40287,8 +40247,7 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/psych)
 "bvX" = (
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/psych)
 "bvY" = (
@@ -41784,8 +41743,8 @@
 /turf/simulated/floor/plating,
 /area/crew_quarters/heads/hop)
 "byL" = (
-/obj/item/modular_computer/console/preset/command,
 /obj/effect/floor_decal/corner/blue/full,
+/obj/item/modular_computer/console/preset/command/hop,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hop)
 "byM" = (
@@ -45851,16 +45810,15 @@
 /area/medical/psych)
 "bFN" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/medical/laptop,
+/obj/item/book/manual/psych,
 /turf/simulated/floor/carpet/blue,
 /area/medical/psych)
 "bFO" = (
-/obj/structure/table/wood,
-/obj/item/book/manual/psych,
 /obj/machinery/light{
 	dir = 1;
 	icon_state = "tube1"
 	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/carpet/blue,
 /area/medical/psych)
 "bFP" = (
@@ -46868,13 +46826,11 @@
 /area/rnd/research)
 "bHt" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
 /obj/effect/floor_decal/corner/white/diagonal{
 	icon_state = "corner_white_diagonal";
 	dir = 4
 	},
+/obj/item/modular_computer/laptop/preset/research/rd,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/hor)
 "bHu" = (
@@ -51613,9 +51569,6 @@
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "bPT" = (
-/obj/machinery/computer/records/employment{
-	pixel_y = 4
-	},
 /obj/item/device/megaphone,
 /obj/structure/table/glass,
 /turf/simulated/floor/tiled/white,
@@ -51640,12 +51593,9 @@
 	icon_state = "alarm0";
 	pixel_x = 24
 	},
-/obj/machinery/computer/records/medical/laptop{
-	pixel_x = 3;
-	pixel_y = 4
-	},
 /obj/structure/table/glass,
 /obj/effect/floor_decal/corner/paleblue,
+/obj/item/modular_computer/laptop/preset/medical/cmo,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "bPW" = (
@@ -53236,7 +53186,7 @@
 	icon_state = "corner_white_full";
 	dir = 4
 	},
-/obj/item/modular_computer/console/preset/medical,
+/obj/item/modular_computer/console/preset/medical/cmo,
 /turf/simulated/floor/tiled/white,
 /area/crew_quarters/heads/cmo)
 "bSO" = (
@@ -53700,10 +53650,6 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/med_data{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "bTM" = (
@@ -53711,18 +53657,10 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/secure_data{
-	pixel_x = -2;
-	pixel_y = 2
-	},
 /obj/item/circuitboard/security{
 	pixel_x = 1;
 	pixel_y = -1
 	},
-/obj/item/circuitboard/skills{
-	pixel_x = 4;
-	pixel_y = -3
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -54068,11 +54006,11 @@
 /area/medical/psych)
 "bUl" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/pink/full,
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_a)
 "bUm" = (
@@ -54110,11 +54048,11 @@
 /area/medical/patient_a)
 "bUo" = (
 /obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 4
 	},
 /obj/effect/floor_decal/corner/pink/full,
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_b)
 "bUp" = (
@@ -56899,9 +56837,7 @@
 	pixel_x = 0;
 	pixel_y = 27
 	},
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop"
-	},
+/obj/item/modular_computer/laptop/preset/engineering/ce,
 /turf/simulated/floor/tiled,
 /area/crew_quarters/heads/chief)
 "bZq" = (
@@ -59534,11 +59470,7 @@
 /obj/machinery/newscaster{
 	pixel_x = 30
 	},
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop{
-	pixel_x = 3;
-	pixel_y = 4
-	},
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing_hallway)
 "ceh" = (
@@ -65161,8 +65093,8 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
 "cou" = (
-/obj/machinery/computer/records/medical,
 /obj/machinery/light,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery)
 "cov" = (
@@ -65180,8 +65112,8 @@
 /turf/simulated/floor/plating,
 /area/engineering/storage)
 "cow" = (
-/obj/machinery/computer/records/medical,
 /obj/machinery/light,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/surgery2)
 "cox" = (
@@ -70556,9 +70488,9 @@
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "cyk" = (
-/obj/machinery/computer/records/medical/laptop,
 /obj/structure/disposalpipe/segment,
 /obj/structure/table/glass,
+/obj/item/modular_computer/laptop/preset/medical,
 /turf/simulated/floor/tiled/white,
 /area/medical/virology)
 "cyl" = (
@@ -77850,8 +77782,7 @@
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
 "eeJ" = (
-/obj/structure/table/standard,
-/obj/machinery/computer/records/medical/laptop,
+/obj/item/modular_computer/console/preset/security/investigations,
 /turf/simulated/floor/tiled/dark{
 	name = "cooled dark floor";
 	temperature = 278
@@ -79400,6 +79331,10 @@
 	},
 /turf/simulated/floor/plating,
 /area/hallway/secondary/exit)
+"rru" = (
+/obj/item/modular_computer/console/preset/engineering/ce,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/heads/chief)
 "rry" = (
 /obj/structure/cable/green{
 	d1 = 4;
@@ -107284,7 +107219,7 @@ bTK
 bUU
 bWs
 bNQ
-bZo
+rru
 caD
 cbY
 cdu
@@ -110300,7 +110235,7 @@ ajT
 akx
 alk
 alW
-amH
+xXA
 anq
 anX
 aoS
@@ -111309,7 +111244,7 @@ aaC
 aaV
 aaC
 acj
-acK
+acL
 add
 adv
 adK
@@ -111566,7 +111501,7 @@ aaS
 abh
 abC
 acl
-acL
+afI
 acO
 acO
 adL

maps/exodus/exodus-2_centcomm.dmm

@@ -3739,7 +3739,7 @@
 	},
 /area/centcom/evac)
 "akM" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/shuttle.dmi';
 	icon_state = "floor4"
@@ -3778,7 +3778,7 @@
 	},
 /area/centcom/evac)
 "akS" = (
-/obj/machinery/computer/crew,
+/obj/item/modular_computer/console/preset/medical,
 /turf/unsimulated/floor{
 	icon = 'icons/turf/shuttle.dmi';
 	icon_state = "floor"
@@ -8525,7 +8525,6 @@
 	},
 /area/centcom/living)
 "azf" = (
-/obj/machinery/computer/records/medical,
 /obj/structure/window/reinforced{
 	dir = 4
 	},
@@ -8536,7 +8535,7 @@
 /turf/simulated/floor/shuttle/white,
 /area/shuttle/escape/centcom)
 "azg" = (
-/obj/item/modular_computer/console/preset/captain,
+/obj/item/modular_computer/console/preset/command/captain,
 /turf/simulated/floor/shuttle{
 	icon_state = "floor4"
 	},
@@ -8647,10 +8646,6 @@
 /turf/simulated/floor/shuttle/white,
 /area/shuttle/escape/centcom)
 "azw" = (
-/obj/structure/bed/chair/office/bridge{
-	icon_state = "bridge";
-	dir = 1
-	},
 /obj/structure/window/reinforced{
 	icon_state = "rwindow";
 	dir = 4
@@ -8664,20 +8659,6 @@
 "azx" = (
 /turf/simulated/floor/shuttle,
 /area/shuttle/escape/centcom)
-"azy" = (
-/obj/structure/bed/chair/office/bridge{
-	icon_state = "bridge";
-	dir = 1
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/floor_decal/spline/plain{
-	icon_state = "spline_plain";
-	dir = 8
-	},
-/turf/simulated/floor/shuttle/white,
-/area/shuttle/escape/centcom)
 "azz" = (
 /turf/unsimulated/floor{
 	icon_state = "asteroid"
@@ -9058,6 +9039,10 @@
 /area/shuttle/escape/centcom)
 "aAG" = (
 /obj/structure/window/reinforced,
+/obj/structure/bed/chair/office/bridge{
+	icon_state = "bridge";
+	dir = 1
+	},
 /turf/simulated/floor/shuttle/white,
 /area/shuttle/escape/centcom)
 "aAH" = (
@@ -13748,12 +13733,8 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
-/obj/machinery/computer/records/employment{
-	icon_state = "medlaptop";
-	pixel_x = 3;
-	pixel_y = 4
-	},
 /obj/structure/window/reinforced,
+/obj/item/modular_computer/laptop/preset/command,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -14055,7 +14036,7 @@
 	},
 /area/centcom/holding)
 "aPi" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "red"
@@ -14344,7 +14325,7 @@
 	},
 /area/centcom/control)
 "aPQ" = (
-/obj/machinery/computer/crew,
+/obj/item/modular_computer/console/preset/medical,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -15721,11 +15702,11 @@
 	},
 /area/centcom/holding)
 "aSU" = (
-/obj/machinery/computer/records/security,
 /obj/machinery/camera/network/crescent{
 	c_tag = "Crescent Arrivals North";
 	dir = 8
 	},
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -16180,14 +16161,8 @@
 /obj/effect/wingrille_spawn/reinforced/crescent,
 /turf/unsimulated/floor,
 /area/centcom/control)
-"aTS" = (
-/obj/machinery/computer/security,
-/turf/unsimulated/floor{
-	icon_state = "floor"
-	},
-/area/centcom/control)
 "aTT" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -17785,12 +17760,6 @@
 	icon_state = "engine"
 	},
 /area/centcom/control)
-"aXp" = (
-/obj/machinery/computer/records/medical,
-/turf/unsimulated/floor{
-	icon_state = "floor"
-	},
-/area/centcom/control)
 "aXq" = (
 /turf/unsimulated/floor{
 	icon_state = "green";
@@ -19510,7 +19479,7 @@
 /area/tdome)
 "egp" = (
 /obj/structure/table/wood,
-/obj/machinery/computer/records/employment,
+/obj/item/modular_computer/laptop/preset/command,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -19800,7 +19769,7 @@
 	},
 /area/centcom/legion)
 "fok" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -21317,7 +21286,6 @@
 /turf/simulated/floor/tiled/dark,
 /area/centcom/legion)
 "lQh" = (
-/obj/machinery/computer/records/security,
 /obj/structure/window/reinforced{
 	dir = 8
 	},
@@ -22702,7 +22670,7 @@
 	},
 /area/space)
 "tcD" = (
-/obj/machinery/computer/records/security,
+/obj/item/modular_computer/console/preset/security,
 /turf/unsimulated/floor{
 	icon_state = "floor"
 	},
@@ -58542,7 +58510,7 @@ aTH
 aPI
 aMn
 aSH
-aTS
+aTT
 aXP
 aRF
 aUv
@@ -59054,7 +59022,7 @@ aXP
 aOK
 aPQ
 aUv
-aXp
+aPQ
 aZK
 aZp
 aZp
@@ -64463,7 +64431,7 @@ aZW
 aTn
 azV
 lQh
-azy
+lQh
 xNc
 aDY
 oex

maps/exodus/exodus-3_telecomms.dmm

@@ -28,7 +28,7 @@
 /turf/template_noop,
 /area/derelict/ship)
 "an" = (
-/obj/machinery/computer/records/medical,
+/obj/item/modular_computer/console/preset/medical,
 /turf/simulated/floor/shuttle{
 	icon_state = "floor3"
 	},