21. The last items

Осталась броня (она еще не нарисована)

code/game/objects/items.dm

@@ -202,6 +202,9 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/g
 	///Datum used in item pixel shift TGUI
 	var/datum/ui_module/item_pixel_shift/item_pixel_shift
 
+	/// Used in butchering of animals, set to TRUE for near instant butchering
+	var/has_speed_harvest = FALSE
+
 /obj/item/New()
 	..()
 	for(var/path in actions_types)

code/game/objects/items/weapons/twohanded.dm

@@ -134,10 +134,24 @@
 	force_wielded = 23
 	needs_permit = TRUE
 
-
 /obj/item/twohanded/fireaxe/boneaxe/update_icon_state()
 	icon_state = "bone_axe[HAS_TRAIT(src, TRAIT_WIELDED)]"
 
+/obj/item/twohanded/fireaxe/boneaxe/guillotine
+	name = "guillotine"
+	desc = "Массивный, грозно выглядящий пилотопор, созданный с использованием костяного нароста ослеплённого жнеца. Идеален для убийства и последующей разделки чудовищ."
+	icon_state = "guillotine0"
+	force_unwielded = 7
+	force_wielded = 25
+	throwforce = 20
+	armour_penetration = 30
+	lefthand_file = 'icons/mob/inhands/lavaland/lava_items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/lavaland/lava_items_righthand.dmi'
+	has_speed_harvest = TRUE
+
+/obj/item/twohanded/fireaxe/boneaxe/guillotine/update_icon_state()
+	icon_state = "guillotine[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
 
 /obj/item/twohanded/fireaxe/energized
 	desc = "Someone with a love for fire axes decided to turn this one into a high-powered energy weapon. Seems excessive."
@@ -408,6 +422,27 @@
 	throwforce = 26
 	icon_prefix = "chitin_spear"
 
+/obj/item/twohanded/spear/bonespear/her_biting_embrace
+	name = "her biting embrace"
+	desc = "Качественно созданное копье, украшенное церемониальными узорами, использующее хвост донного угря в качестве наконечника."
+	icon_state = "her_biting_embrace0"
+	icon_prefix = "her_biting_embrace"
+	lefthand_file = 'icons/mob/inhands/lavaland/lava_items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/lavaland/lava_items_righthand.dmi'
+	force = 16
+	force_unwielded = 16
+	force_wielded = 28 // I have no idea about balance too
+	throwforce = 45
+
+/obj/item/twohanded/spear/bonespear/her_biting_embrace/attack(mob/living/target, mob/living/user, params, def_zone, skip_attack_anim)
+	. = ..()
+	if(!ATTACK_CHAIN_SUCCESS_CHECK(.) || !HAS_TRAIT(src, TRAIT_WIELDED))
+		return .
+	var/datum/status_effect/saw_bleed/bloodletting/A = target.has_status_effect(STATUS_EFFECT_BLOODLETTING)
+	if(!A)
+		target.apply_status_effect(STATUS_EFFECT_BLOODLETTING)
+	else
+		A.add_bleed(6)
 
 /obj/item/twohanded/spear/plasma
 	name = "plasma spear"

code/modules/crafting/recipes.dm

@@ -731,6 +731,18 @@
 	category = CAT_PRIMAL
 	subcategory = CAT_WEAPONS
 
+/datum/crafting_recipe/upgraded_spear
+	name = "Her Biting Embrace"
+	result = /obj/item/twohanded/spear/bonespear/her_biting_embrace
+	time = 7.5 SECONDS
+	reqs = list(/obj/item/twohanded/spear/bonespear/chitinspear = 1, //tier 3 spear
+				/obj/item/stack/sheet/sinew = 1,
+				/obj/item/kitchen/knife/combat/survival/bone/eel = 1,
+				/obj/item/gem/ruby = 1)
+	blacklist = list(/obj/item/twohanded/spear/bonespear/her_biting_embrace)
+	category = CAT_PRIMAL
+	subcategory = CAT_WEAPONS
+
 /datum/crafting_recipe/bow
 	name = "Wooden Bow"
 	result = /obj/item/gun/projectile/bow
@@ -778,6 +790,18 @@
 	category = CAT_PRIMAL
 	subcategory = CAT_WEAPONS
 
+/datum/crafting_recipe/jagged_arrow
+	result = list(/obj/item/ammo_casing/caseless/arrow/jagged,
+				/obj/item/ammo_casing/caseless/arrow/jagged,
+				/obj/item/ammo_casing/caseless/arrow/jagged)
+	time = 4 SECONDS
+	reqs = list(/obj/item/ammo_casing/caseless/arrow = 3,
+				/obj/item/stack/sheet/razor_sharp_teeth = 1,
+				/obj/item/stack/sheet/animalhide/weaver_chitin = 1)
+	blacklist = list(/obj/item/ammo_casing/caseless/arrow/jagged)
+	category = CAT_PRIMAL
+	subcategory = CAT_WEAPONS
+
 /datum/crafting_recipe/quiver
 	name = "Quiver"
 	result = /obj/item/storage/backpack/quiver
