[PORT] Three new plants, faux seaweed sheets and butter slices from T…

…G (PRs #79484 & #76338) (#582)

code/__DEFINES/food.dm

@@ -172,3 +172,6 @@
 // Venues for the barbots.
 #define VENUE_RESTAURANT "Restaurant Venue"
 #define VENUE_BAR "Bar Venue"
+
+/// How much milk is needed to make butter on a reagent grinder
+#define MILK_TO_BUTTER_COEFF 25

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

@@ -566,7 +566,7 @@
 	name = "stick of butter"
 	desc = "A stick of delicious, golden, fatty goodness."
 	icon_state = "butter"
-	food_reagents = list(/datum/reagent/consumable/nutriment = 5)
+	food_reagents = list(/datum/reagent/consumable/nutriment = 15)
 	tastes = list("butter" = 1)
 	foodtypes = DAIRY
 	w_class = WEIGHT_CLASS_SMALL
@@ -597,6 +597,18 @@
 	trash_type = /obj/item/stack/rods
 	food_flags = FOOD_FINGER_FOOD
 
+/obj/item/food/butter/MakeProcessable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/butterslice, 3, 3 SECONDS, table_required = TRUE)
+
+/obj/item/food/butterslice
+	name = "butter slice"
+	desc = "A slice of butter, for your buttering needs."
+	icon_state = "butterslice"
+	food_reagents = list(/datum/reagent/consumable/nutriment = 5)
+	tastes = list("butter" = 1)
+	foodtypes = DAIRY
+	w_class = WEIGHT_CLASS_SMALL
+
 /obj/item/food/onionrings
 	name = "onion rings"
 	desc = "Onion slices coated in batter."
@@ -926,6 +938,18 @@
 	. = ..()
 	AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/sushi/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6)
 
+/obj/item/food/seaweedsheet/saltcane
+	name = "dried saltcane sheathe"
+	desc = "A dried sheet of saltcane sheathe can used for making sushi. Use an ingredient on it to start making custom sushi!"
+	icon_state = "seaweedsheet"
+	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/granola_bar
 	name = "granola bar"
 	desc = "A dried mixture of oats, nuts, fruits, and chocolate condensed into a chewy bar. Makes a great snack while space-hiking."

code/modules/food_and_drinks/recipes/soup_mixtures.dm

