Миррор 34991 (#3252)

Co-authored-by: Builder13 <[email protected]>
SierraBay · Feb 15, 2025 · 7166f69 · 7166f69
1 parent a92bb96
commit 7166f69
Show file tree

Hide file tree

Showing 18 changed files with 565 additions and 51 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -3010,6 +3010,7 @@
 #include "code\modules\reagents\reagent_containers\food\snacks\donkpocket.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\fortunecookie.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\meat.dm"
+#include "code\modules\reagents\reagent_containers\food\snacks\platter.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\shellfish.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle\robot.dm"
@@ -3436,6 +3437,7 @@
 #include "mods\_master_files\code\modules\power\gravitygenerator.dm"
 #include "mods\_master_files\code\modules\projectiles\projectile\bullets.dm"
 #include "mods\_master_files\code\modules\psionics\events\mini_spasm.dm"
+#include "mods\_master_files\code\modules\reagents\reagent_containers\food\snacks.dm"
 #include "mods\_master_files\code\modules\species\species.dm"
 #include "mods\_master_files\code\modules\species\station\adherent.dm"
 #include "mods\_master_files\code\modules\species\station\human_subspecies.dm"

diff --git a/code/game/machinery/kitchen/cookers.dm b/code/game/machinery/kitchen/cookers.dm
@@ -685,6 +685,7 @@
 	icon_state = "stew"
 	nutriment_amt = 4
 	nutriment_desc = list("stew" = 3)
+	trash = /obj/item/trash/pot
 
 
 /obj/item/material/chopping_board

diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
@@ -70,6 +70,8 @@
 	name = "snack bowl"
 	icon_state	= "snack_bowl"
 
+/obj/item/trash/snack_bowl/blue
+	icon_state	= "snack_bowl_blue"
 
 /obj/item/trash/pistachios
 	name = "pistachios pack"
@@ -225,3 +227,11 @@
 /obj/item/trash/usedplatter
 	name = "dirty platter"
 	icon_state = "usedplatter"
+
+/obj/item/trash/ramiken
+	name = "dirty ramiken"
+	icon_state = "ramiken"
+
+/obj/item/trash/pot
+	name = "empty pot"
+	icon_state = "pot_empty"
diff --git a/code/game/objects/structures/crates_lockers/closets/fridge.dm b/code/game/objects/structures/crates_lockers/closets/fridge.dm
@@ -4,6 +4,7 @@
 /obj/structure/closet/kitchen/WillContain()
 	return list(
 		/obj/item/reagent_containers/food/condiment/salt = 1,
+		/obj/item/reagent_containers/food/condiment/spacespice = 1,
 		/obj/item/reagent_containers/food/condiment/flour = 7,
 		/obj/item/reagent_containers/food/condiment/sugar = 2,
 		/obj/item/reagent_containers/glass/bottle/dye/polychromic = 2

diff --git a/code/modules/fabrication/designs/replicator/designs_food.dm b/code/modules/fabrication/designs/replicator/designs_food.dm
@@ -1,6 +1,6 @@
 /datum/fabricator_recipe/food
 	fabricator_types = list(FABRICATOR_CLASS_FOOD)
-	path = /obj/item/reagent_containers/food/snacks/tofurkey
+	path = /obj/item/reagent_containers/food/snacks/sliceable/tofurkey
 
 /datum/fabricator_recipe/food/soylentviridians
 	path = /obj/item/reagent_containers/food/snacks/soylenviridians

diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
@@ -788,8 +788,7 @@
 /datum/microwave_recipe/bread
 	required_items = list(
 		/obj/item/reagent_containers/food/snacks/dough,
-		/obj/item/reagent_containers/food/snacks/dough,
-		/obj/item/reagent_containers/food/snacks/egg
+		/obj/item/reagent_containers/food/snacks/dough
 	)
 	result_path = /obj/item/reagent_containers/food/snacks/sliceable/bread
 
@@ -1367,15 +1366,6 @@
 	result_path = /obj/item/reagent_containers/food/snacks/stuffing
 
 
-/datum/microwave_recipe/tofurkey
-	required_items = list(
-		/obj/item/reagent_containers/food/snacks/tofu,
-		/obj/item/reagent_containers/food/snacks/tofu,
-		/obj/item/reagent_containers/food/snacks/stuffing
-	)
-	result_path = /obj/item/reagent_containers/food/snacks/tofurkey
-
-
 /datum/microwave_recipe/taco
 	required_items = list(
 		/obj/item/reagent_containers/food/snacks/doughslice,
@@ -1466,7 +1456,11 @@
 
 
 /datum/microwave_recipe/cake/ntella_cheesecake
-	required_reagents = list(/datum/reagent/drink/milk = 5, /datum/reagent/nutriment/choconutspread = 15, /datum/reagent/sugar = 10)
+	required_reagents = list(
+		/datum/reagent/drink/milk = 5,
+		/datum/reagent/nutriment/choconutspread = 15,
+		/datum/reagent/sugar = 10
+	)
 	required_items = list(
 		/obj/item/reagent_containers/food/snacks/cheesewedge,
 		/obj/item/reagent_containers/food/snacks/cookie,
@@ -1763,6 +1757,7 @@
 	)
 	result_path = /obj/item/reagent_containers/food/snacks/seafood_paella
 
+
 /datum/microwave_recipe/unscotti
 	required_reagents = list(
 		/datum/reagent/sugar = 10,
@@ -1776,8 +1771,187 @@
 	)
 	result_path = /obj/item/reagent_containers/food/snacks/sliceable/unscottiloaf
 
+
 /datum/microwave_recipe/biscotti
 	required_items = list(
 		/obj/item/reagent_containers/food/snacks/slice/unscotti
 	)
 	result_path = /obj/item/reagent_containers/food/snacks/biscotti
+
+
+/datum/microwave_recipe/mashedpotato
+	required_reagents = list(
+		/datum/reagent/drink/milk = 5,
+		/datum/reagent/sodiumchloride = 1,
+		/datum/reagent/blackpepper = 1
+	)
+	required_produce = list(
+		"potato" = 1
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/mashedpotato
+
+
+/datum/microwave_recipe/roast_chicken
+	required_reagents = list(
+		/datum/reagent/sodiumchloride = 1,
+		/datum/reagent/blackpepper = 1
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/meat/chicken,
+		/obj/item/reagent_containers/food/snacks/meat/chicken,
+		/obj/item/reagent_containers/food/snacks/meat/chicken,
+		/obj/item/reagent_containers/food/snacks/meat/chicken,
+		/obj/item/reagent_containers/food/snacks/stuffing
+	)
+	required_produce = list(
+		"potato" = 2
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/sliceable/roast_chicken
+
+
+/datum/microwave_recipe/tofurkey
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/tofu,
+		/obj/item/reagent_containers/food/snacks/tofu,
+		/obj/item/reagent_containers/food/snacks/tofu,
+		/obj/item/reagent_containers/food/snacks/tofu,
+		/obj/item/reagent_containers/food/snacks/stuffing
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/sliceable/tofurkey
+
+
+/datum/microwave_recipe/figgypudding
+	required_reagents = list(
+		/datum/reagent/nutriment/batter/cakebatter = 20,
+		/datum/reagent/ethanol/lunabrandy = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/no_raisin
+	)
+	required_produce = list(
+		"apple" = 1
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/figgypudding
+
+
+/datum/microwave_recipe/chocolateroulade
+	required_reagents = list(
+		/datum/reagent/sugar = 10
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/chocolatebar,
+		/obj/item/reagent_containers/food/snacks/chocolatebar,
+		/obj/item/reagent_containers/food/snacks/sliceable/flatdough
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/sliceable/chocolateroulade
+
+
+/datum/microwave_recipe/gumbo
+	required_reagents = list(
+		/datum/reagent/water = 10,
+		/datum/reagent/nutriment/rice = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/sausage,
+		/obj/item/reagent_containers/food/snacks/shellfish/shrimp,
+		/obj/item/reagent_containers/food/snacks/shellfish/shrimp
+	)
+	required_produce = list(
+		"chili" = 1,
+		"onion" = 1
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/gumbo
+
+
+/datum/microwave_recipe/macandcheese
+	required_reagents = list(
+		/datum/reagent/water = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/spagetti
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/macandcheese
+
+
+/datum/microwave_recipe/macandcheese_bacon
+	required_reagents = list(
+		/datum/reagent/water = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/spagetti,
+		/obj/item/reagent_containers/food/snacks/bacon
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/macandcheese/bacon
+
+
+/datum/microwave_recipe/puffpuff
+	required_reagents = list(
+		/datum/reagent/nutriment/flour = 10,
+		/datum/reagent/water = 5,
+		/datum/reagent/spacespice = 2,
+		/datum/reagent/sodiumchloride = 1
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/platter/puffpuffs
+
+
+/datum/microwave_recipe/latkes
+	required_reagents = list(
+		/datum/reagent/nutriment/flour = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/rawsticks,
+		/obj/item/reagent_containers/food/snacks/rawsticks,
+		/obj/item/reagent_containers/food/snacks/rawsticks,
+		/obj/item/reagent_containers/food/snacks/egg
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/platter/latkes
+
+
+/datum/microwave_recipe/rugelach
+	required_reagents = list(
+		/datum/reagent/cinnamon = 3,
+		/datum/reagent/sugar = 2,
+		/datum/reagent/drink/milk/cream = 2
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/doughslice
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/rugelach
+
+/datum/microwave_recipe/rugelach_berry
+	required_reagents = list(
+		/datum/reagent/drink/juice/berry = 3,
+		/datum/reagent/sugar = 2,
+		/datum/reagent/drink/milk/cream = 2
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/doughslice
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/rugelach_berry
+
+
+/datum/microwave_recipe/frouka
+	required_reagents = list(
+		/datum/reagent/spacespice = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/boiledegg,
+		/obj/item/reagent_containers/food/snacks/boiledegg
+	)
+	required_produce = list(
+		"potato" = 2
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/frouka
+
+
+/datum/microwave_recipe/custard
+	required_reagents = list(
+		/datum/reagent/drink/milk = 5,
+		/datum/reagent/nutriment/protein/egg = 3,
+		/datum/reagent/sugar = 5
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/custard
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
@@ -777,7 +777,7 @@
 	name = "potato"
 	seed_name = "potato"
 	display_name = "potato plant"
-	chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/juice/potato = list(10,10))
+	chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/juice/potato = list(3,6))
 	kitchen_tag = "potato"
 
 /datum/seed/potato/New()
@@ -796,7 +796,7 @@
 	name = "garlic"
 	seed_name = "garlic"
 	display_name = "garlic plant"
-	chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/juice/garlic = list(10,10))
+	chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/juice/garlic = list(3,6))
 	kitchen_tag = "garlic"
 
 /datum/seed/garlic/New()
@@ -814,7 +814,7 @@
 	name = "onion"
 	seed_name = "onion"
 	display_name = "onion plant"
-	chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/juice/onion = list(10,10))
+	chems = list(/datum/reagent/nutriment = list(1,10), /datum/reagent/drink/juice/onion = list(3,6))
 	kitchen_tag = "onion"
 
 /datum/seed/onion/New()

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Drinks.dm
@@ -139,7 +139,7 @@
 /datum/reagent/drink/juice/potato
 	name = "Potato Juice"
 	description = "Juice of the potato. Bleh."
-	taste_description = "irish sadness and potatoes"
+	taste_description = "potato"
 	nutrition = 2
 	color = "#302000"
 
@@ -149,7 +149,7 @@
 /datum/reagent/drink/juice/garlic
 	name = "Garlic Juice"
 	description = "Who would even drink this?"
-	taste_description = "bad breath"
+	taste_description = "garlic"
 	nutrition = 1
 	color = "#eeddcc"
 
@@ -159,7 +159,7 @@
 /datum/reagent/drink/juice/onion
 	name = "Onion Juice"
 	description = "Juice from an onion, for when you need to cry."
-	taste_description = "stinging tears"
+	taste_description = "onion"
 	nutrition = 1
 	color = "#ffeedd"
 

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food.dm
@@ -642,4 +642,15 @@
 
 	condiment_name = "NTella jar"
 	condiment_desc = "Originally called 'Entella', it was rebranded after being bought by NanoTrasen. Some humans insist this nutty chocolate spread might be the best thing they've ever created."
-	condiment_icon_state = "NTellajar"
+	condiment_icon_state = "NTellajar"
+
+/datum/reagent/spacespice
+	name = "Space Spice"
+	description = "A melange of spices for cooking. It must flow."
+	taste_description = "spices"
+	reagent_state = SOLID
+	color = "#e08702"
+	taste_mult = 1.5
+
+	condiment_name = "bottle of space spice"
+	condiment_icon_state = "spacespicebottle"
diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -146,6 +146,9 @@
 /obj/item/reagent_containers/food/condiment/choconutspread
 	starting_reagents = list(/datum/reagent/nutriment/choconutspread = 50)
 
+/obj/item/reagent_containers/food/condiment/spacespice
+	starting_reagents = list(/datum/reagent/spacespice = 50)
+
 /obj/item/reagent_containers/food/condiment/small
 	possible_transfer_amounts = "1;20"
 	amount_per_transfer_from_this = 1