From a5bc06c7086f16ed5da8cedf7530a8e143a84bde Mon Sep 17 00:00:00 2001 From: Shadowfire117 Date: Sun, 10 Feb 2019 12:05:51 +0100 Subject: [PATCH] Garlic bread, tasty garlic bread, sprited by the jellyfish armadillo alien Kassc! --- code/modules/food/recipes_microwave_vr.dm | 12 +++++++++++- code/modules/reagents/Chemistry-Recipes.dm | 10 +++++----- .../reagent_containers/food/snacks_vr.dm | 12 ++++++++++++ icons/obj/food.dmi | Bin 112075 -> 113102 bytes 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm index d5565824e9..5fadc6d118 100644 --- a/code/modules/food/recipes_microwave_vr.dm +++ b/code/modules/food/recipes_microwave_vr.dm @@ -192,4 +192,14 @@ items = list( /obj/item/weapon/reagent_containers/food/snacks/rawcutlet ) - result = /obj/item/weapon/reagent_containers/food/snacks/tocino \ No newline at end of file + result = /obj/item/weapon/reagent_containers/food/snacks/tocino + +/datum/recipe/garlicbread + reagents = list("sodiumchloride" = 2, "blackpepper" = 2) + fruit = list("onion" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread + ) + result = /obj/item/weapon/reagent_containers/food/snacks/garlicbread \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 91fe4241f8..38121665a2 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2240,35 +2240,35 @@ /datum/chemical_reaction/drinks/bubbleteawatermelon name = "Watermelon bubble tea" id = "bubbleteawatermelon" - result = "watermelon bubble tea" + result = "watermelonbubbletea" required_reagents = list("gelatin" = 2, "watermelontea" = 6, "milk" = 2) result_amount = 10 /datum/chemical_reaction/drinks/bubbleteastrawberry name = "Strawberry bubble tea" id = "bubbleteastrawberry" - result = "strawberry bubble tea" + result = "strawberrybubbletea" required_reagents = list("gelatin" = 2, "berrytea" = 6, "milk" = 2) result_amount = 10 /datum/chemical_reaction/drinks/bubbleteacherry name = "Cherry bubble tea" id = "bubbleteacherry" - result = "cherry bubble tea" + result = "cherrybubbletea" required_reagents = list("gelatin" = 2, "cherrytea" = 6, "milk" = 2) result_amount = 10 /datum/chemical_reaction/drinks/bubbleteacoffee name = "Coffee bubble tea" id = "bubbleteacoffee" - result = "coffee bubble tea" + result = "coffeebubbletea" required_reagents = list("gelatin" = 2, "tea" = 5, "cafe_latte" = 3) result_amount = 10 /datum/chemical_reaction/drinks/bubbleteabanana name = "Banana bubble tea" id = "bubbleteabanana" - result = "banana bubble tea" + result = "bananabubbletea" required_reagents = list("gelatin" = 2, "tea" = 5, "banana" = 1, "milk" = 2) result_amount = 10 diff --git a/code/modules/reagents/reagent_containers/food/snacks_vr.dm b/code/modules/reagents/reagent_containers/food/snacks_vr.dm index 9b9fcb5ce3..e102328fe6 100644 --- a/code/modules/reagents/reagent_containers/food/snacks_vr.dm +++ b/code/modules/reagents/reagent_containers/food/snacks_vr.dm @@ -356,6 +356,18 @@ ..() bitesize = 3 +/obj/item/weapon/reagent_containers/food/snacks/garlicbread + name = "Garlic bread" + desc = "Two slices of bread cooked with garlic, cheese and herbs on top to make a delicious sidedish." + icon = 'icons/obj/food.dmi' + icon_state = "garlicbread" + nutriment_amt = 2 + nutriment_desc = list("onions and melted cheese" = 2, "bread and seasonings" = 2) + +/obj/item/weapon/reagent_containers/food/snacks/garlicbread/New() + ..() + bitesize = 3 + /obj/item/weapon/reagent_containers/food/snacks/monkeycube/sobakacube name = "sobaka cube" monkey_type = "Sobaka" diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index c8ad22b1552eae65f7341b16b1675d29d36fd8f6..d3bac96aabc132d4c3706f28171657b20c6c41f2 100644 GIT binary patch delta 3344 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