diff --git a/code/datums/components/crafting/recipes/primitive.dm b/code/datums/components/crafting/recipes/primitive.dm
index 3c3eb4e84b1..97f6be5e395 100644
--- a/code/datums/components/crafting/recipes/primitive.dm
+++ b/code/datums/components/crafting/recipes/primitive.dm
@@ -1,14 +1,14 @@
 /datum/crafting_recipe/cloth
 	name = "Cloth bolt"
 	result = /obj/item/stack/material/cloth
-	reqs = list(/obj/item/stack/material/fiber = 3)
+	reqs = list(list(/obj/item/stack/material/fiber = 3))
 	time = 40
 	category = CAT_PRIMAL
 
 /datum/crafting_recipe/crude_bandage
 	name = "Crude bandages (x10)"
 	result = /obj/item/stack/medical/crude_pack
-	reqs = list(/obj/item/stack/material/cloth = 2)
+	reqs = list(list(/obj/item/stack/material/cloth = 2))
 	time = 40
 	category = CAT_PRIMAL
 
@@ -20,8 +20,8 @@
 	name = "primitive clothes"
 	result = /obj/item/clothing/under/primitive
 	reqs = list(
-		/obj/item/stack/material/fiber = 4,
-		/obj/item/stack/material/cloth = 6
+		list(/obj/item/stack/material/fiber = 4),
+		list(/obj/item/stack/material/cloth = 6)
 	)
 	time = 90
 	category = CAT_CLOTHING
@@ -30,8 +30,8 @@
 	name = "primitive shoes"
 	result = /obj/item/clothing/shoes/primitive
 	reqs = list(
-		/obj/item/stack/material/fiber = 2,
-		/obj/item/stack/material/cloth = 3
+		list(/obj/item/stack/material/fiber = 2),
+		list(/obj/item/stack/material/cloth = 3)
 	)
 	time = 60
 	category = CAT_CLOTHING
\ No newline at end of file
diff --git a/code/datums/components/crafting/recipes/survival.dm b/code/datums/components/crafting/recipes/survival.dm
index 425f39500bd..ba12fc58156 100644
--- a/code/datums/components/crafting/recipes/survival.dm
+++ b/code/datums/components/crafting/recipes/survival.dm
@@ -2,10 +2,10 @@
 	name = "Wooden Shovel"
 	result = /obj/item/weapon/shovel/wood
 	reqs = list(
-		/obj/item/stack/material/stick = 5,
-		/obj/item/stack/material/wood = 1,
-		/obj/item/stack/material/fiber = 3,
-		/obj/item/stack/material/flint = 1
+		list(/obj/item/stack/material/stick = 5),
+		list(/obj/item/stack/material/wood = 1),
+		list(/obj/item/stack/material/fiber = 3),
+		list(/obj/item/stack/material/flint = 1)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -15,7 +15,7 @@
 	name = "stone blade"
 	result = /obj/item/weapon/material/knife/stone
 	reqs = list(
-		/obj/item/stack/material/flint = 2
+		list(/obj/item/stack/material/flint = 2)
 	)
 	time = 60
 	category = CAT_WEAPONRY
@@ -25,10 +25,10 @@
 	name = "stone knife"
 	result = /obj/item/weapon/material/knife/stone/wood
 	reqs = list(
-		/obj/item/weapon/material/knife/stone = 1,
-		/obj/item/stack/material/flint = 1,
-		/obj/item/stack/material/wood = 1,
-		/obj/item/stack/material/fiber = 3
+		list(/obj/item/weapon/material/knife/stone = 1),
+		list(/obj/item/stack/material/flint = 1),
+		list(/obj/item/stack/material/wood = 1),
+		list(/obj/item/stack/material/fiber = 3)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -38,10 +38,10 @@
 	name = "stone knife"
 	result = /obj/item/weapon/material/knife/stone/bone
 	reqs = list(
-		/obj/item/weapon/material/knife/stone = 1,
-		/obj/item/stack/material/flint = 1,
-		/obj/item/weapon/bone = 1,
-		/obj/item/stack/material/fiber = 3
+		list(/obj/item/weapon/material/knife/stone = 1),
+		list(/obj/item/stack/material/flint = 1),
+		list(/obj/item/weapon/bone = 1),
+		list(/obj/item/stack/material/fiber = 3)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -51,9 +51,9 @@
 	name = "wooden bucket"
 	result = /obj/item/weapon/reagent_containers/glass/bucket/wood
 	reqs = list(
-		/obj/item/stack/material/wood = 1,
-		/obj/item/stack/material/stick = 1,
-		/obj/item/stack/material/fiber = 2
+		list(/obj/item/stack/material/wood = 1),
+		list(/obj/item/stack/material/stick = 1),
+		list(/obj/item/stack/material/fiber = 2)
 	)
 	time = 60
 	category = CAT_TOOL
@@ -61,7 +61,7 @@
 /datum/crafting_recipe/sticks
 	name = "sticks"
 	result = /obj/item/stack/material/stick/fivestack
-	reqs = list(/obj/item/stack/material/wood = 1)
+	reqs = list(list(/obj/item/stack/material/wood = 1))
 	tool_paths = list(/obj/item/weapon/material/knife)
 	time = 200
 	category = CAT_MISC
@@ -70,10 +70,10 @@
 	name = "stone axe"
 	result = /obj/item/weapon/material/knife/machete/hatchet/stone
 	reqs = list(
-		/obj/item/weapon/material/knife/stone = 1,
-		/obj/item/stack/material/flint = 1,
-		/obj/item/stack/material/stick = 10,
-		/obj/item/stack/material/fiber = 3
+		list(/obj/item/weapon/material/knife/stone = 1),
+		list(/obj/item/stack/material/flint = 1),
+		list(/obj/item/stack/material/stick = 1)0,
+		list(/obj/item/stack/material/fiber = 3)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -83,10 +83,10 @@
 	name = "stone axe"
 	result = /obj/item/weapon/material/knife/machete/hatchet/stone/bone
 	reqs = list(
-		/obj/item/weapon/material/knife/stone = 1,
-		/obj/item/stack/material/flint = 1,
-		/obj/item/weapon/bone = 1,
-		/obj/item/stack/material/fiber = 3
+		list(/obj/item/weapon/material/knife/stone = 1),
+		list(/obj/item/stack/material/flint = 1),
+		list(/obj/item/weapon/bone = 1),
+		list(/obj/item/stack/material/fiber = 3)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -96,10 +96,10 @@
 	name = "stone spear"
 	result = /obj/item/weapon/material/twohanded/spear/flint
 	reqs = list(
-		/obj/item/weapon/material/knife/stone = 1,
-		/obj/item/stack/material/flint = 1,
-		/obj/item/stack/material/wood = 2,
-		/obj/item/stack/material/fiber = 3
+		list(/obj/item/weapon/material/knife/stone = 1),
+		list(/obj/item/stack/material/flint = 1),
+		list(/obj/item/stack/material/wood = 2),
+		list(/obj/item/stack/material/fiber = 3)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -109,10 +109,10 @@
 	name = "stone spear"
 	result = /obj/item/weapon/material/twohanded/spear/flint
 	reqs = list(
-		/obj/item/weapon/material/knife/stone = 1,
-		/obj/item/stack/material/flint = 1,
-		/obj/item/weapon/bone = 2,
-		/obj/item/stack/material/fiber = 3
+		list(/obj/item/weapon/material/knife/stone = 1),
+		list(/obj/item/stack/material/flint = 1),
+		list(/obj/item/weapon/bone = 2),
+		list(/obj/item/stack/material/fiber = 3)
 	)
 	time = 120
 	category = CAT_WEAPONRY
@@ -121,6 +121,6 @@
 /datum/crafting_recipe/ropebindings
 	name = "rope bindings"
 	result = /obj/item/weapon/handcuffs/cable/plantfiber
-	reqs = list(/obj/item/stack/material/fiber = 3)
+	reqs = list(list(/obj/item/stack/material/fiber = 3))
 	time = 60
 	category = CAT_MISC
\ No newline at end of file
diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm
index 40222651378..6baa4b5e9bf 100644
--- a/code/datums/components/crafting/recipes/weapons.dm
+++ b/code/datums/components/crafting/recipes/weapons.dm
@@ -1,9 +1,23 @@
 /datum/crafting_recipe/stunprod
 	name = "Stunprod"
 	result = /obj/item/weapon/melee/baton/cattleprod
-	reqs = list(/obj/item/weapon/handcuffs/cable = 1,
-				/obj/item/stack/rods = 1,
-				/obj/item/weapon/tool/wirecutters = 1)
+	reqs = list(list(/obj/item/weapon/handcuffs/cable = 1),
+				list(/obj/item/stack/rods = 1),
+				list(/obj/item/weapon/tool/wirecutters = 1))
+	time = 40
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
+/datum/crafting_recipe/spear
+	name = "Spear"
+	result = /obj/item/weapon/material/twohanded/spear
+	reqs = list(list(/obj/item/weapon/handcuffs/cable = 1),
+				list(/obj/item/stack/rods = 1),
+				list(/obj/item/weapon/material/shard = 1,
+					 /obj/item/weapon/material/butterflyblade = 1)
+				)
+	parts = list(/obj/item/weapon/material/shard = 1,
+				 /obj/item/weapon/material/butterflyblade = 1)
 	time = 40
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
@@ -11,10 +25,8 @@
 /datum/crafting_recipe/shortbow
 	name = "Shortbow"
 	result = /obj/item/weapon/gun/launcher/crossbow/bow
-	reqs = list(
-		/obj/item/stack/material/wood = 10,
-		/obj/item/stack/material/cloth = 5
-	)
+	reqs = list(list(/obj/item/stack/material/wood = 10),
+		list(/obj/item/stack/material/cloth = 5))
 	time = 120
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
@@ -22,10 +34,8 @@
 /datum/crafting_recipe/arrow_sandstone
 	name = "Wood arrow (sandstone tip)"
 	result = /obj/item/weapon/arrow/standard
-	reqs = list(
-		/obj/item/stack/material/wood = 2,
-		/obj/item/stack/material/sandstone = 2
-	)
+	reqs = list(list(/obj/item/stack/material/wood = 2),
+		list(/obj/item/stack/material/sandstone = 2))
 	time = 40
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO
@@ -33,10 +43,8 @@
 /datum/crafting_recipe/arrow_marble
 	name = "Wood arrow (marble tip)"
 	result = /obj/item/weapon/arrow/standard
-	reqs = list(
-		/obj/item/stack/material/wood = 2,
-		/obj/item/stack/material/marble = 2
-	)
+	reqs = list(list(/obj/item/stack/material/wood = 2),
+		list(/obj/item/stack/material/marble = 2))
 	time = 40
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO