From 879b626cd1cdd23bd431a9a4465dad7839ef986b Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Fri, 27 Mar 2020 03:12:04 -0400 Subject: [PATCH] Et tu --- .../food_and_drinks/food/snacks_salad.dm | 9 +++++++++ .../recipes/tablecraft/recipes_salad.dm | 10 ++++++++++ code/modules/hydroponics/grown/misc.dm | 2 -- icons/obj/food/soupsalad.dmi | Bin 20805 -> 21242 bytes 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index e272733235..a977eac3c2 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -116,3 +116,12 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) tastes = list("rice" = 1, "egg" = 1) foodtype = GRAIN | MEAT //EGG = MEAT -NinjaNomNom 2017 + +/obj/item/reagent_containers/food/snacks/salad/caesar + name = "caesar salad" + desc = "You too?" + icon_state = "ceasar_salad" + trash = /obj/item/kitchen/knife + bonus_reagents = list(/datum/reagent/medicine/earthsblood = 1, /datum/reagent/iron = 4) + tastes = list("iron" = 1, "conspiracy" = 1) + foodtype = VEGETABLES \ No newline at end of file diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm index 0a44c4590e..4c942a0c2d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_salad.dm @@ -84,3 +84,13 @@ ) result = /obj/item/reagent_containers/food/snacks/salad/validsalad subcategory = CAT_SALAD + +/datum/crafting_recipe/food/caesarsalad + name = "Caesar salad" + reqs = list( + /obj/item/kitchen/knife = 1, + /obj/item/reagent_containers/food/snacks/grown/ambrosia/gaia = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + ) + result = /obj/item/reagent_containers/food/snacks/salad/caesar + subcategory = CAT_SALAD \ No newline at end of file diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index 6ebfd3254f..aed6cbf93f 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -98,8 +98,6 @@ wine_power = 35 tastes = list("thistle" = 2, "artichoke" = 1) - - // Cabbage /obj/item/seeds/cabbage name = "pack of cabbage seeds" diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi index a6e492608f4ca5efa46619f8df2ddb799a2fddba..fd47e89aa8f90bd1c257301fc25ad84105d3da83 100644 GIT binary patch delta 3375 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