From 60b4c102150248b8a7d1f3c30ddfe8a755374718 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sat, 22 Feb 2020 19:02:43 -0500 Subject: [PATCH] Fish Category, Misc Moves --- code/__DEFINES/construction.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- .../food_and_drinks/food/snacks_egg.dm | 1 + ...ecipes_eastern_fish.dm => recipes_fish.dm} | 113 +++++------------- .../recipes/tablecraft/recipes_meat.dm | 2 + .../recipes/tablecraft/recipes_misc.dm | 45 ++++++- .../recipes/tablecraft/recipes_pastry.dm | 13 ++ tgstation.dme | 2 +- 8 files changed, 92 insertions(+), 88 deletions(-) rename code/modules/food_and_drinks/recipes/tablecraft/{recipes_eastern_fish.dm => recipes_fish.dm} (63%) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index d022fd932d..9c2ea526fa 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -93,8 +93,8 @@ #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" #define CAT_DONUT "Donuts" -#define CAT_EASTERN "Eastern & Fish" #define CAT_EGG "Egg-Based Food" +#define CAT_FISH "Fish" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 187c896938..c381f827c0 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -29,7 +29,7 @@ CAT_CAKE, CAT_DONUT, CAT_EGG, - CAT_EASTERN, + CAT_FISH, CAT_ICE, CAT_MEAT, CAT_MEXICAN, diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index c3d71093b5..0f2856c090 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -124,6 +124,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 2) list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 1) bitesize = 1 + w_class = WEIGHT_CLASS_NORMAL tastes = list("egg" = 1, "cheese" = 1) foodtype = MEAT | BREAKFAST diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm similarity index 63% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm index e69b1dfd36..ad1278978a 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_eastern_fish.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm @@ -1,4 +1,5 @@ -/////////////Recategorizing this as -Eastern- foods/////////////// +// see code/module/crafting/table.dm + ///////////////////////Sushi Components/////////////////////////// /datum/crafting_recipe/food/sushi_rice @@ -8,7 +9,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -18,17 +19,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_EASTERN - -/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_EASTERN + subcategory = CAT_FISH //////////////////////////Sushi///////////////////////////////// @@ -40,7 +31,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -50,7 +41,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -60,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -71,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -81,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_EASTERN + subcategory = CAT_FISH /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -92,75 +83,19 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_EASTERN - -//////////////////Eastern Not-Fish////////////////////// - -/datum/crafting_recipe/food/chawanmushi - name = "Chawanmushi" - reqs = list( - /datum/reagent/water = 5, - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/boiledegg = 2, - /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 - ) - result = /obj/item/reagent_containers/food/snacks/chawanmushi - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/khachapuri - name = "Khachapuri" - reqs = list( - /datum/reagent/consumable/eggyolk = 5, - /obj/item/reagent_containers/food/snacks/cheesewedge = 1, - /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 - ) - result = /obj/item/reagent_containers/food/snacks/khachapuri - subcategory = CAT_EASTERN - -/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_EASTERN - -/datum/crafting_recipe/food/meatbun - name = "Meat bun" - reqs = list( - /datum/reagent/consumable/soysauce = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/faggot = 1, - /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 - ) - result = /obj/item/reagent_containers/food/snacks/meatbun - subcategory = CAT_EASTERN - -/datum/crafting_recipe/food/fortunecookie - time = 15 - name = "Fortune cookie" - reqs = list( - /obj/item/reagent_containers/food/snacks/pastrybase = 1, - /obj/item/paper = 1 - ) - parts = list( - /obj/item/paper = 1 - ) - result = /obj/item/reagent_containers/food/snacks/fortunecookie - subcategory = CAT_EASTERN + subcategory = CAT_FISH //////////////////////////////////////////////FISH/////////////////////////////////////////// -/datum/crafting_recipe/food/fishfingers - name = "Fish fingers" +/datum/crafting_recipe/food/tuna_can + name = "Can of Tuna" reqs = list( - /datum/reagent/consumable/flour = 5, - /obj/item/reagent_containers/food/snacks/bun = 1, - /obj/item/reagent_containers/food/snacks/carpmeat = 1 + /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/fishfingers - subcategory = CAT_EASTERN + result = /obj/item/reagent_containers/food/snacks/tuna + subcategory = CAT_FISH /datum/crafting_recipe/food/cubancarp name = "Cuban carp" @@ -170,7 +105,17 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_EASTERN + subcategory = CAT_FISH + +/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_FISH /datum/crafting_recipe/food/fishandchips name = "Fish and chips" @@ -179,4 +124,4 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_EASTERN \ No newline at end of file + subcategory = CAT_FISH \ No newline at end of file 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 d2b04b7f99..efb773159d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm @@ -1,3 +1,5 @@ +// see code/module/crafting/table.dm + ////////////////////////////////////////////////KEBABS//////////////////////////////////////////////// /datum/crafting_recipe/food/humankebab diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index d72363dcee..6a622d6719 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -1,7 +1,50 @@ // see code/module/crafting/table.dm -// MISC +//////////////////Eastern Foods////////////////////// + +/datum/crafting_recipe/food/chawanmushi + name = "Chawanmushi" + reqs = list( + /datum/reagent/water = 5, + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/boiledegg = 2, + /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 + ) + result = /obj/item/reagent_containers/food/snacks/chawanmushi + subcategory = CAT_MISCFOOD + +/datum/crafting_recipe/food/khachapuri + name = "Khachapuri" + reqs = list( + /datum/reagent/consumable/eggyolk = 5, + /obj/item/reagent_containers/food/snacks/cheesewedge = 1, + /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/khachapuri + subcategory = CAT_MISCFOOD + +/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_MISCFOOD + +/datum/crafting_recipe/food/meatbun + name = "Meat bun" + reqs = list( + /datum/reagent/consumable/soysauce = 5, + /obj/item/reagent_containers/food/snacks/bun = 1, + /obj/item/reagent_containers/food/snacks/faggot = 1, + /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 + ) + result = /obj/item/reagent_containers/food/snacks/meatbun + subcategory = CAT_MISCFOOD + +/////////////////////////////////MISC///////////////////////////////////// /datum/crafting_recipe/food/beans name = "Beans" diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 2458a0e085..8a393476a2 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -214,6 +214,19 @@ result = /obj/item/reagent_containers/food/snacks/cracker subcategory = CAT_PASTRY +/datum/crafting_recipe/food/fortunecookie + time = 15 + name = "Fortune cookie" + reqs = list( + /obj/item/reagent_containers/food/snacks/pastrybase = 1, + /obj/item/paper = 1 + ) + parts = list( + /obj/item/paper = 1 + ) + result = /obj/item/reagent_containers/food/snacks/fortunecookie + subcategory = CAT_PASTRY + /datum/crafting_recipe/food/honeybun name = "Honey bun" reqs = list( diff --git a/tgstation.dme b/tgstation.dme index 850df585d9..b235b08375 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1835,8 +1835,8 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_donut.dm" -#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_eastern_fish.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_fish.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_mexican.dm"