diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
index 4620c5621a8..7dc7b80bba4 100644
--- a/_maps/map_files/Delta/delta.dmm
+++ b/_maps/map_files/Delta/delta.dmm
@@ -27567,10 +27567,6 @@
 	pixel_y = 3
 	},
 /obj/item/circuitboard/card,
-/obj/item/circuitboard/crew{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /obj/structure/cable{
 	d1 = 1;
 	d2 = 2;
@@ -31283,16 +31279,25 @@
 	},
 /area/hallway/primary/central)
 "bDH" = (
-/obj/structure/rack,
-/obj/item/circuitboard/scan_consolenew{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/cyborgrecharger{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/circuitboard/med_data,
-/obj/item/circuitboard/pandemic{
+/obj/item/circuitboard/mech_bay_power_console{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/mech_recharger{
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/mechfab{
+	pixel_y = -6;
+	pixel_x = 6
+	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -31306,16 +31311,27 @@
 /turf/simulated/floor/plasteel/dark,
 /area/storage/tech)
 "bDJ" = (
-/obj/structure/rack,
-/obj/item/circuitboard/aifixer{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/rdconsole{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/circuitboard/rdserver{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/circuitboard/rdconsole,
-/obj/item/circuitboard/rdserver{
+/obj/item/circuitboard/destructive_analyzer,
+/obj/item/circuitboard/protolathe{
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/circuit_imprinter{
+	pixel_y = -6;
+	pixel_x = 6
+	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -32018,29 +32034,53 @@
 /turf/simulated/floor/plasteel/dark,
 /area/storage/tech)
 "bFj" = (
-/obj/structure/rack,
-/obj/item/circuitboard/cloning{
-	pixel_x = -3;
-	pixel_y = 3
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/cloning{
+	pixel_y = 8;
+	pixel_x = -8
+	},
+/obj/item/circuitboard/clonescanner{
+	pixel_x = -5;
+	pixel_y = 5
 	},
-/obj/item/circuitboard/clonescanner,
 /obj/item/circuitboard/clonepod{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/circuitboard/cryo_tube{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/circuitboard/pandemic{
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/bodyscanner{
+	pixel_x = 6;
+	pixel_y = -6
+	},
+/obj/item/circuitboard/sleeper{
+	pixel_x = 9;
+	pixel_y = -9
+	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
 	},
 /area/storage/tech)
 "bFk" = (
-/obj/structure/rack,
-/obj/item/circuitboard/destructive_analyzer{
-	pixel_x = -3;
-	pixel_y = 3
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
 	},
-/obj/item/circuitboard/protolathe,
-/obj/item/circuitboard/circuit_imprinter{
+/obj/item/circuitboard/autolathe{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/circuitboard/ore_redemption{
 	pixel_x = 3;
 	pixel_y = -3
 	},
@@ -32944,7 +32984,6 @@
 	pixel_x = -24
 	},
 /obj/item/folder/yellow,
-/obj/item/airlock_electronics,
 /obj/structure/cable{
 	d2 = 4;
 	icon_state = "0-4"
@@ -32979,12 +33018,6 @@
 	},
 /area/storage/tech)
 "bGW" = (
-/obj/structure/rack,
-/obj/item/circuitboard/mechfab,
-/obj/item/circuitboard/autolathe{
-	pixel_x = 3;
-	pixel_y = -3
-	},
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
@@ -33769,15 +33802,21 @@
 /turf/simulated/floor/plasteel,
 /area/engine/break_room)
 "bIJ" = (
-/obj/structure/rack,
-/obj/item/circuitboard/camera{
-	pixel_x = -3;
-	pixel_y = 3
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
 	},
-/obj/item/circuitboard/prisoner,
 /obj/item/circuitboard/secure_data{
-	pixel_x = 3;
-	pixel_y = -3
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/circuitboard/camera{
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/item/circuitboard/prisoner{
+	pixel_x = 5;
+	pixel_y = -5
 	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
@@ -33795,21 +33834,33 @@
 	c_tag = "Technical Storage";
 	dir = 4
 	},
-/obj/item/airalarm_electronics,
-/obj/item/apc_electronics,
+/obj/item/paicard,
 /turf/simulated/floor/plasteel/dark,
 /area/storage/tech)
 "bIO" = (
-/obj/structure/rack,
-/obj/item/circuitboard/atmos_alert{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/message_monitor{
+	pixel_y = 6;
+	pixel_x = -6
+	},
+/obj/item/circuitboard/aifixer{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/circuitboard/powermonitor,
-/obj/item/circuitboard/stationalert{
+/obj/item/circuitboard/teleporter{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/teleporter_hub{
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/teleporter_station{
+	pixel_x = 6;
+	pixel_y = -6
+	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -34538,16 +34589,25 @@
 	},
 /area/engine/break_room)
 "bKu" = (
-/obj/structure/rack,
-/obj/item/circuitboard/teleporter_hub{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/powermonitor{
 	pixel_x = -3;
 	pixel_y = 3
 	},
-/obj/item/circuitboard/teleporter_station,
-/obj/item/circuitboard/teleporter{
+/obj/item/circuitboard/stationalert{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/atmos_alert{
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/smes{
+	pixel_x = 6;
+	pixel_y = -6
+	},
 /obj/effect/decal/warning_stripes/yellow/hollow,
 /turf/simulated/floor/plasteel{
 	icon_state = "neutralfull"
@@ -35430,10 +35490,6 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/item/firelock_electronics,
-/obj/item/firelock_electronics,
-/obj/item/firealarm_electronics,
-/obj/item/firealarm_electronics,
 /obj/item/circuitboard/sleeper,
 /turf/simulated/floor/plasteel/dark,
 /area/storage/tech)
@@ -36226,7 +36282,6 @@
 /obj/structure/table/reinforced,
 /obj/item/wrench,
 /obj/item/crowbar,
-/obj/item/paicard,
 /obj/machinery/newscaster{
 	dir = 1;
 	name = "south bump";
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index d0c08322510..6dea8883013 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -15416,14 +15416,21 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/storage/toolbox/electrical{
-	pixel_x = 1;
-	pixel_y = -1
+/obj/item/circuitboard/cyborgrecharger{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/mech_bay_power_console{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/mech_recharger{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/circuitboard/mechfab{
+	pixel_y = -6;
+	pixel_x = 6
 	},
-/obj/item/clothing/gloves/color/yellow,
-/obj/item/t_scanner,
-/obj/item/multitool,
-/obj/item/clothing/glasses/meson,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -15433,18 +15440,34 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/powermonitor{
+/obj/item/circuitboard/cloning{
+	pixel_y = 8;
+	pixel_x = -8
+	},
+/obj/item/circuitboard/clonescanner{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/circuitboard/clonepod{
 	pixel_x = -2;
 	pixel_y = 2
 	},
-/obj/item/circuitboard/stationalert{
+/obj/item/circuitboard/cryo_tube{
 	pixel_x = 1;
 	pixel_y = -1
 	},
-/obj/item/circuitboard/atmos_alert{
+/obj/item/circuitboard/pandemic{
 	pixel_x = 3;
 	pixel_y = -3
 	},
+/obj/item/circuitboard/bodyscanner{
+	pixel_x = 6;
+	pixel_y = -6
+	},
+/obj/item/circuitboard/sleeper{
+	pixel_x = 9;
+	pixel_y = -9
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -15467,14 +15490,21 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/cloning,
-/obj/item/circuitboard/med_data{
+/obj/item/circuitboard/powermonitor{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/stationalert{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/atmos_alert{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/clonescanner,
-/obj/item/circuitboard/clonepod,
-/obj/item/circuitboard/scan_consolenew,
+/obj/item/circuitboard/smes{
+	pixel_x = 6;
+	pixel_y = -6
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -16625,6 +16655,10 @@
 	pixel_x = 2;
 	pixel_y = -2
 	},
+/obj/item/circuitboard/aicore{
+	pixel_x = 5;
+	pixel_y = -5
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -16658,15 +16692,22 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/message_monitor{
-	pixel_y = -5
+/obj/item/circuitboard/rdconsole{
+	pixel_x = -6;
+	pixel_y = 6
 	},
-/obj/item/circuitboard/arcade/battle{
-	pixel_x = -4;
-	pixel_y = 2
+/obj/item/circuitboard/rdserver{
+	pixel_x = -3;
+	pixel_y = 3
 	},
-/obj/item/circuitboard/arcade/orion_trail{
-	pixel_x = 4
+/obj/item/circuitboard/destructive_analyzer,
+/obj/item/circuitboard/protolathe{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/circuitboard/circuit_imprinter{
+	pixel_y = -6;
+	pixel_x = 6
 	},
 /obj/structure/cable/yellow{
 	d1 = 1;
@@ -16683,6 +16724,10 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/autolathe{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/circuitboard/ore_redemption{
 	pixel_x = 3;
 	pixel_y = -3
 	},
@@ -16695,13 +16740,25 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/rdconsole,
-/obj/item/circuitboard/rdserver{
+/obj/item/circuitboard/message_monitor{
+	pixel_y = 6;
+	pixel_x = -6
+	},
+/obj/item/circuitboard/aifixer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/teleporter{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/teleporter_hub{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/destructive_analyzer,
-/obj/item/circuitboard/protolathe,
+/obj/item/circuitboard/teleporter_station{
+	pixel_x = 6;
+	pixel_y = -6
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -16719,8 +16776,7 @@
 /area/storage/tech)
 "bgt" = (
 /obj/structure/table,
-/obj/item/apc_electronics,
-/obj/item/airlock_electronics,
+/obj/item/analyzer,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -16883,12 +16939,16 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/secure_data{
-	pixel_x = -2;
-	pixel_y = 2
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /obj/item/circuitboard/camera{
-	pixel_x = 1;
-	pixel_y = -1
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/item/circuitboard/prisoner{
+	pixel_x = 5;
+	pixel_y = -5
 	},
 /obj/machinery/ai_status_display{
 	pixel_y = 31
@@ -17224,10 +17284,6 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/crew{
-	pixel_x = -1;
-	pixel_y = 1
-	},
 /obj/item/circuitboard/card{
 	pixel_x = 2;
 	pixel_y = -2
@@ -18019,21 +18075,38 @@
 /area/storage/tech)
 "bjy" = (
 /obj/structure/table,
-/obj/item/plant_analyzer,
+/obj/item/plant_analyzer{
+	pixel_x = -4;
+	pixel_y = 4
+	},
 /obj/machinery/firealarm{
 	dir = 1;
 	name = "south bump";
 	pixel_y = -24
 	},
+/obj/item/healthanalyzer{
+	pixel_y = 0;
+	pixel_x = 6
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
 /area/storage/tech)
 "bjz" = (
-/obj/structure/table,
-/obj/item/analyzer,
-/obj/item/healthanalyzer,
-/obj/machinery/camera/autoname{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/storage/toolbox/electrical{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/t_scanner,
+/obj/item/multitool,
+/obj/item/clothing/glasses/meson,
+/obj/machinery/camera{
+	c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage";
 	dir = 1
 	},
 /turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
index ef3dbc70380..a2ad9a41a81 100644
--- a/_maps/map_files/cerestation/cerestation.dmm
+++ b/_maps/map_files/cerestation/cerestation.dmm
@@ -26934,8 +26934,7 @@
 /area/storage/tech)
 "cmX" = (
 /obj/structure/table,
-/obj/item/airlock_electronics,
-/obj/item/apc_electronics,
+/obj/item/multitool,
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cmZ" = (
@@ -29758,18 +29757,24 @@
 /turf/simulated/floor/engine,
 /area/toxins/test_chamber)
 "cCe" = (
-/obj/structure/rack,
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
 /obj/item/circuitboard/cyborgrecharger{
-	pixel_x = -4;
-	pixel_y = -2
+	pixel_x = -3;
+	pixel_y = 3
 	},
 /obj/item/circuitboard/mech_bay_power_console{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 0
+	},
+/obj/item/circuitboard/mech_recharger{
+	pixel_x = 3;
+	pixel_y = -3
 	},
-/obj/item/circuitboard/mech_recharger,
 /obj/item/circuitboard/mechfab{
-	pixel_y = 3
+	pixel_y = -6;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -29800,7 +29805,6 @@
 /obj/machinery/cell_charger{
 	pixel_y = 5
 	},
-/obj/item/multitool,
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cCp" = (
@@ -64936,10 +64940,6 @@
 	icon_state = "4-8"
 	},
 /obj/structure/rack,
-/obj/item/circuitboard/crew{
-	pixel_x = -1;
-	pixel_y = 1
-	},
 /obj/item/circuitboard/card{
 	pixel_x = 2;
 	pixel_y = -2
@@ -65521,6 +65521,10 @@
 	pixel_x = 2;
 	pixel_y = -2
 	},
+/obj/item/circuitboard/aicore{
+	pixel_x = 5;
+	pixel_y = -5
+	},
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -70824,6 +70828,30 @@
 	icon_state = "cafeteria"
 	},
 /area/crew_quarters/kitchen)
+"pGT" = (
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/rdconsole{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/circuitboard/rdserver{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/destructive_analyzer,
+/obj/item/circuitboard/protolathe{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/circuitboard/circuit_imprinter{
+	pixel_y = -6;
+	pixel_x = 6
+	},
+/turf/simulated/floor/plating,
+/area/storage/tech)
 "pGZ" = (
 /obj/structure/disposalpipe/segment,
 /obj/structure/cable{
@@ -72441,17 +72469,24 @@
 	},
 /area/maintenance/storage)
 "qkQ" = (
-/obj/structure/rack,
-/obj/item/circuitboard/cloning,
-/obj/item/circuitboard/med_data{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/powermonitor{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/stationalert{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/atmos_alert{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/clonescanner,
-/obj/item/circuitboard/clonepod,
-/obj/item/circuitboard/scan_consolenew,
-/obj/item/circuitboard/cryo_tube{
-	pixel_x = 3
+/obj/item/circuitboard/smes{
+	pixel_x = 6;
+	pixel_y = -6
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -86495,21 +86530,16 @@
 	},
 /area/security/brig)
 "vQx" = (
-/obj/structure/rack,
-/obj/item/circuitboard/rdconsole{
-	pixel_x = -4
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
 	},
-/obj/item/circuitboard/rdserver{
-	pixel_x = 4;
-	pixel_y = -2
+/obj/item/circuitboard/autolathe{
+	pixel_x = -1;
+	pixel_y = 1
 	},
-/obj/item/circuitboard/destructive_analyzer,
-/obj/item/circuitboard/protolathe{
-	pixel_x = -2;
-	pixel_y = 3
-	},
-/obj/item/circuitboard/circuit_imprinter{
-	pixel_x = -4;
+/obj/item/circuitboard/ore_redemption{
+	pixel_x = 3;
 	pixel_y = -3
 	},
 /obj/machinery/light/small{
@@ -86517,8 +86547,8 @@
 	},
 /obj/machinery/firealarm{
 	dir = 4;
-	pixel_x = 24;
-	name = "east bump"
+	name = "east bump";
+	pixel_x = 24
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -86782,15 +86812,38 @@
 /turf/simulated/floor/wood,
 /area/crew_quarters/captain)
 "vUt" = (
-/obj/structure/rack,
-/obj/item/circuitboard/secure_data{
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
+	},
+/obj/item/circuitboard/cloning{
+	pixel_y = 8;
+	pixel_x = -8
+	},
+/obj/item/circuitboard/clonescanner{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/circuitboard/clonepod{
 	pixel_x = -2;
 	pixel_y = 2
 	},
-/obj/item/circuitboard/camera{
+/obj/item/circuitboard/cryo_tube{
 	pixel_x = 1;
 	pixel_y = -1
 	},
+/obj/item/circuitboard/pandemic{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/circuitboard/bodyscanner{
+	pixel_x = 6;
+	pixel_y = -6
+	},
+/obj/item/circuitboard/sleeper{
+	pixel_x = 9;
+	pixel_y = -9
+	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "vUv" = (
@@ -90128,14 +90181,28 @@
 /turf/simulated/floor/plating,
 /area/maintenance/disposal/southwest)
 "xfN" = (
-/obj/structure/rack,
-/obj/item/circuitboard/message_monitor{
-	pixel_y = -5
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
 	},
-/obj/item/circuitboard/arcade/battle,
-/obj/item/circuitboard/arcade/orion_trail{
-	pixel_x = -4;
-	pixel_y = 2
+/obj/item/circuitboard/message_monitor{
+	pixel_y = 6;
+	pixel_x = -6
+	},
+/obj/item/circuitboard/aifixer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/teleporter{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/teleporter_hub{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/circuitboard/teleporter_station{
+	pixel_x = 6;
+	pixel_y = -6
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -91445,14 +91512,21 @@
 /turf/simulated/floor/plating,
 /area/hallway/secondary/entry/south)
 "xKM" = (
-/obj/structure/rack,
-/obj/item/circuitboard/autolathe{
-	pixel_x = 3;
-	pixel_y = -3
+/obj/structure/rack{
+	dir = 8;
+	layer = 2.9
 	},
-/obj/item/circuitboard/bodyscanner,
-/obj/item/circuitboard/sleeper{
-	pixel_x = 3
+/obj/item/circuitboard/secure_data{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/circuitboard/camera{
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/item/circuitboard/prisoner{
+	pixel_x = 5;
+	pixel_y = -5
 	},
 /obj/machinery/light/small{
 	dir = 8
@@ -129706,7 +129780,7 @@ cSf
 dqI
 dyM
 baR
-xfN
+pGT
 vQx
 xfN
 vRp
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index d9e3e8593ff..f6ac43c8561 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -49084,16 +49084,19 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/cyborgrecharger{
-	pixel_x = -4;
-	pixel_y = -2
+	pixel_x = -3;
+	pixel_y = 3
 	},
 /obj/item/circuitboard/mech_bay_power_console{
-	pixel_x = 2;
-	pixel_y = 2
+	pixel_y = 0
+	},
+/obj/item/circuitboard/mech_recharger{
+	pixel_x = 3;
+	pixel_y = -3
 	},
-/obj/item/circuitboard/mech_recharger,
 /obj/item/circuitboard/mechfab{
-	pixel_y = 3
+	pixel_y = -6;
+	pixel_x = 6
 	},
 /obj/machinery/power/apc{
 	dir = 1;
@@ -49115,7 +49118,6 @@
 "cvA" = (
 /obj/structure/table,
 /obj/item/plant_analyzer,
-/obj/item/stock_parts/cell/high/plus,
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cvB" = (
@@ -49464,8 +49466,11 @@
 /area/engine/controlroom)
 "cwN" = (
 /obj/structure/table,
-/obj/item/apc_electronics,
-/obj/item/airlock_electronics,
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus{
+	pixel_x = 3;
+	pixel_y = -3
+	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cwO" = (
@@ -50125,6 +50130,10 @@
 	pixel_x = 2;
 	pixel_y = -2
 	},
+/obj/item/circuitboard/aicore{
+	pixel_x = 5;
+	pixel_y = -5
+	},
 /turf/simulated/floor/plasteel,
 /area/storage/tech)
 "cyv" = (
@@ -50137,16 +50146,17 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/rdconsole{
-	pixel_x = -4
+	pixel_x = -6;
+	pixel_y = 6
 	},
 /obj/item/circuitboard/rdserver{
-	pixel_x = 4;
-	pixel_y = -2
+	pixel_x = -3;
+	pixel_y = 3
 	},
 /obj/item/circuitboard/destructive_analyzer,
 /obj/item/circuitboard/protolathe{
-	pixel_x = -2;
-	pixel_y = 3
+	pixel_x = 3;
+	pixel_y = -3
 	},
 /obj/structure/cable{
 	d1 = 1;
@@ -50154,8 +50164,8 @@
 	icon_state = "1-2"
 	},
 /obj/item/circuitboard/circuit_imprinter{
-	pixel_x = -4;
-	pixel_y = -3
+	pixel_y = -6;
+	pixel_x = 6
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -50170,12 +50180,23 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/message_monitor{
-	pixel_y = -5
+	pixel_y = 6;
+	pixel_x = -6
 	},
-/obj/item/circuitboard/arcade/battle,
-/obj/item/circuitboard/arcade/orion_trail{
-	pixel_x = -4;
-	pixel_y = 2
+/obj/item/circuitboard/aifixer{
+	pixel_x = -3;
+	pixel_y = 3
+	},
+/obj/item/circuitboard/teleporter{
+	pixel_y = 0
+	},
+/obj/item/circuitboard/teleporter_hub{
+	pixel_x = 3;
+	pixel_y = -3
+	},
+/obj/item/circuitboard/teleporter_station{
+	pixel_x = 6;
+	pixel_y = -6
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -50196,13 +50217,13 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/autolathe{
+	pixel_x = -1;
+	pixel_y = 1
+	},
+/obj/item/circuitboard/ore_redemption{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/bodyscanner,
-/obj/item/circuitboard/sleeper{
-	pixel_x = 3
-	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cyB" = (
@@ -50695,17 +50716,13 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/crew{
-	pixel_x = -1;
-	pixel_y = 1
+/obj/item/circuitboard/communications{
+	pixel_y = 1;
+	pixel_x = -1
 	},
 /obj/item/circuitboard/card{
-	pixel_x = 2;
-	pixel_y = -2
-	},
-/obj/item/circuitboard/communications{
-	pixel_x = 5;
-	pixel_y = -5
+	pixel_x = 3;
+	pixel_y = -3
 	},
 /turf/simulated/floor/plasteel,
 /area/storage/tech)
@@ -51172,7 +51189,7 @@
 "cBl" = (
 /obj/structure/table,
 /obj/item/screwdriver{
-	pixel_y = 16
+	pixel_y = 8
 	},
 /obj/item/wirecutters,
 /turf/simulated/floor/plating,
@@ -51221,12 +51238,12 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/robotics{
-	pixel_x = -2;
-	pixel_y = 2
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /obj/item/circuitboard/mecha_control{
-	pixel_x = 1;
-	pixel_y = -1
+	pixel_x = 3;
+	pixel_y = -3
 	},
 /turf/simulated/floor/plasteel,
 /area/storage/tech)
@@ -51235,16 +51252,33 @@
 	dir = 8;
 	layer = 2.9
 	},
-/obj/item/circuitboard/cloning,
-/obj/item/circuitboard/med_data{
+/obj/item/circuitboard/cloning{
+	pixel_y = 8;
+	pixel_x = -8
+	},
+/obj/item/circuitboard/clonescanner{
+	pixel_x = -5;
+	pixel_y = 5
+	},
+/obj/item/circuitboard/clonepod{
+	pixel_x = -2;
+	pixel_y = 2
+	},
+/obj/item/circuitboard/cryo_tube{
+	pixel_x = 1;
+	pixel_y = -1
+	},
+/obj/item/circuitboard/pandemic{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/clonescanner,
-/obj/item/circuitboard/clonepod,
-/obj/item/circuitboard/scan_consolenew,
-/obj/item/circuitboard/cryo_tube{
-	pixel_x = 3
+/obj/item/circuitboard/bodyscanner{
+	pixel_x = 6;
+	pixel_y = -6
+	},
+/obj/item/circuitboard/sleeper{
+	pixel_x = 9;
+	pixel_y = -9
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -51254,20 +51288,19 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/powermonitor{
-	pixel_x = -2;
-	pixel_y = 2
+	pixel_x = -3;
+	pixel_y = 3
 	},
 /obj/item/circuitboard/stationalert{
-	pixel_x = 1;
-	pixel_y = -1
+	pixel_y = 0
 	},
 /obj/item/circuitboard/atmos_alert{
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/obj/item/circuitboard/thermomachine,
 /obj/item/circuitboard/smes{
-	pixel_x = 4
+	pixel_x = 6;
+	pixel_y = -6
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -51277,12 +51310,16 @@
 	layer = 2.9
 	},
 /obj/item/circuitboard/secure_data{
-	pixel_x = -2;
-	pixel_y = 2
+	pixel_x = -1;
+	pixel_y = 1
 	},
 /obj/item/circuitboard/camera{
-	pixel_x = 1;
-	pixel_y = -1
+	pixel_x = 2;
+	pixel_y = -2
+	},
+/obj/item/circuitboard/prisoner{
+	pixel_x = 5;
+	pixel_y = -5
 	},
 /turf/simulated/floor/plating,
 /area/storage/tech)
@@ -51668,7 +51705,6 @@
 	pixel_y = 3
 	},
 /obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high/plus,
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cCQ" = (