diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index b8496c865c..6ebfd3254f 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -234,19 +234,6 @@ reagents.chem_temp = 1000 //Sets off the black powder reagents.handle_reactions() -// Lavaland cactus - -/obj/item/seeds/lavaland/cactus - name = "pack of fruiting cactus seeds" - desc = "These seeds grow into fruiting cacti." - icon_state = "seed-cactus" - species = "cactus" - plantname = "Fruiting Cactus" - product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit - growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' - growthstages = 2 - - // Coconut /obj/item/seeds/coconut name = "pack of coconut seeds" diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 554115eb5f..699a1c798d 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -334,68 +334,4 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/shadowshroom/attack_self(mob/user) . = ..() if(.) - investigate_log("was planted by [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY) - -//// LAVALAND MUSHROOMS //// - -// Bracket (Shaving mushroom) - -/obj/item/seeds/lavaland - name = "lavaland seeds" - desc = "You should never see this." - lifespan = 50 - endurance = 25 - maturation = 7 - production = 4 - yield = 4 - potency = 15 - growthstages = 3 - rarity = 20 - reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) - resistance_flags = FIRE_PROOF - -/obj/item/seeds/lavaland/polypore - name = "pack of polypore mycelium" - desc = "This mycelium grows into bracket mushrooms, also known as polypores. Woody and firm, shaft miners often use them for makeshift crafts." - icon_state = "mycelium-polypore" - species = "polypore" - plantname = "Polypore Mushrooms" - product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings - genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) - growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - -// Porcini (Leafy mushroom) - -/obj/item/seeds/lavaland/porcini - name = "pack of porcini mycelium" - desc = "This mycelium grows into Boletus edulus, also known as porcini. Native to the late Earth, but discovered on Lavaland. Has culinary, medicinal and relaxant effects." - icon_state = "mycelium-porcini" - species = "porcini" - plantname = "Porcini Mushrooms" - product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf - genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) - growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - -// Inocybe (Mushroom caps) - -/obj/item/seeds/lavaland/inocybe - name = "pack of inocybe mycelium" - desc = "This mycelium grows into an inocybe mushroom, a species of Lavaland origin with hallucinatory and toxic effects." - icon_state = "mycelium-inocybe" - species = "inocybe" - plantname = "Inocybe Mushrooms" - product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap - genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) - growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - -// Embershroom (Mushroom stem) - -/obj/item/seeds/lavaland/ember - name = "pack of embershroom mycelium" - desc = "This mycelium grows into embershrooms, a species of bioluminescent mushrooms native to Lavaland." - icon_state = "mycelium-ember" - species = "ember" - plantname = "Embershroom Mushrooms" - 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) - growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' + investigate_log("was planted by [key_name(user)] at [AREACOORD(user)]", INVESTIGATE_BOTANY) \ No newline at end of file diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 1cd63db6da..718033ac56 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -620,7 +620,7 @@ if(!(myseed.resistance_flags & FIRE_PROOF)) adjustHealth(-round(S.get_reagent_amount(/datum/reagent/napalm) * 6)) adjustToxic(round(S.get_reagent_amount(/datum/reagent/napalm) * 7)) - adjustWeeds(-rand(5,9)) + adjustWeeds(-rand(5,9)) //Weed Spray if(S.has_reagent(/datum/reagent/toxin/plantbgone/weedkiller, 1)) diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index ea0174d2a5..43c8dec129 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -227,6 +227,78 @@ else . = ..() +////// LAVALAND FLORA ////// + +/obj/item/seeds/lavaland + name = "lavaland seeds" + desc = "You should never see this." + lifespan = 50 + endurance = 25 + maturation = 7 + production = 4 + yield = 4 + potency = 15 + growthstages = 3 + rarity = 20 + reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) + resistance_flags = FIRE_PROOF + +/obj/item/seeds/lavaland/cactus + name = "pack of fruiting cactus seeds" + desc = "These seeds grow into fruiting cacti." + icon_state = "seed-cactus" + species = "cactus" + plantname = "Fruiting Cactus" + product = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit + 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) + +/obj/item/seeds/lavaland/polypore + name = "pack of polypore mycelium" + desc = "This mycelium grows into bracket mushrooms, also known as polypores. Woody and firm, shaft miners often use them for makeshift crafts." + icon_state = "mycelium-polypore" + species = "polypore" + plantname = "Polypore Mushrooms" + 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) + +/obj/item/seeds/lavaland/porcini + name = "pack of porcini mycelium" + desc = "This mycelium grows into Boletus edulus, also known as porcini. Native to the late Earth, but discovered on Lavaland. Has culinary, medicinal and relaxant effects." + icon_state = "mycelium-porcini" + species = "porcini" + plantname = "Porcini Mushrooms" + 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) + +/obj/item/seeds/lavaland/inocybe + name = "pack of inocybe mycelium" + desc = "This mycelium grows into an inocybe mushroom, a species of Lavaland origin with hallucinatory and toxic effects." + icon_state = "mycelium-inocybe" + species = "inocybe" + plantname = "Inocybe Mushrooms" + 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) + +/obj/item/seeds/lavaland/ember + name = "pack of embershroom mycelium" + desc = "This mycelium grows into embershrooms, a species of bioluminescent mushrooms native to Lavaland." + icon_state = "mycelium-ember" + species = "ember" + plantname = "Embershroom Mushrooms" + 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) + //what you can craft with these things /datum/crafting_recipe/mushroom_bowl name = "Mushroom Bowl"