cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

TG update: Botany fixes courtesy of Numbers:

Browse Source 
- Adjusts a few nutrient values for plants.
- Fixes the weird messages produced by Chantrelles.
- Nettles breaking has also been fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2666 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
trubblebass@gmail.com
2011-12-12 00:23:11 +00:00
committed by Albert Iordache
parent d631e11e78
commit 9b84f88ebb
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/defines/obj/hydro.dm
View File

@@ -465,7 +465,7 @@
maturation = 7 maturation = 7
production = 1 production = 1
yield = 5 yield = 5
potency = -1 potency = 1
oneharvest = 1 oneharvest = 1
growthstages = 3 growthstages = 3
plant_type = 2 plant_type = 2
@@ -483,7 +483,7 @@
maturation = 15 maturation = 15
production = 1 production = 1
yield = 5 yield = 5
potency = -1 potency = 1
oneharvest = 1 oneharvest = 1
growthstages = 3 growthstages = 3
plant_type = 2 plant_type = 2
@@ -555,7 +555,7 @@
maturation = 6 maturation = 6
production = 6 production = 6
yield = 4 yield = 4
potency = 8 potency = 10
oneharvest = 0 oneharvest = 0
growthstages = 5 growthstages = 5
plant_type = 1 plant_type = 1
@@ -573,7 +573,7 @@
maturation = 8 maturation = 8
production = 6 production = 6
yield = 2 yield = 2
potency = 20 potency = 10
oneharvest = 0 oneharvest = 0
growthstages = 5 growthstages = 5
plant_type = 1 plant_type = 1
@@ -608,7 +608,7 @@
maturation = 7 maturation = 7
production = 1 production = 1
yield = -1 yield = -1
potency = -1 potency = 1
oneharvest = 1 oneharvest = 1
growthstages = 4 growthstages = 4
plant_type = 1 plant_type = 1
@@ -626,7 +626,7 @@
maturation = 6 maturation = 6
production = 1 production = 1
yield = 2 yield = 2
potency = -1 potency = 1
oneharvest = 1 oneharvest = 1
growthstages = 3 growthstages = 3
plant_type = 1 plant_type = 1
@@ -644,7 +644,7 @@
maturation = 10 maturation = 10
production = 1 production = 1
yield = -1 yield = -1
potency = -1 potency = 1
oneharvest = 1 oneharvest = 1
growthstages = 3 growthstages = 3
plant_type = 2 plant_type = 2
@@ -1255,7 +1255,7 @@
icon_state = "chilipepper" icon_state = "chilipepper"
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
reagents.add_reagent("capsaicin", 3+round(potency / 5, 1)) reagents.add_reagent("capsaicin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1281,7 +1281,7 @@
icon_state = "soybeans" icon_state = "soybeans"
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato /obj/item/weapon/reagent_containers/food/snacks/grown/tomato
@@ -1363,7 +1363,7 @@
icon_state = "wheat" icon_state = "wheat"
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper /obj/item/weapon/reagent_containers/food/snacks/grown/icepepper
@@ -1374,7 +1374,7 @@
potency = 20 potency = 20
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("frostoil", 3+round(potency / 5, 1)) reagents.add_reagent("frostoil", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1391,7 +1391,7 @@
potency = 10 potency = 10
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 10), 1)) reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
reagents.add_reagent("imidazoline", 3+round(potency / 5, 1)) reagents.add_reagent("imidazoline", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1403,7 +1403,7 @@
potency = 10 potency = 10
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1)
reagents.add_reagent("amatoxin", 3+round(potency / 3, 1)) reagents.add_reagent("amatoxin", 3+round(potency / 3, 1))
reagents.add_reagent("psilocybin", 1+round(potency / 25, 1)) reagents.add_reagent("psilocybin", 1+round(potency / 25, 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1422,7 +1422,7 @@
potency = 35 potency = 35
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("amatoxin", 13+round(potency / 3, 1)) reagents.add_reagent("amatoxin", 13+round(potency / 3, 1))
reagents.add_reagent("psilocybin", 1+round(potency / 25, 1)) reagents.add_reagent("psilocybin", 1+round(potency / 25, 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1441,7 +1441,7 @@
potency = 15 potency = 15
New() New()
..() ..()
reagents.add_reagent("nutriment", round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("psilocybin", 3+round(potency / 5, 1)) reagents.add_reagent("psilocybin", 3+round(potency / 5, 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
@@ -1495,7 +1495,7 @@
icon_state = "chanterelle" icon_state = "chanterelle"
New() New()
..() ..()
reagents.add_reagent("nutriment",round((potency / 20), 1)) reagents.add_reagent("nutriment",1+round((potency / 25), 1))
bitesize = 1+round(reagents.total_volume / 2, 1) bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom
@@ -1561,7 +1561,7 @@
var/maturation = 7 var/maturation = 7
var/production = 7 var/production = 7
var/yield = 2 var/yield = 2
var/potency = -1 var/potency = 1
var/plant_type = 0 var/plant_type = 0
New() New()
var/datum/reagents/R = new/datum/reagents(50) var/datum/reagents/R = new/datum/reagents(50)
@@ -1647,9 +1647,9 @@
seed = "/obj/item/seeds/nettleseed" seed = "/obj/item/seeds/nettleseed"
New() New()
..() ..()
reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("acid", round(potency, 1)) reagents.add_reagent("acid", round(potency, 1))
force = round((15*potency/50), 1) force = round((5+potency/5), 1)
/obj/item/weapon/grown/deathnettle // -- Skie /obj/item/weapon/grown/deathnettle // -- Skie
desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!" desc = "The \red glowing \black nettle incites \red<B>rage</B>\black in you just from looking at it!"
@@ -1668,9 +1668,9 @@
origin_tech = "combat=3" origin_tech = "combat=3"
New() New()
..() ..()
reagents.add_reagent("nutriment", 1+round((potency / 20), 1)) reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("pacid", round(potency, 1)) reagents.add_reagent("pacid", round(potency, 1))
force = round((15*potency/25), 1) force = round((5+potency/2.5), 1)
// ************************************* // *************************************
// Pestkiller defines for hydroponics // Pestkiller defines for hydroponics