@@ -813,6 +837,17 @@
 	category = CAT_PRIMAL
 	subcategory = CAT_WEAPONS
 
+/datum/crafting_recipe/boneaxe
+	name = "Bone Axe"
+	result = /obj/item/twohanded/fireaxe/boneaxe/guillotine
+	time = 5 SECONDS
+	reqs = list(/obj/item/twohanded/fireaxe/boneaxe = 1,
+				/obj/item/circular_saw_blade = 1,
+				/obj/item/stack/sheet/sinew = 2)
+	blacklist = list(/obj/item/twohanded/fireaxe/boneaxe/guillotine)
+	category = CAT_PRIMAL
+	subcategory = CAT_WEAPONS
+
 /datum/crafting_recipe/bonfire
 	name = "Bonfire"
 	time = 60

code/modules/mining/ash_walkers/fish.dm

@@ -107,7 +107,7 @@
 	if(sharpness && user.a_intent == INTENT_HARM)
 		to_chat(user, span_notice("Вы начинаете разделывать [declent_ru(ACCUSATIVE)]..."))
 		playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
-		if(do_after(user, 6 SECONDS, src,) && Adjacent(I))
+		if(do_after(user, I.has_speed_harvest ? 1 SECONDS : 6 SECONDS, src,) && Adjacent(I))
 			check_special_harvest()
 			harvest(user)
 	return ..()

code/modules/mob/living/living.dm

@@ -1381,7 +1381,7 @@
 	. = TRUE
 	to_chat(user, span_notice("You begin to butcher [src]..."))
 	playsound(loc, 'sound/weapons/slice.ogg', 50, TRUE, -1)
-	if(!do_after(user, 4 SECONDS * mob_size, src, NONE, max_interact_count = 1, cancel_on_max = TRUE) || !Adjacent(user))
+	if(!do_after(user, I.has_speed_harvest ? 1 SECONDS : (4 SECONDS * mob_size), src, NONE, max_interact_count = 1, cancel_on_max = TRUE) || !Adjacent(user))
 		return .
 	harvest(user)
 

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

@@ -18,7 +18,6 @@
 	desc = "A primitive bow with a sinew bowstring. Typically used by tribal hunters and warriors. Due to the specific design of the bow, it's able to shoot only bone arrows."
 	icon_state = "ashenbow"
 	item_state = "ashenbow"
-	mag_type = /obj/item/ammo_box/magazine/internal/bow/ashen //you can't shoot wooden arrows from bone bow!
 	flags = NONE
 	force = 10
 	slowdown_when_ready = 1
@@ -99,11 +98,6 @@
 	max_ammo = 1
 	start_empty = TRUE
 
-/obj/item/ammo_box/magazine/internal/bow/ashen
-	name = "ashen bow internal magazine"
-	ammo_type = /obj/item/ammo_casing/caseless/arrow/bone_tipped
-	caliber = "bone_arrow"
-
 /obj/item/projectile/bullet/reusable/arrow //only for wooden bow!
 	name = "arrow"
 	icon_state = "arrow"
@@ -120,6 +114,14 @@
 	damage = 45
 	armour_penetration = -10
 
+/obj/item/projectile/bullet/reusable/arrow/jagged //alternative arrow, made from fishing
+	name = "jagged-tipped arrow"
+	icon_state = "jagged_arrow"
+	ammo_type = /obj/item/ammo_casing/caseless/arrow/jagged
+	range = 12
+	damage = 70
+	armour_penetration = -10
+
 /obj/item/ammo_casing/caseless/arrow
 	name = "arrow"
 	desc = "Stab, stab, stab."
@@ -135,7 +137,15 @@
 	icon_state = "bone_arrow"
 	force = 12
 	projectile_type = /obj/item/projectile/bullet/reusable/arrow/bone
-	caliber = "bone_arrow"
+	caliber = "arrow"
+
+/obj/item/ammo_casing/caseless/arrow/jagged
+	name = "jagged-tipped arrow"
+	desc = "Стрела, сделанная из зубов хищной рыбы. Невероятно острая и крепкая."
+	icon_state = "jagged_arrow"
+	force = 16
+	projectile_type = /obj/item/projectile/bullet/reusable/arrow/jagged
+	caliber = "arrow"
 
 //quiver
 /obj/item/storage/backpack/quiver