-Adds cherry seeds to the seed vendor

-Adds some recipes for cherries and cherry jelly
-Standardizes the vendor's seed count to 3 for all (though the plants that make you high starting with more seeds than everything else was a humorous commentary). 
-New sprites for eggplants/seeds!!!
-Making ambrosia salads removes the toxin from them now. 

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4841 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/vending.dm

@@ -225,8 +225,8 @@
 	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/ambrosiavulgarisseed;/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/cocoapodseed;/obj/item/seeds/cabbageseed;/obj/item/seeds/grapeseed;/obj/item/seeds/pumpkinseed"
-	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;3;3"
+	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/ambrosiavulgarisseed;/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/cocoapodseed;/obj/item/seeds/cabbageseed;/obj/item/seeds/grapeseed;/obj/item/seeds/pumpkinseed;/obj/item/seeds/cherryseed"
+	product_amounts = "3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;3;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;/obj/item/seeds/reishimycelium"
 	product_hideamt = "2;2;2;2;2;2"

code/modules/food/recipes_microwave.dm

@@ -46,6 +46,14 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
 
+/datum/recipe/jellydonut/roro
+	reagents = list("rorojelly" = 5, "flour" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/donut/rorojelly
+
+/datum/recipe/jellydonut/cherry
+	reagents = list("cherryjelly" = 5, "flour" = 5)
+	result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
+
 /datum/recipe/donut
 	reagents = list("flour" = 5)
 	items = list(
@@ -356,6 +364,13 @@
 		 /obj/item/weapon/reagent_containers/food/snacks/grown/banana,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/pie
+
+/datum/recipe/cherrypie
+	reagents = list("flour" = 10)
+	items = list(
+		 /obj/item/weapon/reagent_containers/food/snacks/grown/cherries,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie
 /*
 /datum/recipe/berrypie
 	reagents = list("berryjuice" = 5)
@@ -761,7 +776,14 @@
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice,
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/rorotoast
+	result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/roro
+
+/datum/recipe/jelliedtoast
+	reagents = list("cherryjelly" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/breadslice,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
 
 /datum/recipe/milosoup
 	reagents = list("water" = 10)
@@ -878,10 +900,13 @@
 
 /datum/recipe/roroburger
 	reagents = list("rorojelly" = 5, "flour" = 15)
-	items = list(
-		// /obj/item/weapon/reagent_containers/food/snacks/flour,
-	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/roroburger
+	items = list()
+	result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/roro
+
+/datum/recipe/jellyburger
+	reagents = list("cherryjelly" = 5, "flour" = 15)
+	items = list()
+	result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
 
 /datum/recipe/twobread
 	reagents = list("wine" = 5)
@@ -897,7 +922,15 @@
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice,
 		/obj/item/weapon/reagent_containers/food/snacks/breadslice,
 	)
-	result = /obj/item/weapon/reagent_containers/food/snacks/rorosandwich
+	result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/roro
+
+/datum/recipe/cherrysandwich
+	reagents = list("cherryjelly" = 5)
+	items = list(
+		/obj/item/weapon/reagent_containers/food/snacks/breadslice,
+		/obj/item/weapon/reagent_containers/food/snacks/breadslice,
+	)
+	result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
 
 /datum/recipe/orangecake
 	reagents = list("milk" = 5, "flour" = 15)
@@ -1070,6 +1103,10 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/apple,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad
+	make_food(var/obj/container as obj)
+		var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container)
+		being_cooked.reagents.del_reagent("toxin")
+		return being_cooked
 
 /datum/recipe/aesirsalad
 	items = list(
@@ -1089,6 +1126,10 @@
 		/obj/item/weapon/reagent_containers/food/snacks/faggot,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
+	make_food(var/obj/container as obj)
+		var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container)
+		being_cooked.reagents.del_reagent("toxin")
+		return being_cooked
 
 /datum/recipe/cracker
 	reagents = list("flour" = 5, "sodiumchloride" = 1)

code/modules/reagents/Chemistry-Machinery.dm

@@ -697,6 +697,7 @@
 		/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
 		/obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("cornoil" = 0),
 		/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = 0),
+		/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
 
 
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -2136,6 +2136,19 @@ datum
 				if(!istype(T, /turf/space))
 					new /obj/effect/decal/cleanable/flour(T)
 
+		cherryjelly
+			name = "Cherry Jelly"
+			id = "cherryjelly"
+			description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
+			reagent_state = LIQUID
+			nutriment_factor = 1 * REAGENTS_METABOLISM
+			color = "#801E28" // rgb: 128, 30, 40
+
+			on_mob_life(var/mob/living/M as mob)
+				M.nutrition += nutriment_factor
+				..()
+				return
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -3633,8 +3646,6 @@ datum
 				..()
 				return
 
-////////////////////////// REMOVED COCKTAIL REAGENTS BELOW:: RE-ENABLE THEM IF THEY EVER GET SPRITES THAT DON'T LOOK FUCKING STUPID --Agouri ///////////////////////////
-
 		sbiten
 			name = "Sbiten"
 			id = "sbiten"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -381,6 +381,36 @@
 			src.name = "Frosted Jelly Donut"
 			reagents.add_reagent("sprinkles", 2)
 
+/obj/item/weapon/reagent_containers/food/snacks/donut/rorojelly
+	name = "Jelly Donut"
+	desc = "You jelly?"
+	icon_state = "jdonut1"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("sprinkles", 1)
+		reagents.add_reagent("rorojelly", 5)
+		bitesize = 5
+		if(prob(30))
+			src.icon_state = "jdonut2"
+			src.name = "Frosted Jelly Donut"
+			reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
+	name = "Jelly Donut"
+	desc = "You jelly?"
+	icon_state = "jdonut1"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("sprinkles", 1)
+		reagents.add_reagent("cherryjelly", 5)
+		bitesize = 5
+		if(prob(30))
+			src.icon_state = "jdonut2"
+			src.name = "Frosted Jelly Donut"
+			reagents.add_reagent("sprinkles", 2)
+
 /obj/item/weapon/reagent_containers/food/snacks/egg
 	name = "egg"
 	desc = "An egg!"
@@ -1440,27 +1470,45 @@
 		reagents.add_reagent("water", 5)
 		bitesize = 10
 
-/obj/item/weapon/reagent_containers/food/snacks/rorotoast
-	name = "Roro Toast"
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
+	name = "Jellied Toast"
 	desc = "A slice of bread covered with delicious jam."
 	icon_state = "rorotoast"
 	trash = /obj/item/trash/plate
 	New()
 		..()
 		reagents.add_reagent("nutriment", 1)
-		reagents.add_reagent("rorojelly", 5)
 		bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/roroburger
-	name = "Roro Burger"
-	desc = "A very toxic and tasty burger."
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
+	New()
+		..()
+		reagents.add_reagent("cherryjelly", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/roro
+	New()
+		..()
+		reagents.add_reagent("rorojelly", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/jellyburger
+	name = "Jelly Burger"
+	desc = "Culinary delight..?"
 	icon_state = "roroburger"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 1)
-		reagents.add_reagent("rorojelly", 5)
+		reagents.add_reagent("nutriment", 5)
 		bitesize = 2
 
+/obj/item/weapon/reagent_containers/food/snacks/jellyburger/roro
+	New()
+		..()
+		reagents.add_reagent("rorojelly", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
+	New()
+		..()
+		reagents.add_reagent("cherryjelly", 5)
+
 /obj/item/weapon/reagent_containers/food/snacks/milosoup
 	name = "Milosoup"
 	desc = "The universes best soup! Yum!!!"
@@ -1569,6 +1617,16 @@
 		reagents.add_reagent("nutriment", 4)
 		bitesize = 3
 
+
+/obj/item/weapon/reagent_containers/food/snacks/cherrypie
+	name = "Cherry Pie"
+	desc = "Taste so good, make a grown man cry."
+	icon_state = "cherrypie"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 4)
+		bitesize = 3
+
 /obj/item/weapon/reagent_containers/food/snacks/twobread
 	name = "Two Bread"
 	desc = "It is very bitter and winy."
@@ -1578,17 +1636,26 @@
 		reagents.add_reagent("nutriment", 2)
 		bitesize = 3
 
-/obj/item/weapon/reagent_containers/food/snacks/rorosandwich
-	name = "Roro Sandwich"
-	desc = "You think you can see someone's face in the toast!"
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
+	name = "Jelly Sandwich"
+	desc = "You wish you had some peanut butter to go with this..."
 	icon_state = "rorosandwich"
 	trash = /obj/item/trash/plate
 	New()
 		..()
 		reagents.add_reagent("nutriment", 2)
-		reagents.add_reagent("rorojelly", 5)
 		bitesize = 3
 
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/roro
+	New()
+		..()
+		reagents.add_reagent("rorojelly", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
+	New()
+		..()
+		reagents.add_reagent("cherryjelly", 5)
+
 /obj/item/weapon/reagent_containers/food/snacks/boiledrorocore
 	name = "Boiled Roro Core"
 	desc = "A boiled red thing."

code/modules/reagents/reagent_containers/food/snacks/grown.dm

@@ -106,6 +106,7 @@
 	name = "cherries"
 	desc = "Great for toppings!"
 	icon_state = "cherry"
+	gender = PLURAL
 	New()
 		..()
 		spawn(5)	//So potency can be set in the proc that creates these crops