ya nasral v kod

code/datums/mapgen/LavalandGenerator.dm

@@ -26,7 +26,8 @@
 		/obj/structure/flora/ash/stem_shroom = 2,
 		/obj/structure/flora/ash/cacti = 1,
 		/obj/structure/flora/ash/tall_shroom = 2,
-		/obj/structure/flora/ash/fireblossom = 2
+		/obj/structure/flora/ash/fireblossom = 2,
+		/obj/structure/flora/ash/coaltree = 1
 	)
 
 	smoothing_iterations = 50

code/game/objects/items/devices/scanners.dm

@@ -679,6 +679,18 @@ REAGENT SCANNER
 	origin_tech = "magnets=2;biotech=2"
 	usesound = 'sound/items/deconstruct.ogg'
 
+/obj/item/healthanalyzer/gem_analyzer
+	name = "eye of health"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "Gem_analyzer"
+	item_state = "gem_analyzer"
+	desc = "Потом."
+	origin_tech = null
+
+/obj/item/healthanalyzer/healtheye/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/healthupgrade))
+		to_chat(user, span_notice("Установить невозможно."))
+
 /obj/item/reagent_scanner
 	name = "reagent scanner"
 	desc = "A hand-held reagent scanner which identifies chemical agents and blood types."

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

@@ -286,7 +286,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		if(!do_after(user, 5 SECONDS * I.toolspeed, src, category = DA_CAT_TOOL))
 			return ATTACK_CHAIN_PROCEED
 		to_chat(user, span_notice("You cut the hair from [src]."))
-		var/obj/item/stack/sheet/hairlesshide/hide = new(drop_location(), amount)
+		var/obj/item/stack/sheet/hairlesshide/hide = new(drop_location(), amount + amount)
 		hide.add_fingerprint(user)
 		qdel(src)
 		return ATTACK_CHAIN_BLOCKED_ALL

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

@@ -89,7 +89,7 @@
 	item_state = "goliath_shield"
 	materials = list()
 	origin_tech = "materials=1;combat=3;biotech=2"
-	block_chance = 30
+	block_chance = 45
 	obj_integrity = 380
 	max_integrity = 380
 

code/game/objects/structures/watercloset.dm

@@ -698,6 +698,14 @@
 	can_rotate = 0
 	resistance_flags = UNACIDABLE
 
+/obj/structure/sink/puddle/Initialize(mapload)
+	. = ..()
+
+	var/static/list/loc_connections = list(
+		COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+	)
+	AddElement(/datum/element/connect_loc, loc_connections)
+
 
 /obj/structure/sink/puddle/attack_hand(mob/user)
 	flick("puddle-splash", src)
@@ -727,6 +735,22 @@
 
 	return ..()
 
+/obj/structure/sink/puddle/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+	SIGNAL_HANDLER
+	wash(arrived)
+
+/obj/structure/sink/puddle/proc/wash(atom/target)
+	if(isitem(target))
+		var/obj/item/item = target
+		item.extinguish()
+
+	if(isliving(target))
+		var/mob/living/l_target = target
+		l_target.ExtinguishMob()
+		l_target.adjust_fire_stacks(-20)
+		to_chat(l_target, span_warning("You've been drenched in water!"))
+
+	target.clean_blood()
 
 //////////////////////////////////
 //		Bathroom Fixture Items	//

code/modules/clothing/gloves/miscellaneous.dm

@@ -18,7 +18,7 @@
 	desc = "Grey gloves without fingertips made from the hide of a dead arachnid found on lavaland. Makes wearer stronger in disarming ability."
 	icon_state = "weaver_chitin"
 	item_state = "weaver_chitin"
-	extra_knock_chance = 5
+	extra_knock_chance = 20
 
 /obj/item/clothing/gloves/cyborg
 	desc = "beep boop borp"

code/modules/clothing/suits/armor.dm

@@ -639,7 +639,7 @@
 	item_state = "goliath_cloak"
 	desc = "A staunch, practical cape made out of numerous monster materials, it is coveted amongst exiles & hermits."
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/twohanded/spear, /obj/item/organ/internal/regenerative_core/legion, /obj/item/kitchen/knife/combat/survival, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
-	armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
+	armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 60) //a fair alternative to bone armor, requiring alternative materials and gaining a suit slot
 	hoodtype = /obj/item/clothing/head/hooded/goliath
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
 
