From 0db492b1dd2e1eedc9d3be3160b29df71fff7f83 Mon Sep 17 00:00:00 2001 From: MisterTikva Date: Tue, 6 Dec 2016 22:42:21 +0200 Subject: [PATCH] Implementing unused hydroponics code and some other botany tweaks. (#21938) * Update plant_genes.dm * Update berries.dm * Update pumpkin.dm * Update melon.dm * Update root.dm --- code/modules/hydroponics/grown/berries.dm | 2 +- code/modules/hydroponics/grown/melon.dm | 4 ++-- code/modules/hydroponics/grown/pumpkin.dm | 4 ++-- code/modules/hydroponics/grown/root.dm | 1 + code/modules/hydroponics/plant_genes.dm | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 3ac1d6c11e8..50418424b83 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -76,7 +76,7 @@ lifespan = 30 endurance = 25 mutatelist = list() - genes = list(/datum/plant_gene/trait/glow/berry) + genes = list(/datum/plant_gene/trait/glow/berry , /datum/plant_gene/trait/noreact) reagents_add = list("uranium" = 0.25, "iodine" = 0.2, "vitamin" = 0.04, "nutriment" = 0.1) rarity = 20 diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 51de1ba722f..676248635ca 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -11,7 +11,7 @@ growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_dead = "watermelon-dead" mutatelist = list(/obj/item/seeds/watermelon/holy) - reagents_add = list("vitamin" = 0.04, "nutriment" = 0.2) + reagents_add = list("water" = 0.2, "vitamin" = 0.04, "nutriment" = 0.2) /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon seed = /obj/item/seeds/watermelon @@ -43,4 +43,4 @@ desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon." icon_state = "holymelon" filling_color = "#FFD700" - dried_type = null \ No newline at end of file + dried_type = null diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index bc33c024091..9d644dabc49 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -40,7 +40,7 @@ plantname = "Blumpkin Vines" product = /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin mutatelist = list() - reagents_add = list("ammonia" = 0.2, "chlorine" = 0.2, "nutriment" = 0.2) + reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "nutriment" = 0.2) rarity = 20 /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin @@ -49,4 +49,4 @@ desc = "The pumpkin's toxic sibling." icon_state = "blumpkin" filling_color = "#87CEFA" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index 76f222dc743..bb112d8c839 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -93,6 +93,7 @@ oneharvest = 1 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_dead = "whitebeet-dead" + genes = list(/datum/plant_gene/trait/maxchem) reagents_add = list("vitamin" = 0.05, "nutriment" = 0.05) /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 7431980ac1f..e3a8b25b196 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -174,8 +174,8 @@ examine_line = "It has a lot of liquid contents inside." origin_tech = list("biotech" = 5) -/*/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target) - G.squash(target)*/ +/datum/plant_gene/trait/squash/on_slip(obj/item/weapon/reagent_containers/food/snacks/grown/G, mob/living/carbon/target) + G.squash(target) /datum/plant_gene/trait/slip