Ports sushi and adds seafood crafting tab

beestation.dme

@@ -1450,6 +1450,7 @@
 #include "code\game\objects\items\food\snacks.dm"
 #include "code\game\objects\items\food\soup.dm"
 #include "code\game\objects\items\food\spaghetti.dm"
+#include "code\game\objects\items\food\sushi.dm"
 #include "code\game\objects\items\food\sweets.dm"
 #include "code\game\objects\items\food\vegetables.dm"
 #include "code\game\objects\items\grenades\_grenade.dm"
@@ -2681,6 +2682,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"

code/__DEFINES/construction.dm

@@ -100,6 +100,7 @@
 #define CAT_PIZZA "Pizzas"
 #define CAT_SALAD "Salads"
 #define CAT_SANDWICH "Sandwiches"
+#define CAT_SEAFOOD "Seafood"
 #define CAT_SOUP "Soups"
 #define CAT_SPAGHETTI "Spaghettis"
 #define CAT_ICE "Frozen"

code/datums/components/crafting/crafting.dm

@@ -35,6 +35,7 @@
 					CAT_PIZZA,
 					CAT_SALAD,
 					CAT_SANDWICH,
+					CAT_SEAFOOD,
 					CAT_SOUP,
 					CAT_SPAGHETTI,
 				),

code/game/objects/items/food/misc.dm

@@ -298,3 +298,28 @@
 
 /obj/item/food/rationpack/proc/check_liked(fraction, mob/M)	//Nobody likes rationpacks. Nobody.
 	return FOOD_DISLIKED
+
+
+/obj/item/food/onigiri
+	name = "onigiri"
+	desc = "A ball of cooked rice surrounding a filling formed into a triangular shape and wrapped in seaweed. Can add fillings!"
+	icon = 'icons/obj/food/sushi.dmi'
+	icon_state = "onigiri"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/vitamin = 2,
+		)
+	tastes = list("rice" = 1, "dried seaweed" = 1)
+	foodtypes = VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/onigiri/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/onigiri/empty, CUSTOM_INGREDIENT_ICON_NOCHANGE, max_ingredients = 4)
+
+/obj/item/food/onigiri/empty //for custom onigiri creation
+	name = "onigiri"
+	foodtypes = VEGETABLES
+	tastes = list()
+	icon_state = "onigiri"
+	desc = "A ball of cooked rice surrounding a filling formed into a triangular shape and wrapped in seaweed."

code/game/objects/items/food/salad.dm

@@ -83,24 +83,24 @@
 	tastes = list("sourness" = 1, "leaves" = 1)
 	foodtypes = FRUIT
 
-/obj/item/food/salad/ricebowl
-	name = "ricebowl"
-	desc = "A bowl of raw rice."
-	icon_state = "ricebowl"
+/obj/item/food/uncooked_rice
+	name = "uncooked rice"
+	desc = "A clump of raw rice."
+	icon_state = "uncooked_rice"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 4)
 	tastes = list("rice" = 1)
 	foodtypes = GRAIN | RAW
-	microwaved_type = /obj/item/food/salad/boiledrice
+	microwaved_type = /obj/item/food/boiledrice
 
 /*
 /obj/item/food/salad/ricebowl/make_microwaveable()
 	AddElement(/datum/element/microwavable, /obj/item/food/salad/boiledrice)
 */
 
-/obj/item/food/salad/boiledrice
+/obj/item/food/boiledrice
 	name = "boiled rice"
