diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index ed917c76fad9..e469f18c7799 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -323,19 +323,6 @@ }, /turf/open/indestructible/boss/air, /area/ruin/unpowered/ash_walkers) -"aY" = ( -/obj/structure/stone_tile, -/obj/structure/stone_tile{ - dir = 4 - }, -/obj/structure/stone_tile{ - dir = 8 - }, -/obj/structure/stone_tile/cracked{ - dir = 1 - }, -/turf/open/indestructible/boss, -/area/ruin/unpowered/ash_walkers) "aZ" = ( /obj/structure/stone_tile/cracked{ dir = 4 @@ -1361,6 +1348,20 @@ }, /turf/closed/mineral/volcanic/lava_land_surface, /area/lavaland/surface/outdoors) +"ue" = ( +/obj/structure/stone_tile, +/obj/structure/stone_tile{ + dir = 4 + }, +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/cracked{ + dir = 1 + }, +/obj/item/book/manual/ashwalker, +/turf/open/indestructible/boss, +/area/ruin/unpowered/ash_walkers) "uD" = ( /obj/structure/stone_tile/block, /obj/effect/mapping_helpers/no_lava, @@ -1492,7 +1493,7 @@ ac as aB aN -aY +ue bk bw ak diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 83feeed73632..0c37db3abf6d 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -615,6 +615,14 @@ reqs = list(/obj/item/stack/sheet/bone = 4) category = CAT_PRIMAL +/datum/crafting_recipe/resincrown + name = "Resin Crown" + result = /obj/item/clothing/head/crown/resin + time = 4 SECONDS + reqs = list(/obj/item/stack/sheet/ashresin = 2, + /obj/item/stack/sheet/mineral/mythril = 1) + category = CAT_PRIMAL + /datum/crafting_recipe/goliathcloak name = "Goliath Cloak" result = /obj/item/clothing/suit/hooded/cloak/goliath @@ -732,10 +740,11 @@ /datum/crafting_recipe/chitinspear name = "Chitin Spear" - result = /obj/item/twohanded/chitinspear //take a bonespear, reinforce it with some chitin, profit? + result = /obj/item/twohanded/chitinspear //take a bonespear, reinforce it with some chitin and resin, profit? time = 7.5 SECONDS reqs = list(/obj/item/twohanded/bonespear = 1, /obj/item/stack/sheet/sinew = 4, + /obj/item/stack/sheet/ashresin = 1, /obj/item/stack/sheet/animalhide/weaver_chitin = 6) category = CAT_PRIMAL diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 8e30b5c557c4..e1ad140acd62 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -161,6 +161,84 @@ "} +/obj/item/book/manual/ashwalker + name = "Tome of Herbal Knowledge" + icon_state = "book1" + author = "Ma'sha Alazee the Shaman" + title = "Tome of Herbal Knowledge" + dat = {" + + + + + +

Ancient Ashwalker Recipes

+ I pass down my knowledge to my kin, all that I know shall forever be preserved in this book. + Inside, I shall teach you various important healing recipes and crafting techniques. + + +

Tribalordrazine:

+ + To prepare, first gather mushroom stems, cacti or porcini leaves, ashes from a burnt item, and a heat source such as a welder. + Next, mash together a stem and cacti fruit/porcini leaf within a mortar with the help of a pestle. + Afterwards, scoop up ashes with the mortar. If the ashes are warm enough, it may mix without extra heat needed. + If it has yet to mix, heat up the bowl by using the welder on it until it has done so. + Consume in moderation in order to heal burns and bruises. + +

Capmix:

+ + To prepare, first gather a mushroom cap, ashes from a burnt item, and a heat source such as a welder. + Next, mash together one mushroom cap. + Afterwards, scoop up ashes with the mortar. If the ashes are warm enough, it may mix without extra heat needed. + If it has yet to mix, heat up the bowl by using the welder on it until it has done so. + Consume in moderation in order to detox the body. Note, this may induce vomiting. + +

Resin:

+ + All the plants here contain a small amount of resin, likely to deter consumption of them, or perhaps to retain water. + Either way, it is known to cause belly aches and toxicity within our bodies when consumed in large amounts. + However there is several methods for avoiding this: + Consuming plants in small quantities, or not consuming them at all. + Mashing the plants up and heating the bowl to solidify and remove most of the resin. + Ingesting capmix in order to expel the resin. + + Resin is also useful for ensuring things stick together, and is a stronger binder than watcher sinew. + To use it for this purpose you'll have to solidify it by heating it up. + +

Mushroom Paste:

+ + To prepare, first gather mushroom stems, cacti or porcini leaves, and a bowl of gutlunch honey/milk. + Next, mash together a stem and a cacti fruit/porcini leaf within a mortar with the help of a pestle. + Afterwards, the mix should congeal into a odorous paste. + This paste can then be applied to crops in order to fertilize them to nurtur and stabilize them. + +

Bug Cheese:

+ + A recipe passed down from generation to generation, far before we even discovered the healing properties of mushrooms and such. + Although I am not an avid chef, I found it important to ensure the knowledge of making this is never lost either. + Creating this delicious food is rather easy. + All you must do is use a mortar and pestle to crush a cacti fruit or porcini leaf and then mix it with gutlunch honey. + The resulting creation is a ball of healthy bug cheese, ready to eat. + +

Flora:

+ Every plant we are blessed with can be used in some way. + All are not dangerous when consumed in moderation, save for mushroom caps. + All may be fermented and brewed into substances that induce a woozy and feel-good high. + Cacti fruit is rich in juices that will nurtur and heal your body. + Polypore shavings are tough and can be used for crafts such as bowls and contain a higher than average resin content. + Porcini leaves contain a similar content to cacti fruit along with a substance that increases brain focus. + Inocybe caps contain deadly toxins in their raw state, but with ash and heat can be neutralized to instead detox the body. + Embershroom stems contain a bioluminescient substance that manages to even light up the body when consumed. + + + "} + /obj/item/book/manual/nuclear name = "Fission Mailed: Nuclear Sabotage 101" icon_state ="bookNuclear" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 2c029b47dc60..8b8dd1b5492a 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -795,3 +795,23 @@ GLOBAL_LIST_INIT(ruinous_metal_recipes, list ( recipes = GLOB.ruinous_metal_recipes . = ..() +/obj/item/stack/sheet/ashresin + name = "ashy resin" + desc = "A solidified mass of sticky plant resin. Useful as an incredibly strong bonding agent." + icon_state = "sheet-resin" + item_state = "sheet-resin" + icon = 'icons/obj/stack_objects.dmi' + sheettype = null + singular_name = "resin droplet" + max_amount = 10 + novariants = TRUE + grind_results = list(/datum/reagent/consumable/ashresin = 5) + merge_type = /obj/item/stack/sheet/ashresin + +GLOBAL_LIST_INIT(ashresin_recipes, list ( + new/datum/stack_recipe("resin statue", /obj/structure/statue/resin/ashwalker, 5, one_per_turf = 1, on_floor = 1, time = 40) + )) + +/obj/item/stack/sheet/ashresin/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.ashresin_recipes + . = ..() diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index 3cc00b651818..f14d79a202fe 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -325,6 +325,21 @@ return ..() return ..() +////////////////////////ash resin////////////// +/obj/structure/statue/resin + max_integrity = 50 + material_drop_type = /obj/item/stack/sheet/ashresin + impressiveness = 20 + desc = "A decently well done statue made of solid resin." + +/obj/structure/statue/resin/ashwalker + name = "statue of an ashwalker" + icon_state = "ashwalker" + + + +///////////////////other////////////////////////// + /obj/structure/statue/elder_atmosian name = "Elder Atmosian" desc = "A statue of an Elder Atmosian, capable of bending the laws of thermodynamics to their will." diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index b49237d54e2e..10fce19b9db6 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -323,6 +323,13 @@ desc = "A crown worn by only the highest emperors of the land space." icon_state = "fancycrown" +/obj/item/clothing/head/crown/resin + name = "resin crown" + desc = "Despite being formed with incredibly tough resin and given a mythril insert, it's still more of a fashion statement than a helmet." + icon_state = "resincrown" + armor = list("melee" = 25,"energy" = 10,"fire" = 0, "acid" = 10) + resistance_flags = NONE + /obj/item/clothing/head/scarecrow_hat name = "scarecrow hat" desc = "A simple straw hat." diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 2ae25a934a5c..7e1b1d205e05 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -220,7 +220,7 @@ genes = list(/datum/plant_gene/trait/fire_resistance) growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' growthstages = 2 - reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/vitfro = 0.08) + reagents_add = list(/datum/reagent/consumable/nutriment = 0.02, /datum/reagent/consumable/vitfro = 0.08, /datum/reagent/consumable/ashresin = 0.02) /obj/item/seeds/lavaland/polypore name = "pack of polypore mycelium" @@ -231,7 +231,7 @@ product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - reagents_add = list(/datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/toxin/minttoxin = 0.02) + reagents_add = list(/datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/toxin/minttoxin = 0.02, /datum/reagent/consumable/ashresin = 0.04) /obj/item/seeds/lavaland/porcini name = "pack of porcini mycelium" @@ -242,7 +242,7 @@ product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - reagents_add = list(/datum/reagent/consumable/nutriment = 0.06, /datum/reagent/consumable/vitfro = 0.04, /datum/reagent/drug/nicotine = 0.04) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/consumable/vitfro = 0.04, /datum/reagent/drug/nicotine = 0.04, /datum/reagent/consumable/ashresin = 0.02) /obj/item/seeds/lavaland/inocybe name = "pack of inocybe mycelium" @@ -253,7 +253,7 @@ product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.04, /datum/reagent/consumable/entpoly = 0.08, /datum/reagent/drug/mushroomhallucinogen = 0.04) + reagents_add = list(/datum/reagent/toxin/mindbreaker = 0.04, /datum/reagent/consumable/entpoly = 0.08, /datum/reagent/drug/mushroomhallucinogen = 0.04, /datum/reagent/consumable/ashresin = 0.02) /obj/item/seeds/lavaland/ember name = "pack of embershroom mycelium" @@ -264,7 +264,7 @@ product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/glow, /datum/plant_gene/trait/fire_resistance) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment/vitamin = 0.02, /datum/reagent/drug/space_drugs = 0.02) + reagents_add = list(/datum/reagent/consumable/tinlux = 0.04, /datum/reagent/consumable/nutriment = 0.02, /datum/reagent/drug/space_drugs = 0.02, /datum/reagent/consumable/ashresin = 0.02) //CRAFTING diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index e22bc8137e35..0e5746977c4f 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -684,16 +684,28 @@ name = "Vitrium Froth" description = "A bubbly paste that heals wounds of the skin." color = "#d3a308" - nutriment_factor = 3 * REAGENTS_METABOLISM taste_description = "fruity mushroom" /datum/reagent/consumable/vitfro/on_mob_life(mob/living/carbon/M) - if(prob(80)) + if(prob(60)) M.adjustBruteLoss(-1*REM, 0) M.adjustFireLoss(-1*REM, 0) . = TRUE ..() +/datum/reagent/consumable/ashresin + name = "Ash Resin" + description = "A sticky and in large quantities toxic substance found in lavaland flora that helps retain water and keep out pests." + color = "#ad8604" + taste_description = "sticky ash" + metabolization_rate = 0.5 * REAGENTS_METABOLISM + +/datum/reagent/consumable/ashresin/on_mob_life(mob/living/carbon/M) //nothing to worry about when eaten sparsely + if(prob(90)) + M.adjustOrganLoss(ORGAN_SLOT_STOMACH, 1) + . = 1 + ..() + /datum/reagent/consumable/clownstears name = "Clown's Tears" description = "The sorrow and melancholy of a thousand bereaved clowns, forever denied their Honkmechs." diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 3989a9415785..a3887828cd26 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -654,3 +654,15 @@ mix_message = "The mixture congeals into a foul smelling paste." results = list(/datum/reagent/plantnutriment/tribalnutriment = 6) required_reagents = list(/datum/reagent/consumable/cream/bug = 2, /datum/reagent/consumable/vitfro = 2, /datum/reagent/consumable/entpoly = 2) + +/datum/chemical_reaction/resinsolidification + name = "Ash Resin Solidification" + id = "resin_solid" + mix_message = "The resin solidifies from the extreme heat." + required_reagents = list(/datum/reagent/consumable/ashresin = 5) + required_temp = 800 + +/datum/chemical_reaction/resinsolidification/on_reaction(datum/reagents/holder, created_volume) + var/location = get_turf(holder.my_atom) + for(var/i in 1 to created_volume) + new /obj/item/stack/sheet/ashresin(location) diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 59dfca3f08a7..2e72bf17da23 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 7fabd4d7935f..f6ff5b6ad313 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi index 9a203ec1e49e..c1a112244ba8 100644 Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ diff --git a/icons/obj/statue.dmi b/icons/obj/statue.dmi index 217fbf89b2e8..e9a8f9374984 100644 Binary files a/icons/obj/statue.dmi and b/icons/obj/statue.dmi differ