From 00d66c9b91c6703d7a17d243130c1f2f6bebf6ba Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Tue, 18 Feb 2020 22:19:58 -0500 Subject: [PATCH] Renamed CAT_FISH to CAT_EASTERN --- code/__DEFINES/construction.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- .../recipes/tablecraft/recipes_sushi.dm | 28 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index c4d87de495..a46e2ed7b7 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -92,7 +92,7 @@ #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" #define CAT_CAKE "Cakes" -#define CAT_FISH "Eastern" +#define CAT_EASTERN "Eastern" #define CAT_EGG "Egg-Based Food" #define CAT_MEAT "Meats" #define CAT_MEXICAN "Mexican" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 674746479d..1caf7d9489 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -28,7 +28,7 @@ CAT_BURGER, CAT_CAKE, CAT_EGG, - CAT_FISH, + CAT_EASTERN, CAT_ICE, CAT_MEAT, CAT_MEXICAN, diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm index 5a95ba9907..3a77181d8f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm @@ -8,7 +8,7 @@ /datum/reagent/consumable/rice = 10 ) result = /obj/item/reagent_containers/food/snacks/sushi_rice - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sea_weed name = "Sea Weed Sheet" @@ -18,7 +18,7 @@ /obj/item/reagent_containers/food/snacks/grown/kudzupod = 1, ) result = /obj/item/reagent_containers/food/snacks/sea_weed - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/tuna_can name = "Can of Tuna" @@ -28,7 +28,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1, ) result = /obj/item/reagent_containers/food/snacks/tuna - subcategory = CAT_FISH + subcategory = CAT_EASTERN //////////////////////////Sushi///////////////////////////////// @@ -40,7 +40,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sashimi - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/riceball name = "Onigiri" @@ -50,7 +50,7 @@ /obj/item/reagent_containers/food/snacks/sushi_rice = 1 ) result = /obj/item/reagent_containers/food/snacks/riceball - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_egg name = "Tobiko" @@ -60,7 +60,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 2, ) result = /obj/item/reagent_containers/food/snacks/tobiko - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_basic name = "Funa Hosomaki" @@ -71,7 +71,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 3, ) result = /obj/item/reagent_containers/food/snacks/sushie_basic - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_adv name = "Funa Nigiri" @@ -81,7 +81,7 @@ /obj/item/reagent_containers/food/snacks/carpmeat = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_adv - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/sushie_pro name = "Well made Funa Nigiri" @@ -92,7 +92,7 @@ /obj/item/reagent_containers/food/snacks/sea_weed = 1 ) result = /obj/item/reagent_containers/food/snacks/sushie_pro - subcategory = CAT_FISH + subcategory = CAT_EASTERN //////////////////Not-Fish////////////////////// @@ -105,7 +105,7 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle = 1 ) result = /obj/item/reagent_containers/food/snacks/chawanmushi - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/khachapuri name = "Khachapuri" @@ -115,7 +115,7 @@ /obj/item/reagent_containers/food/snacks/store/bread/plain = 1 ) result = /obj/item/reagent_containers/food/snacks/khachapuri - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/rawkhinkali name = "Raw Khinkali" @@ -124,7 +124,7 @@ /obj/item/reagent_containers/food/snacks/faggot = 1 ) result = /obj/item/reagent_containers/food/snacks/rawkhinkali - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/meatbun name = "Meat bun" @@ -135,7 +135,7 @@ /obj/item/reagent_containers/food/snacks/grown/cabbage = 1 ) result = /obj/item/reagent_containers/food/snacks/meatbun - subcategory = CAT_FISH + subcategory = CAT_EASTERN /datum/crafting_recipe/food/fortunecookie time = 15 @@ -148,4 +148,4 @@ /obj/item/paper = 1 ) result = /obj/item/reagent_containers/food/snacks/fortunecookie - subcategory = CAT_FISH + subcategory = CAT_EASTERN