Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/modules/research/designs/machine_designs.dm

@@ -891,16 +891,6 @@
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_SERVICE
 
-/datum/design/board/donksofttoyvendor
-	name = "Donksoft Toy Vendor Board"
-	desc = "The circuit board for a Donksoft Toy Vendor."
-	id = "donksofttoyvendor"
-	build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor
-	category = list(
-		RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_SERVICE
-	)
-	departmental_flags = DEPARTMENT_BITFLAG_SERVICE
-
 /datum/design/board/cell_charger
 	name = "Cell Charger Board"
 	desc = "The circuit board for a cell charger."

code/modules/research/techweb/nodes/syndicate_nodes.dm

@@ -8,7 +8,6 @@
 		"ai_cam_upgrade",
 		"borg_syndicate_module",
 		"donksoft_refill",
-		"donksofttoyvendor",
 		"largecrossbow",
 		"mag_autorifle",
 		"mag_autorifle_ap",