Merge pull request #8215 from Trilbyspaceclone/Sush

[Ready] Sushi!

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -54,6 +54,43 @@
 	tastes = list("fish" = 1, "chips" = 1)
 	foodtype = MEAT | VEGETABLES | FRIED
 
+/obj/item/reagent_containers/food/snacks/sushi_basic
+	name = "funa hosomaki"
+	desc = "A small cylindrical kudzu skin, filled with rice and fish."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_basic"
+	bonus_reagents = list("vitamin" = 2)
+	list_reagents = list("nutriment" = 4)
+	bitesize = 10
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 1, "rice" = 2, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/sushi_adv
+	name = "funa nigiri"
+	desc = "A peace  of carp lightly placed on some rice."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_adv"
+	bonus_reagents = list("vitamin" = 2)
+	list_reagents = list("nutriment" = 6)
+	bitesize = 10
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 2, "rice" = 2, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/sushi_pro
+	name = "funa nigiri"
+	desc = "A well prepared peace  of the best of the carp fillet placed on rice. Looks fancy and fresh!"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_pro"
+	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bitesize = 10
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 3, "rice" = 2, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+
 ////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
 
 /obj/item/reagent_containers/food/snacks/tofu

code/modules/food_and_drinks/food/snacks_other.dm

@@ -207,6 +207,16 @@
 	tastes = list("cobwebs" = 1, "sugar" = 2)
 	foodtype = JUNKFOOD | SUGAR
 
+/obj/item/reagent_containers/food/snacks/tobiko
+	name = "tobiko"
+	desc = "Spider eggs wrapped in a thin salted Kudzu pod"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_egg"
+	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	filling_color = "#FF3333" // R225 G051 B051
+	tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2)
+	foodtype = MEAT | VEGETABLES
+
 /obj/item/reagent_containers/food/snacks/chococoin
 	name = "chocolate coin"
 	desc = "A completely edible but nonflippable festive coin."
@@ -569,3 +579,12 @@
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
+
+/obj/item/reagent_containers/food/snacks/riceball
+	name = "onigiri"
+	desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "riceball"
+	list_reagents = list("nutriment" = 6, "sodiumchloride" = 2)
+	tastes = list("rice" = 3, "salt" = 1)
+	foodtype = GRAIN

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

@@ -81,6 +81,37 @@
 	result = /obj/item/reagent_containers/food/snacks/sashimi
 	subcategory = CAT_MEAT
 
+/datum/crafting_recipe/food/sushi_basic
+	name = "Funa Hosomaki"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 3,
+		/obj/item/reagent_containers/food/snacks/salad/ricebowl = 1,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 2,
+		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 3,
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushi_basic
+	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/sushi_adv
+	name = "Funa Nigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/salad/ricebowl = 1,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushi_adv
+	subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/sushi_pro
+	name = "Well made Funa Nigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 10,
+		/obj/item/reagent_containers/food/snacks/salad/ricebowl = 2,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 2
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushi_pro
+	subcategory = CAT_MEAT
+
 ////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/spidereggsham
@@ -93,6 +124,16 @@
 	result = /obj/item/reagent_containers/food/snacks/spidereggsham
 	subcategory = CAT_MEAT
 
+/datum/crafting_recipe/food/sushi_egg
+	name = "Tobiko"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 6,
+		/obj/item/reagent_containers/food/snacks/spidereggs = 1,
+		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 2,
+	)
+	result = /obj/item/reagent_containers/food/snacks/tobiko
+	subcategory = CAT_MEAT
+
 ////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/cornedbeef

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

@@ -345,3 +345,13 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/ricepudding
 	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/riceball
+	name = "Onigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 1,
+		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 1,
+		/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/riceball
+	subcategory = CAT_MISCFOOD

code/modules/vending/drinnerware.dm

@@ -13,7 +13,7 @@
 		            /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5,
 		            /obj/item/reagent_containers/food/condiment/saltshaker = 5,
 		            /obj/item/reagent_containers/food/condiment/peppermill = 5,
-		            /obj/item/reagent_containers/glass/bowl = 20)
+		            /obj/item/reagent_containers/glass/bowl = 30)
 	contraband = list(/obj/item/kitchen/rollingpin = 2,
 		              /obj/item/kitchen/knife/butcher = 2)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)