diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 3a8d15af47c..27d1b5bbc6c 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -56618,6 +56618,11 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
+"mFY" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/machinery/vending/modularpc,
+/turf/open/floor/plasteel,
+/area/storage/primary)
 "mJd" = (
 /obj/structure/disposalpipe/segment{
 	dir = 5
@@ -77267,7 +77272,7 @@ ayy
 ayy
 aAO
 aBN
-aDe
+mFY
 aDe
 aFT
 aDe
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8073a2333ee..f125b269ae3 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -86294,7 +86294,6 @@
 /turf/open/floor/plasteel/white,
 /area/science/research)
 "cPb" = (
-/obj/item/twohanded/required/kirbyplants/random,
 /obj/machinery/light{
 	dir = 1
 	},
@@ -86304,6 +86303,7 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
 	},
+/obj/machinery/vending/modularpc,
 /turf/open/floor/plasteel/white,
 /area/science/research)
 "cPc" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 2ae560e7541..bf07f698e14 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -53582,17 +53582,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/science/research)
-"cau" = (
-/obj/structure/table,
-/obj/item/paper/pamphlet/gateway,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/science/research)
 "cav" = (
 /obj/structure/chair,
 /obj/effect/landmark/start/assistant,
@@ -83694,6 +83683,16 @@
 /obj/effect/spawner/structure/window/reinforced,
 /turf/open/floor/plating,
 /area/science/misc_lab/range)
+"ofy" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/machinery/vending/modularpc,
+/turf/open/floor/plasteel/white,
+/area/science/research)
 "ogE" = (
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
@@ -112755,7 +112754,7 @@ bVk
 bWx
 bXV
 bZj
-cat
+ofy
 ccd
 ccd
 ceN
@@ -113012,7 +113011,7 @@ aYX
 aXR
 bXW
 bZk
-cau
+cat
 cce
 ccd
 qBh
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index bcddf0f102a..f24fa5ef348 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -26324,11 +26324,7 @@
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/aft)
 "bks" = (
-/obj/structure/table,
-/obj/item/wrench,
-/obj/item/stack/cable_coil,
-/obj/item/electronics/apc,
-/obj/item/electronics/airlock,
+/obj/machinery/vending/modularpc,
 /turf/open/floor/plasteel/dark,
 /area/hallway/primary/aft)
 "bkt" = (
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index bcd32ea7905..6076e86cf6b 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1374,16 +1374,12 @@
 	crate_name = "shield generators crate"
 	crate_type = /obj/structure/closet/crate/secure/science
 
-/datum/supply_pack/science/tablets
-	name = "Tablet Crate"
-	desc = "What's a computer? Contains five cargo tablets."
+/datum/supply_pack/science/modularpc
+	name = "Deluxe Silicate Selections restocking unit"
+	desc = "What's a computer? Contains Deluxe Silicate Selections restocking unit."
 	cost = 1500
-	contains = list(/obj/item/modular_computer/tablet/preset/cargo,
-					/obj/item/modular_computer/tablet/preset/cargo,
-					/obj/item/modular_computer/tablet/preset/cargo,
-					/obj/item/modular_computer/tablet/preset/cargo,
-					/obj/item/modular_computer/tablet/preset/cargo)
-	crate_name = "tablet crate"
+	contains = list(/obj/item/vending_refill/modularpc)
+	crate_name = "computer supply crate"
 
 /datum/supply_pack/science/transfer_valves
 	name = "Tank Transfer Valves Crate"
diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm
index 1e3c517351b..68d99f9a081 100644
--- a/code/modules/modular_computers/hardware/hard_drive.dm
+++ b/code/modules/modular_computers/hardware/hard_drive.dm
@@ -157,6 +157,7 @@
 	max_capacity = 64
 	icon_state = "ssd_mini"
 	w_class = WEIGHT_CLASS_TINY
+	custom_price = 15
 
 /obj/item/computer_hardware/hard_drive/micro
 	name = "micro solid state drive"
diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm
new file mode 100644
index 00000000000..bd9d9741356
--- /dev/null
+++ b/code/modules/vending/modularpc.dm
@@ -0,0 +1,29 @@
+/obj/machinery/vending/modularpc
+	name = "\improper Deluxe Silicate Selections"
+	desc = "All the parts you need to build your own custom pc."
+	icon_state = "modularpc"
+	icon_deny = "modularpc-deny"
+	product_ads = "Get your gamer gear!;The best GPUs for all of your space-crypto needs!;The most robust cooling!;The finest RGB in space!"
+	vend_reply = "Game on!"
+	products = list(/obj/item/modular_computer/laptop = 4,
+					/obj/item/modular_computer/tablet = 4,
+					/obj/item/computer_hardware/hard_drive = 4,
+					/obj/item/computer_hardware/hard_drive/small = 4,
+					/obj/item/computer_hardware/network_card = 8,
+					/obj/item/computer_hardware/hard_drive/portable = 8,
+					/obj/item/computer_hardware/battery = 8,
+					/obj/item/stock_parts/cell/computer = 8,
+					/obj/item/computer_hardware/processor_unit = 4,
+					/obj/item/computer_hardware/processor_unit/small = 4)
+	premium = list(/obj/item/computer_hardware/card_slot = 2,
+		           /obj/item/computer_hardware/ai_slot = 2,
+		           /obj/item/computer_hardware/printer/mini = 2,
+		           /obj/item/computer_hardware/recharger/APC = 2)
+	refill_canister = /obj/item/vending_refill/modularpc
+	default_price = 30
+	extra_price = 250
+	payment_department = ACCOUNT_SCI
+
+/obj/item/vending_refill/modularpc
+	machine_name = "Deluxe Silicon Selections"
+	icon_state = "refill_engi"
\ No newline at end of file
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 737e5d79d92..90fabaac797 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 97771db4ea1..d8a131b6a4a 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -2786,6 +2786,7 @@
 #include "code\modules\vending\medical.dm"
 #include "code\modules\vending\medical_wall.dm"
 #include "code\modules\vending\megaseed.dm"
+#include "code\modules\vending\modularpc.dm"
 #include "code\modules\vending\nutrimax.dm"
 #include "code\modules\vending\plasmaresearch.dm"
 #include "code\modules\vending\robotics.dm"