diff --git a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
index 3de949017cd..e1d2266dc59 100644
--- a/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2_skyrat.dmm
@@ -5119,7 +5119,7 @@
/turf/open/floor/iron,
/area/maintenance/port/fore)
"aoh" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 4
},
/obj/machinery/light{
@@ -6769,7 +6769,7 @@
/area/maintenance/starboard/fore)
"asc" = (
/obj/structure/table/wood,
-/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted,
+/obj/item/gun/ballistic/automatic/pistol/toy,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
@@ -29377,7 +29377,7 @@
/turf/open/floor/iron/grimy,
/area/command/heads_quarters/hos)
"bnZ" = (
-/obj/machinery/computer/card/minor/hos{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
@@ -33956,7 +33956,7 @@
/turf/open/floor/iron,
/area/hallway/primary/central)
"byg" = (
-/obj/machinery/computer/card,
+/obj/machinery/modular_computer/console/preset/id,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -42395,7 +42395,7 @@
/turf/open/floor/iron/dark,
/area/engineering/transit_tube)
"bNO" = (
-/obj/machinery/computer/card/minor/ce{
+/obj/machinery/modular_computer/console/preset/id{
dir = 4
},
/obj/machinery/status_display/evac{
@@ -45593,7 +45593,7 @@
/turf/open/floor/iron/dark,
/area/tcommsat/server)
"bUL" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 4
},
/obj/machinery/keycard_auth{
@@ -48527,7 +48527,7 @@
/turf/open/floor/plating,
/area/command/heads_quarters/hop)
"caN" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 1
},
/obj/structure/cable,
@@ -80906,7 +80906,7 @@
/turf/open/floor/iron/white,
/area/command/heads_quarters/rd)
"dtu" = (
-/obj/machinery/computer/card/minor/rd{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/obj/machinery/status_display/ai{
@@ -84526,7 +84526,7 @@
/turf/open/floor/iron/white,
/area/command/heads_quarters/cmo)
"dCK" = (
-/obj/machinery/computer/card/minor/cmo{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/obj/machinery/status_display/ai{
@@ -91125,7 +91125,7 @@
/turf/open/floor/iron,
/area/maintenance/port/aft)
"dPV" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 4
},
/obj/machinery/camera{
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
index 311f9d55c2b..20dced0e0c1 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation_skyrat.dmm
@@ -813,7 +813,7 @@
/turf/open/floor/carpet,
/area/command/heads_quarters/hos)
"abU" = (
-/obj/machinery/computer/card/minor/hos,
+/obj/machinery/modular_computer/console/preset/id,
/turf/open/floor/carpet,
/area/command/heads_quarters/hos)
"abV" = (
@@ -15790,7 +15790,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 5
},
-/obj/machinery/computer/card/minor/rd{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/turf/open/floor/iron,
@@ -20236,7 +20236,7 @@
/turf/open/floor/wood,
/area/command/heads_quarters/captain)
"bil" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/turf/open/floor/wood,
@@ -21395,7 +21395,7 @@
/turf/open/openspace/icemoon,
/area/icemoon/surface/outdoors)
"blr" = (
-/obj/machinery/computer/card/minor/cmo,
+/obj/machinery/modular_computer/console/preset/id,
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -23385,7 +23385,7 @@
/turf/open/floor/carpet,
/area/command/heads_quarters/hop)
"bqA" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 1
},
/obj/effect/turf_decal/tile/blue{
@@ -36303,7 +36303,7 @@
/turf/open/floor/iron,
/area/engineering/engine_smes)
"cjg" = (
-/obj/machinery/computer/card/minor/ce{
+/obj/machinery/modular_computer/console/preset/id{
dir = 4
},
/obj/machinery/requests_console{
@@ -47449,7 +47449,7 @@
/turf/open/floor/iron/white,
/area/medical/pharmacy)
"lif" = (
-/obj/machinery/computer/card,
+/obj/machinery/modular_computer/console/preset/id,
/obj/machinery/light{
dir = 1
},
diff --git a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
index 994acf1c51f..aae51eef2e3 100644
--- a/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
+++ b/_maps/map_files/KiloStation/KiloStation_skyrat.dmm
@@ -9249,7 +9249,7 @@
/turf/open/floor/plating,
/area/maintenance/fore)
"aru" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
@@ -10640,7 +10640,7 @@
/turf/open/floor/plating,
/area/maintenance/port/fore)
"atI" = (
-/obj/machinery/computer/card{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
@@ -12647,7 +12647,7 @@
/turf/closed/wall/r_wall,
/area/engineering/break_room)
"awO" = (
-/obj/machinery/computer/card/minor/ce,
+/obj/machinery/modular_computer/console/preset/id,
/obj/effect/turf_decal/bot,
/obj/machinery/computer/security/telescreen/ce{
pixel_y = 28
@@ -23304,7 +23304,7 @@
/turf/open/floor/iron/showroomfloor,
/area/science/mixing/chamber)
"aOR" = (
-/obj/machinery/computer/card/minor/cmo{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -33094,7 +33094,7 @@
/turf/open/floor/iron,
/area/engineering/break_room)
"bdw" = (
-/obj/machinery/computer/card/minor/rd{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/obj/effect/turf_decal/bot,
@@ -75100,7 +75100,7 @@
},
/area/maintenance/port/aft)
"czQ" = (
-/obj/machinery/computer/card/minor/hos{
+/obj/machinery/modular_computer/console/preset/id{
dir = 1
},
/turf/open/floor/wood,
diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
index 8208cc7a425..3cd639a71c3 100644
--- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
@@ -24921,7 +24921,7 @@
/turf/open/floor/iron/dark,
/area/engineering/gravity_generator)
"cvg" = (
-/obj/machinery/computer/card/minor/hos{
+/obj/machinery/modular_computer/console/preset/id{
dir = 8
},
/turf/open/floor/iron/dark,
diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm
index ec24df072ef..e7b22b8747c 100644
--- a/_maps/map_files/generic/CentCom_skyrat.dmm
+++ b/_maps/map_files/generic/CentCom_skyrat.dmm
@@ -7656,7 +7656,7 @@
/turf/open/floor/iron,
/area/wizard_station)
"aCt" = (
-/obj/machinery/computer/card/centcom,
+/obj/machinery/modular_computer/console/preset/id/centcom,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office.";
name = "Research Monitor";
@@ -7686,7 +7686,7 @@
/turf/open/floor/iron,
/area/centcom/ferry)
"aCw" = (
-/obj/machinery/computer/card/centcom{
+/obj/machinery/modular_computer/console/preset/id/centcom{
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
@@ -11938,7 +11938,7 @@
/turf/open/floor/iron,
/area/centcom/control)
"aPv" = (
-/obj/machinery/computer/card/centcom,
+/obj/machinery/modular_computer/console/preset/id/centcom,
/turf/open/floor/iron/grimy,
/area/centcom/ferry)
"aPx" = (
@@ -12490,7 +12490,7 @@
/turf/open/floor/iron,
/area/centcom/ferry)
"aRh" = (
-/obj/machinery/computer/card/centcom{
+/obj/machinery/modular_computer/console/preset/id/centcom{
dir = 1
},
/turf/open/floor/iron/grimy,
@@ -13731,7 +13731,7 @@
},
/area/abductor_ship)
"aUV" = (
-/obj/machinery/computer/card/centcom{
+/obj/machinery/modular_computer/console/preset/id/centcom{
dir = 1
},
/obj/machinery/button/door/indestructible{
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index c288eff7d39..765dbeb644d 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -505,8 +505,7 @@
name = "secure command circuit board spawner"
loot = list(
/obj/item/circuitboard/computer/crew,
- /obj/item/circuitboard/computer/communications,
- /obj/item/circuitboard/computer/card
+ /obj/item/circuitboard/computer/communications
)
/obj/effect/spawner/lootdrop/techstorage/rnd_secure
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 64512bbc21a..aed55102c8f 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -14,33 +14,6 @@
name = "Bluespace Artillery Controls (Computer Board)"
build_path = /obj/machinery/computer/bsa_control
-/obj/item/circuitboard/computer/card
- name = "ID Console (Computer Board)"
- icon_state = "command"
- build_path = /obj/machinery/computer/card
-
-/obj/item/circuitboard/computer/card/centcom
- name = "CentCom ID Console (Computer Board)"
- build_path = /obj/machinery/computer/card/centcom
-
-/obj/item/circuitboard/computer/card/minor
- name = "Department Management Console (Computer Board)"
- build_path = /obj/machinery/computer/card/minor
- var/target_dept = 1
- var/list/dept_list = list("General","Security","Medical","Science","Engineering")
-
-/obj/item/circuitboard/computer/card/minor/attackby(obj/item/I, mob/user, params)
- if(I.tool_behaviour == TOOL_SCREWDRIVER)
- target_dept = (target_dept == dept_list.len) ? 1 : (target_dept + 1)
- to_chat(user, "You set the board to \"[dept_list[target_dept]]\".")
- else
- return ..()
-
-/obj/item/circuitboard/computer/card/minor/examine(user)
- ..()
- to_chat(user, "Currently set to \"[dept_list[target_dept]]\".")
-
-
//obj/item/circuitboard/computer/shield
// name = "Shield Control (Computer Board)"
// icon_state = "command"
diff --git a/code/modules/modular_computers/file_system/programs/jobmanagement.dm b/code/modules/modular_computers/file_system/programs/jobmanagement.dm
index 4df92541b35..bcb650f760c 100644
--- a/code/modules/modular_computers/file_system/programs/jobmanagement.dm
+++ b/code/modules/modular_computers/file_system/programs/jobmanagement.dm
@@ -1,3 +1,6 @@
+/// The time since the last job opening was created
+GLOBAL_VAR_INIT(time_last_changed_position, 0)
+
/datum/computer_file/program/job_management
filename = "plexagoncore"
filedesc = "Plexagon HR Core"
diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm
index 794f7492252..488288e52eb 100644
--- a/code/modules/research/designs/comp_board_designs.dm
+++ b/code/modules/research/designs/comp_board_designs.dm
@@ -104,14 +104,6 @@
category = list("Computer Boards")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime.
-/datum/design/board/idcardconsole
- name = "Computer Design (ID Console)"
- desc = "Allows for the construction of circuit boards used to build an ID computer."
- id = "idcardconsole"
- build_path = /obj/item/circuitboard/computer/card
- category = list("Computer Boards")
- departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime.
-
/datum/design/board/crewconsole
name = "Computer Design (Crew monitoring computer)"
desc = "Allows for the construction of circuit boards used to build a Crew monitoring computer."
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index f2633cc2f63..5249b7792f3 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -362,7 +362,7 @@
display_name = "Computer Consoles"
description = "Computers and how they work."
prereq_ids = list("datatheory")
- design_ids = list("cargo", "cargorequest", "libraryconsole", "mining", "crewconsole", "rdcamera", "comconsole", "idcard","idcardconsole", "seccamera")
+ design_ids = list("cargo", "cargorequest", "libraryconsole", "mining", "crewconsole", "rdcamera", "comconsole", "idcard", "seccamera")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000)
/datum/techweb_node/computer_hardware_basic //Modular computers are shitty and nearly useless so until someone makes them actually useful this can be easy to get.
diff --git a/tgstation.dme b/tgstation.dme
index 73c66dfdcac..981f05c4720 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -930,7 +930,6 @@
#include "code\game\machinery\computer\buildandrepair.dm"
#include "code\game\machinery\computer\camera.dm"
#include "code\game\machinery\computer\camera_advanced.dm"
-#include "code\game\machinery\computer\card.dm"
#include "code\game\machinery\computer\communications.dm"
#include "code\game\machinery\computer\crew.dm"
#include "code\game\machinery\computer\dna_console.dm"