From 84d82fa500f565f0fc18c33c19800e587a5d1b3c Mon Sep 17 00:00:00 2001 From: Rafael <34388545+RafRoq@users.noreply.github.com> Date: Sat, 29 Jun 2024 03:28:59 -0300 Subject: [PATCH] fixes botany early game (#2460) --- code/modules/hydroponics/grown/aloe.dm | 2 +- code/modules/hydroponics/grown/ambrosia.dm | 2 +- code/modules/hydroponics/grown/apple.dm | 2 +- code/modules/hydroponics/grown/berries.dm | 6 +++--- code/modules/hydroponics/grown/cereals.dm | 2 +- code/modules/hydroponics/grown/chili.dm | 6 +++--- code/modules/hydroponics/grown/citrus.dm | 10 +++++----- .../modules/hydroponics/grown/cocoa_vanilla.dm | 4 ++-- code/modules/hydroponics/grown/cotton.dm | 4 ++-- code/modules/hydroponics/grown/cucumber.dm | 2 +- code/modules/hydroponics/grown/eggplant.dm | 2 +- code/modules/hydroponics/grown/flowers.dm | 8 ++++---- code/modules/hydroponics/grown/garlic.dm | 2 +- code/modules/hydroponics/grown/gatfruit.dm | 2 +- code/modules/hydroponics/grown/grass_carpet.dm | 2 +- code/modules/hydroponics/grown/hedges.dm | 2 +- code/modules/hydroponics/grown/herbs.dm | 2 +- code/modules/hydroponics/grown/korta_nut.dm | 2 +- code/modules/hydroponics/grown/kronkus.dm | 2 +- code/modules/hydroponics/grown/mushrooms.dm | 18 +++++++++--------- code/modules/hydroponics/grown/olive.dm | 2 +- code/modules/hydroponics/grown/onion.dm | 2 +- code/modules/hydroponics/grown/peanut.dm | 2 +- code/modules/hydroponics/grown/peas.dm | 4 ++-- code/modules/hydroponics/grown/plum.dm | 2 +- code/modules/hydroponics/grown/potato.dm | 2 +- .../modules/hydroponics/grown/rainbow_bunch.dm | 2 +- code/modules/hydroponics/grown/replicapod.dm | 4 ++-- code/modules/hydroponics/grown/root.dm | 6 +++--- code/modules/hydroponics/grown/seedling.dm | 2 +- code/modules/hydroponics/grown/sugarcane.dm | 2 +- code/modules/hydroponics/grown/tea_coffee.dm | 4 ++-- code/modules/hydroponics/grown/tobacco.dm | 2 +- code/modules/hydroponics/grown/tomato.dm | 4 ++-- code/modules/hydroponics/grown/towercap.dm | 2 +- code/modules/hydroponics/grown/weeds/kudzu.dm | 2 +- code/modules/hydroponics/grown/weeds/nettle.dm | 4 ++-- .../hydroponics/grown/weeds/starthistle.dm | 4 ++-- code/modules/hydroponics/seeds.dm | 2 +- .../code/modules/botany/new_seeds/seeds.dm | 2 +- 40 files changed, 69 insertions(+), 69 deletions(-) diff --git a/code/modules/hydroponics/grown/aloe.dm b/code/modules/hydroponics/grown/aloe.dm index d873eccba2fb..27992a58f345 100644 --- a/code/modules/hydroponics/grown/aloe.dm +++ b/code/modules/hydroponics/grown/aloe.dm @@ -11,7 +11,7 @@ endurance = 25 maturation = 12 production = 12 - yield = 6 + yield = 60 growthstages = 5 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.05) diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index ee01a447de7e..a9cc7b361eec 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -20,7 +20,7 @@ product = /obj/item/food/grown/ambrosia/vulgaris lifespan = 60 endurance = 25 - yield = 6 + yield = 60 potency = 5 icon_dead = "ambrosia-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index d6001514f51a..c9a644038b67 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/apple lifespan = 55 endurance = 35 - yield = 5 + yield = 50 harvest_age = 200 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "apple-grow" diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index c8f19237ae26..3d0a62b7eea9 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 25 production = 5 - yield = 2 + yield = 20 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "berry-grow" // Uses one growth icons set for all the subtypes icon_dead = "berry-dead" // Same for the dead icon @@ -118,7 +118,7 @@ endurance = 25 maturation = 30 production = 5 - yield = 4 + yield = 40 growthstages = 2 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "grape-grow" @@ -171,7 +171,7 @@ lifespan = 20 maturation = 25 production = 5 - yield = 2 + yield = 20 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "toechtauese-grow" icon_dead = "toechtauese-dead" diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index 46d455ae27c9..e4b2170a4726 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -7,7 +7,7 @@ plantname = "Wheat Stalks" product = /obj/item/food/grown/wheat production = 1 - yield = 4 + yield = 40 potency = 15 icon_dead = "wheat-dead" possible_mutations = list(/datum/hydroponics/plant_mutation/oat_wheat, /datum/hydroponics/plant_mutation/meat_wheat) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index a1be42dd08f8..15b11f43fcdf 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 20 production = 20 - yield = 4 + yield = 40 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "chili-grow" // Uses one growth icons set for all the subtypes @@ -67,7 +67,7 @@ endurance = 10 maturation = 10 production = 10 - yield = 3 + yield = 30 rarity = 20 genes = list(/datum/plant_gene/trait/chem_heating, /datum/plant_gene/trait/backfire/chili_heat) possible_mutations = list() @@ -96,7 +96,7 @@ endurance = 10 maturation = 10 production = 10 - yield = 3 + yield = 30 rarity = 20 genes = list(/datum/plant_gene/trait/repeated_harvest) possible_mutations = list() diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 491b8c3f026b..d368e95f8bce 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -17,7 +17,7 @@ product = /obj/item/food/grown/citrus/lime lifespan = 55 endurance = 50 - yield = 4 + yield = 40 potency = 15 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -41,7 +41,7 @@ product = /obj/item/food/grown/citrus/orange lifespan = 60 endurance = 50 - yield = 5 + yield = 50 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "lime-grow" @@ -69,7 +69,7 @@ product = /obj/item/food/grown/citrus/lemon lifespan = 55 endurance = 45 - yield = 4 + yield = 40 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "lime-grow" icon_dead = "lime-dead" @@ -98,7 +98,7 @@ genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/bomb_plant/potency_based) lifespan = 55 endurance = 45 - yield = 4 + yield = 40 reagents_add = list(/datum/reagent/consumable/nutriment = 0.05, /datum/reagent/fuel = 0.05) /obj/item/food/grown/firelemon @@ -120,7 +120,7 @@ product = /obj/item/food/grown/citrus/orange_3d lifespan = 60 endurance = 50 - yield = 5 + yield = 50 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "lime-grow" diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index e3a87c31613c..3407e0e06b37 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 25 production = 25 - yield = 2 + yield = 20 growthstages = 5 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "cocoapod-grow" @@ -60,7 +60,7 @@ product = /obj/item/food/grown/bungofruit lifespan = 30 maturation = 12 - yield = 3 + yield = 30 production = 7 genes = list(/datum/plant_gene/trait/repeated_harvest) possible_mutations = list() diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm index c67c30440538..89a3431af243 100644 --- a/code/modules/hydroponics/grown/cotton.dm +++ b/code/modules/hydroponics/grown/cotton.dm @@ -10,7 +10,7 @@ endurance = 25 maturation = 15 production = 1 - yield = 2 + yield = 20 potency = 50 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing.dmi' @@ -68,7 +68,7 @@ endurance = 50 maturation = 15 production = 1 - yield = 2 + yield = 20 potency = 50 //growthstages = 3 //growing_icon = 'icons/obj/hydroponics/growing.dmi' diff --git a/code/modules/hydroponics/grown/cucumber.dm b/code/modules/hydroponics/grown/cucumber.dm index 5180044be60d..a22670a8f32e 100644 --- a/code/modules/hydroponics/grown/cucumber.dm +++ b/code/modules/hydroponics/grown/cucumber.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/cucumber maturation = 10 production = 1 - yield = 5 + yield = 50 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "cucumber-grow" icon_dead = "cucumber-dead" diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm index fac6c7eed8ed..0147d9a37bd7 100644 --- a/code/modules/hydroponics/grown/eggplant.dm +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -6,7 +6,7 @@ species = "eggplant" plantname = "Eggplants" product = /obj/item/food/grown/eggplant - yield = 2 + yield = 20 potency = 20 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "eggplant-grow" diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index 10c05b8586c3..848e4e870fb0 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/poppy endurance = 10 maturation = 8 - yield = 6 + yield = 60 potency = 20 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' @@ -65,7 +65,7 @@ production = 5 endurance = 10 maturation = 12 - yield = 4 + yield = 40 potency = 20 growthstages = 4 weed_rate = 2 @@ -140,7 +140,7 @@ endurance = 20 maturation = 7 production = 1 - yield = 2 + yield = 20 potency = 30 growthstages = 4 genes = list(/datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/preserved) @@ -169,7 +169,7 @@ genes = list(/datum/plant_gene/trait/attack/sunflower_attack, /datum/plant_gene/trait/preserved) endurance = 20 production = 2 - yield = 2 + yield = 20 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' icon_grow = "sunflower-grow" diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm index ea228e09b9d6..b61150b4da40 100644 --- a/code/modules/hydroponics/grown/garlic.dm +++ b/code/modules/hydroponics/grown/garlic.dm @@ -5,7 +5,7 @@ species = "garlic" plantname = "Garlic Sprouts" product = /obj/item/food/grown/garlic - yield = 6 + yield = 60 potency = 25 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' diff --git a/code/modules/hydroponics/grown/gatfruit.dm b/code/modules/hydroponics/grown/gatfruit.dm index 866944b390e1..5671f4b1a799 100644 --- a/code/modules/hydroponics/grown/gatfruit.dm +++ b/code/modules/hydroponics/grown/gatfruit.dm @@ -12,7 +12,7 @@ endurance = 20 maturation = 1 production = 10 - yield = 2 + yield = 20 potency = 60 growthstages = 2 rarity = 60 // Obtainable only with xenobio+superluck. diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index 920e04883069..78c745e1561e 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -10,7 +10,7 @@ endurance = 40 maturation = 80 production = 5 - yield = 5 + yield = 50 growthstages = 2 icon_grow = "grass-grow" icon_dead = "grass-dead" diff --git a/code/modules/hydroponics/grown/hedges.dm b/code/modules/hydroponics/grown/hedges.dm index 02a2b5a5dd2d..951abd86feaa 100644 --- a/code/modules/hydroponics/grown/hedges.dm +++ b/code/modules/hydroponics/grown/hedges.dm @@ -9,7 +9,7 @@ endurance = 30 maturation = 12 production = 6 - yield = 2 + yield = 20 growthstages = 3 reagents_add = list() possible_mutations = list(/datum/hydroponics/plant_mutation/kudzu_vines) diff --git a/code/modules/hydroponics/grown/herbs.dm b/code/modules/hydroponics/grown/herbs.dm index 5416de9becf1..9e095475348e 100644 --- a/code/modules/hydroponics/grown/herbs.dm +++ b/code/modules/hydroponics/grown/herbs.dm @@ -7,7 +7,7 @@ plantname = "Herbs" product = /obj/item/food/grown/herbs growthstages = 2 - yield = 5 + yield = 50 potency = 20 growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_grow = "herbs-grow" diff --git a/code/modules/hydroponics/grown/korta_nut.dm b/code/modules/hydroponics/grown/korta_nut.dm index 4c6787a91822..bfc6777c21ac 100644 --- a/code/modules/hydroponics/grown/korta_nut.dm +++ b/code/modules/hydroponics/grown/korta_nut.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/korta_nut lifespan = 55 endurance = 35 - yield = 5 + yield = 50 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "kortanut-grow" icon_dead = "kortanut-dead" diff --git a/code/modules/hydroponics/grown/kronkus.dm b/code/modules/hydroponics/grown/kronkus.dm index 732a6e26c834..17ca34f755c3 100644 --- a/code/modules/hydroponics/grown/kronkus.dm +++ b/code/modules/hydroponics/grown/kronkus.dm @@ -11,7 +11,7 @@ endurance = 10 maturation = 12 production = 4 - yield = 3 + yield = 30 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing.dmi' reagents_add = list(/datum/reagent/consumable/nutriment = 0.05) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 3562c80a346e..3b94cebeab6a 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -18,7 +18,7 @@ endurance = 35 maturation = 10 production = 5 - yield = 4 + yield = 40 potency = 15 growthstages = 4 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -44,7 +44,7 @@ endurance = 35 maturation = 10 production = 5 - yield = 4 + yield = 40 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' @@ -71,7 +71,7 @@ endurance = 35 maturation = 12 production = 5 - yield = 2 + yield = 20 potency = 35 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -97,7 +97,7 @@ product = /obj/item/food/grown/mushroom/libertycap maturation = 7 production = 1 - yield = 5 + yield = 50 potency = 15 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -122,7 +122,7 @@ product = /obj/item/food/grown/mushroom/plumphelmet maturation = 8 production = 1 - yield = 4 + yield = 40 potency = 15 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -149,7 +149,7 @@ lifespan = 30 endurance = 30 maturation = 22 - yield = 1 + yield = 10 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/mob_transformation/shroom) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' possible_mutations = list() @@ -176,7 +176,7 @@ endurance = 20 maturation = 7 production = 1 - yield = 5 + yield = 50 potency = 15 growthstages = 3 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism) @@ -202,7 +202,7 @@ lifespan = 40 production = 4 endurance = 8 - yield = 4 + yield = 40 growthstages = 2 genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/reagent/preset/liquidelectricity, /datum/plant_gene/trait/carnivory/jupitercup) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' @@ -228,7 +228,7 @@ endurance = 30 maturation = 15 production = 1 - yield = 3 //-> spread + yield = 30 //-> spread potency = 30 //-> brightness growthstages = 4 rarity = 20 diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm index 8f93a9695ecf..29e03fcf08cf 100644 --- a/code/modules/hydroponics/grown/olive.dm +++ b/code/modules/hydroponics/grown/olive.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/olive lifespan = 150 endurance = 35 - yield = 5 + yield = 50 maturation = 10 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "olive-grow" diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 79650dab3193..eb9fc33484b9 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -8,7 +8,7 @@ lifespan = 20 maturation = 30 production = 4 - yield = 6 + yield = 60 endurance = 25 growthstages = 3 weed_chance = 3 diff --git a/code/modules/hydroponics/grown/peanut.dm b/code/modules/hydroponics/grown/peanut.dm index bda79a10a6be..b9d21b7d1185 100644 --- a/code/modules/hydroponics/grown/peanut.dm +++ b/code/modules/hydroponics/grown/peanut.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/peanut lifespan = 55 endurance = 35 - yield = 5 + yield = 50 growing_icon = 'icons/obj/hydroponics/growing.dmi' icon_grow = "peanut-grow" icon_dead = "peanut-dead" diff --git a/code/modules/hydroponics/grown/peas.dm b/code/modules/hydroponics/grown/peas.dm index a813601bee3b..9bd23f6483ba 100644 --- a/code/modules/hydroponics/grown/peas.dm +++ b/code/modules/hydroponics/grown/peas.dm @@ -36,7 +36,7 @@ product = /obj/item/food/grown/laugh maturation = 7 potency = 10 - yield = 7 + yield = 70 production = 5 growthstages = 3 icon_grow = "laughpeas-grow" @@ -68,7 +68,7 @@ product = /obj/item/food/grown/peace maturation = 20 potency = 75 - yield = 1 + yield = 10 production = 10 genes = list (/datum/plant_gene/trait/glow/blue) reagents_add = list (/datum/reagent/pax = 0.1, /datum/reagent/drug/happiness = 0.1, /datum/reagent/consumable/nutriment = 0.15) diff --git a/code/modules/hydroponics/grown/plum.dm b/code/modules/hydroponics/grown/plum.dm index d12718d4ebf5..56c2e20536b1 100644 --- a/code/modules/hydroponics/grown/plum.dm +++ b/code/modules/hydroponics/grown/plum.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/plum lifespan = 55 endurance = 35 - yield = 5 + yield = 50 growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' icon_grow = "plum-grow" icon_dead = "plum-dead" diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 2f478b6b27b8..5375d3e2a0d4 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -9,7 +9,7 @@ lifespan = 30 maturation = 10 production = 1 - yield = 4 + yield = 40 growthstages = 4 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_grow = "potato-grow" diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm index 3b60906c3f51..a15fa08a7722 100644 --- a/code/modules/hydroponics/grown/rainbow_bunch.dm +++ b/code/modules/hydroponics/grown/rainbow_bunch.dm @@ -10,7 +10,7 @@ endurance = 10 maturation = 6 production = 3 - yield = 5 + yield = 50 potency = 20 growthstages = 4 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 5dd01a418fa2..be51fe2d9e98 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -12,7 +12,7 @@ endurance = 25 maturation = 30 production = 5 - yield = 4 + yield = 40 growthstages = 1 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -41,7 +41,7 @@ endurance = 8 maturation = 10 production = 1 - yield = 1 //seeds if there isn't a dna inside + yield = 10 potency = 30 var/volume = 5 var/ckey diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index dbb67d0e8882..ccbcae864929 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/carrot maturation = 10 production = 1 - yield = 5 + yield = 50 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' possible_mutations = list(/datum/hydroponics/plant_mutation/parsnip) @@ -66,7 +66,7 @@ product = /obj/item/food/grown/whitebeet lifespan = 60 endurance = 50 - yield = 6 + yield = 60 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_dead = "whitebeet-dead" possible_mutations = list(/datum/hydroponics/plant_mutation/redbeet) @@ -91,7 +91,7 @@ product = /obj/item/food/grown/redbeet lifespan = 60 endurance = 50 - yield = 5 + yield = 50 growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi' icon_dead = "whitebeet-dead" genes = list(/datum/plant_gene/trait/maxchem) diff --git a/code/modules/hydroponics/grown/seedling.dm b/code/modules/hydroponics/grown/seedling.dm index e50b8fe10d13..bd0e1a37e819 100644 --- a/code/modules/hydroponics/grown/seedling.dm +++ b/code/modules/hydroponics/grown/seedling.dm @@ -12,7 +12,7 @@ maturation = 10 production = 1 growthstages = 2 - yield = 1 + yield = 10 potency = 30 /obj/item/seeds/seedling/harvest(mob/harvester) diff --git a/code/modules/hydroponics/grown/sugarcane.dm b/code/modules/hydroponics/grown/sugarcane.dm index 90f87fce8539..a32fe8fb58c5 100644 --- a/code/modules/hydroponics/grown/sugarcane.dm +++ b/code/modules/hydroponics/grown/sugarcane.dm @@ -11,7 +11,7 @@ lifespan = 60 endurance = 50 maturation = 30 - yield = 4 + yield = 40 growthstages = 2 reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/sugar = 0.25) possible_mutations = list(/datum/hydroponics/plant_mutation/bamboo) diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm index a83a7a09d40e..9231102097f4 100644 --- a/code/modules/hydroponics/grown/tea_coffee.dm +++ b/code/modules/hydroponics/grown/tea_coffee.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 5 production = 5 - yield = 5 + yield = 50 growthstages = 5 icon_dead = "tea-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) @@ -56,7 +56,7 @@ endurance = 20 maturation = 5 production = 5 - yield = 5 + yield = 50 growthstages = 5 icon_dead = "coffee-dead" genes = list(/datum/plant_gene/trait/repeated_harvest) diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index 7a5679e66f12..08e1ec675fd8 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -9,7 +9,7 @@ lifespan = 20 maturation = 35 production = 5 - yield = 10 + yield = 100 growthstages = 3 icon_dead = "tobacco-dead" possible_mutations = list(/datum/hydroponics/plant_mutation/space_tobacco) diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 387cf0a56782..3a2af110e9d6 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -82,7 +82,7 @@ species = "bluespacetomato" plantname = "Bluespace Tomato Plants" product = /obj/item/food/grown/tomato/blue/bluespace - yield = 2 + yield = 20 possible_mutations = list() genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/backfire/bluespace) reagents_add = list(/datum/reagent/lube = 0.2, /datum/reagent/bluespace = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) @@ -106,7 +106,7 @@ species = "killertomato" plantname = "Killer-Tomato Plants" product = /obj/item/food/grown/tomato/killer - yield = 2 + yield = 20 genes = list(/datum/plant_gene/trait/mob_transformation/tomato) growthstages = 2 icon_grow = "killertomato-grow" diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 5c1aa0d40013..bc46dd77e557 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -9,7 +9,7 @@ endurance = 50 maturation = 15 production = 1 - yield = 5 + yield = 50 potency = 50 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' diff --git a/code/modules/hydroponics/grown/weeds/kudzu.dm b/code/modules/hydroponics/grown/weeds/kudzu.dm index 679e99d500c9..7e95ae00f4b4 100644 --- a/code/modules/hydroponics/grown/weeds/kudzu.dm +++ b/code/modules/hydroponics/grown/weeds/kudzu.dm @@ -11,7 +11,7 @@ genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy) lifespan = 20 endurance = 10 - yield = 4 + yield = 40 growthstages = 4 rarity = 30 var/list/mutations = list() diff --git a/code/modules/hydroponics/grown/weeds/nettle.dm b/code/modules/hydroponics/grown/weeds/nettle.dm index 3e4301c75083..375c031e0ab9 100644 --- a/code/modules/hydroponics/grown/weeds/nettle.dm +++ b/code/modules/hydroponics/grown/weeds/nettle.dm @@ -8,7 +8,7 @@ product = /obj/item/food/grown/nettle lifespan = 30 endurance = 40 // tuff like a toiger - yield = 4 + yield = 40 growthstages = 5 genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/attack/nettle_attack, /datum/plant_gene/trait/backfire/nettle_burn) possible_mutations = list(/datum/hydroponics/plant_mutation/death_nettle) @@ -24,7 +24,7 @@ product = /obj/item/food/grown/nettle/death endurance = 25 maturation = 8 - yield = 2 + yield = 20 genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/plant_type/weed_hardy, /datum/plant_gene/trait/stinging, /datum/plant_gene/trait/attack/nettle_attack/death, /datum/plant_gene/trait/backfire/nettle_burn/death) possible_mutations = list() reagents_add = list(/datum/reagent/toxin/acid/fluacid = 0.5, /datum/reagent/toxin/acid = 0.5) diff --git a/code/modules/hydroponics/grown/weeds/starthistle.dm b/code/modules/hydroponics/grown/weeds/starthistle.dm index d5f730a5360b..859ef9f5b086 100644 --- a/code/modules/hydroponics/grown/weeds/starthistle.dm +++ b/code/modules/hydroponics/grown/weeds/starthistle.dm @@ -10,7 +10,7 @@ endurance = 50 // damm pesky weeds maturation = 5 production = 1 - yield = 2 + yield = 20 potency = 10 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' @@ -44,7 +44,7 @@ endurance = 40 maturation = 30 production = 2 - yield = 2 + yield = 20 potency = 25 growthstages = 3 growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi' diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 9f0997f83afd..bb7911aea17e 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -35,7 +35,7 @@ /// Changes the amount of time needed for a plant to become harvestable. var/production = 25 /// Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested. - var/yield = 3 + var/yield = 30 /// The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways. var/potency = 10 /// Amount of growth sprites the plant has. diff --git a/monkestation/code/modules/botany/new_seeds/seeds.dm b/monkestation/code/modules/botany/new_seeds/seeds.dm index f654551cc389..d54ec1d4d37a 100644 --- a/monkestation/code/modules/botany/new_seeds/seeds.dm +++ b/monkestation/code/modules/botany/new_seeds/seeds.dm @@ -12,7 +12,7 @@ endurance = 50 maturation = 15 production = 5 - yield = 5 + yield = 50 plant_icon_offset = 0 growing_icon = 'goon/icons/obj/hydroponics/plants_crop.dmi'