diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm
index dca12185e9d4..154d9fd5919c 100644
--- a/code/game/machinery/PDApainter.dm
+++ b/code/game/machinery/PDApainter.dm
@@ -101,11 +101,13 @@
 	else
 		return ..()
 
+/*
 /obj/machinery/pdapainter/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!(machine_stat & BROKEN))
 			machine_stat |= BROKEN
 			update_icon()
+*/
 
 /obj/machinery/pdapainter/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 
diff --git a/code/modules/research/techweb/nodes/computer_hud_nodes.dm b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
index af65a9202d83..b09c56b0b364 100644
--- a/code/modules/research/techweb/nodes/computer_hud_nodes.dm
+++ b/code/modules/research/techweb/nodes/computer_hud_nodes.dm
@@ -23,7 +23,7 @@
 	display_name = "Computerized Recordkeeping"
 	description = "Organized record databases and how they're used."
 	prereq_ids = list("comptech")
-	design_ids = list("secdata", "med_data", "prisonmanage", "vendor", "automated_announcement")
+	design_ids = list("secdata", "med_data", "prisonmanage", "vendor", "automated_announcement", "pdapainter")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1250)
 
 /datum/techweb_node/telecomms
diff --git a/code/modules/research/techweb/nodes/medical_nodes.dm b/code/modules/research/techweb/nodes/medical_nodes.dm
index 637eca8fdbc2..89a537c59841 100644
--- a/code/modules/research/techweb/nodes/medical_nodes.dm
+++ b/code/modules/research/techweb/nodes/medical_nodes.dm
@@ -49,7 +49,7 @@
 	description = "Basic fragile prosthetics for the impaired."
 	starting_node = TRUE
 	prereq_ids = list("biotech")
-	design_ids = list("basic_l_arm", "basic_r_arm", "basic_r_leg", "basic_l_leg")
+	design_ids = list("basic_l_arm", "basic_r_arm", "basic_r_leg", "basic_l_leg", "aug_manipulator")
 
 /datum/techweb_node/advance_limbs
 	id = "advance_limbs"
diff --git a/modular_bluemoon/code/game/machinery/PDApainter.dm b/modular_bluemoon/code/game/machinery/PDApainter.dm
new file mode 100644
index 000000000000..0c888fc20726
--- /dev/null
+++ b/modular_bluemoon/code/game/machinery/PDApainter.dm
@@ -0,0 +1,7 @@
+/obj/machinery/pdapainter
+	circuit = /obj/item/circuitboard/machine/pdapainter
+
+/obj/machinery/pdapainter/crowbar_act(mob/living/user, obj/item/tool)
+	if(!default_deconstruction_crowbar(tool, TRUE))
+		return
+	return TOOL_ACT_TOOLTYPE_SUCCESS
diff --git a/modular_bluemoon/code/game/machinery/aug_manipulator.dm b/modular_bluemoon/code/game/machinery/aug_manipulator.dm
new file mode 100644
index 000000000000..f45f6d4f9834
--- /dev/null
+++ b/modular_bluemoon/code/game/machinery/aug_manipulator.dm
@@ -0,0 +1,7 @@
+/obj/machinery/aug_manipulator
+	circuit = /obj/item/circuitboard/machine/aug_manipulator
+
+/obj/machinery/aug_manipulator/crowbar_act(mob/living/user, obj/item/tool)
+	if(!default_deconstruction_crowbar(tool, TRUE))
+		return
+	return TOOL_ACT_TOOLTYPE_SUCCESS
diff --git a/modular_bluemoon/code/game/objects/items/circuitboards/machine_circuitboards.dm b/modular_bluemoon/code/game/objects/items/circuitboards/machine_circuitboards.dm
new file mode 100644
index 000000000000..5b77ff79ab53
--- /dev/null
+++ b/modular_bluemoon/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -0,0 +1,19 @@
+/obj/item/circuitboard/machine/pdapainter
+	name = "PDA painter (Machine Board)"
+	icon_state = "service"
+	build_path = /obj/machinery/pdapainter
+	req_components = list(
+		/obj/item/stock_parts/micro_laser = 1,
+		/obj/item/stack/cable_coil = 2,
+		/obj/item/stack/sheet/glass = 2)
+	needs_anchored = FALSE
+
+/obj/item/circuitboard/machine/aug_manipulator
+	name = "Augment manipulator (Machine Board)"
+	icon_state = "science"
+	build_path = /obj/machinery/aug_manipulator
+	req_components = list(
+		/obj/item/stock_parts/micro_laser = 1,
+		/obj/item/stack/cable_coil = 2,
+		/obj/item/stack/sheet/glass = 2)
+	needs_anchored = FALSE
diff --git a/modular_bluemoon/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm b/modular_bluemoon/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm
new file mode 100644
index 000000000000..9947984b4b41
--- /dev/null
+++ b/modular_bluemoon/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm
@@ -0,0 +1,15 @@
+/datum/design/board/pdapainter
+	name = "Machine Design (PDA painter Board)"
+	desc = "The circuit board for an PDA painter."
+	id = "pdapainter"
+	build_path = /obj/item/circuitboard/machine/pdapainter
+	category = list ("Misc. Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
+/datum/design/board/aug_manipulator
+	name = "Machine Design (Augment manipulator Board)"
+	desc = "The circuit board for a augment manipulator."
+	id = "aug_manipulator"
+	build_path = /obj/item/circuitboard/machine/aug_manipulator
+	category = list ("Misc. Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_SCIENCE
diff --git a/tgstation.dme b/tgstation.dme
index 6d255a3332c7..f3d71d8120fb 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1074,6 +1074,7 @@
 #include "code\game\machinery\airlock_control.dm"
 #include "code\game\machinery\announcement_system.dm"
 #include "code\game\machinery\aug_manipulator.dm"
+#include "modular_bluemoon\code\game\machinery\aug_manipulator.dm"
 #include "code\game\machinery\autolathe.dm"
 #include "code\game\machinery\autoloom.dm"
 #include "code\game\machinery\bank_machine.dm"
@@ -1110,6 +1111,7 @@
 #include "code\game\machinery\mass_driver.dm"
 #include "code\game\machinery\navbeacon.dm"
 #include "code\game\machinery\PDApainter.dm"
+#include "modular_bluemoon\code\game\machinery\PDApainter.dm"
 #include "code\game\machinery\posi_alert.dm"
 #include "code\game\machinery\prisonlabor.dm"
 #include "code\game\machinery\quantum_pad.dm"
@@ -1373,6 +1375,7 @@
 #include "code\game\objects\items\circuitboards\circuitboard.dm"
 #include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
 #include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
+#include "modular_bluemoon\code\game\objects\items\circuitboards\machine_circuitboards.dm"
 #include "code\game\objects\items\devices\aicard.dm"
 #include "code\game\objects\items\devices\anomaly_neutralizer.dm"
 #include "code\game\objects\items\devices\beacon.dm"
@@ -3750,6 +3753,7 @@
 #include "code\modules\research\designs\autolathe_desings\autolathe_designs_tcomms_and_misc.dm"
 #include "code\modules\research\designs\autolathe_desings\autolathe_designs_tools.dm"
 #include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm"
+#include "modular_bluemoon\code\modules\research\designs\machine_desings\machine_designs_all_misc.dm"
 #include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo.dm"
 #include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm"
 #include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm"