Merge pull request #14958 from WanderingFox95/WanderingFox95-TribalOverhaul

Tribal Crafting Overhauled & Expanded

code/modules/cargo/exports/weapons.dm

@@ -211,11 +211,6 @@
 	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/ash)
 
-/datum/export/weapon/bow_teaching
-	cost = 500
-	unit_name = "bowyery tablet"
-	export_types = list(/obj/item/book/granter/crafting_recipe/bone_bow)
-
 /datum/export/weapon/quiver
 	cost = 100
 	unit_name = "quiver"

code/modules/clothing/gloves/tacklers.dm

@@ -67,6 +67,20 @@
 	resistance_flags = NONE
 	strip_mod = 1.2 // because apparently black gloves had this
 
+/obj/item/clothing/gloves/tackler/combat/goliath
+	name = "goliath gloves"
+	desc = "Rudimentary tackling gloves. The goliath hide makes it great for grappling with targets, while also being fireproof."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "goligloves"
+	item_state = "goligloves"
+
+	tackle_stam_cost = 25
+	base_knockdown = 1 SECONDS
+	tackle_range = 5
+	tackle_speed = 2
+	min_distance = 2
+	skill_mod = 1
+
 /obj/item/clothing/gloves/tackler/combat/insulated
 	name = "guerrilla gloves"
 	desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."

code/modules/hydroponics/hydroitemdefines.dm

@@ -84,6 +84,12 @@
 	user.visible_message("<span class='suicide'>[user] is scratching [user.p_their()] back as hard as [user.p_they()] can with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (BRUTELOSS)
 
+/obj/item/cultivator/bone
+	name = "bone cultivator"
+	desc = "A handle and a few bones tied together to resemble a hoe. Should work for removing weeds."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "cultivator_bone"
+
 /obj/item/hatchet
 	name = "hatchet"
 	desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
@@ -112,6 +118,12 @@
 	playsound(src, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
 	return (BRUTELOSS)
 
+/obj/item/hatchet/bone
+	name = "bone hatchet"
+	desc = "A primitive hatchet made out of mostly bone, with some sinew to keep it together. It just might do for cutting logs into planks."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "hatchet_bone"
+
 /obj/item/scythe
 	icon_state = "scythe0"
 	lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'

code/modules/mining/equipment/kinetic_crusher.dm

@@ -228,6 +228,13 @@
 /obj/item/kinetic_crusher/glaive/update_icon_state()
 	item_state = "crusher[wielded]-glaive" // this is not icon_state and not supported by 2hcomponent
 
+/obj/item/kinetic_crusher/glaive/bone
+	name = "necropolis bone glaive"
+	desc = "Tribals trying to immitate technology have spent a long time to somehow assemble bits and pieces to work together just like the real thing. \
+	Although it does take a lot of effort and luck to create, it was a success."
+	icon_state = "crusher-bone"
+	item_state = "crusher0-bone"
+
 //destablizing force
 /obj/item/projectile/destabilizer
 	name = "destabilizing force"

code/modules/mining/equipment/mining_tools.dm

@@ -179,6 +179,12 @@
 	custom_materials = list(/datum/material/iron=50)
 	w_class = WEIGHT_CLASS_SMALL
 
+/obj/item/shovel/spade/bone
+	name = "bone spade"
+	desc = "A bone spade, suitable for digging and moving dirt."
+	icon_state = "spade_bone"
+	toolspeed = 0.75
+
 /obj/item/shovel/serrated
 	name = "serrated bone shovel"
 	desc = "A wicked tool that cleaves through dirt just as easily as it does flesh. The design was styled after ancient lavaland tribal designs."

code/modules/surgery/tools.dm

@@ -48,6 +48,13 @@
 	w_class = WEIGHT_CLASS_TINY
 	toolspeed = 0.5
 
+/obj/item/retractor/ashwalker
+	name = "bontractor"
+	desc = "Kinda looks like a chicken bone."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "retractor_bone"
+	toolspeed = 0.85
+
 /obj/item/hemostat
 	name = "hemostat"
 	desc = "You think you have seen this before."
@@ -78,6 +85,14 @@
 	toolspeed = 0.5
 	attack_verb = list("attacked", "pinched")
 
+/obj/item/hemostat/ashwalker
+	name = "femurstat"
+	desc = "Bones that are strapped together with sinews. Used to stop bleeding."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "hemostat_bone"
+	toolspeed = 0.85
+
+
 /obj/item/cautery
 	name = "cautery"
 	desc = "This stops bleeding."
@@ -108,6 +123,13 @@
 	toolspeed = 0.5
 	attack_verb = list("burnt")
 
+/obj/item/cautery/ashwalker
+	name = "coretery"
+	desc = "A legion core strapped to a bone. It can close wounds."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "cautery_bone"
+	toolspeed = 0.85
+
 /obj/item/surgicaldrill
 	name = "surgical drill"
 	desc = "You can drill using this item. You dig?"
@@ -257,6 +279,14 @@
 	user.visible_message("<span class='suicide'>[user] is slitting [user.p_their()] [pick("wrists", "throat", "stomach")] with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (BRUTELOSS)
 
+/obj/item/scalpel/ashwalker
+	name = "diamond scalpel"
+	desc = "Bones and a Diamond tied together to make a scalpel."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "scalpel_bone"
+	force = 12
+	toolspeed = 0.85
+
 /obj/item/circular_saw
 	name = "circular saw"
 	desc = "For heavy duty cutting."
@@ -309,6 +339,14 @@
 	attack_verb = list("attacked", "slashed", "sawed", "cut")
 	sharpness = SHARP_EDGED
 
+/obj/item/circular_saw/ashwalker
+	name = "diamond bonesaw"
+	desc = "Bones designed like a skull, with diamond teeth to cut through bones."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "saw_bone"
+	force = 12
+	toolspeed = 0.85
+
 /obj/item/surgical_drapes
 	name = "surgical drapes"
 	desc = "Nanotrasen brand surgical drapes provide optimal safety and infection control."
@@ -341,6 +379,13 @@
 			prototype = SSresearch.techweb_design_by_id(id)
 			. |= prototype.surgery
 
+
+/obj/item/surgical_drapes/goliath
+	name = "goliath drapes"
+	desc = "Probably not the most hygienic but what the heck else are you gonna use?"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "surgical_drapes_goli"
+
 /obj/item/organ_storage //allows medical cyborgs to manipulate organs without hands
 	name = "organ storage bag"
 	desc = "A container for holding body parts."
@@ -433,3 +478,10 @@
 		to_chat(user, "<span class='warning'>You refrain from hitting [L] with [src], as you are in help intent.</span>")
 		return
 	return ..()
+
+/obj/item/bonesetter/bone
+	name = "bone bonesetter"
+	desc = "A bonesetter made of bones... for setting bones with... bones?"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "bone setter_bone"
+	toolspeed = 0.85