Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

ashwalker - the resin expansion #12607

Merged
JamieD1 merged 8 commits into from
Nov 14, 2021
Merged

ashwalker - the resin expansion #12607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9911fc8
ashwalker resin expansion
Marmio64 Nov 6, 2021
14c7ff9
Merge remote-tracking branch 'upstream/master' into lavaland-resin
Marmio64 Nov 6, 2021
e02a29d
Merge remote-tracking branch 'upstream/master' into lavaland-resin
Marmio64 Nov 6, 2021
a113e3e
resin statue
Marmio64 Nov 6, 2021
958e6f9
Update code/modules/reagents/chemistry/recipes/others.dm
Marmio64 Nov 6, 2021
50a702b
fix?
Marmio64 Nov 6, 2021
2196d3a
makes statue look a tiny bit better
Marmio64 Nov 6, 2021
28ea24b
resin slightly less dangerous and less rng dependant, fixed statues
Marmio64 Nov 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -1492,7 +1493,7 @@ ac
as
aB
aN
aY
ue
bk
bw
ak
Expand Down
11 changes: 10 additions & 1 deletion code/datums/components/crafting/recipes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
78 changes: 78 additions & 0 deletions code/game/objects/items/manuals.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,84 @@
</html>
"}

/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 = {"<html>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
h2 {font-size: 15px; margin: 15px 0px 5px;}
li {margin: 2px 0px 2px 15px;}
ul {list-style: none; margin: 5px; padding: 0px;}
ol {margin: 5px; padding: 0px 15px;}
</style>
</head>
<body>

<h1>Ancient Ashwalker Recipes</h1>
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.


<h2>Tribalordrazine:</h2>

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.

<h2>Capmix:</h2>

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.

<h2>Resin:</h2>

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.

<h2>Mushroom Paste:</h2>

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.

<h2>Bug Cheese:</h2>

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.

<h2>Flora:</h2>
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.
</body>
</html>
"}

/obj/item/book/manual/nuclear
name = "Fission Mailed: Nuclear Sabotage 101"
icon_state ="bookNuclear"
Expand Down
20 changes: 20 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
. = ..()
15 changes: 15 additions & 0 deletions code/game/objects/structures/statues.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/head/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,13 @@
desc = "A crown worn by only the highest emperors of the <s>land</s> 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."
Expand Down
10 changes: 5 additions & 5 deletions code/modules/mining/lavaland/ash_flora.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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

Expand Down
16 changes: 14 additions & 2 deletions code/modules/reagents/chemistry/reagents/food_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
12 changes: 12 additions & 0 deletions code/modules/reagents/chemistry/recipes/others.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Binary file modified icons/mob/head.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/stack_objects.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/statue.dmi
View file
Open in desktop
Binary file not shown.