@@ -1083,7 +1083,7 @@
 		/obj/item/food/grown/onion = 2,
 		/obj/item/food/grown/chili = 1,
 		/obj/item/food/grown/garlic = 1,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 		/obj/item/food/boiledrice = 1,
 	)
 	results = list(
@@ -1435,7 +1435,7 @@
 	)
 	required_ingredients = list(
 		/obj/item/food/cheese/wedge = 2,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 		/obj/item/food/grown/potato/sweet = 1,
 	)
 	results = list(
@@ -1646,7 +1646,7 @@
 	required_ingredients = list(
 		/obj/item/food/cheese/firm_cheese_slice = 1,
 		/obj/item/food/cheese/curd_cheese = 1,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 	)
 	results = list(
 		/datum/reagent/consumable/nutriment/soup/cheese_porridge = 30,

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

@@ -89,7 +89,7 @@
 	time = 40
 	reqs = list(/obj/item/food/grown/garlic = 1,
 				/obj/item/food/breadslice/plain = 1,
-				/obj/item/food/butter = 1
+				/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/garlicbread
 	category = CAT_BREAD
@@ -98,7 +98,7 @@
 	name = "Butter Biscuit"
 	reqs = list(
 		/obj/item/food/bun = 1,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/butterbiscuit
 	category = CAT_BREAD
@@ -107,7 +107,7 @@
 	name = "Butterdog"
 	reqs = list(
 		/obj/item/food/bun = 1,
-		/obj/item/food/butter = 3,
+		/obj/item/food/butter = 1,
 		)
 	result = /obj/item/food/butterdog
 	category = CAT_BREAD
@@ -127,7 +127,7 @@
 	reqs = list(
 		/obj/item/food/doughslice = 1,
 		/datum/reagent/consumable/salt = 1,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/raw_breadstick
 	category = CAT_BREAD
@@ -169,7 +169,7 @@
 	name = "Buttered Toast"
 	reqs = list(
 		/obj/item/food/breadslice/plain = 1,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/butteredtoast
 	category = CAT_BREAD

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

@@ -263,6 +263,10 @@
 	result = /obj/item/food/pastrybase
 	category = CAT_BREAD
 
+/datum/crafting_recipe/food/knife/butterslice
+	reqs = list(/obj/item/food/butter = 1)
+	result = /obj/item/food/butterslice
+
 /datum/crafting_recipe/food/knife/doughball
 	reqs = list(/obj/item/food/doughslice = 1)
 	result = /obj/item/food/bait/doughball
@@ -515,7 +519,7 @@
 	result = /datum/reagent/consumable/flour
 
 /datum/crafting_recipe/food/grinder/butter
-	reqs = list(/datum/reagent/consumable/milk = 15)
+	reqs = list(/datum/reagent/consumable/milk = MILK_TO_BUTTER_COEFF)
 	result = /obj/item/food/butter
 	steps = list("Put into grinder and mix")
 

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

@@ -314,7 +314,7 @@
 	name = "Korta brittle slab"
 	reqs = list(
 		/obj/item/food/grown/korta_nut = 2,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 		/datum/reagent/consumable/korta_nectar = 5,
 		/datum/reagent/consumable/sugar = 5,
 		/datum/reagent/consumable/salt = 2

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

@@ -136,7 +136,7 @@
 	name = "Pig in a Blanket"
 	reqs = list(
 		/obj/item/food/bun = 1,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 		/obj/item/food/meat/cutlet = 1
 	)
 	result = /obj/item/food/pigblanket

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

@@ -164,7 +164,7 @@
 	reqs = list(
 		/obj/item/organ/internal/brain = 1,
 		/obj/item/organ/internal/heart = 1,
-		/obj/item/food/butter = 10,
+		/obj/item/food/butter = 4,
 		/obj/item/food/meat/slab = 5,
 		/datum/reagent/blood = 50,
 		/datum/reagent/teslium = 1 //To shock the whole thing into life
@@ -233,7 +233,7 @@
 	reqs = list(
 		/datum/reagent/consumable/milk = 10,
 		/datum/reagent/consumable/flour = 5,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/bechamel_sauce
 	category = CAT_MISCFOOD
@@ -285,7 +285,7 @@
 	reqs = list(
 		/obj/item/food/grown/potato = 2,
 		/obj/item/food/grown/garlic = 1,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 		/datum/reagent/consumable/milk = 1,
 	)
 	result = /obj/item/food/mashed_potatoes
@@ -367,7 +367,7 @@
 	name = "Buttered baked potato"
 	reqs = list(
 		/obj/item/food/baked_potato = 1,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 	)
 	result = /obj/item/food/buttered_baked_potato
 	category = CAT_MISCFOOD

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

@@ -111,7 +111,7 @@
 	name = "Buttered baked corn"
 	reqs = list(
 		/obj/item/food/oven_baked_corn = 1,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/buttered_baked_corn
 	category = CAT_MOTH
@@ -313,7 +313,7 @@
 /datum/crafting_recipe/food/raw_mothic_garlic
 	reqs = list(
 		/obj/item/food/mothic_pizza_dough = 1,
-		/obj/item/food/butter = 1,
+		/obj/item/food/butterslice = 1,
 		/obj/item/food/grown/garlic = 1,
 		/obj/item/food/grown/herbs = 1
 	)

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

@@ -603,7 +603,7 @@
 		/datum/reagent/consumable/sugar = 5,
 		/obj/item/food/egg = 2,
 		/datum/reagent/consumable/coco = 5,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/raw_brownie_batter
 	category = CAT_PASTRY

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

@@ -200,7 +200,7 @@
 /datum/crafting_recipe/food/baklava
 	name = "Baklava pie"
 	reqs = list(
-		/obj/item/food/butter = 2,
+		/obj/item/food/butterslice = 2,
 		/obj/item/food/tortilla = 4, //Layers
 		/obj/item/seeds/wheat/oat = 4
 	)

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

@@ -64,7 +64,7 @@
 	name = "Butter Noodles"
 	reqs = list(
 		/obj/item/food/spaghetti/boiledspaghetti = 1,
-		/obj/item/food/butter = 1
+		/obj/item/food/butterslice = 1
 	)
 	result = /obj/item/food/spaghetti/butternoodles
 	category = CAT_SPAGHETTI

code/modules/hydroponics/grown/beans.dm

@@ -14,7 +14,7 @@
 	icon_grow = "soybean-grow"
 	icon_dead = "soybean-dead"
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
-	mutatelist = list(/obj/item/seeds/soya/koi)
+	mutatelist = list(/obj/item/seeds/soya/koi, /obj/item/seeds/soya/butter)
 	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.05, /datum/reagent/consumable/cooking_oil = 0.03) //Vegetable oil!
 
 /obj/item/food/grown/soybeans
@@ -26,7 +26,7 @@
 	foodtypes = VEGETABLES
 	grind_results = list(/datum/reagent/consumable/soymilk = 0)
 	tastes = list("soy" = 1)
-	wine_power = 20
+	distill_reagent = /datum/reagent/consumable/soysauce
 
 // Koibean
 /obj/item/seeds/soya/koi
@@ -50,6 +50,37 @@
 	tastes = list("koi" = 1)
 	wine_power = 40
 
+//Butterbeans, the beans wid da butta!
+// Butterbeans! - Squeeze for a single butter slice!
+/obj/item/seeds/soya/butter
+	name = "pack of butterbean seeds"
+	desc = "These seeds grow into butterbean plants."
+	icon_state = "seed-butterbean"
+	species = "butterbean"
+	plantname = "butterbean Plants"
+	product = /obj/item/food/grown/butterbeans
+	potency = 10
+	mutatelist = null
+	reagents_add = list(/datum/reagent/consumable/milk = 0.05, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/cream = 0.05)
+	rarity = 20
+
+/obj/item/food/grown/butterbeans
+	seed = /obj/item/seeds/soya/butter
+	name = "butterbean"
+	desc = "Soft, creamy and milky... You could almost smear them over toast."
+	icon_state = "butterbeans"
+	foodtypes = VEGETABLES | DAIRY
+	tastes = list("creamy butter" = 1)
+	distill_reagent = /datum/reagent/consumable/yoghurt
+
+/obj/item/food/grown/butterbeans/attack_self(mob/living/user)
+	user.visible_message(span_notice("[user] crushes [src] into a pat of butter."), span_notice("You crush [src] into something that resembles butter."))
+	playsound(user, 'sound/effects/blobattack.ogg', 50, TRUE)
+	var/obj/item/food/butterslice/butty = new(null)
+	qdel(src)
+	user.put_in_hands(butty)
+	return TRUE
+
 // Green Beans
 /obj/item/seeds/greenbean
 	name = "pack of green bean seeds"

code/modules/hydroponics/grown/corn.dm

@@ -13,7 +13,7 @@
 	growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
 	icon_grow = "corn-grow" // Uses one growth icons set for all the subtypes
 	icon_dead = "corn-dead" // Same for the dead icon
-	mutatelist = list(/obj/item/seeds/corn/snapcorn)
+	mutatelist = list(/obj/item/seeds/corn/snapcorn, /obj/item/seeds/corn/pepper)
 	reagents_add = list(/datum/reagent/consumable/cornoil = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
 
 /obj/item/food/grown/corn
@@ -89,3 +89,29 @@
 	if(!snap_pops)
 		new /obj/item/grown/corncob(user.loc)
 		qdel(src)
+
+//Pepper-corn - Heh funny.
+/obj/item/seeds/corn/pepper
+	name = "pack of pepper-corn seeds"
+	desc = "If Peter picked a pack of pepper-corn..."
+	icon_state = "seed-peppercorn"
+	species = "peppercorn"
+	plantname = "Pepper-Corn Stalks"
+	product = /obj/item/food/grown/peppercorn
+	mutatelist = null
+	reagents_add = list(/datum/reagent/consumable/blackpepper = 0.2, /datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1)
+
+/obj/item/food/grown/peppercorn
+	seed = /obj/item/seeds/corn/pepper
+	name = "ear of pepper-peppercorn"
+	desc = "This dusty monster needs god..."
+	icon_state = "peppercorn"
+	trash_type = /obj/item/grown/corncob/pepper
+	foodtypes = VEGETABLES
+	grind_results = list(/datum/reagent/consumable/blackpepper = 0)
+	tastes = list("pepper" = 1, "sneezing" = 1)
+
+/obj/item/grown/corncob/pepper
+	seed = /obj/item/seeds/corn/pepper
+	name = "pepper corn cob"
+	desc = "A reminder of genetic abominations gone by."

code/modules/hydroponics/grown/sugarcane.dm

@@ -15,7 +15,7 @@
 	instability = 15
 	growthstages = 2
 	reagents_add = list(/datum/reagent/consumable/sugar = 0.25)
-	mutatelist = list(/obj/item/seeds/bamboo)
+	mutatelist = list(/obj/item/seeds/bamboo, /obj/item/seeds/sugarcane/saltcane)
 
 /obj/item/food/grown/sugarcane
 	seed = /obj/item/seeds/sugarcane
@@ -56,3 +56,25 @@
 
 /obj/item/grown/log/bamboo/CheckAccepted(obj/item/I)
 	return FALSE
+
+//Saltcane - Gross, salty shafts!
+/obj/item/seeds/sugarcane/saltcane
+	name = "pack of saltcane seeds"
+	desc = "These seeds grow into saltcane."
+	icon_state = "seed-saltcane"
+	species = "saltcane"
+	plantname = "Saltcane"
+	product = /obj/item/food/grown/sugarcane/saltcane
+	genes = list(/datum/plant_gene/trait/repeated_harvest)
+	reagents_add = list(/datum/reagent/consumable/nutriment = 0.04, /datum/reagent/consumable/salt = 0.25)
+	mutatelist = null
+
+/obj/item/food/grown/sugarcane/saltcane
+	seed = /obj/item/seeds/sugarcane/saltcane
+	name = "saltcane"
+	desc = "Ungodly salty, bane of slugs, treasure of horses."
+	icon_state = "saltcane"
+	foodtypes = VEGETABLES | GROSS
+
+/obj/item/food/grown/sugarcane/saltcane/make_dryable()
+	AddElement(/datum/element/dryable, /obj/item/food/seaweedsheet/saltcane) //soooshi

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

@@ -1,4 +1,3 @@
-#define MILK_TO_BUTTER_COEFF 15
 
 /obj/machinery/reagentgrinder
 	name = "\improper All-In-One Grinder"