From 7a452ac47b1cbee14c6787764d0b0119c4074ff0 Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 13:31:25 +0100
Subject: [PATCH 01/11] Adds seaweed sheets

---
 code/game/objects/items/food/sushi.dm             |  12 ++++++++++++
 .../research/designs/biogenerator_designs.dm      |   8 ++++++++
 icons/obj/food/sushi.dmi                          | Bin 0 -> 632 bytes
 3 files changed, 20 insertions(+)
 create mode 100644 code/game/objects/items/food/sushi.dm
 create mode 100644 icons/obj/food/sushi.dmi

diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
new file mode 100644
index 0000000000000..1387e7f6386d9
--- /dev/null
+++ b/code/game/objects/items/food/sushi.dm
@@ -0,0 +1,12 @@
+/obj/item/food/seaweed_sheet
+	name = "Seaweed Sheet"
+	desc = "A dried sheet of seaweed used for making sushi."
+	icon = 'icons/obj/food/sushi.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
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index f62ee14c00baf..da6280427e520 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -218,3 +218,11 @@
 	materials = list(/datum/material/biomass = 100)
 	build_path = /obj/item/reagent_containers/food/condiment/soymilk
 	category = list("initial","Food")
+
+/datum/design/seaweed_sheet
+	name = "Seaweed Sheet"
+	id = "seaweed_sheet"
+	build_type = BIOGENERATOR
+	materials = list(/datum/material/biomass= 30)
+	build_path = /obj/item/food/sushi
+	category = list("initial","Food")
diff --git a/icons/obj/food/sushi.dmi b/icons/obj/food/sushi.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..58c7520153dba8f5be391f0617a220ed945c4af3
GIT binary patch
literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001idQ@0+L}hbh
za%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+
z(=$pSoZ^zil2jm5sW>&UJT)~XzBnT_wM2=FGbOXA7$|PY#hF%=n41b^XXKX@7vzKV
z8XD*r8tNEwDJ!`8xqxj10Jp6oPBdHO+5i9nvPnciRCt{2l)-AkKoEwfK?(5?1QAgW
zJxB{)idXwCeTkm?41I|{Mjyay>BU2-&_gLAiU?IhiZ=hqzl5OE&`S^9FNEF9COfnL
zzgZEF$K(0$oLPf|yTQJD*_FxTM8fk>qIIP4<!q^Ky;;|G6|ZFXy3>Bp3$%|mUd0+4
z-H%S@39JH;9CWTb(&#p%c2SeC9cnSSH?@u4)vv0Hp^xMMV?R-`1{Y5Yodkt!Kew`e
zSszy3u1oTfxFl4DMA=m)IWR5g-}LvIFq0Z9pFU5eb=A`3umN$jl%4Ma+62ZA<KI~T
zNg+Ry115*(lo<)(HJ<T4z&I^oL8mY+fVA`Xxsw=$VDch}!TYq5s{AOZtOaHPm>83}
zU7uZ&ZEVO*`O)GzYDSXAsf#6ViMGcI&SP4@m0%)Bj6PzNl`ZYy7%eEHf>{8e68YVZ
z7*~g};!0sh8B7bDoU`ngYl=&v7RbQ@T)L7taE0+8Lc#j2fvEtJ(*mlHmzmbk0>D2a
zZ=Z#E4h(OHd-_<EwCqlY3f56<S^%({^XEDb9*&XX0mQ!~?UmaL9*@WKXM6*8QPy37
S;4vEj0000<MNUMnLSTZN4j?B0

literal 0
HcmV?d00001


From 095a8514882b3be5bd2536398eb3a54e9e76c1ec Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 16:04:39 +0100
Subject: [PATCH 02/11] Adds sprites and some sushi types

---
 beestation.dme                                |   1 +
 code/game/objects/items/food/sushi.dm         |  76 +++++++++++++++++-
 .../research/designs/biogenerator_designs.dm  |   2 +-
 icons/obj/food/food_ingredients.dmi           | Bin 2713 -> 3957 bytes
 icons/obj/food/sushi.dmi                      | Bin 632 -> 5394 bytes
 5 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/beestation.dme b/beestation.dme
index 0eba7be95547f..d9b40dcdfe052 100644
--- a/beestation.dme
+++ b/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"
diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index 1387e7f6386d9..6bf7555fe08d8 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -1,8 +1,40 @@
+/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)
+	foodtypes = VEGETABLES | GRAIN
+	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 = 4,
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		)
+	tastes = list("sushi" = 1)
+	foodtypes = VEGETABLES | GRAIN
+	w_class = WEIGHT_CLASS_SMALL
+
 /obj/item/food/seaweed_sheet
-	name = "Seaweed Sheet"
+	name = "seaweed sheet"
 	desc = "A dried sheet of seaweed used for making sushi."
-	icon = 'icons/obj/food/sushi.dmi'
-	icon_state = 'seaweed_sheet'
+	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,
@@ -10,3 +42,41 @@
 	tastes = list("seaweed" = 1)
 	foodtypes = VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/food/sushi_roll/vegetarian
+	name = "vegetarian sushi roll"
+	desc = "A roll of simple vegetarian sushi with rice, carrots, and potatoes. Sliceable into pieces!"
+	icon_state = "vegetariansushiroll"
+	tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 2)
+	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 potatoes."
+	icon_state = "vegetariansushislice"
+	tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 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 = VEGETABLES | MEAT | GRAIN
+	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 = 4,
+		/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 = VEGETABLES | MEAT | GRAIN
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index da6280427e520..f41cad1fba302 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -224,5 +224,5 @@
 	id = "seaweed_sheet"
 	build_type = BIOGENERATOR
 	materials = list(/datum/material/biomass= 30)
-	build_path = /obj/item/food/sushi
+	build_path = /obj/item/food/seaweed_sheet
 	category = list("initial","Food")
diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi
index 66fa74644a43a5d395a0c83a8267da34d4e7a703..cf81b083572de68b29d3a76217447ab01559d6a7 100644
GIT binary patch
literal 3957
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
CiMgc!

literal 2713
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
T#aS_n00000NkvXXu0mjflbGG5

diff --git a/icons/obj/food/sushi.dmi b/icons/obj/food/sushi.dmi
index 58c7520153dba8f5be391f0617a220ed945c4af3..532ce48ebf1be77773e8fe6471a360c42ae4314a 100644
GIT binary patch
literal 5394
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

literal 632
zcmV-;0*C#HP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80001idQ@0+L}hbh
za%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+
z(=$pSoZ^zil2jm5sW>&UJT)~XzBnT_wM2=FGbOXA7$|PY#hF%=n41b^XXKX@7vzKV
z8XD*r8tNEwDJ!`8xqxj10Jp6oPBdHO+5i9nvPnciRCt{2l)-AkKoEwfK?(5?1QAgW
zJxB{)idXwCeTkm?41I|{Mjyay>BU2-&_gLAiU?IhiZ=hqzl5OE&`S^9FNEF9COfnL
zzgZEF$K(0$oLPf|yTQJD*_FxTM8fk>qIIP4<!q^Ky;;|G6|ZFXy3>Bp3$%|mUd0+4
z-H%S@39JH;9CWTb(&#p%c2SeC9cnSSH?@u4)vv0Hp^xMMV?R-`1{Y5Yodkt!Kew`e
zSszy3u1oTfxFl4DMA=m)IWR5g-}LvIFq0Z9pFU5eb=A`3umN$jl%4Ma+62ZA<KI~T
zNg+Ry115*(lo<)(HJ<T4z&I^oL8mY+fVA`Xxsw=$VDch}!TYq5s{AOZtOaHPm>83}
zU7uZ&ZEVO*`O)GzYDSXAsf#6ViMGcI&SP4@m0%)Bj6PzNl`ZYy7%eEHf>{8e68YVZ
z7*~g};!0sh8B7bDoU`ngYl=&v7RbQ@T)L7taE0+8Lc#j2fvEtJ(*mlHmzmbk0>D2a
zZ=Z#E4h(OHd-_<EwCqlY3f56<S^%({^XEDb9*&XX0mQ!~?UmaL9*@WKXM6*8QPy37
S;4vEj0000<MNUMnLSTZN4j?B0


From 3fab76ab3d6504c854049c4a20b5e15aa8dd30f1 Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 16:25:05 +0100
Subject: [PATCH 03/11] Seafood crafting tab

---
 code/__DEFINES/construction.dm                |  1 +
 code/datums/components/crafting/crafting.dm   |  1 +
 .../recipes/tablecraft/recipes_meat.dm        | 41 ------------
 .../recipes/tablecraft/recipes_seafood.dm     | 64 +++++++++++++++++++
 4 files changed, 66 insertions(+), 41 deletions(-)
 create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm

diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
index 3d416afead97c..f18fbd97c9635 100644
--- a/code/__DEFINES/construction.dm
+++ b/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"
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index d3a5bdc64f25a..64514d2d33831 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -35,6 +35,7 @@
 					CAT_PIZZA,
 					CAT_SALAD,
 					CAT_SANDWICH,
+					CAT_SEAFOOD,
 					CAT_SOUP,
 					CAT_SPAGHETTI,
 				),
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 7b539a450b8c4..bab50c26fa421 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/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
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
new file mode 100644
index 0000000000000..66b37a45fd3a7
--- /dev/null
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
@@ -0,0 +1,64 @@
+
+//SEAFOOD
+
+/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_SEAFOOD
+
+/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_SEAFOOD
+
+/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_SEAFOOD
+
+/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_SEAFOOD
+
+/datum/crafting_recipe/food/vegetariansushiroll
+	name ="Vegetarian sushi roll"
+	reqs = list(
+		/obj/item/food/seaweed_sheet = 1,
+		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/grown/carrot = 1,
+		/obj/item/food/grown/potato = 1
+	)
+	result = /obj/item/food/sushi_roll/vegetarian
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/spicyfiletsushiroll
+	name ="Spicy filet sushi roll"
+	reqs = list(
+		/obj/item/food/seaweed_sheet = 1,
+		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/fishmeat = 1,
+		/obj/item/food/grown/chili = 1,
+		/obj/item/food/grown/onion = 1
+	)
+	result = /obj/item/food/sushi_roll/spicyfilet
+	subcategory = CAT_SEAFOOD

From 3f8a2086fbe7eb85fc3b033c0ed091d76cb55cd6 Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 16:25:20 +0100
Subject: [PATCH 04/11] Update beestation.dme

---
 beestation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/beestation.dme b/beestation.dme
index d9b40dcdfe052..cb1be18775aa7 100644
--- a/beestation.dme
+++ b/beestation.dme
@@ -2682,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"

From 3e991379769a7d964809ad6f923bd4652f7ec334 Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 17:45:05 +0100
Subject: [PATCH 05/11] More sushi types, plant bags and fridge can take
 seaweed sheets

---
 code/game/objects/items/food/sushi.dm         | 83 +++++++++++++++++--
 .../kitchen_machinery/smartfridge.dm          |  2 +-
 .../recipes/tablecraft/recipes_seafood.dm     | 43 +++++++++-
 3 files changed, 115 insertions(+), 13 deletions(-)

diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index 6bf7555fe08d8..b536fa264c260 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -8,7 +8,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 4,
 		)
 	tastes = list("sushi" = 1)
-	foodtypes = VEGETABLES | GRAIN
+	foodtypes = VEGETABLES
 	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
@@ -23,11 +23,11 @@
 	icon = 'icons/obj/food/sushi.dmi'
 	icon_state = "ERROR"
 	food_reagents = list(
-		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/nutriment/vitamin = 1,
 		)
 	tastes = list("sushi" = 1)
-	foodtypes = VEGETABLES | GRAIN
+	foodtypes = VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/seaweed_sheet
@@ -64,9 +64,10 @@
 		/datum/reagent/consumable/nutriment = 12,
 		/datum/reagent/consumable/nutriment/protein = 4,
 		/datum/reagent/consumable/capsaicin = 4,
-		/datum/reagent/consumable/nutriment/vitamin = 4)
+		/datum/reagent/consumable/nutriment/vitamin = 4,
+		)
 	tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2)
-	foodtypes = VEGETABLES | MEAT | GRAIN
+	foodtypes = VEGETABLES | MEAT
 	slice_type = /obj/item/food/sushi_slice/spicyfilet
 
 /obj/item/food/sushi_slice/spicyfilet
@@ -74,9 +75,75 @@
 	desc = "A roll of tasty, spicy sushi made with fish and vegetables."
 	icon_state = "spicyfiletslice"
 	food_reagents = list(
-		/datum/reagent/consumable/nutriment = 4,
+		/datum/reagent/consumable/nutriment = 3,
 		/datum/reagent/consumable/nutriment/protein = 1,
 		/datum/reagent/consumable/capsaicin = 1,
-		/datum/reagent/consumable/nutriment/vitamin = 1)
+		/datum/reagent/consumable/nutriment/vitamin = 1,
+		)
 	tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2)
-	foodtypes = VEGETABLES | MEAT | GRAIN
+	foodtypes = VEGETABLES | MEAT
+
+/obj/item/food/sushi_roll/futomaki
+	name = "futomaki sushi roll"
+	desc = "A roll of futomaki sushi, made of boiled egg, fish, and cucumber. 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 = VEGETABLES | 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 cucumber."
+	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, "cucumber" = 2)
+	foodtypes = VEGETABLES | MEAT
+
+/obj/item/food/sushi_roll/philadelphia
+	name = "Philadelphia sushi roll"
+	desc = "A roll of Philadelphia sushi, made of cheese, fish, and cucumber. 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, "cucumber" = 2)
+	foodtypes = VEGETABLES | 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 cucumber."
+	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, "cucumber" = 2)
+	foodtypes = VEGETABLES | 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 = VEGETABLES | MEAT
+	w_class = WEIGHT_CLASS_SMALL
+
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 1b5a23f470210..25302a2d2e4c9 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/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
 
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
index 66b37a45fd3a7..8971898adbec3 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
@@ -40,25 +40,60 @@
 	result = /obj/item/food/sashimi
 	subcategory = CAT_SEAFOOD
 
-/datum/crafting_recipe/food/vegetariansushiroll
+/datum/crafting_recipe/food/vegetarian_sushi_roll
 	name ="Vegetarian sushi roll"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
 		/obj/item/food/salad/boiledrice = 1,
 		/obj/item/food/grown/carrot = 1,
-		/obj/item/food/grown/potato = 1
+		/obj/item/food/grown/cabbage = 1
 	)
 	result = /obj/item/food/sushi_roll/vegetarian
 	subcategory = CAT_SEAFOOD
 
-/datum/crafting_recipe/food/spicyfiletsushiroll
+/datum/crafting_recipe/food/spicy_filet_sushi_roll
 	name ="Spicy filet sushi roll"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
 		/obj/item/food/salad/boiledrice = 1,
-		/obj/item/food/fishmeat = 1,
+		/obj/item/food/fishmeat/carp = 1,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/onion = 1
 	)
 	result = /obj/item/food/sushi_roll/spicyfilet
 	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/futomaki_sushi_roll
+	name ="Futomaki sushi roll"
+	reqs = list(
+		/obj/item/food/seaweed_sheet = 1,
+		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledegg = 1,
+		/obj/item/food/fishmeat/carp = 1,
+		/obj/item/food/grown/cabbage = 1,
+	)
+	result = /obj/item/food/sushi_roll/futomaki
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/philadelphia_sushi_roll
+	name ="Philadelphia sushi roll"
+	reqs = list(
+		/obj/item/food/seaweed_sheet = 1,
+		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/cheese/wedge = 1,
+		/obj/item/food/fishmeat/carp = 1,
+		/obj/item/food/grown/cabbage = 1,
+	)
+	result = /obj/item/food/sushi_roll/philadelphia
+	subcategory = CAT_SEAFOOD
+
+/datum/crafting_recipe/food/nigiri_sushi
+	name ="Nigiri sushi"
+	reqs = list(
+		/obj/item/food/seaweed_sheet = 1,
+		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/fishmeat = 1,
+		/datum/reagent/consumable/soysauce = 2
+	)
+	result = /obj/item/food/nigiri_sushi
+	subcategory = CAT_SEAFOOD

From 2d0c7eb1b074e688929ec260f1bdd90a950f59eb Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 18:05:23 +0100
Subject: [PATCH 06/11] Custom sushi

---
 code/game/objects/items/food/sushi.dm   | 21 ++++++++++++++++++++-
 code/game/objects/items/storage/bags.dm |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index b536fa264c260..8b3bfdb299bb2 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -32,7 +32,7 @@
 
 /obj/item/food/seaweed_sheet
 	name = "seaweed sheet"
-	desc = "A dried sheet of seaweed used for making sushi."
+	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(
@@ -43,6 +43,25 @@
 	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 potatoes. Sliceable into pieces!"
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 8a99c5a180a4c..fed6580a6761b 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/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))
 
 ////////
 

From 96c9da45eb5857a5af670975cd6231194463741c Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 18:17:28 +0100
Subject: [PATCH 07/11] Adds custom sushi and custom onigiri

---
 code/game/objects/items/food/misc.dm          | 25 +++++++++++++++++++
 code/game/objects/items/food/sushi.dm         | 14 +++++------
 .../recipes/tablecraft/recipes_misc.dm        | 10 ++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index 2bea2d0e998ce..675e3e9b23748 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/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."
diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index 8b3bfdb299bb2..5bdf1d50955be 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -104,7 +104,7 @@
 
 /obj/item/food/sushi_roll/futomaki
 	name = "futomaki sushi roll"
-	desc = "A roll of futomaki sushi, made of boiled egg, fish, and cucumber. Sliceable"
+	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,
@@ -117,39 +117,39 @@
 
 /obj/item/food/sushi_slice/futomaki
 	name = "futomaki sushi slice"
-	desc = "A slice of futomaki sushi, made of boiled egg, fish, and cucumber."
+	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, "cucumber" = 2)
+	tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cabbage" = 2)
 	foodtypes = VEGETABLES | MEAT
 
 /obj/item/food/sushi_roll/philadelphia
 	name = "Philadelphia sushi roll"
-	desc = "A roll of Philadelphia sushi, made of cheese, fish, and cucumber. Sliceable"
+	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, "cucumber" = 2)
+	tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cabbage" = 2)
 	foodtypes = VEGETABLES | 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 cucumber."
+	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, "cucumber" = 2)
+	tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cabbage" = 2)
 	foodtypes = VEGETABLES | MEAT | DAIRY
 
 /obj/item/food/nigiri_sushi
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index f1963c822d51b..4a50abaecf756 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -173,6 +173,7 @@
 	)
 	result = /obj/item/food/pingles
 	subcategory = CAT_MISCFOOD
+
 /datum/crafting_recipe/food/swirl_lollipop
 	name = "swirl lollipop"
 	reqs = list(
@@ -182,3 +183,12 @@
 		)
 	result = /obj/item/food/swirl_lollipop
 	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/onigiri
+	name = "Onigiri"
+	reqs = list(
+		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/seaweed_sheet = 1,
+	)
+	result = /obj/item/food/onigiri
+	subcategory = CAT_MISCFOOD

From a9c54b68dcfdd8a19c42ae07ee455885246e3061 Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Thu, 22 Aug 2024 18:20:42 +0100
Subject: [PATCH 08/11] Fixed a description

---
 code/game/objects/items/food/sushi.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index 5bdf1d50955be..d9c94dd593f70 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -64,14 +64,14 @@
 
 /obj/item/food/sushi_roll/vegetarian
 	name = "vegetarian sushi roll"
-	desc = "A roll of simple vegetarian sushi with rice, carrots, and potatoes. Sliceable into pieces!"
+	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, "potato" = 2)
 	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 potatoes."
+	desc = "A roll of simple vegetarian sushi with rice, carrots, and cabbage."
 	icon_state = "vegetariansushislice"
 	tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 2)
 

From 24198aa87a1807a1051f00a0475e0e8ad78e58de Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Fri, 23 Aug 2024 09:30:37 +0100
Subject: [PATCH 09/11] More small things that were annoying me

Veggie rolls dont taste like potatoes, required ingredients consistent, removed unused sprite
---
 code/game/objects/items/food/sushi.dm         |   4 ++--
 .../recipes/tablecraft/recipes_seafood.dm     |   2 +-
 icons/obj/food/sushi.dmi                      | Bin 5394 -> 2422 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index d9c94dd593f70..9c6204af9a5c1 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -66,14 +66,14 @@
 	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, "potato" = 2)
+	tastes = list("boiled rice" = 4, "carrots" = 2, "cabbage" = 2)
 	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"
-	tastes = list("boiled rice" = 4, "carrots" = 2, "potato" = 2)
+	tastes = list("boiled rice" = 4, "carrots" = 2, "cabbage" = 2)
 
 /obj/item/food/sushi_roll/spicyfilet
 	name = "spicy filet sushi roll"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
index 8971898adbec3..ce329bd3600d1 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
@@ -92,7 +92,7 @@
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
 		/obj/item/food/salad/boiledrice = 1,
-		/obj/item/food/fishmeat = 1,
+		/obj/item/food/fishmeat/carp = 1,
 		/datum/reagent/consumable/soysauce = 2
 	)
 	result = /obj/item/food/nigiri_sushi
diff --git a/icons/obj/food/sushi.dmi b/icons/obj/food/sushi.dmi
index 532ce48ebf1be77773e8fe6471a360c42ae4314a..d338606d00f226b4ac773baad50f5c44823d714c 100644
GIT binary patch
literal 2422
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

literal 5394
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


From a4d418bc861144df4733c459ff5ab334c8ebb9cc Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Fri, 23 Aug 2024 11:14:53 +0100
Subject: [PATCH 10/11] Rice/water reaction no longer needs a bowl, Foods that
 made use of rice bowls now require boiled rice and a bowl

---
 code/game/objects/items/food/salad.dm         |  16 ++++++++--------
 .../food_and_drinks/recipes/food_mixtures.dm  |  14 ++++++--------
 .../recipes/tablecraft/recipes_egg.dm         |   3 ++-
 .../recipes/tablecraft/recipes_meat.dm        |   3 ++-
 .../recipes/tablecraft/recipes_misc.dm        |   5 +++--
 .../recipes/tablecraft/recipes_seafood.dm     |  10 +++++-----
 .../recipes/tablecraft/recipes_soup.dm        |   3 ++-
 icons/obj/food/food.dmi                       | Bin 81705 -> 82120 bytes
 8 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm
index 8d5a4a842a3ed..c60fc22e285a3 100644
--- a/code/game/objects/items/food/salad.dm
+++ b/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
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 117d46ebfb86d..840a710febe5a 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/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"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
index 5f03e927d9b04..c444f4ee5388b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+++ b/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
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index bab50c26fa421..35bff8f48e67b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -174,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
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 4a50abaecf756..65ee50cfaaaf6 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -132,9 +132,10 @@
 /datum/crafting_recipe/food/ricepudding
 	name = "Rice pudding"
 	reqs = list(
+		/obj/item/reagent_containers/glass/bowl = 1,
 		/datum/reagent/consumable/milk = 5,
 		/datum/reagent/consumable/sugar = 5,
-		/obj/item/food/salad/boiledrice = 1
+		/obj/item/food/boiledrice = 1
 	)
 	result = /obj/item/food/salad/ricepudding
 	subcategory = CAT_MISCFOOD
@@ -187,7 +188,7 @@
 /datum/crafting_recipe/food/onigiri
 	name = "Onigiri"
 	reqs = list(
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/seaweed_sheet = 1,
 	)
 	result = /obj/item/food/onigiri
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
index ce329bd3600d1..578e27af49193 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_seafood.dm
@@ -44,7 +44,7 @@
 	name ="Vegetarian sushi roll"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/grown/carrot = 1,
 		/obj/item/food/grown/cabbage = 1
 	)
@@ -55,7 +55,7 @@
 	name ="Spicy filet sushi roll"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/fishmeat/carp = 1,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/onion = 1
@@ -67,7 +67,7 @@
 	name ="Futomaki sushi roll"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/boiledegg = 1,
 		/obj/item/food/fishmeat/carp = 1,
 		/obj/item/food/grown/cabbage = 1,
@@ -79,7 +79,7 @@
 	name ="Philadelphia sushi roll"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/cheese/wedge = 1,
 		/obj/item/food/fishmeat/carp = 1,
 		/obj/item/food/grown/cabbage = 1,
@@ -91,7 +91,7 @@
 	name ="Nigiri sushi"
 	reqs = list(
 		/obj/item/food/seaweed_sheet = 1,
-		/obj/item/food/salad/boiledrice = 1,
+		/obj/item/food/boiledrice = 1,
 		/obj/item/food/fishmeat/carp = 1,
 		/datum/reagent/consumable/soysauce = 2
 	)
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
index 59ad255ae545a..abb4e3fdc3ac6 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm
@@ -250,10 +250,11 @@
 /datum/crafting_recipe/food/bisque
 	name = "Bisque"
 	reqs = list(
+		/obj/item/reagent_containers/glass/bowl = 1,
 		/datum/reagent/water = 10,
 		/obj/item/reagent_containers/glass/bowl = 1,
 		/obj/item/food/meat/crab = 1,
-		/obj/item/food/salad/boiledrice = 1
+		/obj/item/food/boiledrice = 1
 	)
 	result = /obj/item/food/soup/bisque
 	subcategory = CAT_SOUP
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index fa1a15fdbd512e66f4da40f896a47b8db4168018..534d70c32bca3f3e6132e2e661dbc669a8ef3dc5 100644
GIT binary patch
delta 8909
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
RuEV@uQetwVmBM=d{|`-wKSTfk

delta 8491
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
U=?3HSP=60uDJ99u_lExe1A$m%%m4rY


From 20023eb31fe329564f0edbcfa0d89191840cd20a Mon Sep 17 00:00:00 2001
From: PatienceStPim <ethanbarratt1234@gmail.com>
Date: Fri, 23 Aug 2024 15:00:42 +0100
Subject: [PATCH 11/11] Changes foodtypes

So other races can actually like sushi
---
 code/game/objects/items/food/sushi.dm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/code/game/objects/items/food/sushi.dm b/code/game/objects/items/food/sushi.dm
index 9c6204af9a5c1..bd4f8848fcbe1 100644
--- a/code/game/objects/items/food/sushi.dm
+++ b/code/game/objects/items/food/sushi.dm
@@ -8,7 +8,6 @@
 		/datum/reagent/consumable/nutriment/vitamin = 4,
 		)
 	tastes = list("sushi" = 1)
-	foodtypes = VEGETABLES
 	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
@@ -27,7 +26,6 @@
 		/datum/reagent/consumable/nutriment/vitamin = 1,
 		)
 	tastes = list("sushi" = 1)
-	foodtypes = VEGETABLES
 	w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/food/seaweed_sheet
@@ -67,12 +65,14 @@
 	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
@@ -86,7 +86,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 4,
 		)
 	tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2)
-	foodtypes = VEGETABLES | MEAT
+	foodtypes = MEAT
 	slice_type = /obj/item/food/sushi_slice/spicyfilet
 
 /obj/item/food/sushi_slice/spicyfilet
@@ -100,7 +100,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 1,
 		)
 	tastes = list("boiled rice" = 4, "fish" = 2, "spicyness" = 2)
-	foodtypes = VEGETABLES | MEAT
+	foodtypes = MEAT
 
 /obj/item/food/sushi_roll/futomaki
 	name = "futomaki sushi roll"
@@ -112,7 +112,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 4,
 	)
 	tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2)
-	foodtypes = VEGETABLES | MEAT
+	foodtypes = MEAT
 	slice_type = /obj/item/food/sushi_slice/futomaki
 
 /obj/item/food/sushi_slice/futomaki
@@ -125,7 +125,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 1,
 	)
 	tastes = list("boiled rice" = 4, "fish" = 5, "egg" = 3, "dried seaweed" = 2, "cabbage" = 2)
-	foodtypes = VEGETABLES | MEAT
+	foodtypes = MEAT
 
 /obj/item/food/sushi_roll/philadelphia
 	name = "Philadelphia sushi roll"
@@ -137,7 +137,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 8,
 	)
 	tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cabbage" = 2)
-	foodtypes = VEGETABLES | MEAT | DAIRY
+	foodtypes = MEAT | DAIRY
 	slice_type = /obj/item/food/sushi_slice/philadelphia
 
 /obj/item/food/sushi_slice/philadelphia
@@ -150,7 +150,7 @@
 		/datum/reagent/consumable/nutriment/vitamin = 2,
 	)
 	tastes = list("boiled rice" = 4, "fish" = 5, "creamy cheese" = 3, "dried seaweed" = 2, "cabbage" = 2)
-	foodtypes = VEGETABLES | MEAT | DAIRY
+	foodtypes = MEAT | DAIRY
 
 /obj/item/food/nigiri_sushi
 	name = "nigiri sushi"
@@ -163,6 +163,6 @@
 		/datum/reagent/consumable/nutriment/protein = 2,
 		)
 	tastes = list("boiled rice" = 4, "fish filet" = 2, "soy sauce" = 2)
-	foodtypes = VEGETABLES | MEAT
+	foodtypes = MEAT | RAW
 	w_class = WEIGHT_CLASS_SMALL