Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531

[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter

code/modules/cargo/packs.dm

@@ -1648,7 +1648,8 @@
 	                /obj/item/stack/tile/fakespace/loaded,
 	                /obj/item/gun/ballistic/shotgun/toy/crossbow,
 	                /obj/item/toy/redbutton,
-					/obj/item/toy/eightball)
+					/obj/item/toy/eightball,
+					/obj/item/vending_refill/donksoft)
 	crate_name = "toy crate"
 
 /datum/supply_pack/misc/autodrobe

code/modules/projectiles/boxes_magazines/external_mag.dm

@@ -324,6 +324,7 @@
 /obj/item/ammo_box/magazine/toy/smg
 	name = "foam force SMG magazine"
 	icon_state = "smg9mm-42"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	max_ammo = 20
 
 /obj/item/ammo_box/magazine/toy/smg/update_icon()
@@ -348,23 +349,29 @@
 /obj/item/ammo_box/magazine/toy/smgm45
 	name = "donksoft SMG magazine"
 	caliber = "foam_force"
-	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	max_ammo = 20
 
 /obj/item/ammo_box/magazine/toy/smgm45/update_icon()
 	..()
 	icon_state = "c20r45-[round(ammo_count(),2)]"
 
+/obj/item/ammo_box/magazine/toy/smgm45/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
 /obj/item/ammo_box/magazine/toy/m762
 	name = "donksoft box magazine"
 	caliber = "foam_force"
-	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	max_ammo = 50
 
 /obj/item/ammo_box/magazine/toy/m762/update_icon()
 	..()
 	icon_state = "a762-[round(ammo_count(),10)]"
 
+/obj/item/ammo_box/magazine/toy/m762/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
 
 
 

code/modules/projectiles/guns/ballistic/toy.dm

@@ -89,6 +89,12 @@
 /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted
 	pin = /obj/item/device/firing_pin
 
+/obj/item/gun/ballistic/automatic/smgm45/toy/riot
+	mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
+
+/obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted
+	pin = /obj/item/device/firing_pin
+
 /obj/item/gun/ballistic/automatic/l6_saw/toy
 	name = "donksoft LMG"
 	desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
@@ -99,4 +105,10 @@
 	casing_ejector = 0
 
 /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted
-	pin = /obj/item/device/firing_pin
+	pin = /obj/item/device/firing_pin
+
+/obj/item/gun/ballistic/automatic/l6_saw/toy/riot
+	mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
+
+/obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted
+	pin = /obj/item/device/firing_pin

code/modules/research/designs/machine_designs.dm

@@ -418,3 +418,11 @@
 	req_tech = list("programming" = 1)
 	build_path = /obj/item/circuitboard/machine/deep_fryer
 	category = list ("Misc. Machinery")
+
+/datum/design/board/donksofttoyvendor
+	name = "Machine Design (Donksoft Toy Vendor Board)"
+	desc = "The circuit board for a Donksoft Toy Vendor."
+	id = "donksofttoyvendor"
+	req_tech = list("programming" = 1, "syndicate" = 2)
+	build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor
+	category = list ("Misc. Machinery")