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/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)