-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
This commit is contained in:
d_h2005@yahoo.com
2012-10-09 21:54:36 +00:00
parent 67433021a1
commit 4d74a9f252
9 changed files with 143 additions and 22 deletions

View File

@@ -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),

View File

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

View File

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

View File

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