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

code/WorkInProgress/Chemistry-Reagents.dm

@@ -1456,6 +1456,12 @@ datum
 			description = "A power ground from peppercorns. *AAAACHOOO*"
 			reagent_state = SOLID
 
+		crushedchocolate
+			name = "Crushed Chocolate"
+			id = "crushedchocolate"
+			description = "Crushed goodness"
+			reagent_state = SOLID
+
 		amatoxin
 			name = "Amatoxin"
 			id = "amatoxin"
@@ -1582,6 +1588,56 @@ datum
 				..()
 				return
 
+		watermelonjuice
+			name = "Watermelon Juice"
+			id = "watermelonjuice"
+			description = "Delicious juice made from watermelon."
+			reagent_state = LIQUID
+			nutriment_factor = 1 * REAGENTS_METABOLISM
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M:nutrition += nutriment_factor
+				..()
+				return
+
+		limejuice
+			name = "Lime Juice"
+			id = "limejuice"
+			description = "Some very sour juice, enough to make your face twitch."
+			reagent_state = LIQUID
+			nutriment_factor = 1 * REAGENTS_METABOLISM
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M:nutrition += nutriment_factor
+				..()
+				return
+
+		lemonjuice
+			name = "Lemon Juice"
+			id = "lemonjuice"
+			description = "This juice is VERY sour."
+			reagent_state = LIQUID
+			nutriment_factor = 1 * REAGENTS_METABOLISM
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M:nutrition += nutriment_factor
+				..()
+				return
+
+		poisonberryjuice
+			name = "Poison Berry Juice"
+			id = "poisonberryjuice"
+			description = "A tasty juice blended from various kinds of very deadly and toxic berries."
+			reagent_state = LIQUID
+			nutriment_factor = 1 * REAGENTS_METABOLISM
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M:nutrition += nutriment_factor
+				if(!M) M = holder.my_atom
+				M:toxloss += 2.5
+				..()
+				return
+
 		banana
 			name = "Banana Juice"
 			id = "banana"

code/WorkInProgress/Chemistry-Tools.dm

@@ -2480,6 +2480,14 @@
 					icon_state  = "glass_white"
 					name = "Glass of cream"
 					desc = "Ewwww..."
+				if("chocolate")
+					icon_state  = "chocolateglass"
+					name = "Glass of chocolate"
+					desc = "Tasty"
+				if("lemon")
+					icon_state  = "lemonglass"
+					name = "Glass of lemon"
+					desc = "Sour..."
 				if("cola")
 					icon_state  = "glass_brown"
 					name = "Glass of Space Cola"
@@ -2708,6 +2716,10 @@
 					icon_state = "berryjuice"
 					name = "Glass of berry juice"
 					desc = "Berry juice. Or maybe its jam. Who cares?"
+				if("poisonberryjuice")
+					icon_state = "poisonberryjuice"
+					name = "Glass of poison berry juice"
+					desc = "A glass of deadly juice."
 				if("carrotjuice")
 					icon_state = "carrotjuice"
 					name = "Glass of  carrot juice"

code/defines/obj/hydro.dm

@@ -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'

code/defines/obj/vending.dm

@@ -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"

code/game/machinery/hydroponics.dm

@@ -305,6 +305,14 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
 		del(src.myseed)
 		src.myseed = new /obj/item/seeds/icepepperseed
 
+	else if ( istype(src.myseed, /obj/item/seeds/berryseed ))
+		del(src.myseed)
+		src.myseed = new /obj/item/seeds/poisonberryseed
+/*
+	else if ( istype(src.myseed, /obj/item/seeds/tomatoseed ))
+		del(src.myseed)
+		src.myseed = new /obj/item/seeds/gibtomatoseed
+*/
 	else if ( istype(src.myseed, /obj/item/seeds/eggplantseed ))
 		del(src.myseed)
 		src.myseed = new /obj/item/seeds/eggyseed
@@ -727,6 +735,27 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 
 	parent.update_tray()
 
+/obj/item/seeds/gibtomato/harvest(mob/user = usr)
+	var/produce = text2path(productname)
+	var/obj/machinery/hydroponics/parent = loc //for ease of access
+	var/t_amount = 0
+
+	while ( t_amount < (yield * parent.yieldmod ))
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/t_prod = new produce(user.loc, potency) // User gets a consumable
+
+		t_prod.seed = mypath
+		t_prod.species = species
+		t_prod.lifespan = lifespan
+		t_prod.endurance = endurance
+		t_prod.maturation = maturation
+		t_prod.production = production
+		t_prod.yield = yield
+		t_prod.potency = potency
+		t_prod.plant_type = plant_type
+		t_amount++
+
+	parent.update_tray()
+
 /obj/item/seeds/nettleseed/harvest(mob/user = usr)
 	var/produce = text2path(productname)
 	var/obj/machinery/hydroponics/parent = loc //for ease of access

code/game/machinery/kitchen/blender.dm

@@ -94,6 +94,8 @@ the blender or the processor: Processor items are solid objects and Blender resu
 			src.reagents.add_reagent("ketchup", 5)
 		else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/corn))
 			src.reagents.add_reagent("cornoil", 5)
+		else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/chocolatebar))
+			src.reagents.add_reagent("crushedchocolate", 5)
 		if(istype(O, /obj/item/weapon/reagent_containers/food/snacks))	//This is intentionally not an "else if"
 			O.reagents.trans_to(src, O.reagents.total_volume)			//Think of it as the "pulp" leftover.
 			del(O)

code/game/machinery/kitchen/juicer.dm

@@ -20,6 +20,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/orange = "orangejuice",
 		/obj/item/weapon/reagent_containers/food/snacks/grown/lime = "limejuice",
 		/obj/item/weapon/reagent_containers/food/snacks/watermelonslice = "watermelonjuice",
+		/obj/item/weapon/reagent_containers/food/snacks/grown/poisonberries = "poisonberryjuice",
 	)
 
 /obj/machinery/juicer/New()

code/game/machinery/kitchen/processor.dm

@@ -73,6 +73,14 @@
 		input = /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
 		output = /obj/item/weapon/reagent_containers/food/snacks/sugar
 
+	cocoapod
+		input = /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod
+		output = /obj/item/weapon/reagent_containers/food/snacks/cocoa
+
+	cocoa
+		input = /obj/item/weapon/reagent_containers/food/snacks/cocoa
+		output = /obj/item/weapon/reagent_containers/food/snacks/chocolatebar
+
 	/* mobs */
 	mob
 		process(loc, what)

code/modules/food/food.dm

@@ -54,6 +54,24 @@
 		reagents.add_reagent("nutriment", 3)
 		bitesize = 1
 
+/obj/item/weapon/reagent_containers/food/snacks/cocoa
+	name = "cocoa"
+	desc = "Such, sweet, fattening food."
+	icon_state = "cocoa"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 2)
+		bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
+	name = "Chocolate Bar"
+	desc = "Such, sweet, fattening food."
+	icon_state = "chocolatebar"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 2)
+		bitesize = 1
+
 /obj/item/weapon/reagent_containers/food/snacks/donut
 	name = "donut"
 	desc = "Goes great with Robust Coffee."
@@ -1067,7 +1085,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 40)
-		bitesize = 3
+		bitesize = 10
 
 /obj/item/weapon/reagent_containers/food/snacks/candiedapple
 	name = "Candied Apple"