diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index d48c5c10..8c34c1d3 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -93,7 +93,8 @@ yield = 3 rarity = 20 mutatelist = list() - reagents_add = list("aphro" = 0.2, "penis_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.04) + genes = list(/datum/plant_gene/reagent/fragile/penischem, /datum/plant_gene/reagent/fragile/crocin) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.04) /obj/item/reagent_containers/food/snacks/grown/pink_chili seed = /obj/item/seeds/chili/pink diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 1646a401..92784ee9 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -68,15 +68,10 @@ icon_grow = "spacemanstrumpet-grow" icon_dead = "spacemanstrumpet-dead" mutatelist = list() - genes = list(/datum/plant_gene/reagent/polypyr) + genes = list(/datum/plant_gene/reagent/fragile/polypyr) reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) rarity = 30 -/obj/item/seeds/poppy/lily/trumpet/Initialize(mapload, nogenes = FALSE) - . = ..() - if(!nogenes) - unset_mutability(/datum/plant_gene/reagent/polypyr, PLANT_GENE_EXTRACTABLE) - /obj/item/reagent_containers/food/snacks/grown/trumpet seed = /obj/item/seeds/poppy/lily/trumpet name = "spaceman's trumpet" diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 001997a7..bc92b5d3 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -72,13 +72,14 @@ plantname = "Milk Melon Vines" product = /obj/item/reagent_containers/food/snacks/grown/milkmelon mutatelist = list() - reagents_add = list("milk" = 0.2, "breast_enlarger" = 0.08, "vitamin" = 0.04, "nutriment" = 0.1) + genes = list(/datum/plant_gene/reagent/fragile/breastchem) + reagents_add = list(/datum/reagent/consumable/milk = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) rarity = 20 /obj/item/reagent_containers/food/snacks/grown/milkmelon seed = /obj/item/seeds/watermelon/milk name = "milkmelon" - desc = "A softer, rounder-looking watermelon that audibly sloshes with milk." + desc = "A softer watermelon that audibly sloshes with milk." icon_state = "milkmelon" filling_color = "#FFAABB" dried_type = null diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 3f61dcdf..86742109 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -212,14 +212,13 @@ endurance = 8 yield = 4 growthstages = 2 - genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/teslium, /datum/plant_gene/trait/plant_type/carnivory) + genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/fragile/teslium, /datum/plant_gene/trait/plant_type/carnivory) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.1) /obj/item/seeds/chanterelle/jupitercup/Initialize(mapload, nogenes = FALSE) . = ..() if(!nogenes) - unset_mutability(/datum/plant_gene/reagent/teslium, PLANT_GENE_EXTRACTABLE) unset_mutability(/datum/plant_gene/trait/plant_type/carnivory, PLANT_GENE_REMOVABLE) /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 604fa3e4..b8e561ce 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -109,7 +109,7 @@ // Reagent genes store reagent ID and reagent ratio. Amount of reagent in the plant = 1 + (potency * rate) /datum/plant_gene/reagent name = "Nutriment" - var/reagent_id = "nutriment" + var/reagent_id = /datum/reagent/consumable/nutriment var/rate = 0.04 /datum/plant_gene/reagent/get_name() @@ -153,16 +153,35 @@ return FALSE return TRUE -/datum/plant_gene/reagent/polypyr +/datum/plant_gene/reagent/fragile + name = "Fragile Gene" + mutability_flags = PLANT_GENE_REMOVABLE //Cannot be extracted + +/datum/plant_gene/reagent/fragile/polypyr name = "Polypyrylium Oligomers" - reagent_id = "polypyr" + reagent_id = /datum/reagent/medicine/polypyr rate = 0.15 -/datum/plant_gene/reagent/teslium +/datum/plant_gene/reagent/fragile/teslium name = "Teslium" - reagent_id = "teslium" + reagent_id = /datum/reagent/teslium rate = 0.1 +/datum/plant_gene/reagent/fragile/breastchem + name = "Succubus Milk" + reagent_id = /datum/reagent/fermi/breast_enlarger + rate = 0.04 //5 units at 100 potency + +/datum/plant_gene/reagent/fragile/penischem + name = "Incubus Draft" + reagent_id = /datum/reagent/fermi/penis_enlarger + rate = 0.04 + +/datum/plant_gene/reagent/fragile/crocin + name = "Crocin" + reagent_id = /datum/reagent/drug/aphrodisiac + rate = 0.2 + // Various traits affecting the product. /datum/plant_gene/trait var/rate = 0.05