@@ -648,7 +648,7 @@
 	icon_state = "golhood"
 	item_state = "golhood"
 	desc = "A protective & concealing hood."
-	armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
+	armor = list("melee" = 35, "bullet" = 10, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 60)
 	flags_inv = HIDEHAIR
 	flags_cover = HEADCOVERSEYES
 

code/modules/crafting/recipes.dm

@@ -675,6 +675,22 @@
 	result = /obj/item/stack/medical/splint/tribal
 	category = CAT_PRIMAL
 
+/datum/crafting_recipe/primitive_surgical_kit
+	name = "Primitive surgical kit"
+	time = 30
+	reqs = list(/obj/item/stack/sheet/bone = 6,
+				/obj/item/stack/sheet/sinew = 3)
+	result = list(/obj/item/retractor/primitive_retractor,
+				/obj/item/hemostat/primitive_hemostat,
+				/obj/item/cautery/primitive_cautery,
+				/obj/item/surgicaldrill/primitive_surgicaldrill,
+				/obj/item/scalpel/primitive_scalpel,
+				/obj/item/circular_saw/primitive_saw,
+				/obj/item/bonegel/primitive_bonegel,
+				/obj/item/FixOVein/primitive_FixOVein,
+				/obj/item/bonesetter/primitive_bonesetter)
+	category = CAT_PRIMAL
+
 /datum/crafting_recipe/bonedagger
 	name = "Bone Dagger"
 	result = /obj/item/kitchen/knife/combat/survival/bone
@@ -695,7 +711,7 @@
 	result = /obj/item/shield/riot/goliath
 	time = 6 SECONDS
 	reqs = list(/obj/item/stack/sheet/bone = 4,
-				/obj/item/stack/sheet/animalhide/goliath_hide = 3)
+				/obj/item/stack/sheet/animalhide/goliath_hide = 2)
 	category = CAT_PRIMAL
 
 /datum/crafting_recipe/bonespear
@@ -798,6 +814,14 @@
 	category = CAT_PRIMAL
 	alert_admins_on_craft = TRUE
 
+/datum/crafting_recipe/bonfire_coaltree
+	name = "Bonfire (coaltree)"
+	time = 60
+	reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/coaltree_log = 5)
+	result = /obj/structure/bonfire
+	category = CAT_PRIMAL
+	alert_admins_on_craft = TRUE
+
 /datum/crafting_recipe/rake //Category resorting incoming
 	name = "Rake"
 	time = 30
@@ -1477,9 +1501,9 @@
 	time = 5 SECONDS
 	reqs = list(/obj/item/clothing/suit/hooded/goliath = 1,
 				/obj/item/stack/sheet/animalhide/goliath_hide = 2, //2 plates for the cloak plus 2 here plus 3 for plating the armor = 7 total
-				/obj/item/stack/sheet/animalhide/weaver_chitin = 10,
-				/obj/item/stack/sheet/bone = 8,
-				/obj/item/stack/sheet/sinew = 10)
+				/obj/item/stack/sheet/animalhide/weaver_chitin = 6,
+				/obj/item/stack/sheet/bone = 5,
+				/obj/item/stack/sheet/sinew = 5)
 	category = CAT_PRIMAL
 
 /datum/crafting_recipe/pathtreads
@@ -1518,3 +1542,11 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
 	always_availible = FALSE
+
+/datum/crafting_recipe/ashrack
+	name = "Primitive dryig rack"
+	result = /obj/machinery/smartfridge/drying_rack/ash
+	time = 15 SECONDS
+	reqs = list(/obj/item/stack/sheet/wood = 2,
+				/obj/item/stack/sheet/sinew = 1)
+	category = CAT_PRIMAL

code/modules/food_and_drinks/food/foods/meat.dm

@@ -57,6 +57,19 @@
 		cutlet.add_fingerprint(user)
 	qdel(src)
 
