Merge pull request #11098 from Trilbyspaceclone/bows!

Silk into clothing, bows, arrows, quivers and more!

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 pice of silk looks like cable coil."
+	icon = 'icons/obj/improvised.dmi'
+	icon_state = "silkstring"

code/datums/components/crafting/recipes/recipes_primal.dm

@@ -89,4 +89,31 @@
 	parts = list(/obj/item/bodypart/head = 1,
 			/obj/item/twohanded/bonespear = 1)
 	result = /obj/structure/headpike/bone
+	category = CAT_PRIMAL
+
+/datum/crafting_recipe/quiver
+	name = "Quiver"
+	always_availible = FALSE
+	result = /obj/item/storage/belt/quiver
+	time = 80
+	reqs = list(/obj/item/stack/sheet/leather = 3,
+				 /obj/item/stack/sheet/sinew = 4)
+	category = CAT_PRIMAL
+
+/datum/crafting_recipe/bone_bow
+	name = "Bone Bow"
+	result = /obj/item/gun/ballistic/bow/ashen
+	time = 200
+	always_availible = FALSE
+	reqs = list(/obj/item/stack/sheet/bone = 8,
+				 /obj/item/stack/sheet/sinew = 4)
+	category = CAT_PRIMAL
+
+/datum/crafting_recipe/bow_tablet
+	name = "Sandstone Bow Making Manual"
+	result = /obj/item/book/granter/crafting_recipe/bone_bow
+	time = 600 //Scribing
+	always_availible = FALSE
+	reqs = list(/obj/item/stack/rods = 1,
+				 /obj/item/stack/sheet/mineral/sandstone = 4)
 	category = CAT_PRIMAL

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -199,6 +199,16 @@
 //////////////////
 
 
+/datum/crafting_recipe/pipebow
+	name = "Pipe Bow"
+	result =  /obj/item/gun/ballistic/bow/pipe
+	reqs = list(/obj/item/pipe = 5,
+	/obj/item/stack/sheet/plastic = 15,
+	/obj/item/weaponcrafting/silkstring = 10)
+	time = 450
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+
 /datum/crafting_recipe/smartdartgun
 	name = "Smart dartgun"
 	result =  /obj/item/gun/syringe/dart
@@ -278,6 +288,37 @@
 ///AMMO CRAFTING//
 //////////////////
 
+/datum/crafting_recipe/arrow
+	name = "Arrow"
+	result = /obj/item/ammo_casing/caseless/arrow
+	time = 40
+	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
+				 /obj/item/weaponcrafting/silkstring = 1,
+				 /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+
+/datum/crafting_recipe/bone_arrow
+	name = "Bone Arrow"
+	result = /obj/item/ammo_casing/caseless/arrow/bone
+	time = 40
+	always_availible = FALSE
+	reqs = list(/obj/item/stack/sheet/bone = 1,
+				 /obj/item/stack/sheet/sinew = 1,
+				 /obj/item/ammo_casing/caseless/arrow/ashen = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+
+/datum/crafting_recipe/ashen_arrow
+	name = "Harden Arrow"
+	result = /obj/item/ammo_casing/caseless/arrow/ashen
+	tools = list(/obj/structure/bonfire)
+	time = 20
+	always_availible = FALSE
+	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1)
+	category = CAT_WEAPONRY
+	subcategory = CAT_AMMO
+
 /datum/crafting_recipe/smartdart
 	name = "Medical smartdart"
 	result =  /obj/item/reagent_containers/syringe/dart

code/game/objects/items/granters.dm

@@ -490,7 +490,13 @@
 	oneuse = FALSE
 	remarks = list("Looks like these would sell much better in a plasma fire...", "Using glass bowls rather then cones?", "Mixing soda and ice-cream?", "Tall glasses with of liquids and solids...", "Just add a bit of icecream and cherry on top?")
 
-//Later content when I have free time - Trilby Date:24-Aug-2019
+/obj/item/book/granter/crafting_recipe/bone_bow //Bow crafting for non-ashwalkers
+	name = "Sandstone manual on bows"
+	desc = "A standstone slab with everything you need to know for making bows and arrows just like an ashwalker would."
+	crafting_recipe_types = list(/datum/crafting_recipe/bone_arrow, /datum/crafting_recipe/bone_bow, /datum/crafting_recipe/ashen_arrow, /datum/crafting_recipe/quiver, /datum/crafting_recipe/bow_tablet)
+	icon_state = "stone_tablet"
+	oneuse = FALSE
+	remarks = list("Sticking burning arrows into the sand makes them stronger?", "Breaking the bone apart to get shards, not sharpening  the bone.", "Sinew is just like rope?")
 
 /obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book
 	name = "Under The Oven"

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -376,6 +376,14 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 /*
  * Silk
  */
+
+	GLOBAL_LIST_INIT(silk_recipes, list ( \
+	new/datum/stack_recipe("white jumpsuit", /obj/item/clothing/under/color/white, 4, time = 40), \
+	new/datum/stack_recipe("white gloves", /obj/item/clothing/gloves/color/white, 2, time = 40), \
+	null, \
+	new/datum/stack_recipe("silk string", /obj/item/weaponcrafting/silkstring, 2, time = 40), \
+	))
+
 /obj/item/stack/sheet/silk
 	name = "silk"
 	desc = "A long soft material. This one is just made out of cotton rather then any spiders or wyrms"
@@ -385,14 +393,14 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	novariants = TRUE
 	merge_type = /obj/item/stack/sheet/silk
 
-//obj/item/stack/sheet/silk/Initialize(mapload, new_amount, merge = TRUE)
-//	recipes = GLOB.silk_recipes
-//	return ..()
+/obj/item/stack/sheet/silk/Initialize(mapload, new_amount, merge = TRUE)
+	recipes = GLOB.silk_recipes
+	return ..()
 
 /*
  * Durathread
  */
