From 526ccaa738dabd4a3026a94b55792c4379e2ecb6 Mon Sep 17 00:00:00 2001 From: "morikou@gmail.com" Date: Thu, 30 Dec 2010 22:00:43 +0000 Subject: [PATCH] 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 --- code/WorkInProgress/Chemistry-Reagents.dm | 8 ++++---- code/WorkInProgress/Chemistry-Recipes.dm | 2 +- code/WorkInProgress/Chemistry-Tools.dm | 14 +++----------- code/game/machinery/blender.dm | 2 ++ maps/tgstation.2.0.0.dmm | 4 ++-- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Reagents.dm b/code/WorkInProgress/Chemistry-Reagents.dm index 3c86c362e1..cc54d500fb 100644 --- a/code/WorkInProgress/Chemistry-Reagents.dm +++ b/code/WorkInProgress/Chemistry-Reagents.dm @@ -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) diff --git a/code/WorkInProgress/Chemistry-Recipes.dm b/code/WorkInProgress/Chemistry-Recipes.dm index be1a0fbba4..8ab6f278f7 100644 --- a/code/WorkInProgress/Chemistry-Recipes.dm +++ b/code/WorkInProgress/Chemistry-Recipes.dm @@ -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 diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 9dca759384..2bd850d874 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -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 diff --git a/code/game/machinery/blender.dm b/code/game/machinery/blender.dm index b227f8e023..8b91eeaecf 100644 --- a/code/game/machinery/blender.dm +++ b/code/game/machinery/blender.dm @@ -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) diff --git a/maps/tgstation.2.0.0.dmm b/maps/tgstation.2.0.0.dmm index ca78d06769..7fee45db07 100644 --- a/maps/tgstation.2.0.0.dmm +++ b/maps/tgstation.2.0.0.dmm @@ -2862,7 +2862,7 @@ "bdb" = (/obj/machinery/atmospherics/pipe/manifold{dir = 8},/turf/simulated/wall,/area/crew_quarters/kitchen) "bdc" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor{tag = "icon-cafeteria"; icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bdd" = (/obj/table,/obj/machinery/blender{pixel_y = 11},/turf/simulated/floor{tag = "icon-cafeteria"; icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) -"bde" = (/obj/table,/obj/item/weapon/reagent_containers/food/condiment/oliveoil,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor{tag = "icon-cafeteria"; icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) +"bde" = (/obj/table,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/food/condiment/enzyme,/turf/simulated/floor{tag = "icon-cafeteria"; icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bdf" = (/obj/secure_closet/fridge,/obj/machinery/light,/turf/simulated/floor{tag = "icon-cafeteria"; icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bdg" = (/obj/table/reinforced{tag = "icon-reinf_tabledir (EAST)"; icon_state = "reinf_tabledir"; dir = 4},/obj/window/reinforced/west{tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4},/obj/window/reinforced/west{tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1},/obj/item/weapon/reagent_containers/food/snacks/pie,/turf/simulated/floor{tag = "icon-cafeteria"; icon_state = "cafeteria"; dir = 2},/area/crew_quarters/kitchen) "bdh" = (/obj/machinery/light{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar) @@ -6677,7 +6677,7 @@ "cyu" = (/turf/unsimulated/wall{icon = 'beach.dmi'; icon_state = "water"},/area/beach) "cyv" = (/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/beach) "cyw" = (/obj/overlay{anchored = 1; icon = 'beach.dmi'; icon_state = "water2"; layer = 10; mouse_opacity = 0; name = "water"},/turf/unsimulated/floor{icon = 'beach.dmi'; icon_state = "water"; name = "water"},/area/beach) -"cyx" = (/turf/unsimulated/wall{icon = 'icons/turf/floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown) +"cyx" = (/turf/unsimulated/wall{icon = 'floors.dmi'; icon_state = "grass3"; name = "grass"},/area/planet/clown) "cyy" = (/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "cyz" = (/obj/item/weapon/bananapeel,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown) "cyA" = (/obj/item/weapon/mousetrap/armed,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"; tag = "icon-grass1"},/area/planet/clown)