Merge pull request #17036 from TechnoAlchemisto/goliathbones

Adds Bones and sinew to butchering results. Adds bone armor(craftable)

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

@@ -127,6 +127,13 @@ var/global/list/datum/stack_recipe/xeno_recipes = list ( \
 	icon_state = "sheet-leather"
 	origin_tech = "materials=2"
 
+/obj/item/stack/sheet/sinew
+	name = "watcher sinew"
+	icon = 'icons/obj/mining.dmi'
+	desc = "Long stringy filaments which presumably came from a watcher's wings."
+	singular_name = "watcher sinew"
+	icon_state = "sinew"
+	origin_tech = "bio=4"
 
 
 //Step one - dehairing.

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

@@ -14,6 +14,7 @@ Mineral Sheets
 		- Adamantine
 		- Mythril
 		- Enriched Uranium
+		- Bones
 */
 
 /obj/item/stack/sheet/mineral
@@ -372,3 +373,6 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
 /obj/item/stack/sheet/mineral/abductor/New(var/loc, var/amount=null)
 	recipes = abductor_recipes
 	..()
+
+
+

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

@@ -249,4 +249,20 @@ var/global/list/datum/stack_recipe/runed_metal_recipes = list ( \
 	desc = "Rare kind of gems which are only gained by blood sacrifice to minor deities. They are needed in crafting powerful objects."
 	singular_name = "greater gem"
 	icon_state = "sheet-greatergem"
-	origin_tech = "materials=8"
+	origin_tech = "materials=8"
+
+	/*
+ * Bones
+ */
+/obj/item/stack/sheet/bone
+	name = "bones"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "bone"
+	singular_name = "bone"
+	desc = "Someone's been drinking their milk."
+	force = 7
+	throwforce = 5
+	w_class = 3
+	throw_speed = 1
+	throw_range = 3
+	origin_tech = "materials=2;bio=2"

code/modules/clothing/suits/armor.dm

@@ -89,6 +89,15 @@
 	strip_delay = 80
 	put_on_delay = 60
 
+/obj/item/clothing/suit/armor/bone
+	name = "bone armor"
+	desc = "A tribal armor plate, crafted from animal bone."
+	icon_state = "bonearmor"
+	item_state = "bonearmor"
+	blood_overlay_type = "armor"
+	armor = list(melee = 35, bullet = 25, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+	body_parts_covered = CHEST
+
 /obj/item/clothing/suit/armor/bulletproof
 	name = "bulletproof armor"
 	desc = "A bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
@@ -319,3 +328,5 @@
 	desc = "God wills it!"
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
+
+

code/modules/clothing/under/ties.dm

@@ -305,4 +305,18 @@
 	icon = 'icons/obj/clothing/ties.dmi'
 	icon_state = "bling"
 	item_state = ""	//no inhands
-	item_color = "bling"
+	item_color = "bling"
+
+////////////////
+//OONGA BOONGA//
+////////////////
+
+/obj/item/clothing/tie/talisman
+	name = "bone talisman"
+	desc = "A hunter's talisman, some say the old gods smile on those who wear it."
+	icon = 'icons/obj/clothing/ties.dmi'
+	icon_state = "talisman"
+	item_state = ""
+	item_color = "talisman"
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD
+	armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 50, bio = 65, rad = 5) //Faith is the best armor. //This won't actually work because of accessories kill me with a fucking knife jesus christ I hate code

code/modules/crafting/recipes.dm

@@ -351,3 +351,18 @@
 	parts = list(/obj/item/weapon/stock_parts/matter_bin = 1, /obj/item/weapon/grenade/chem_grenade = 2)
 	time = 50
 	category = CAT_WEAPON
+
+/datum/table_recipe/bonearmor
+	name = "Bone Armor"
+	result = /obj/item/clothing/suit/armor/bone
+	time = 30
+	reqs = list(/obj/item/stack/sheet/bone = 6)
+	category = CAT_MISC
+
+/datum/table_recipe/bonetalisman
+	name = "Bone Talisman"
+	result = /obj/item/clothing/tie/talisman
+	time = 20
+	reqs = list(/obj/item/stack/sheet/bone = 2,
+				 /obj/item/stack/sheet/sinew = 1)
+	category = CAT_MISC

code/modules/mining/lavaland/necropolis_chests.dm

@@ -366,7 +366,7 @@
 /datum/table_recipe/oar
 	name = "goliath bone oar"
 	result = /obj/item/weapon/oar
-	reqs = list(/obj/item/asteroid/goliath_hide = 1)
+	reqs = list(/obj/item/stack/sheet/bone = 2)
 	time = 15
 	category = CAT_MISC
 

code/modules/mob/living/simple_animal/hostile/mining_mobs.dm

@@ -479,6 +479,7 @@
 				user << "<span class='warning'>You can't improve [D] any further!</span>"
 				return
 
+
 /mob/living/simple_animal/hostile/asteroid/handle_temperature_damage()
 	if(bodytemperature < minbodytemp)
 		adjustBruteLoss(2)
@@ -634,7 +635,7 @@
 	stat_attack = 1
 	robust_searching = 1
 	loot = list()
-	butcher_results = list(/obj/item/weapon/ore/diamond = 2)
+	butcher_results = list(/obj/item/weapon/ore/diamond = 2, /obj/item/stack/sheet/sinew = 1)
 
 //Goliath
 
@@ -648,11 +649,13 @@
 	icon_dead = "goliath_dead"
 	throw_message = "does nothing to the tough hide of the"
 	pre_attack_icon = "goliath2"
-	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/asteroid/goliath_hide = 1)
+	butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath = 2, /obj/item/asteroid/goliath_hide = 1, /obj/item/stack/sheet/bone = 2)
 	loot = list()
 	stat_attack = 1
 	robust_searching = 1
 
+
+
 //Legion
 
 /mob/living/simple_animal/hostile/asteroid/hivelord/legion

config/admins.txt

@@ -112,4 +112,8 @@ Lumipharon = Game Master
 bgobandit = Game Master
 coiax = Game Master
 RandomMarine = Game Master
-PKPenguin321 = Game Master
+PKPenguin321 = Game Master
+TechnoAlchemist = Game Master
+
+
+