From 079dc70dc25c17518518e5499dfce6b9cc4e5efe Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:44:05 -0400 Subject: [PATCH 01/15] Delete food.dmi --- modular_citadel/icons/obj/food/food.dmi | Bin 4184 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 modular_citadel/icons/obj/food/food.dmi diff --git a/modular_citadel/icons/obj/food/food.dmi b/modular_citadel/icons/obj/food/food.dmi deleted file mode 100644 index d205b29b8b2969c0f7c114450a742f5329b6697d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4184 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 Date: Mon, 29 Apr 2019 17:44:32 -0400 Subject: [PATCH 02/15] Add files via upload --- modular_citadel/icons/obj/food/food.dmi | Bin 0 -> 5346 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_citadel/icons/obj/food/food.dmi diff --git a/modular_citadel/icons/obj/food/food.dmi b/modular_citadel/icons/obj/food/food.dmi new file mode 100644 index 0000000000000000000000000000000000000000..da9a6c365f697cd66b3f00949ece94110a1bada2 GIT binary patch literal 5346 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 Z=|A_g Date: Mon, 29 Apr 2019 17:45:48 -0400 Subject: [PATCH 03/15] Add files via upload --- .../recipes/tablecraft/snacks_sushi.dm | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm diff --git a/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm new file mode 100644 index 0000000000..a4cbc5e344 --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm @@ -0,0 +1,95 @@ +//////////////////////////Sushi Components/////////////////////// + +/obj/item/reagent_containers/food/snacks/sushi_rice + name = "Sushi Rice" + desc = "A bowl of sticky rice for making sushi." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushi_rice" + list_reagents = list("sodiumchloride" = 5) + tastes = list("rice" = 5, "salt" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/sea_weed + name = "Sea Weed Sheet" + desc = "A thin, light salt sheet of plant mater. This is commenly used in sushi recipes," + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sea_weed" + list_reagents = list("sodiumchloride" = 2) + tastes = list("plants" = 2, "salt" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/tuna + name = "Canned Tuna" + desc = "A small can of tuna fish beloved by felines." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "tuna_can" +//trash = /obj/item/trash/tuna_used //I dont know if I like this idea - A Masked Cat + list_reagents = list("sodiumchloride" = 5, "mercury" = 2) + tastes = list("tuna" = 15, "mercury" = 1, "salt" = 3) + foodtype = MEAT + +//////////////////////////Sushi///////////////////////////////// +/obj/item/reagent_containers/food/snacks/sushie_basic + name = "Funa Hosomaki" + desc = "A small cylindrical filled with rice and fish." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_basic" + bonus_reagents = list("vitamin" = 2) + list_reagents = list("nutriment" = 1) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/sushie_adv + name = "Funa Nigiri" + desc = "A pice of carp lightly placed on some rice." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_adv" + bonus_reagents = list("vitamin" = 2) + list_reagents = list("nutriment" = 2) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/sushie_pro + name = "Funa Nigiri" + desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_pro" + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + list_reagents = list("nutriment" = 8, "vitamin" = 1) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/tobiko + name = "Tobiko" + desc = "Spider eggs wrapped in a thin salted Kudzu pod" + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_egg" + list_reagents = list("nutriment" = 3, "vitamin" = 2) + filling_color = "#FF3333" // R225 G051 B051 + tastes = list("seaweed" = 1, "salty" = 2) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/riceball + name = "Onigiri" + desc = "A ball of rice with some light salt and a wrap of Kudzu skin." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "riceball" + list_reagents = list("nutriment" = 5, "sodiumchloride" = 2) + tastes = list("rice" = 4, "salt" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/sashimi + name = "carp sashimi" + desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." + icon_state = "sashimi" + bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4) + list_reagents = list("nutriment" = 6, "capsaicin" = 5) + filling_color = "#FA8072" + tastes = list("fish" = 1, "hot peppers" = 1) + foodtype = MEAT | TOXIC \ No newline at end of file From bf9f9dcac32bdd836cd9915c6898dd4da862c43a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:47:15 -0400 Subject: [PATCH 04/15] Update tgstation.dme --- tgstation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 5b4c4eabe5..55cf2cd18e 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1628,6 +1628,7 @@ #include "code\modules\food_and_drinks\food\snacks_sandwichtoast.dm" #include "code\modules\food_and_drinks\food\snacks_soup.dm" #include "code\modules\food_and_drinks\food\snacks_spaghetti.dm" +#include "code\modules\food_and_drinks\food\snacks_sushi.dm" #include "code\modules\food_and_drinks\food\snacks_vend.dm" #include "code\modules\food_and_drinks\food\snacks\dough.dm" #include "code\modules\food_and_drinks\food\snacks\meat.dm" @@ -1655,6 +1656,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_soup.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_spaghetti.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sushi.dm" #include "code\modules\games\cas.dm" #include "code\modules\goonchat\browserOutput.dm" #include "code\modules\goonchat\jsErrorHandler.dm" From 25df517ad567cab4b8375fadc5335b53cbe8a8be Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:48:26 -0400 Subject: [PATCH 05/15] Update construction.dm --- code/__DEFINES/construction.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index aab49720f6..9f3d38efa1 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -102,6 +102,7 @@ #define CAT_SANDWICH "Sandwiches" #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" +#define CAT_SUSHI "Fish" #define RCD_FLOORWALL 1 #define RCD_AIRLOCK 2 From 555359f873083b0ac4e2497a52b0d103cf64b7be Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:51:53 -0400 Subject: [PATCH 06/15] Update snacks_sandwichtoast.dm --- .../food_and_drinks/food/snacks_sandwichtoast.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm index 747f5f7d35..88f8848315 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm @@ -102,3 +102,13 @@ list_reagents = list("nutriment" = 2, "vitamin" = 2) tastes = list("bread" = 2) foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/tuna_sandwich + name = "tuna sandwich" + desc = "Both a salad and a sandwich in one." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "tunasandwich" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 1, "vitamin" = 3) + tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2) + foodtype = GRAIN | MEAT From 5737a4e951d34070df6691ed0f2b2ec34eea3773 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:52:28 -0400 Subject: [PATCH 07/15] Add files via upload --- .../food_and_drinks/food/snacks_sushi.dm | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 code/modules/food_and_drinks/food/snacks_sushi.dm diff --git a/code/modules/food_and_drinks/food/snacks_sushi.dm b/code/modules/food_and_drinks/food/snacks_sushi.dm new file mode 100644 index 0000000000..a4cbc5e344 --- /dev/null +++ b/code/modules/food_and_drinks/food/snacks_sushi.dm @@ -0,0 +1,95 @@ +//////////////////////////Sushi Components/////////////////////// + +/obj/item/reagent_containers/food/snacks/sushi_rice + name = "Sushi Rice" + desc = "A bowl of sticky rice for making sushi." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushi_rice" + list_reagents = list("sodiumchloride" = 5) + tastes = list("rice" = 5, "salt" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/sea_weed + name = "Sea Weed Sheet" + desc = "A thin, light salt sheet of plant mater. This is commenly used in sushi recipes," + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sea_weed" + list_reagents = list("sodiumchloride" = 2) + tastes = list("plants" = 2, "salt" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/tuna + name = "Canned Tuna" + desc = "A small can of tuna fish beloved by felines." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "tuna_can" +//trash = /obj/item/trash/tuna_used //I dont know if I like this idea - A Masked Cat + list_reagents = list("sodiumchloride" = 5, "mercury" = 2) + tastes = list("tuna" = 15, "mercury" = 1, "salt" = 3) + foodtype = MEAT + +//////////////////////////Sushi///////////////////////////////// +/obj/item/reagent_containers/food/snacks/sushie_basic + name = "Funa Hosomaki" + desc = "A small cylindrical filled with rice and fish." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_basic" + bonus_reagents = list("vitamin" = 2) + list_reagents = list("nutriment" = 1) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/sushie_adv + name = "Funa Nigiri" + desc = "A pice of carp lightly placed on some rice." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_adv" + bonus_reagents = list("vitamin" = 2) + list_reagents = list("nutriment" = 2) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/sushie_pro + name = "Funa Nigiri" + desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_pro" + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + list_reagents = list("nutriment" = 8, "vitamin" = 1) + bitesize = 1 + filling_color = "#F2EEEA" //rgb(242, 238, 234) + tastes = list("fish" = 1, "rice" = 1, "salt" = 1) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/tobiko + name = "Tobiko" + desc = "Spider eggs wrapped in a thin salted Kudzu pod" + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "sushie_egg" + list_reagents = list("nutriment" = 3, "vitamin" = 2) + filling_color = "#FF3333" // R225 G051 B051 + tastes = list("seaweed" = 1, "salty" = 2) + foodtype = MEAT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/riceball + name = "Onigiri" + desc = "A ball of rice with some light salt and a wrap of Kudzu skin." + icon = 'modular_citadel/icons/obj/food/food.dmi' + icon_state = "riceball" + list_reagents = list("nutriment" = 5, "sodiumchloride" = 2) + tastes = list("rice" = 4, "salt" = 1) + foodtype = GRAIN + +/obj/item/reagent_containers/food/snacks/sashimi + name = "carp sashimi" + desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." + icon_state = "sashimi" + bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4) + list_reagents = list("nutriment" = 6, "capsaicin" = 5) + filling_color = "#FA8072" + tastes = list("fish" = 1, "hot peppers" = 1) + foodtype = MEAT | TOXIC \ No newline at end of file From 862512fba749ff11bfc71962999bd5a1f7ed5760 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:53:44 -0400 Subject: [PATCH 08/15] Update recipes_sandwich.dm --- .../recipes/tablecraft/recipes_sandwich.dm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index 9750e91930..a2e83a09b4 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -62,5 +62,13 @@ result = /obj/item/reagent_containers/food/snacks/notasandwich subcategory = CAT_SANDWICH - - +/datum/crafting_recipe/food/notasandwich + name = "Tuna sandwich" + reqs = list( + /obj/item/reagent_containers/food/snacks/breadslice/plain = 2, + /obj/item/reagent_containers/food/snacks/tuna = 1, + /obj/item/reagent_containers/food/snacks/grown/onion = 1, + /obj/item/reagent_containers/food/condiment/mayonnaise = 5 + ) + result = /obj/item/reagent_containers/food/snacks/tuna_sandwich + subcategory = CAT_SANDWICH From adc6ef506e609689ebd6493f6c5b445eaa9fc81c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 17:58:17 -0400 Subject: [PATCH 09/15] Update recipes_meat.dm --- .../recipes/tablecraft/recipes_meat.dm | 486 ++++++++++-------- 1 file changed, 269 insertions(+), 217 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index e401e08062..d48d71c63c 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,240 +1,292 @@ +//Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu -////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// +////////////////////////////////////////////FISH//////////////////////////////////////////// -/datum/crafting_recipe/food/humankebab - name = "Human kebab" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 2 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/human - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/cubancarp + name = "\improper Cuban carp" + desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" + icon_state = "cubancarp" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 1, "vitamin" = 4) + bitesize = 3 + filling_color = "#CD853F" + list_reagents = list("nutriment" = 6, "capsaicin" = 1) + tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) + foodtype = MEAT -/datum/crafting_recipe/food/kebab - name = "Kebab" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/meat/steak = 2 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/monkey - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/carpmeat + name = "carp fillet" + desc = "A fillet of spess carp meat." + icon_state = "fishfillet" + list_reagents = list("nutriment" = 3, "carpotoxin" = 2, "vitamin" = 2) + bitesize = 6 + filling_color = "#FA8072" + tastes = list("fish" = 1) + foodtype = MEAT -/datum/crafting_recipe/food/tofukebab - name = "Tofu kebab" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/tofu = 2 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/tofu - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/carpmeat/Initialize() + . = ..() + eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") -/datum/crafting_recipe/food/tailkebab - name = "Lizard tail kebab" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/organ/tail/lizard = 1 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/tail - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/carpmeat/imitation + name = "imitation carp fillet" + desc = "Almost just like the real thing, kinda." -// see code/module/crafting/table.dm +/obj/item/reagent_containers/food/snacks/fishfingers + name = "fish fingers" + desc = "A finger of fish." + icon_state = "fishfingers" + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + list_reagents = list("nutriment" = 4) + bitesize = 1 + filling_color = "#CD853F" + tastes = list("fish" = 1, "breadcrumbs" = 1) + foodtype = MEAT -////////////////////////////////////////////////FISH//////////////////////////////////////////////// +/obj/item/reagent_containers/food/snacks/fishandchips + name = "fish and chips" + desc = "I do say so myself chap." + icon_state = "fishandchips" + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + list_reagents = list("nutriment" = 6) + filling_color = "#FA8072" + tastes = list("fish" = 1, "chips" = 1) + foodtype = MEAT | VEGETABLES | FRIED -/datum/crafting_recipe/food/cubancarp - name = "Cuban carp" - reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/grown/chili = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_MEAT +////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// -/datum/crafting_recipe/food/fishandchips - name = "Fish and chips" - reqs = list( - /obj/item/reagent_containers/food/snacks/fries = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/tofu + name = "tofu" + desc = "We all love tofu." + icon_state = "tofu" + list_reagents = list("nutriment" = 2) + filling_color = "#F0E68C" + tastes = list("tofu" = 1) + foodtype = VEGETABLES -/datum/crafting_recipe/food/fishfingers - name = "Fish fingers" - reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fishfingers - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/spiderleg + name = "spider leg" + desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?" + icon_state = "spiderleg" + list_reagents = list("nutriment" = 2, "toxin" = 2) + cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg + filling_color = "#000000" + tastes = list("cobwebs" = 1) + foodtype = MEAT | TOXIC -/datum/crafting_recipe/food/sashimi - name = "Sashimi" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/spidereggs = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/cornedbeef + name = "corned beef and cabbage" + desc = "Now you can feel like a real tourist vacationing in Ireland." + icon_state = "cornedbeef" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 1, "vitamin" = 4) + list_reagents = list("nutriment" = 5) + tastes = list("meat" = 1, "cabbage" = 1) + foodtype = MEAT | VEGETABLES -/datum/crafting_recipe/food/sushi_basic - name = "Funa Hosomaki" - reqs = list( - /datum/reagent/consumable/soysauce = 3, - /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 2, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, - ) - result = /obj/item/reagent_containers/food/snacks/sushi_basic - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/sushi_adv - name = "Funa Nigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sushi_adv - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/sushi_pro - name = "Well made Funa Nigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, - /obj/item/reagent_containers/food/snacks/carpmeat = 2 - ) - result = /obj/item/reagent_containers/food/snacks/sushi_pro - subcategory = CAT_MEAT - -////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// - -/datum/crafting_recipe/food/spidereggsham - name = "Spider eggs ham" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 1, - /obj/item/reagent_containers/food/snacks/spidereggs = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 2 - ) - result = /obj/item/reagent_containers/food/snacks/spidereggsham - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/sushi_egg - name = "Tobiko" - reqs = list( - /datum/reagent/consumable/soysauce = 6, - /obj/item/reagent_containers/food/snacks/spidereggs = 1, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, - ) - result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_MEAT - -////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// - -/datum/crafting_recipe/food/cornedbeef - name = "Corned beef" - reqs = list( - /datum/reagent/consumable/sodiumchloride = 5, - /obj/item/reagent_containers/food/snacks/meat/steak = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 2 - ) - result = /obj/item/reagent_containers/food/snacks/cornedbeef - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/bearsteak +/obj/item/reagent_containers/food/snacks/bearsteak name = "Filet migrawr" - reqs = list( - /datum/reagent/consumable/ethanol/manly_dorf = 5, - /obj/item/reagent_containers/food/snacks/meat/steak/bear = 1, - ) - tools = list(/obj/item/lighter) - result = /obj/item/reagent_containers/food/snacks/bearsteak - subcategory = CAT_MEAT + desc = "Because eating bear wasn't manly enough." + icon_state = "bearsteak" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 2, "vitamin" = 6) + list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5) + tastes = list("meat" = 1, "salmon" = 1) + foodtype = MEAT | ALCOHOL -/datum/crafting_recipe/food/enchiladas - name = "Enchiladas" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, - /obj/item/reagent_containers/food/snacks/grown/chili = 2, - /obj/item/reagent_containers/food/snacks/tortilla = 2 - ) - result = /obj/item/reagent_containers/food/snacks/enchiladas - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/faggot + name = "faggot" + desc = "A great meal all round. Not a cord of wood." + icon_state = "faggot" + list_reagents = list("nutriment" = 4, "vitamin" = 1) + filling_color = "#800000" + tastes = list("meat" = 1) + foodtype = MEAT -/datum/crafting_recipe/food/stewedsoymeat - name = "Stewed soymeat" - reqs = list( - /obj/item/reagent_containers/food/snacks/soydope = 2, - /obj/item/reagent_containers/food/snacks/grown/carrot = 1, - /obj/item/reagent_containers/food/snacks/grown/tomato = 1 - ) - result = /obj/item/reagent_containers/food/snacks/stewedsoymeat - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/sausage + name = "sausage" + desc = "A piece of mixed, long meat." + icon_state = "sausage" + filling_color = "#CD5C5C" + bonus_reagents = list("nutriment" = 1, "vitamin" = 1) + list_reagents = list("nutriment" = 6, "vitamin" = 1) + tastes = list("meat" = 1) + foodtype = MEAT + var/roasted = FALSE -/datum/crafting_recipe/food/sausage - name = "Sausage" - reqs = list( - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2 - ) - result = /obj/item/reagent_containers/food/snacks/sausage - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/sausage/Initialize() + . = ..() + eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") -/datum/crafting_recipe/food/nugget - name = "Chicken nugget" - reqs = list( - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/nugget - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/kebab + trash = /obj/item/stack/rods + icon_state = "kebab" + w_class = WEIGHT_CLASS_NORMAL + list_reagents = list("nutriment" = 8) + tastes = list("meat" = 3, "metal" = 1) + foodtype = MEAT -/datum/crafting_recipe/food/rawkhinkali - name = "Raw Khinkali" - reqs = list( - /obj/item/reagent_containers/food/snacks/doughslice = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1 - ) - result = /obj/item/reagent_containers/food/snacks/rawkhinkali - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/kebab/human + name = "human-kebab" + desc = "A human meat, on a stick." + bonus_reagents = list("nutriment" = 1, "vitamin" = 6) + tastes = list("tender meat" = 3, "metal" = 1) + foodtype = MEAT | GROSS -/datum/crafting_recipe/food/pigblanket - name = "Pig in a Blanket" - reqs = list( - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/butter = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 - ) - result = /obj/item/reagent_containers/food/snacks/pigblanket - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/kebab/monkey + name = "meat-kebab" + desc = "Delicious meat, on a stick." + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + tastes = list("meat" = 3, "metal" = 1) + foodtype = MEAT -/datum/crafting_recipe/food/ratkebab - name = "Rat Kebab" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/deadmouse = 1 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/rat - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/kebab/tofu + name = "tofu-kebab" + desc = "Vegan meat, on a stick." + bonus_reagents = list("nutriment" = 1) + tastes = list("tofu" = 3, "metal" = 1) + foodtype = VEGETABLES -/datum/crafting_recipe/food/doubleratkebab - name = "Double Rat Kebab" - reqs = list( - /obj/item/stack/rods = 1, - /obj/item/reagent_containers/food/snacks/deadmouse = 2 - ) - result = /obj/item/reagent_containers/food/snacks/kebab/rat/double - subcategory = CAT_MEAT +/obj/item/reagent_containers/food/snacks/kebab/tail + name = "lizard-tail kebab" + desc = "Severed lizard tail on a stick." + bonus_reagents = list("nutriment" = 1, "vitamin" = 4) + tastes = list("meat" = 8, "metal" = 4, "scales" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/rawkhinkali + name = "raw khinkali" + desc = "One hundred khinkalis? Do I look like a pig?" + icon_state = "khinkali" + list_reagents = list("nutriment" = 1, "vitamin" = 1) + cooked_type = /obj/item/reagent_containers/food/snacks/khinkali + tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/khinkali + name = "khinkali" + desc = "One hundred khinkalis? Do I look like a pig?" + icon_state = "khinkali" + list_reagents = list("nutriment" = 4, "vitamin" = 2) + bitesize = 3 + filling_color = "#F0F0F0" + tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/monkeycube + name = "monkey cube" + desc = "Just add water!" + icon_state = "monkeycube" + bitesize = 12 + list_reagents = list("nutriment" = 2) + filling_color = "#CD853F" + tastes = list("the jungle" = 1, "bananas" = 1) + foodtype = MEAT | SUGAR + +/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/living/carbon/M) + if(iscarbon(M)) + M.visible_message("[src] bursts out of [M]!") + M.emote("scream") + M.Knockdown(40) + M.adjustBruteLoss(60) + Expand() + return ..() + +/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() + var/mob/spammer = get_mob_by_key(fingerprintslast) + var/mob/living/carbon/monkey/bananas = new(drop_location(), TRUE, spammer) + if (!QDELETED(bananas)) + visible_message("[src] expands!") + bananas.log_message("Spawned via [src] at [AREACOORD(src)], Last attached mob: [key_name(spammer)].", LOG_ATTACK) + else if (!spammer) // Visible message in case there are no fingerprints + visible_message("[src] fails to expand!") + qdel(src) + +/obj/item/reagent_containers/food/snacks/enchiladas + name = "enchiladas" + desc = "Viva La Mexico!" + icon_state = "enchiladas" + bonus_reagents = list("nutriment" = 1, "vitamin" = 2) + bitesize = 4 + filling_color = "#FFA07A" + list_reagents = list("nutriment" = 8, "capsaicin" = 6) + tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/stewedsoymeat + name = "stewed soy meat" + desc = "Even non-vegetarians will LOVE this!" + icon_state = "stewedsoymeat" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 1) + list_reagents = list("nutriment" = 8) + filling_color = "#D2691E" + tastes = list("soy" = 1, "vegetables" = 1) + foodtype = VEGETABLES + +/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize() + . = ..() + eatverb = pick("slurp","sip","suck","inhale","drink") + +/obj/item/reagent_containers/food/snacks/boiledspiderleg + name = "boiled spider leg" + desc = "A giant spider's leg that's still twitching after being cooked. Gross!" + icon_state = "spiderlegcooked" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 1, "capsaicin" = 2, "vitamin" = 2) + list_reagents = list("nutriment" = 3, "capsaicin" = 2) + filling_color = "#000000" + tastes = list("hot peppers" = 1, "cobwebs" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/spidereggsham + name = "green eggs and ham" + desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" + icon_state = "spidereggsham" + trash = /obj/item/trash/plate + bonus_reagents = list("nutriment" = 1, "vitamin" = 3) + list_reagents = list("nutriment" = 6) + bitesize = 4 + filling_color = "#7FFF00" + tastes = list("meat" = 1, "the colour green" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/nugget + name = "chicken nugget" + filling_color = "#B22222" + bonus_reagents = list("nutriment" = 1, "vitamin" = 1) + list_reagents = list("nutriment" = 2) + tastes = list("\"chicken\"" = 1) + foodtype = MEAT + +/obj/item/reagent_containers/food/snacks/nugget/Initialize() + . = ..() + var/shape = pick("lump", "star", "lizard", "corgi") + desc = "A 'chicken' nugget vaguely shaped like a [shape]." + icon_state = "nugget_[shape]" + +/obj/item/reagent_containers/food/snacks/pigblanket + name = "pig in a blanket" + desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it." + icon_state = "pigblanket" + list_reagents = list("nutriment" = 6, "vitamin" = 1) + bonus_reagents = list("nutriment" = 1, "vitamin" = 1) + filling_color = "#800000" + tastes = list("meat" = 1, "butter" = 1) + +/obj/item/reagent_containers/food/snacks/kebab/rat + name = "rat-kebab" + desc = "Not so delicious rat meat, on a stick." + icon_state = "ratkebab" + w_class = WEIGHT_CLASS_NORMAL + list_reagents = list("nutriment" = 6, "vitamin" = 2) + tastes = list("rat meat" = 1, "metal" = 1) + foodtype = MEAT | GROSS + +/obj/item/reagent_containers/food/snacks/kebab/rat/double + name = "double rat-kebab" + icon_state = "doubleratkebab" + tastes = list("rat meat" = 2, "metal" = 1) + bonus_reagents = list("nutriment" = 6, "vitamin" = 2) -/datum/crafting_recipe/food/ricepork - name = "Rice and pork" - reqs = list( - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1, - /obj/item/reagent_containers/food/snacks/meat/cutlet = 2 - ) - result = /obj/item/reagent_containers/food/snacks/salad/ricepork - subcategory = CAT_MEAT From 0d099cb627bf544194ef1e11af9d1d8209fe6aae Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 18:13:42 -0400 Subject: [PATCH 10/15] Update recipes_meat.dm --- code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index d48d71c63c..a4a3cdd298 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,6 +1,5 @@ //Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu - ////////////////////////////////////////////FISH//////////////////////////////////////////// /obj/item/reagent_containers/food/snacks/cubancarp From fd5554dc2176fdc12ce420b345af31b94ddd8364 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 18:17:53 -0400 Subject: [PATCH 11/15] Update recipes_meat.dm --- .../modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index a4a3cdd298..620418e2d0 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,6 +1,6 @@ //Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu -////////////////////////////////////////////FISH//////////////////////////////////////////// +///////////////////////////////////////////FISH//////////////////////////////////////////// /obj/item/reagent_containers/food/snacks/cubancarp name = "\improper Cuban carp" @@ -288,4 +288,3 @@ icon_state = "doubleratkebab" tastes = list("rat meat" = 2, "metal" = 1) bonus_reagents = list("nutriment" = 6, "vitamin" = 2) - From c03febe17e394b32ba0317df7b34ec2fc75bee62 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 18:20:38 -0400 Subject: [PATCH 12/15] THATS WHY --- .../recipes/tablecraft/recipes_meat.dm | 496 ++++++++---------- 1 file changed, 228 insertions(+), 268 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index 620418e2d0..fe71e9e154 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,290 +1,250 @@ -//Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu -///////////////////////////////////////////FISH//////////////////////////////////////////// -/obj/item/reagent_containers/food/snacks/cubancarp - name = "\improper Cuban carp" - desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!" - icon_state = "cubancarp" - trash = /obj/item/trash/plate - bonus_reagents = list("nutriment" = 1, "vitamin" = 4) - bitesize = 3 - filling_color = "#CD853F" - list_reagents = list("nutriment" = 6, "capsaicin" = 1) - tastes = list("fish" = 4, "batter" = 1, "hot peppers" = 1) - foodtype = MEAT +////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// -/obj/item/reagent_containers/food/snacks/carpmeat - name = "carp fillet" - desc = "A fillet of spess carp meat." - icon_state = "fishfillet" - list_reagents = list("nutriment" = 3, "carpotoxin" = 2, "vitamin" = 2) - bitesize = 6 - filling_color = "#FA8072" - tastes = list("fish" = 1) - foodtype = MEAT +/datum/crafting_recipe/food/humankebab + name = "Human kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/meat/steak/plain/human = 2 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/human + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/carpmeat/Initialize() - . = ..() - eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") +/datum/crafting_recipe/food/kebab + name = "Kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/meat/steak = 2 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/monkey + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/carpmeat/imitation - name = "imitation carp fillet" - desc = "Almost just like the real thing, kinda." +/datum/crafting_recipe/food/tofukebab + name = "Tofu kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/tofu = 2 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/tofu + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/fishfingers - name = "fish fingers" - desc = "A finger of fish." - icon_state = "fishfingers" - bonus_reagents = list("nutriment" = 1, "vitamin" = 2) - list_reagents = list("nutriment" = 4) - bitesize = 1 - filling_color = "#CD853F" - tastes = list("fish" = 1, "breadcrumbs" = 1) - foodtype = MEAT +/datum/crafting_recipe/food/tailkebab + name = "Lizard tail kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/organ/tail/lizard = 1 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/tail + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/fishandchips - name = "fish and chips" - desc = "I do say so myself chap." - icon_state = "fishandchips" - bonus_reagents = list("nutriment" = 1, "vitamin" = 2) - list_reagents = list("nutriment" = 6) - filling_color = "#FA8072" - tastes = list("fish" = 1, "chips" = 1) - foodtype = MEAT | VEGETABLES | FRIED +// see code/module/crafting/table.dm -////////////////////////////////////////////MEATS AND ALIKE//////////////////////////////////////////// +////////////////////////////////////////////////FISH//////////////////////////////////////////////// -/obj/item/reagent_containers/food/snacks/tofu - name = "tofu" - desc = "We all love tofu." - icon_state = "tofu" - list_reagents = list("nutriment" = 2) - filling_color = "#F0E68C" - tastes = list("tofu" = 1) - foodtype = VEGETABLES +/datum/crafting_recipe/food/cubancarp + name = "Cuban carp" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/grown/chili = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/cubancarp + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/spiderleg - name = "spider leg" - desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?" - icon_state = "spiderleg" - list_reagents = list("nutriment" = 2, "toxin" = 2) - cooked_type = /obj/item/reagent_containers/food/snacks/boiledspiderleg - filling_color = "#000000" - tastes = list("cobwebs" = 1) - foodtype = MEAT | TOXIC +/datum/crafting_recipe/food/fishandchips + name = "Fish and chips" + reqs = list( + /obj/item/reagent_containers/food/snacks/fries = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishandchips + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/cornedbeef - name = "corned beef and cabbage" - desc = "Now you can feel like a real tourist vacationing in Ireland." - icon_state = "cornedbeef" - trash = /obj/item/trash/plate - bonus_reagents = list("nutriment" = 1, "vitamin" = 4) - list_reagents = list("nutriment" = 5) - tastes = list("meat" = 1, "cabbage" = 1) - foodtype = MEAT | VEGETABLES +/datum/crafting_recipe/food/fishfingers + name = "Fish fingers" + reqs = list( + /datum/reagent/consumable/flour = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fishfingers + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/bearsteak +/datum/crafting_recipe/food/sashimi + name = "Sashimi" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/spidereggs = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sashimi + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/riceball + name = "Onigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 1, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 + ) + result = /obj/item/reagent_containers/food/snacks/riceball + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/sushie_egg + name = "Tobiko" + reqs = list( + /datum/reagent/consumable/soysauce = 6, + /obj/item/reagent_containers/food/snacks/spidereggs = 1, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, + ) + result = /obj/item/reagent_containers/food/snacks/tobiko + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/sushie_basic + name = "Funa Hosomaki" + reqs = list( + /datum/reagent/consumable/soysauce = 3, + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 2, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, + ) + result = /obj/item/reagent_containers/food/snacks/sushie_basic + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/sushie_adv + name = "Funa Nigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sushie_adv + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/sushie_pro + name = "Well made Funa Nigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, + /obj/item/reagent_containers/food/snacks/carpmeat = 5 + ) + result = /obj/item/reagent_containers/food/snacks/sushie_pro + subcategory = CAT_MEAT + +////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// + +/datum/crafting_recipe/food/spidereggsham + name = "Spider eggs ham" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 1, + /obj/item/reagent_containers/food/snacks/spidereggs = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet/spider = 2 + ) + result = /obj/item/reagent_containers/food/snacks/spidereggsham + subcategory = CAT_MEAT + +////////////////////////////////////////////////MISC RECIPE's//////////////////////////////////////////////// + +/datum/crafting_recipe/food/cornedbeef + name = "Corned beef" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 5, + /obj/item/reagent_containers/food/snacks/meat/steak = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 2 + ) + result = /obj/item/reagent_containers/food/snacks/cornedbeef + subcategory = CAT_MEAT + +/datum/crafting_recipe/food/bearsteak name = "Filet migrawr" - desc = "Because eating bear wasn't manly enough." - icon_state = "bearsteak" - trash = /obj/item/trash/plate - bonus_reagents = list("nutriment" = 2, "vitamin" = 6) - list_reagents = list("nutriment" = 2, "vitamin" = 5, "manlydorf" = 5) - tastes = list("meat" = 1, "salmon" = 1) - foodtype = MEAT | ALCOHOL + reqs = list( + /datum/reagent/consumable/ethanol/manly_dorf = 5, + /obj/item/reagent_containers/food/snacks/meat/steak/bear = 1, + ) + tools = list(/obj/item/lighter) + result = /obj/item/reagent_containers/food/snacks/bearsteak + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/faggot - name = "faggot" - desc = "A great meal all round. Not a cord of wood." - icon_state = "faggot" - list_reagents = list("nutriment" = 4, "vitamin" = 1) - filling_color = "#800000" - tastes = list("meat" = 1) - foodtype = MEAT +/datum/crafting_recipe/food/enchiladas + name = "Enchiladas" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2, + /obj/item/reagent_containers/food/snacks/grown/chili = 2, + /obj/item/reagent_containers/food/snacks/tortilla = 2 + ) + result = /obj/item/reagent_containers/food/snacks/enchiladas + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/sausage - name = "sausage" - desc = "A piece of mixed, long meat." - icon_state = "sausage" - filling_color = "#CD5C5C" - bonus_reagents = list("nutriment" = 1, "vitamin" = 1) - list_reagents = list("nutriment" = 6, "vitamin" = 1) - tastes = list("meat" = 1) - foodtype = MEAT - var/roasted = FALSE +/datum/crafting_recipe/food/stewedsoymeat + name = "Stewed soymeat" + reqs = list( + /obj/item/reagent_containers/food/snacks/soydope = 2, + /obj/item/reagent_containers/food/snacks/grown/carrot = 1, + /obj/item/reagent_containers/food/snacks/grown/tomato = 1 + ) + result = /obj/item/reagent_containers/food/snacks/stewedsoymeat + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/sausage/Initialize() - . = ..() - eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp") +/datum/crafting_recipe/food/sausage + name = "Sausage" + reqs = list( + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2 + ) + result = /obj/item/reagent_containers/food/snacks/sausage + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/kebab - trash = /obj/item/stack/rods - icon_state = "kebab" - w_class = WEIGHT_CLASS_NORMAL - list_reagents = list("nutriment" = 8) - tastes = list("meat" = 3, "metal" = 1) - foodtype = MEAT +/datum/crafting_recipe/food/nugget + name = "Chicken nugget" + reqs = list( + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 + ) + result = /obj/item/reagent_containers/food/snacks/nugget + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/kebab/human - name = "human-kebab" - desc = "A human meat, on a stick." - bonus_reagents = list("nutriment" = 1, "vitamin" = 6) - tastes = list("tender meat" = 3, "metal" = 1) - foodtype = MEAT | GROSS +/datum/crafting_recipe/food/rawkhinkali + name = "Raw Khinkali" + reqs = list( + /obj/item/reagent_containers/food/snacks/doughslice = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1 + ) + result = /obj/item/reagent_containers/food/snacks/rawkhinkali + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/kebab/monkey - name = "meat-kebab" - desc = "Delicious meat, on a stick." - bonus_reagents = list("nutriment" = 1, "vitamin" = 2) - tastes = list("meat" = 3, "metal" = 1) - foodtype = MEAT +/datum/crafting_recipe/food/pigblanket + name = "Pig in a Blanket" + reqs = list( + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/butter = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 1 + ) + result = /obj/item/reagent_containers/food/snacks/pigblanket + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/kebab/tofu - name = "tofu-kebab" - desc = "Vegan meat, on a stick." - bonus_reagents = list("nutriment" = 1) - tastes = list("tofu" = 3, "metal" = 1) - foodtype = VEGETABLES +/datum/crafting_recipe/food/ratkebab + name = "Rat Kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/deadmouse = 1 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/rat + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/kebab/tail - name = "lizard-tail kebab" - desc = "Severed lizard tail on a stick." - bonus_reagents = list("nutriment" = 1, "vitamin" = 4) - tastes = list("meat" = 8, "metal" = 4, "scales" = 1) - foodtype = MEAT +/datum/crafting_recipe/food/doubleratkebab + name = "Double Rat Kebab" + reqs = list( + /obj/item/stack/rods = 1, + /obj/item/reagent_containers/food/snacks/deadmouse = 2 + ) + result = /obj/item/reagent_containers/food/snacks/kebab/rat/double + subcategory = CAT_MEAT -/obj/item/reagent_containers/food/snacks/rawkhinkali - name = "raw khinkali" - desc = "One hundred khinkalis? Do I look like a pig?" - icon_state = "khinkali" - list_reagents = list("nutriment" = 1, "vitamin" = 1) - cooked_type = /obj/item/reagent_containers/food/snacks/khinkali - tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/khinkali - name = "khinkali" - desc = "One hundred khinkalis? Do I look like a pig?" - icon_state = "khinkali" - list_reagents = list("nutriment" = 4, "vitamin" = 2) - bitesize = 3 - filling_color = "#F0F0F0" - tastes = list("meat" = 1, "onions" = 1, "garlic" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/monkeycube - name = "monkey cube" - desc = "Just add water!" - icon_state = "monkeycube" - bitesize = 12 - list_reagents = list("nutriment" = 2) - filling_color = "#CD853F" - tastes = list("the jungle" = 1, "bananas" = 1) - foodtype = MEAT | SUGAR - -/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/living/carbon/M) - if(iscarbon(M)) - M.visible_message("[src] bursts out of [M]!") - M.emote("scream") - M.Knockdown(40) - M.adjustBruteLoss(60) - Expand() - return ..() - -/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand() - var/mob/spammer = get_mob_by_key(fingerprintslast) - var/mob/living/carbon/monkey/bananas = new(drop_location(), TRUE, spammer) - if (!QDELETED(bananas)) - visible_message("[src] expands!") - bananas.log_message("Spawned via [src] at [AREACOORD(src)], Last attached mob: [key_name(spammer)].", LOG_ATTACK) - else if (!spammer) // Visible message in case there are no fingerprints - visible_message("[src] fails to expand!") - qdel(src) - -/obj/item/reagent_containers/food/snacks/enchiladas - name = "enchiladas" - desc = "Viva La Mexico!" - icon_state = "enchiladas" - bonus_reagents = list("nutriment" = 1, "vitamin" = 2) - bitesize = 4 - filling_color = "#FFA07A" - list_reagents = list("nutriment" = 8, "capsaicin" = 6) - tastes = list("hot peppers" = 1, "meat" = 3, "cheese" = 1, "sour cream" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/stewedsoymeat - name = "stewed soy meat" - desc = "Even non-vegetarians will LOVE this!" - icon_state = "stewedsoymeat" - trash = /obj/item/trash/plate - bonus_reagents = list("nutriment" = 1) - list_reagents = list("nutriment" = 8) - filling_color = "#D2691E" - tastes = list("soy" = 1, "vegetables" = 1) - foodtype = VEGETABLES - -/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize() - . = ..() - eatverb = pick("slurp","sip","suck","inhale","drink") - -/obj/item/reagent_containers/food/snacks/boiledspiderleg - name = "boiled spider leg" - desc = "A giant spider's leg that's still twitching after being cooked. Gross!" - icon_state = "spiderlegcooked" - trash = /obj/item/trash/plate - bonus_reagents = list("nutriment" = 1, "capsaicin" = 2, "vitamin" = 2) - list_reagents = list("nutriment" = 3, "capsaicin" = 2) - filling_color = "#000000" - tastes = list("hot peppers" = 1, "cobwebs" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/spidereggsham - name = "green eggs and ham" - desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?" - icon_state = "spidereggsham" - trash = /obj/item/trash/plate - bonus_reagents = list("nutriment" = 1, "vitamin" = 3) - list_reagents = list("nutriment" = 6) - bitesize = 4 - filling_color = "#7FFF00" - tastes = list("meat" = 1, "the colour green" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/nugget - name = "chicken nugget" - filling_color = "#B22222" - bonus_reagents = list("nutriment" = 1, "vitamin" = 1) - list_reagents = list("nutriment" = 2) - tastes = list("\"chicken\"" = 1) - foodtype = MEAT - -/obj/item/reagent_containers/food/snacks/nugget/Initialize() - . = ..() - var/shape = pick("lump", "star", "lizard", "corgi") - desc = "A 'chicken' nugget vaguely shaped like a [shape]." - icon_state = "nugget_[shape]" - -/obj/item/reagent_containers/food/snacks/pigblanket - name = "pig in a blanket" - desc = "A tiny sausage wrapped in a flakey, buttery roll. Free this pig from its blanket prison by eating it." - icon_state = "pigblanket" - list_reagents = list("nutriment" = 6, "vitamin" = 1) - bonus_reagents = list("nutriment" = 1, "vitamin" = 1) - filling_color = "#800000" - tastes = list("meat" = 1, "butter" = 1) - -/obj/item/reagent_containers/food/snacks/kebab/rat - name = "rat-kebab" - desc = "Not so delicious rat meat, on a stick." - icon_state = "ratkebab" - w_class = WEIGHT_CLASS_NORMAL - list_reagents = list("nutriment" = 6, "vitamin" = 2) - tastes = list("rat meat" = 1, "metal" = 1) - foodtype = MEAT | GROSS - -/obj/item/reagent_containers/food/snacks/kebab/rat/double - name = "double rat-kebab" - icon_state = "doubleratkebab" - tastes = list("rat meat" = 2, "metal" = 1) - bonus_reagents = list("nutriment" = 6, "vitamin" = 2) +/datum/crafting_recipe/food/ricepork + name = "Rice and pork" + reqs = list( + /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1, + /obj/item/reagent_containers/food/snacks/meat/cutlet = 2 + ) + result = /obj/item/reagent_containers/food/snacks/salad/ricepork + subcategory = CAT_MEAT From 482ee83621294711934aa244ae1aad1427ffa62a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 18:22:31 -0400 Subject: [PATCH 13/15] Update recipes_meat.dm --- .../recipes/tablecraft/recipes_meat.dm | 63 ------------------- 1 file changed, 63 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm index fe71e9e154..c16c7268b9 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,5 +1,3 @@ - - ////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// /datum/crafting_recipe/food/humankebab @@ -71,67 +69,6 @@ result = /obj/item/reagent_containers/food/snacks/fishfingers subcategory = CAT_MEAT -/datum/crafting_recipe/food/sashimi - name = "Sashimi" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/spidereggs = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/riceball - name = "Onigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 1, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1 - ) - result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/sushie_egg - name = "Tobiko" - reqs = list( - /datum/reagent/consumable/soysauce = 6, - /obj/item/reagent_containers/food/snacks/spidereggs = 1, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 2, - ) - result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/sushie_basic - name = "Funa Hosomaki" - reqs = list( - /datum/reagent/consumable/soysauce = 3, - /obj/item/reagent_containers/food/snacks/salad/boiledrice = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 2, - /obj/item/reagent_containers/food/snacks/grown/kudzupod = 3, - ) - result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/sushie_adv - name = "Funa Nigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/salad/ricebowl = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_MEAT - -/datum/crafting_recipe/food/sushie_pro - name = "Well made Funa Nigiri" - reqs = list( - /datum/reagent/consumable/soysauce = 10, - /obj/item/reagent_containers/food/snacks/salad/ricebowl = 2, - /obj/item/reagent_containers/food/snacks/carpmeat = 5 - ) - result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_MEAT - ////////////////////////////////////////////////MR SPIDER//////////////////////////////////////////////// /datum/crafting_recipe/food/spidereggsham From ee007ecae041800944c4bdd305bf6ad140895097 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 18:26:19 -0400 Subject: [PATCH 14/15] Update snacks_sushi.dm --- .../recipes/tablecraft/snacks_sushi.dm | 165 +++++++++--------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm index a4cbc5e344..99d48cf69d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm @@ -1,95 +1,94 @@ //////////////////////////Sushi Components/////////////////////// -/obj/item/reagent_containers/food/snacks/sushi_rice +/datum/crafting_recipe/food/sushi_rice name = "Sushi Rice" - desc = "A bowl of sticky rice for making sushi." - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sushi_rice" - list_reagents = list("sodiumchloride" = 5) - tastes = list("rice" = 5, "salt" = 1) - foodtype = GRAIN + reqs = list( + /datum/reagent/water = 40, + /datum/reagent/consumable/rice = 10 + ) + result = /obj/item/reagent_containers/food/snacks/sushi_rice + subcategory = CAT_SUSHI -/obj/item/reagent_containers/food/snacks/sea_weed +/datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" - desc = "A thin, light salt sheet of plant mater. This is commenly used in sushi recipes," - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sea_weed" - list_reagents = list("sodiumchloride" = 2) - tastes = list("plants" = 2, "salt" = 1) - foodtype = VEGETABLES + reqs = list( + /datum/reagent/water = 30, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, + ) + result = /obj/item/reagent_containers/food/snacks/sea_weed + subcategory = CAT_SUSHI -/obj/item/reagent_containers/food/snacks/tuna - name = "Canned Tuna" - desc = "A small can of tuna fish beloved by felines." - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "tuna_can" -//trash = /obj/item/trash/tuna_used //I dont know if I like this idea - A Masked Cat - list_reagents = list("sodiumchloride" = 5, "mercury" = 2) - tastes = list("tuna" = 15, "mercury" = 1, "salt" = 3) - foodtype = MEAT +/datum/crafting_recipe/food/tuna_can + name = "Can of Tuna" + reqs = list( + /datum/reagent/consumable/sodiumchloride = 15, + /datum/reagent/consumable/cooking_oil = 5, + /obj/item/reagent_containers/food/snacks/carpmeat = 1, + ) + result = /obj/item/reagent_containers/food/snacks/tuna + subcategory = CAT_SUSHI //////////////////////////Sushi///////////////////////////////// -/obj/item/reagent_containers/food/snacks/sushie_basic - name = "Funa Hosomaki" - desc = "A small cylindrical filled with rice and fish." - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sushie_basic" - bonus_reagents = list("vitamin" = 2) - list_reagents = list("nutriment" = 1) - bitesize = 1 - filling_color = "#F2EEEA" //rgb(242, 238, 234) - tastes = list("fish" = 1, "rice" = 1, "salt" = 1) - foodtype = MEAT | VEGETABLES -/obj/item/reagent_containers/food/snacks/sushie_adv - name = "Funa Nigiri" - desc = "A pice of carp lightly placed on some rice." - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sushie_adv" - bonus_reagents = list("vitamin" = 2) - list_reagents = list("nutriment" = 2) - bitesize = 1 - filling_color = "#F2EEEA" //rgb(242, 238, 234) - tastes = list("fish" = 1, "rice" = 1, "salt" = 1) - foodtype = MEAT | VEGETABLES +/datum/crafting_recipe/food/sashimi + name = "Sashimi" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/spidereggs = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sashimi + subcategory = CAT_SUSHI -/obj/item/reagent_containers/food/snacks/sushie_pro - name = "Funa Nigiri" - desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!" - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sushie_pro" - bonus_reagents = list("nutriment" = 1, "vitamin" = 2) - list_reagents = list("nutriment" = 8, "vitamin" = 1) - bitesize = 1 - filling_color = "#F2EEEA" //rgb(242, 238, 234) - tastes = list("fish" = 1, "rice" = 1, "salt" = 1) - foodtype = MEAT | VEGETABLES - -/obj/item/reagent_containers/food/snacks/tobiko - name = "Tobiko" - desc = "Spider eggs wrapped in a thin salted Kudzu pod" - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "sushie_egg" - list_reagents = list("nutriment" = 3, "vitamin" = 2) - filling_color = "#FF3333" // R225 G051 B051 - tastes = list("seaweed" = 1, "salty" = 2) - foodtype = MEAT | VEGETABLES - -/obj/item/reagent_containers/food/snacks/riceball +/datum/crafting_recipe/food/riceball name = "Onigiri" - desc = "A ball of rice with some light salt and a wrap of Kudzu skin." - icon = 'modular_citadel/icons/obj/food/food.dmi' - icon_state = "riceball" - list_reagents = list("nutriment" = 5, "sodiumchloride" = 2) - tastes = list("rice" = 4, "salt" = 1) - foodtype = GRAIN + reqs = list( + /datum/reagent/consumable/soysauce = 1, + /obj/item/reagent_containers/food/snacks/sea_weed = 1, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1 + ) + result = /obj/item/reagent_containers/food/snacks/riceball + subcategory = CAT_SUSHI -/obj/item/reagent_containers/food/snacks/sashimi - name = "carp sashimi" - desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself." - icon_state = "sashimi" - bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4) - list_reagents = list("nutriment" = 6, "capsaicin" = 5) - filling_color = "#FA8072" - tastes = list("fish" = 1, "hot peppers" = 1) - foodtype = MEAT | TOXIC \ No newline at end of file +/datum/crafting_recipe/food/sushie_egg + name = "Tobiko" + reqs = list( + /datum/reagent/consumable/soysauce = 6, + /obj/item/reagent_containers/food/snacks/spidereggs = 1, + /obj/item/reagent_containers/food/snacks/sea_weed = 2, + ) + result = /obj/item/reagent_containers/food/snacks/tobiko + subcategory = CAT_SUSHI + +/datum/crafting_recipe/food/sushie_basic + name = "Funa Hosomaki" + reqs = list( + /datum/reagent/consumable/soysauce = 3, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 2, + /obj/item/reagent_containers/food/snacks/sea_weed = 3, + ) + result = /obj/item/reagent_containers/food/snacks/sushie_basic + subcategory = CAT_SUSHI + +/datum/crafting_recipe/food/sushie_adv + name = "Funa Nigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/sushi_rice = 1, + /obj/item/reagent_containers/food/snacks/carpmeat = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sushie_adv + subcategory = CAT_SUSHI + +/datum/crafting_recipe/food/sushie_pro + name = "Well made Funa Nigiri" + reqs = list( + /datum/reagent/consumable/soysauce = 10, + /obj/item/reagent_containers/food/snacks/sushi_rice = 2, + /obj/item/reagent_containers/food/snacks/carpmeat = 5, + /obj/item/reagent_containers/food/snacks/sea_weed = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sushie_pro + subcategory = CAT_SUSHI From 0d868bc660f13c7dcbc7d828da40478d7b914171 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Mon, 29 Apr 2019 18:52:04 -0400 Subject: [PATCH 15/15] Rename snacks_sushi.dm to recipes_sushi.dm --- .../recipes/tablecraft/{snacks_sushi.dm => recipes_sushi.dm} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename code/modules/food_and_drinks/recipes/tablecraft/{snacks_sushi.dm => recipes_sushi.dm} (100%) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm similarity index 100% rename from code/modules/food_and_drinks/recipes/tablecraft/snacks_sushi.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm