Explosive Update no Jutsu!

- Bottle of Olive oil removed from kitchen.
- Olive Oil reagent renamed 'Corn Oil.' Functionality remains the same as Olive Oil (in both use and reactions).
- Corn Oil can be produced by blending Corn in the blender.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@738 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2010-12-30 22:00:43 +00:00
parent 084393fa65
commit 526ccaa738
5 changed files with 12 additions and 18 deletions

View File

@@ -1291,10 +1291,10 @@ datum
return
..()
oliveoil
name = "Olive Oil"
id = "oliveoil"
description = "An oil derived from various types of olives. A famous export of Space Italy."
cornoil
name = "Corn Oil"
id = "cornoil"
description = "An oil derived from various types of corn."
reagent_state = LIQUID
nutriment_factor = 20 * REAGENTS_METABOLISM
on_mob_life(var/mob/M)

View File

@@ -228,7 +228,7 @@ datum
name = "Glycerol"
id = "glycerol"
result = "glycerol"
required_reagents = list("oliveoil" = 3, "acid" = 1)
required_reagents = list("cornoil" = 3, "acid" = 1)
result_amount = 1
nitroglycerin

View File

@@ -1972,9 +1972,9 @@
name = "Pepper Mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
if("oliveoil")
name = "Olive Oil"
desc = "A delicious oil used in cooking. Possibly made from space olives."
if("cornoil")
name = "Corn Oil"
desc = "A delicious oil used in cooking. Made from corn."
icon_state = "oliveoil"
else
name = "Misc Condiment Bottle"
@@ -2014,14 +2014,6 @@
R.my_atom = src
reagents.add_reagent("blackpepper", 20)
/obj/item/weapon/reagent_containers/food/condiment/oliveoil //Will remove this as soon as there is a way to make olive oil.
name = "Olive Oil"
desc = "A delicious oil used in cooking. Possibly made from space olives."
icon_state = "oliveoil" //redundant but added so it looks nicer on the map.
New()
..()
reagents.add_reagent("oliveoil", 50)
///////////////////////////////////////////////Drinks
//Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly

View File

@@ -88,6 +88,8 @@ the blender or the processor: Processor items are solid objects and Blender resu
src.reagents.add_reagent("soymilk", 5)
else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/tomato))
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)
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)