+/obj/item/reagent_containers/food/snacks/meat/burn()
+	visible_message("<span class='notice'>[src] finishes cooking!</span>")
+	new /obj/item/reagent_containers/food/snacks/roasted_meat(loc)
+	qdel(src)
+
+/obj/item/reagent_containers/food/snacks/roasted_meat
+	name = "roasted meat"
+	desc = "Потом"
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	icon_state = "roasted_meat"
+	list_reagents = list("protein" = 4, "vitamin" = 1)
+	tastes = list("meat" = 1)
+	foodtype = MEAT
 
 /obj/item/reagent_containers/food/snacks/meat/syntiflesh
 	name = "synthetic meat"
@@ -420,6 +433,11 @@
 	list_reagents = list("protein" = 2, "toxin" = 2)
 	tastes = list("cobwebs" = 1, "creepy motion" = 1)
 
+/obj/item/reagent_containers/food/snacks/monstermeat/spiderleg/burn()
+	visible_message("<span class='notice'>[src] finishes cooking!</span>")
+	new /obj/item/reagent_containers/food/snacks/roasted_spiderleg(loc)
+	qdel(src)
+
 /obj/item/reagent_containers/food/snacks/raw_bacon
 	name = "raw bacon"
 	desc = "God's gift to man in uncooked form."
@@ -700,6 +718,15 @@
 	tastes = list("meat" = 1)
 	foodtype = MEAT
 
+/obj/item/reagent_containers/food/snacks/roasted_spiderleg
+	name = "roasted spider leg"
+	desc = "Потом"
+	resistance_flags = LAVA_PROOF | FIRE_PROOF
+	icon_state = "roasted_spiderleg"
+	list_reagents = list("protein" = 4, "vitamin" = 1)
+	tastes = list("cobwebs" = 1, "meat" = 1)
+	foodtype = MEAT
+
 /obj/item/reagent_containers/food/snacks/goldgrubmeat
 	name= "goldgrub steak"
 	desc = "Cooked intestines with goldgrub skin, retrieved from a Goldgrub. Legends say it is valuable in traditional medicines."

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -789,6 +789,8 @@
 	active_power_usage = 200
 	can_dry = TRUE
 	visible_contents = FALSE
+	var/primitive = FALSE //used for energy consuming stuff
+	var/drying_timer = 1
 	icon_lightmask = null
 
 /obj/machinery/smartfridge/drying_rack/Initialize(mapload)
@@ -810,6 +812,8 @@
 	return
 
 /obj/machinery/smartfridge/drying_rack/power_change(forced = FALSE)
+	if(primitive)
+		return
 	if(powered() && anchored)
 		stat &= ~NOPOWER
 	else
@@ -839,10 +843,10 @@
 	switch(action)
 		if("drying")
 			drying = !drying
-			use_power = drying ? ACTIVE_POWER_USE : IDLE_POWER_USE
+			if(!primitive)
+				use_power = drying ? ACTIVE_POWER_USE : IDLE_POWER_USE
 			update_icon(UPDATE_OVERLAYS)
 
-
 /obj/machinery/smartfridge/drying_rack/update_overlays()
 	. = list()
 	if(drying)
@@ -852,9 +856,14 @@
 
 
 /obj/machinery/smartfridge/drying_rack/process()
-	if(drying && rack_dry())//no need to update unless something got dried
-		update_icon(UPDATE_OVERLAYS)
-
+	..()
+	if(drying)//no need to update unless something got dried
+		if(drying_timer && length(contents))
+			drying_timer--
+		else
+			rack_dry()
+			drying_timer = initial(drying_timer)
+	update_icon(UPDATE_OVERLAYS)
 
 /obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
 	. = ..()
@@ -903,3 +912,25 @@
 		SStgui.update_uis(src)
 		return TRUE
 	return FALSE
+
+/obj/machinery/smartfridge/drying_rack/ash
+	name = "primitive drying rack"
+	desc = "A handmade tribal wooden rack, used to dry plant products, food and leather."
+	icon_state = "primitive-drying-rack"
+	use_power = NO_POWER_USE
+	can_dry = FALSE //trust me
+	drying = TRUE
+	idle_power_usage = 0
+	active_power_usage = 0
+	drying_timer = 8
+	primitive = TRUE
+
+/obj/machinery/smartfridge/drying_rack/ash/update_overlays()
+	overlays.Cut()
+	if(length(contents))
+		overlays += "primitive-drying-rack_leather"
+
+/obj/machinery/smartfridge/drying_rack/ash/on_deconstruction()
+	new /obj/item/stack/sheet/wood(loc, 2)
+	new /obj/item/stack/sheet/sinew(loc, 1)
+	..()

