From 4c03d552eedb609a2692f0d9e5574ed9ff73c647 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 23 Feb 2020 16:22:19 -0500 Subject: [PATCH] Gettin Salty. Fish is now Seafood. --- code/__DEFINES/construction.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- .../{recipes_fish.dm => recipes_seafood.dm} | 24 +++++++++---------- tgstation.dme | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) rename code/modules/food_and_drinks/recipes/tablecraft/{recipes_fish.dm => recipes_seafood.dm} (92%) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 9c2ea526fa..1774121c80 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -94,7 +94,6 @@ #define CAT_CAKE "Cakes" #define CAT_DONUT "Donuts" #define CAT_EGG "Egg-Based Food" -#define CAT_FISH "Fish" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" #define CAT_MISCFOOD "Misc. Food" @@ -102,6 +101,7 @@ #define CAT_PIE "Pies & Sweets" #define CAT_PIZZA "Pizzas" #define CAT_SALAD "Salads" +#define CAT_SEAFOOD "Seafood" #define CAT_SANDWICH "Sandwiches" #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index c381f827c0..cd3f05b326 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -29,7 +29,6 @@ CAT_CAKE, CAT_DONUT, CAT_EGG, - CAT_FISH, CAT_ICE, CAT_MEAT, CAT_MEXICAN, @@ -37,6 +36,7 @@ CAT_PASTRY, CAT_PIE, CAT_PIZZA, + CAT_SEAFOOD, CAT_SALAD, CAT_SANDWICH, CAT_SOUP, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm similarity index 92% rename from code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm rename to code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm index ad1278978a..4fc12f0777 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm @@ -9,7 +9,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -19,7 +19,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD //////////////////////////Sushi///////////////////////////////// @@ -31,7 +31,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -41,7 +41,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -51,7 +51,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -62,7 +62,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -72,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -83,7 +83,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD //////////////////////////////////////////////FISH/////////////////////////////////////////// @@ -95,7 +95,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1, ) result = /obj/item/reagent_containers/food/snacks/tuna - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/cubancarp name = "Cuban carp" @@ -105,7 +105,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/cubancarp - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/fishfingers name = "Fish fingers" @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishfingers - subcategory = CAT_FISH + subcategory = CAT_SEAFOOD /datum/crafting_recipe/food/fishandchips name = "Fish and chips" @@ -124,4 +124,4 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/fishandchips - subcategory = CAT_FISH \ No newline at end of file + subcategory = CAT_SEAFOOD \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index b235b08375..d3dd12cf7b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1836,7 +1836,6 @@ #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_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" @@ -1846,6 +1845,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_salad.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_sandwich.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.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\games\cas.dm"