Bones, Bows, and Bamboo - Ports "Tribal crafting expansion", "Adds bamboo walls, stools, benches, recolours and resprites existing bamboo items" and other assorted Bee PRs [IDB IGNORE]

code/__DEFINES/construction.dm

@@ -84,7 +84,10 @@
 #define CAT_MISC	"Misc"
 #define CAT_PRIMAL  "Tribal"
 #define CAT_STRUCTURES "Structures"
+#define CAT_APPAREL	"Apparel"
 #define CAT_CLOTHING	"Clothing"
+#define CAT_ARMOR	"Armor"
+#define CAT_EQUIPMENT	"Equipment"
 #define CAT_FOOD	"Foods"
 #define CAT_BREAD	"Breads"
 #define CAT_BURGER	"Burgers"

code/datums/components/crafting/antag.dm

@@ -0,0 +1,142 @@
+///////////////////////////////////////////////////
+/// 				Antag recipes				///
+// see granters.dm - at the top for easy viewing //
+///////////////////////////////////////////////////
+
+// Weapons
+/datum/crafting_recipe/baseball_bat
+	name = "Baseball Bat"
+	result = /obj/item/melee/baseball_bat
+	reqs = list(/obj/item/stack/sheet/mineral/wood = 30
+				)
+	tools = list(TOOL_HATCHET) //to carve the wood into shape
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE
+
+/datum/crafting_recipe/lance
+	name = "Explosive Lance (Grenade)"
+	result = /obj/item/twohanded/spear
+	reqs = list(/obj/item/twohanded/spear = 1,
+				/obj/item/grenade = 1)
+	blacklist = list(/obj/item/twohanded/spear/explosive,
+					/obj/item/grenade/flashbang)
+	parts = list(/obj/item/twohanded/spear = 1,
+				/obj/item/grenade = 1)
+	time = 1.5 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE
+
+/datum/crafting_recipe/knifeboxing
+	name = "Knife-boxing Gloves"
+	result = /obj/item/clothing/gloves/knifeboxing
+	reqs = list(/obj/item/clothing/gloves/boxing = 1,
+				/obj/item/kitchen/knife = 2)
+	time = 10 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE
+
+/datum/crafting_recipe/pipebomb
+	name = "Pipe Bomb"
+	result = /obj/item/grenade/pipebomb
+	reqs = list(/datum/reagent/fuel = 50,
+				/obj/item/stack/cable_coil = 1,
+				/obj/item/assembly/igniter = 1,
+				/obj/item/pipe = 1,
+				/obj/item/assembly/mousetrap = 1)
+	tools = list(TOOL_WELDER, TOOL_WRENCH, TOOL_WIRECUTTER)
+	time = 1.5 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE 	//This was such a bad idea
+
+/datum/crafting_recipe/flamethrower
+	name = "Flamethrower"
+	result = /obj/item/flamethrower
+	reqs = list(/obj/item/weldingtool = 1,
+				/obj/item/assembly/igniter = 1,
+				/obj/item/stack/rods = 1)
+	parts = list(/obj/item/assembly/igniter = 1,
+				/obj/item/weldingtool = 1)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 1 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE
+
+/datum/crafting_recipe/makeshiftpistol
+	name = "Makeshift Pistol"
+	result = /obj/item/gun/ballistic/automatic/pistol/makeshift
+	reqs = list(/obj/item/weaponcrafting/receiver = 1,
+				/obj/item/stack/sheet/metal = 4,
+				/obj/item/stack/rods = 2,
+           		/obj/item/stack/tape = 3)
+	tools = list(TOOL_SCREWDRIVER)
+	time = 12 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE
+
+/datum/crafting_recipe/makeshiftsuppressor
+	name = "Makeshift Suppressor"
+	result = /obj/item/suppressor/makeshift
+	reqs = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1,
+				/obj/item/stack/rods = 1,
+				/obj/item/stack/sheet/cloth = 2,
+           		/obj/item/stack/tape = 1)
+	time = 12 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_availible = FALSE
+
+// Ammo
+
+/datum/crafting_recipe/makeshiftmagazine
+	name = "Makeshift Pistol Magazine (10mm)"
+	result = /obj/item/ammo_box/magazine/m10mm/makeshift
+	reqs = list(/obj/item/stack/sheet/metal = 2,
+        		/obj/item/stack/tape = 2)
+	time = 12 SECONDS
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_availible = FALSE
+
+/datum/crafting_recipe/bola_arrow
+	name = "Bola arrow"
+	result = /obj/item/ammo_casing/caseless/arrow/bola
+	time = 3 SECONDS
+	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
+				/obj/item/stack/sheet/silk = 1,
+				/obj/item/restraints/legcuffs/bola = 1)
+	parts = list(/obj/item/ammo_casing/caseless/arrow = 1, /obj/item/restraints/legcuffs/bola = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_availible = FALSE
+
+/*
+/datum/crafting_recipe/explosive_arrow
+	name = "Explosive arrow"
+	result = /obj/item/ammo_casing/caseless/arrow/explosive
+	time = 3 SECONDS
+	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
+				/obj/item/stack/sheet/silk = 1,
+				/obj/item/grenade = 1)
+	parts = list(/obj/item/ammo_casing/caseless/arrow = 1, /obj/item/grenade = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_availible = FALSE
+*/
+
+/datum/crafting_recipe/flaming_arrow
+	name = "Flaming arrow"
+	result = /obj/item/ammo_casing/caseless/arrow/flaming
+	time = 3 SECONDS
+	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1,
+				/obj/item/stack/sheet/cloth = 1,
+				/datum/reagent/fuel = 10)
+	parts = list(/obj/item/ammo_casing/caseless/arrow = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+	always_availible = FALSE

code/datums/components/crafting/crafting.dm

@@ -41,7 +41,11 @@
 					CAT_SPAGHETTI,
 				),
 				CAT_DRINK = CAT_NONE,
-				CAT_CLOTHING = CAT_NONE,
+				CAT_APPAREL = list(
+					CAT_CLOTHING, 
+					CAT_ARMOR, 
+					CAT_EQUIPMENT
+				),
 			)
 
 	var/cur_category = CAT_NONE
@@ -65,28 +69,40 @@
 
 
 
-/datum/component/personal_crafting/proc/check_contents(datum/crafting_recipe/R, list/contents)
+/datum/component/personal_crafting/proc/check_contents(mob/user, datum/crafting_recipe/R, list/contents)
+	var/list/item_instances = contents["instances"]
 	contents = contents["other"]
-	main_loop:
-		for(var/A in R.reqs)
-			var/needed_amount = R.reqs[A]
-			for(var/B in contents)
-				if(ispath(B, A))
-					if (R.blacklist.Find(B))
-						continue
-					if(contents[B] >= R.reqs[A])
-						continue main_loop
-					else
-						needed_amount -= contents[B]
-						if(needed_amount <= 0)
-							continue main_loop
-						else
-							continue
-			return 0
-	for(var/A in R.chem_catalysts)
-		if(contents[A] < R.chem_catalysts[A])
-			return 0
-	return 1
+
+	var/list/requirements_list = list()
+
+	// Process all requirements
+	for(var/requirement_path in R.reqs)
+		// Check we have the appropriate ammount avalible in the contents list
+		var/needed_amount = R.reqs[requirement_path]
+		for(var/content_item_path in contents)
+			// Right path and not blacklisted
+			if(!ispath(content_item_path, requirement_path) || R.blacklist.Find(requirement_path))
+				continue
+
+			needed_amount -= contents[content_item_path]
+			if(needed_amount <= 0)
+				break
+
+		if(needed_amount > 0)
+			return FALSE
+
+		// Store the instances of what we will use for R.check_requirements() for requirement_path
+		var/list/instances_list = list()
+		for(var/instance_path in item_instances)
+			if(ispath(instance_path in item_instances))
+				instances_list += item_instances[instance_path]
+
+		requirements_list[requirement_path] = instances_list
+
+	for(var/requirement_path in R.chem_catalysts)
+		if(contents[requirement_path] < R.chem_catalysts[requirement_path])
+			return FALSE
+	return R.check_requirements(user, requirements_list)
 
 /datum/component/personal_crafting/proc/get_environment(mob/user)
 	. = list()
@@ -108,11 +124,14 @@
 	. = list()
 	.["tool_behaviour"] = list()
 	.["other"] = list()
+	.["instances"] = list()
 	for(var/obj/item/I in get_environment(user))
-		if(I.flags_1 & HOLOGRAM_1)
-			continue
-		if(I.status_traits && HAS_TRAIT(I,TRAIT_NODROP))
+		if(I.status_traits && HAS_TRAIT(I,TRAIT_NODROP) || I.flags_1 & HOLOGRAM_1)
 			continue
+		if(.["instances"][I.type])
+			.["instances"][I.type] += I
+		else
+			.["instances"][I.type] = list(I)
 		if(istype(I, /obj/item/stack))
 			var/obj/item/stack/S = I
 			.["other"][I.type] += S.amount
@@ -163,11 +182,11 @@
 	var/send_feedback = 1
 	if(HAS_TRAIT(user, TRAIT_CRAFTY))
 		R.time *= 0.75
-	if(check_contents(R, contents))
+	if(check_contents(user, R, contents))
 		if(check_tools(user, R, contents))
 			if(do_after(user, R.time, user))
 				contents = get_surroundings(user)
-				if(!check_contents(R, contents))
+				if(!check_contents(user, R, contents))
 					return ", missing component."
 				if(!check_tools(user, R, contents))
 					return ", missing tool."
@@ -342,7 +361,7 @@
 
 		if((R.category != cur_category) || (R.subcategory != cur_subcategory))
 			continue
-		craftability["[REF(R)]"] = check_contents(R, surroundings)
+		craftability["[REF(R)]"] = check_contents(user, R, surroundings)
 
 	data["craftability"] = craftability
 	return data

code/datums/components/crafting/guncrafting.dm

@@ -13,3 +13,9 @@
 	desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
 	icon = 'icons/obj/improvised.dmi'
 	icon_state = "riflestock"
+
+/obj/item/weaponcrafting/silkstring
+	name = "silkstring"
+	desc = "A long piece of Silk that looks like a cable coil."
+	icon = 'icons/obj/improvised.dmi'
+	icon_state = "silkstring"

code/datums/components/crafting/makeshift.dm

@@ -1,57 +1,3 @@
-//////////
-// GUNS //
-//////////
-
-/datum/crafting_recipe/makeshiftpistol
-	name = "Makeshift Pistol"
-	result = /obj/item/gun/ballistic/automatic/pistol/makeshift
-	reqs = list(/obj/item/weaponcrafting/receiver = 1,
-				/obj/item/stack/sheet/metal = 4,
-				/obj/item/stack/rods = 2,
-           		/obj/item/stack/tape = 3)
-	tools = list(TOOL_SCREWDRIVER)
-	time = 12 SECONDS
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-	always_availible = FALSE
-
-/datum/crafting_recipe/makeshiftmagazine
-	name = "Makeshift Pistol Magazine (10mm)"
-	result = /obj/item/ammo_box/magazine/m10mm/makeshift
-	reqs = list(/obj/item/stack/sheet/metal = 2,
-        		/obj/item/stack/tape = 2)
-	time = 12 SECONDS
-	category = CAT_WEAPONRY
-	subcategory = CAT_AMMO
-	always_availible = FALSE
-
-/datum/crafting_recipe/makeshiftsuppressor
-	name = "Makeshift Suppressor"
-	result = /obj/item/suppressor/makeshift
-	reqs = list(/obj/item/reagent_containers/food/drinks/soda_cans = 1,
-				/obj/item/stack/rods = 1,
-				/obj/item/stack/sheet/cloth = 2,
-           		/obj/item/stack/tape = 1)
-	time = 12 SECONDS
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-	always_availible = FALSE
-
-/datum/crafting_recipe/gauss
-	name = "Makeshift gauss rifle"
-	reqs = list(/obj/item/stock_parts/cell = 1,
-				/obj/item/weaponcrafting/stock = 1,
-				/obj/item/weaponcrafting/receiver = 1,
-				/obj/item/stack/tape = 1,
-				/obj/item/stack/rods = 4,
-				/obj/item/stack/cable_coil = 10)
-	tools = list(TOOL_SCREWDRIVER,TOOL_WELDER,TOOL_WRENCH)
-	result = /obj/item/gun/ballistic/gauss
-	time = 12
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
-
 ///////////
 // TOOLS //
 ///////////
@@ -141,3 +87,13 @@
 	time = 12 SECONDS
 	category = CAT_TOOLS
 	always_availible = FALSE
+
+/datum/crafting_recipe/makeshiftid
+	name = "Makeshift ID"
+	result = /obj/item/card/id/makeshift
+	reqs = list(/obj/item/stack/sheet/cardboard = 2,
+				/obj/item/stack/tape = 1,
+				/obj/item/pen = 1)
+	tools = list(TOOL_WIRECUTTER)
+	time = 30
+	category = CAT_MISC