-	GLOBAL_LIST_INIT(durathread_recipes, list ( \
+GLOBAL_LIST_INIT(durathread_recipes, list ( \
 	new/datum/stack_recipe("durathread jumpsuit", /obj/item/clothing/under/durathread, 4, time = 40),
 	new/datum/stack_recipe("durathread beret", /obj/item/clothing/head/beret/durathread, 2, time = 40), \
 	new/datum/stack_recipe("durathread beanie", /obj/item/clothing/head/beanie/durathread, 2, time = 40), \

code/game/objects/structures/ghost_role_spawners.dm

@@ -66,6 +66,14 @@
 	var/datum/language_holder/holder = new_spawn.get_language_holder()
 	holder.selected_default_language = /datum/language/draconic
 
+//Ash walkers on birth understand how to make bone bows, bone arrows and ashen arrows
+
+	new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_arrow)
+	new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bone_bow)
+	new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/ashen_arrow)
+	new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/quiver)
+	new_spawn.mind.teach_crafting_recipe(/datum/crafting_recipe/bow_tablet)
+
 	if(ishuman(new_spawn))
 		var/mob/living/carbon/human/H = new_spawn
 		H.underwear = "Nude"

code/modules/cargo/exports/weapons.dm

@@ -199,6 +199,31 @@
 	unit_name = "advanced shotgun shell"
 	export_types = list(/obj/item/ammo_casing/shotgun/dragonsbreath, /obj/item/ammo_casing/shotgun/meteorslug, /obj/item/ammo_casing/shotgun/pulseslug, /obj/item/ammo_casing/shotgun/frag12, /obj/item/ammo_casing/shotgun/ion, /obj/item/ammo_casing/shotgun/laserslug)
 
+/////////////////////////
+//Bow and Arrows/////////
+/////////////////////////
+
+/datum/export/weapon/bows
+	cost = 450
+	unit_name = "bow"
+	export_types = list(/obj/item/gun/ballistic/bow)
+
+/datum/export/weapon/arrows
+	cost = 150
+	unit_name = "arrow"
+	export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ashen)
+
+/datum/export/weapon/bow_teaching
+	cost = 500
+	unit_name = "stone tablets"
+	export_types = list(/obj/item/book/granter/crafting_recipe/bone_bow)
+
+/datum/export/weapon/quiver
+	cost = 100
+	unit_name = "quiver"
+	export_types = list(/obj/item/storage/belt/quiver)
+
+
 /////////////////////////
 //The Traitor Sell Outs//
 /////////////////////////

code/modules/projectiles/ammunition/caseless/arrow.dm

@@ -5,4 +5,22 @@
 	caliber = "arrow"
 	icon_state = "arrow"
 	throwforce = 3 //good luck hitting someone with the pointy end of the arrow
-	throw_speed = 3
+	throw_speed = 3
+
+/obj/item/ammo_casing/caseless/arrow/ashen
+	name = "ashen arrow"
+	desc = "Fire harderned wooden arrow."
+	icon_state = "asharrow"
+	projectile_type = /obj/item/projectile/bullet/reusable/arrow/ashen
+
+/obj/item/ammo_casing/caseless/arrow/bone
+	name = "bone arrow"
+	desc = "Arrow made of bone and sinew. The tip is sharp enough to pierce into a goliath plate."
+	icon_state = "bonearrow"
+	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone
+
+/obj/item/ammo_casing/caseless/arrow/bronze
+	name = "bronze arrow"
+	desc = "Bronze tipped arrow."
+	icon_state = "bronzearrow"
+	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bronze

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

@@ -50,4 +50,19 @@
 	icon_state = "bow_[get_ammo() ? (chambered ? "firing" : "loaded") : "unloaded"]"
 
 /obj/item/gun/ballistic/bow/can_shoot()
-	return chambered
+	return chambered
+
+/obj/item/gun/ballistic/bow/ashen
+	name = "bone bow"
+	desc = "Some sort of primitive projectile weapon made of bone and sinew. Used to fire arrows."
+	icon_state = "ashenbow"
+	item_state = "ashenbow"
+	force = 8
+
+/obj/item/gun/ballistic/bow/pipe
+	name = "pipe bow"
+	desc = "Some sort of pipe made projectile weapon made of a silk string and lots of bending. Used to fire arrows."
+	icon_state = "pipebow"
+	item_state = "pipebow"
+	inaccuracy_modifier = 1.1 //Made of pipe and in a rush
+	force = 0

code/modules/projectiles/projectile/reusable/arrow.dm

@@ -3,4 +3,23 @@
 	desc = "Woosh!"
 	damage = 15
 	icon_state = "arrow"
-	ammo_type = /obj/item/ammo_casing/caseless/arrow
+	ammo_type = /obj/item/ammo_casing/caseless/arrow
+
+/obj/item/projectile/bullet/reusable/arrow/ashen
+	name = "ashen arrow"
+	desc = "Fire harderned arrow."
+	damage = 25
+	ammo_type = /obj/item/ammo_casing/caseless/arrow/ashen
+
+/obj/item/projectile/bullet/reusable/arrow/bone //AP for ashwalkers
+	name = "bone arrow"
+	desc = "Arrow made of bone and sinew."
+	damage = 35
+	armour_penetration = 40
+	ammo_type = /obj/item/ammo_casing/caseless/arrow/bone
+
+/obj/item/projectile/bullet/reusable/arrow/bronze //Just some AP shots
+	name = "bronze arrow"
+	desc = "Bronze tipped arrow."
+	armour_penetration = 10
+	ammo_type = /obj/item/ammo_casing/caseless/arrow/bronze