-	desc = "A warm bowl of rice."
-	icon_state = "boiledrice"
+	desc = "A steaming cup of boiled rice. A bit bland by itself, but the basis for something delicious..."
+	icon_state = "cooked_rice"
 	food_reagents = list(
 		/datum/reagent/consumable/nutriment = 6,
 		/datum/reagent/consumable/nutriment/vitamin = 2

code/game/objects/items/food/sushi.dm

@@ -0,0 +1,168 @@
+/obj/item/food/sushi_roll
+	name = "Sushi Parent"
+	desc = "You either spawned this erroneously, or a coder did. Either way, someone messed up."
+	icon = 'icons/obj/food/sushi.dmi'
+	icon_state = "ERROR"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 12,
+		/datum/reagent/consumable/nutriment/vitamin = 4,
+		)
+	tastes = list("sushi" = 1)
+	w_class = WEIGHT_CLASS_NORMAL
+	var/obj/item/food/sushi_slice/slice_type /// type is spawned 4 at a time and replaces this cake when processed by cutting tool
+	var/yield = 4 /// yield of sliced sushi, default is 4
+
+/obj/item/food/sushi_roll/make_processable()
+	if (slice_type)
+		AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE)
+
+/obj/item/food/sushi_slice
+	name = "Sushi Slice Parent"
+	desc = "You either spawned this erroneously, or a coder did. Either way, someone messed up."
+	icon = 'icons/obj/food/sushi.dmi'
+	icon_state = "ERROR"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 3,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		)
+	tastes = list("sushi" = 1)
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/seaweed_sheet
+	name = "seaweed sheet"
+	desc = "A dried sheet of seaweed used for making sushi. Use an ingredient on it to start making custom sushi!"
+	icon = 'icons/obj/food/food_ingredients.dmi'
+	icon_state = "seaweed_sheet"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 1,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+	)
+	tastes = list("seaweed" = 1)
+	foodtypes = VEGETABLES
+	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/seaweed_sheet/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/sushi_roll/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6)
+
+/obj/item/food/sushi_roll/empty //for custom sushi creation
+	name = "sushi"
+	desc = "A roll of customized sushi."
+	icon_state = "vegetariansushiroll"
+	tastes = list()
+	foodtypes = NONE
+	slice_type = /obj/item/food/sushi_slice/empty
+
+/obj/item/food/sushi_slice/empty
+	name = "sushi slice"
+	desc = "A slice of customized sushi."
+	icon_state = "vegetariansushislice"
+	tastes = list()
+	foodtypes = NONE
+
+/obj/item/food/sushi_roll/vegetarian
+	name = "vegetarian sushi roll"
+	desc = "A roll of simple vegetarian sushi with rice, carrots, and cabbage. Sliceable into pieces!"
+	icon_state = "vegetariansushiroll"
+	tastes = list("boiled rice" = 4, "carrots" = 2, "cabbage" = 2)
+	foodtypes = VEGETABLES
+	slice_type = /obj/item/food/sushi_slice/vegetarian
+
+/obj/item/food/sushi_slice/vegetarian
+	name = "vegetarian sushi slice"
+	desc = "A roll of simple vegetarian sushi with rice, carrots, and cabbage."
+	icon_state = "vegetariansushislice"
+	foodtypes = VEGETABLES
+	tastes = list("boiled rice" = 4, "carrots" = 2, "cabbage" = 2)
+
+/obj/item/food/sushi_roll/spicyfilet
+	name = "spicy filet sushi roll"
+	desc = "A roll of tasty, spicy sushi made with fish and vegetables. Sliceable into pieces!"
+	icon_state = "spicyfiletroll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 12,
+		/datum/reagent/consumable/nutriment/protein = 4,
+		/datum/reagent/consumable/capsaicin = 4,
+		/datum/reagent/consumable/nutriment/vitamin = 4,
+		)
+	tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2)
+	foodtypes = MEAT
+	slice_type = /obj/item/food/sushi_slice/spicyfilet
+
+/obj/item/food/sushi_slice/spicyfilet
+	name = "spicy filet sushi slice"
+	desc = "A roll of tasty, spicy sushi made with fish and vegetables."
+	icon_state = "spicyfiletslice"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 3,
+		/datum/reagent/consumable/nutriment/protein = 1,
+		/datum/reagent/consumable/capsaicin = 1,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		)
+	tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2)
+	foodtypes = MEAT
+
+/obj/item/food/sushi_roll/futomaki
+	name = "futomaki sushi roll"
+	desc = "A roll of futomaki sushi, made of boiled egg, fish, and cabbage. Sliceable"
+	icon_state = "futomaki_sushi_roll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 12,
+		/datum/reagent/consumable/nutriment/protein = 8,
+		/datum/reagent/consumable/nutriment/vitamin = 4,
+	)
+	tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2)
+	foodtypes = MEAT
+	slice_type = /obj/item/food/sushi_slice/futomaki
+
+/obj/item/food/sushi_slice/futomaki
+	name = "futomaki sushi slice"
+	desc = "A slice of futomaki sushi, made of boiled egg, fish, and cabbage."
+	icon_state = "futomaki_sushi_slice"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 3,
+		/datum/reagent/consumable/nutriment/protein = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+	)
+	tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cabbage" = 2)
+	foodtypes = MEAT
+
+/obj/item/food/sushi_roll/philadelphia
+	name = "Philadelphia sushi roll"
+	desc = "A roll of Philadelphia sushi, made of cheese, fish, and cabbage. Sliceable"
+	icon_state = "philadelphia_sushi_roll"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 12,
+		/datum/reagent/consumable/nutriment/protein = 8,
+		/datum/reagent/consumable/nutriment/vitamin = 8,
+	)
+	tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cabbage" = 2)
+	foodtypes = MEAT | DAIRY
+	slice_type = /obj/item/food/sushi_slice/philadelphia
+
+/obj/item/food/sushi_slice/philadelphia
+	name = "Philadelphia sushi slice"
+	desc = "A roll of Philadelphia sushi, made of cheese, fish, and cabbage."
+	icon_state = "philadelphia_sushi_slice"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 3,
+		/datum/reagent/consumable/nutriment/protein = 2,
+		/datum/reagent/consumable/nutriment/vitamin = 2,
+	)
+	tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cabbage" = 2)
+	foodtypes = MEAT | DAIRY
+
+/obj/item/food/nigiri_sushi
+	name = "nigiri sushi"
+	desc = "A simple nigiri of fish atop a packed rice ball with a seaweed wrapping and a side of soy sauce."
+	icon = 'icons/obj/food/sushi.dmi'
+	icon_state = "nigiri_sushi"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment/vitamin = 2,
+		/datum/reagent/consumable/nutriment/protein = 2,
+		)
+	tastes = list("boiled rice" = 4, "fish filet" = 2, "soy sauce" = 2)
+	foodtypes = MEAT | RAW
+	w_class = WEIGHT_CLASS_SMALL
+

