shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gettin Salty. Fish is now Seafood.

Browse Source
This commit is contained in:
Winter Flare
2020-02-23 16:22:19 -05:00
parent 60b4c10215
commit 4c03d552ee
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/construction.dm
+1 -1
View File
@@ -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"
code/datums/components/crafting/craft.dm
+1 -1
View File
@@ -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,
code/modules/food_and_drinks/recipes/tablecraft/recipes_fish.dm → code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
+12 -12
View File
@@ -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
subcategory = CAT_SEAFOOD
tgstation.dme
+1 -1
View File
@@ -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"