code/modules/mining/lavaland/ash_flora.dm

@@ -178,6 +178,21 @@
 	regrowth_time_low = 2500
 	regrowth_time_high = 4000
 
+/obj/structure/flora/ash/coaltree
+	icon_state = "coaltree"
+	name = "coaltree"
+	desc = "Потом"
+	harvested_name = "coaltree stump"
+	harvested_desc = "Потом."
+	harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/coaltree_log
+	harvest_amount_high = 5
+	harvest_time = 40
+	harvest_message_low = "Потом."
+	harvest_message_med = "Потом."
+	harvest_message_high = "Потом."
+	regrowth_time_low = 4000
+	regrowth_time_high = 6000
+
 /obj/item/reagent_containers/food/snacks/grown/ash_flora
 	name = "mushroom shavings"
 	desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
@@ -232,6 +247,34 @@
 	seed = /obj/item/seeds/lavaland/fireblossom
 	wine_power = 0.4
 
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/coaltree_log
+	name = "coaltree log"
+	desc = "Потом."
+	icon_state = "coaltree_log"
+	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	item_state = "coaltree_log"
+	seed = /obj/item/seeds/lavaland/coaltree
+	wine_power = 0.5
+	item_flags = NOBLUDGEON
+	w_class = WEIGHT_CLASS_NORMAL
+
+/obj/item/reagent_containers/food/snacks/grown/ash_flora/coaltree_log/attackby(obj/item/I, mob/user, params)
+	if(is_sharp(I))
+		if(!isturf(loc))
+			add_fingerprint(user)
+			to_chat(user, span_warning("You cannot chop [src] [ismob(loc) ? "in inventory" : "in [loc]"]."))
+			return ATTACK_CHAIN_PROCEED
+		to_chat(user, span_notice("You have chopped [src] into planks."))
+		var/seed_modifier = 0
+		if(seed)
+			seed_modifier = round(seed.potency / 25)
+		var/obj/item/stack/planks = new /obj/item/stack/sheet/wood(loc, 1 + seed_modifier)
+		transfer_fingerprints_to(planks)
+		planks.add_fingerprint(user)
+		qdel(src)
+		return ATTACK_CHAIN_BLOCKED_ALL
+
 //SEEDS
 
 /obj/item/seeds/lavaland
@@ -316,6 +359,17 @@
 	genes = list(/datum/plant_gene/trait/fire_resistance, /datum/plant_gene/trait/glow/yellow)
 	reagents_add = list("tinlux" = 0.04, "nutriment" = 0.03, "carbon" = 0.05)
 
+/obj/item/seeds/lavaland/coaltree
+	name = "pack of coaltree seeds"
+	desc = "These seeds grow into coaltree."
+	icon_state = "seed-coaltree"
+	species = "coaltree"
+	plantname = "Coaltree"
+	growing_icon = 'icons/obj/hydroponics/growing.dmi'
+	product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/coaltree_log
+	genes = list(/datum/plant_gene/trait/fire_resistance)
+	reagents_add = list("nutriment" = 0.04, "coaltree_extract" = 0.1)
+
 //CRAFTING
 
 //what you can craft with these things

code/modules/mob/living/simple_animal/hostile/mining/goliath.dm

@@ -244,8 +244,7 @@
 	speed = 4
 	pre_attack_icon = "Goliath_preattack"
 	throw_message = "does nothing to the rocky hide of the"
-	loot = list(/obj/item/stack/sheet/animalhide/goliath_hide) //A throwback to the asteroid days
-	butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath = 2, /obj/item/stack/sheet/bone = 2)
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/monstermeat/goliath= 2, /obj/item/stack/sheet/animalhide/goliath_hide = 2, /obj/item/stack/sheet/bone = 2)
 	crusher_drop_mod = 30
 	wander = FALSE
 	var/list/cached_tentacle_turfs