code/game/objects/items/storage/bags.dm

@@ -230,7 +230,7 @@
 	STR.max_w_class = WEIGHT_CLASS_NORMAL
 	STR.max_combined_w_class = 100
 	STR.max_items = 100
-	STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb, /obj/item/disk/plantgene))
+	STR.can_hold = typecacheof(list(/obj/item/food/grown, /obj/item/seeds, /obj/item/grown, /obj/item/reagent_containers/honeycomb, /obj/item/disk/plantgene, /obj/item/food/seaweed_sheet))
 
 ////////
 

code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm

@@ -171,7 +171,7 @@
 
 
 /obj/machinery/smartfridge/proc/accept_check(obj/item/O)
-	if(istype(O, /obj/item/food/grown/) || istype(O, /obj/item/seeds/) || istype(O, /obj/item/grown/))
+	if(istype(O, /obj/item/food/grown/) || istype(O, /obj/item/seeds/) || istype(O, /obj/item/grown/) || istype(O, /obj/item/food/seaweed_sheet))
 		return TRUE
 	return FALSE
 

code/modules/food_and_drinks/recipes/food_mixtures.dm

@@ -165,18 +165,16 @@
 	id = "vegancakebatter"
 	required_reagents = list(/datum/reagent/consumable/soymilk = 15, /datum/reagent/consumable/flour = 15, /datum/reagent/consumable/sugar = 5)
 
-/datum/chemical_reaction/ricebowl
-	name = "Rice Bowl"
-	id = "ricebowl"
+/datum/chemical_reaction/uncooked_rice
+	name = "Uncooked Rice"
+	id = "uncookedrice"
 	required_reagents = list(/datum/reagent/consumable/rice = 10, /datum/reagent/water = 10)
-	required_container = /obj/item/reagent_containers/glass/bowl
 	mix_message = "The rice absorbs the water."
 
-/datum/chemical_reaction/ricebowl/on_reaction(datum/reagents/holder)
+/datum/chemical_reaction/uncooked_rice/on_reaction(datum/reagents/holder, created_volume)
 	var/location = get_turf(holder.my_atom)
-	new /obj/item/food/salad/ricebowl(location)
-	if(holder?.my_atom)
-		qdel(holder.my_atom)
+	for(var/i in 1 to created_volume)
+		new /obj/item/food/uncooked_rice(location)
 
 /datum/chemical_reaction/bbqsauce
 	name = "BBQ Sauce"

code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm

@@ -44,7 +44,8 @@
 /datum/crafting_recipe/food/eggbowl
 	name = "Egg bowl"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/boiledegg = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/grown/corn = 1

code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm

@@ -50,47 +50,6 @@
 	result = /obj/item/food/kebab/fiesta
 	subcategory = CAT_MEAT
 
-////////////////////////////////////////////////FISH////////////////////////////////////////////////
-
-/datum/crafting_recipe/food/cubancarp
-	name = "Cuban carp"
-	reqs = list(
-		/datum/reagent/consumable/flour = 5,
-		/obj/item/food/grown/chili = 1,
-		/obj/item/food/fishmeat/carp = 1
-	)
-	result = /obj/item/food/cubancarp
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/fishandchips
-	name = "Fish and chips"
-	reqs = list(
-		/obj/item/food/fries = 1,
-		/obj/item/food/fishmeat/carp = 1
-	)
-	result = /obj/item/food/fishandchips
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/fishfingers
-	name = "Fish fingers"
-	reqs = list(
-		/datum/reagent/consumable/flour = 5,
-		/obj/item/food/bun = 1,
-		/obj/item/food/fishmeat/carp = 1
-	)
-	result = /obj/item/food/fishfingers
-	subcategory = CAT_MEAT
-
-/datum/crafting_recipe/food/sashimi
-	name = "Sashimi"
-	reqs = list(
-		/datum/reagent/consumable/soysauce = 5,
-		/obj/item/food/spidereggs = 1,
-		/obj/item/food/fishmeat/carp = 1
-	)
-	result = /obj/item/food/sashimi
-	subcategory = CAT_MEAT
-
 ////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/spidereggsham
@@ -215,7 +174,8 @@
 /datum/crafting_recipe/food/ricepork
 	name = "Rice and Pork"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/meat/cutlet = 2
 	)
 	result = /obj/item/food/salad/ricepork