Skip to content

Commit

Permalink
fixes botany early game
Browse files Browse the repository at this point in the history
  • Loading branch information
@RafRoq
RafRoq committed Jun 28, 2024
1 parent fe172c2 commit 4725ce9
Show file tree
Hide file tree
Showing 40 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/aloe.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/ambrosia.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/apple.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/hydroponics/grown/berries.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cereals.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/hydroponics/grown/chili.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
10 changes: 5 additions & 5 deletions code/modules/hydroponics/grown/citrus.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/cocoa_vanilla.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions code/modules/hydroponics/grown/cotton.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/cucumber.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/eggplant.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/hydroponics/grown/flowers.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -65,7 +65,7 @@
production = 5
endurance = 10
maturation = 12
yield = 4
yield = 40
potency = 20
growthstages = 4
weed_rate = 2
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/garlic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/gatfruit.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/grass_carpet.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
endurance = 40
maturation = 80
production = 5
yield = 5
yield = 50
growthstages = 2
icon_grow = "grass-grow"
icon_dead = "grass-dead"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/hedges.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/herbs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/korta_nut.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/kronkus.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions code/modules/hydroponics/grown/mushrooms.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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'
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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()
Expand All @@ -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)
Expand All @@ -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'
Expand All @@ -228,7 +228,7 @@
endurance = 30
maturation = 15
production = 1
yield = 3 //-> spread
yield = 30 //-> spread
potency = 30 //-> brightness
growthstages = 4
rarity = 20
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/olive.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/onion.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
lifespan = 20
maturation = 30
production = 4
yield = 6
yield = 60
endurance = 25
growthstages = 3
weed_chance = 3
Expand Down
2 changes: 1 addition & 1 deletion code/modules/hydroponics/grown/peanut.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 4725ce9

Please sign in to comment.