Allow sashimi to be chopped into chopped fish

NebulaSS13 · Aug 14, 2024 · 7d4bf10 · 7d4bf10
1 parent c0f91da
commit 7d4bf10
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/code/modules/butchery/butchery_data_fish.dm b/code/modules/butchery/butchery_data_fish.dm
@@ -9,7 +9,7 @@
 	skin_amount   = 3
 	must_use_hook = FALSE
 	gut_type      = /obj/item/food/butchery/offal/small
-	meat_flags    = INGREDIENT_FLAG_MEAT | INGREDIENT_FLAG_FISH
+	meat_flags    = INGREDIENT_FLAG_FISH
 
 /decl/butchery_data/animal/fish/small
 	bone_amount     = 1

diff --git a/code/modules/butchery/butchery_products_meat_fish.dm b/code/modules/butchery/butchery_products_meat_fish.dm
@@ -15,7 +15,7 @@
 	slice_path                     = /obj/item/food/sashimi
 	slice_num                      = 3
 	meat_name                      = "fish"
-	ingredient_flags               = INGREDIENT_FLAG_MEAT | INGREDIENT_FLAG_FISH
+	ingredient_flags               = INGREDIENT_FLAG_FISH
 
 /obj/item/food/butchery/meat/fish/get_meat_icons()
 	var/static/list/meat_icons = list(

diff --git a/code/modules/reagents/reagent_containers/food/sushi.dm b/code/modules/reagents/reagent_containers/food/sushi.dm
@@ -4,6 +4,7 @@
 	icon = 'icons/obj/sushi.dmi'
 	icon_state = "sushi_rice"
 	bitesize = 1
+	ingredient_flags = INGREDIENT_FLAG_FISH
 	var/fish_type = "fish"
 
 /obj/item/food/sushi/Initialize(mapload, material_key, skip_plate = FALSE, obj/item/food/rice, obj/item/food/topping)
@@ -58,6 +59,9 @@
 	icon_state = "sashimi"
 	gender = PLURAL
 	bitesize = 1
+	slice_num = 1
+	slice_path = /obj/item/food/butchery/chopped
+	ingredient_flags = INGREDIENT_FLAG_FISH
 	var/fish_type = "fish"
 	var/slices = 1
 
@@ -109,6 +113,17 @@
 		return
 	. = ..()
 
+/obj/item/food/sashimi/handle_utensil_cutting(obj/item/tool, mob/user)
+	slice_num = slices // to avoid wasting it
+	. = ..()
+	if(length(.))
+		for(var/obj/item/food/food in .)
+			food.cooked_food = cooked_food
+			food.ingredient_flags = ingredient_flags
+		if(fish_type)
+			for(var/obj/item/food/butchery/meat in .)
+				meat.set_meat_name(fish_type)
+
  // Used for turning rice into sushi.
 /obj/item/food/boiledrice/attackby(var/obj/item/I, var/mob/user)
 	if((locate(/obj/structure/table) in loc))