Note: This will be the last mundane plant for a LONG time. Next shall be various mutations, fantasy, sci-fi and custom plants.

Hydro can now grow cocoa trees and harvest cocoa pods.

The chef can process the cocoa pods into cocoa and process that into chocolate bars. He can also put the chocolate bars into the blender to get crushed chocolate, which the barman can use.

Lemon, watermelon, poison berry juice and crushed chocolate is added to the reagents list.

Barman can now also serve a chocolate drink. He can also now serve Lemon, Watermelon and Poison berry juice as drinks.

Poison Berry was made a mutation of berries.

Nurse uniform was now also fully fixed.

PS. Poison berry was added to the juicer machine as well.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1833 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
firecage@hotmail.com
2011-07-10 23:14:57 +00:00
parent 25da5aaf0f
commit 2fa096add2
16 changed files with 203 additions and 7 deletions
+75 -5
View File
@@ -549,7 +549,7 @@
icon_state = "seed-whitebeet"
mypath = "/obj/item/seeds/whitebeetseed"
species = "whitebeet"
plantname = "White Beet"
plantname = "White Beet Plant"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet"
lifespan = 60
endurance = 50
@@ -581,7 +581,7 @@
icon_state = "seed-watermelon"
mypath = "/obj/item/seeds/watermelonseed"
species = "watermelon"
plantname = "Watermelon"
plantname = "Watermelon Plant"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon"
lifespan = 50
endurance = 40
@@ -598,7 +598,7 @@
icon_state = "seed-lime"
mypath = "/obj/item/seeds/limeseed"
species = "lime"
plantname = "Lime"
plantname = "Lime Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/lime"
lifespan = 55
endurance = 50
@@ -614,7 +614,7 @@
icon_state = "seed-lemon"
mypath = "/obj/item/seeds/lemonseed"
species = "lemon"
plantname = "Lemon"
plantname = "Lemon Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/lemon"
lifespan = 55
endurance = 45
@@ -630,7 +630,7 @@
icon_state = "seed-orange"
mypath = "/obj/item/seeds/orangeseed"
species = "orange"
plantname = "Orange"
plantname = "Orange Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/orange"
lifespan = 60
endurance = 50
@@ -674,6 +674,42 @@
plant_type = 0
growthstages = 2
/obj/item/seeds/cocoapodseed
name = "Cocoa Pod seeds"
desc = "Looks fattening these seeds."
icon_state = "seed-cocoapod"
mypath = "/obj/item/seeds/cocoapodseed"
species = "cocoapod"
plantname = "Cocoa Pod Tree"
productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod"
lifespan = 20
endurance = 15
maturation = 5
production = 5
yield = 2
potency = 10
plant_type = 0
growthstages = 6
/* // Maybe one day when I get it to work like a grenade which exlodes gibs.
/obj/item/seeds/gibtomatoseed
name = "Gib Tomato seeds"
desc = "Used to grow gib tomotoes."
icon_state = "seed-gibtomato"
mypath = "/obj/item/seeds/gibtomatoseed"
species = "gibtomato"
plantname = "Gib Tomato plant"
productname = "/obj/item/weapon/grown/gibtomato"
lifespan = 35
endurance = 25
maturation = 6
production = 6
yield = 3
potency = 10
plant_type = 0
growthstages = 6
*/
/*
/obj/item/seeds/
name = ""
@@ -815,6 +851,16 @@
..()
reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
seed = "/obj/item/seeds/cocoapodseed"
name = "Cocoa Pod"
desc = "Fattening"
icon_state = "cocoapod"
potency = 10
New()
..()
reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/grown/grass
seed = "/obj/item/seeds/grassseed"
name = "Grass"
@@ -1207,7 +1253,31 @@
throw_range = 3
plant_type = 1
seed = "/obj/item/seeds/sunflower"
/*
/obj/item/weapon/grown/gibtomato
desc = "A plump tomato."
icon = 'harvest.dmi'
name = "Gib Tomato"
icon_state = "gibtomato"
damtype = "fire"
force = 0
flags = TABLEPASS
throwforce = 1
w_class = 1.0
throw_speed = 1
throw_range = 3
plant_type = 1
seed = "/obj/item/seeds/gibtomato"
New()
..()
/obj/item/weapon/grown/gibtomato/New()
..()
src.gibs = new /obj/gibspawner/human(get_turf(src))
src.gibs.attach(src)
src.smoke.set_up(10, 0, usr.loc)
*/
/obj/item/weapon/grown/nettle // -- Skie
desc = "This is a nettle. It's probably <B>not</B> wise to touch it with bare hands..."
icon = 'weapons.dmi'
+1 -1
View File
@@ -128,7 +128,7 @@
name = "MegaSeed Servitor"
desc = "When you need seeds fast!"
icon_state = "seeds"
product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/athelasmorganstearsseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed;/obj/item/seeds/limeseed;/obj/item/seeds/lemonseed;/obj/item/seeds/orangeseed;/obj/item/seeds/grassseed;/obj/item/seeds/poisonberryseed;/obj/item/seeds/sugarcaneseed"
product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/athelasmorganstearsseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed;/obj/item/seeds/limeseed;/obj/item/seeds/lemonseed;/obj/item/seeds/orangeseed;/obj/item/seeds/grassseed;/obj/item/seeds/sugarcaneseed;/obj/item/seeds/cocoapodseed"
product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3;3;3;3;3;3;3;3"
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium"