From a6783f5bbfb478d12aa0b297da2dd6eb5e2a283a Mon Sep 17 00:00:00 2001
From: tralezab <40974010+tralezab@users.noreply.github.com>
Date: Mon, 2 Aug 2021 22:57:15 -0700
Subject: [PATCH] Improves Pavlova Code Copypasta, Changes Description Of
 Pavlova (The Pavlova Incident of 2021) (#60595)

---
 code/game/objects/items/food/cake.dm          | 33 +++++--------------
 .../recipes/tablecraft/recipes_cake.dm        |  8 +++--
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm
index 26ebd3c5770..4c12a4065b5 100644
--- a/code/game/objects/items/food/cake.dm
+++ b/code/game/objects/items/food/cake.dm
@@ -468,38 +468,23 @@
 	tastes = list("cake" = 4, "butter" = 2, "cream" = 1)
 	foodtypes = GRAIN | DAIRY | SUGAR
 
-/obj/item/food/cake/pavlovacream
+/obj/item/food/cake/pavlova
 	name = "pavlova"
-	desc = "A sweet berry pavlova. Invented in New Zealand, has become popular with Vox for some reason."
+	desc = "A sweet berry pavlova. Invented in New Zealand, but named after a Russian ballerina... And scientifically proven to be the best at dinner parties!"
 	icon_state = "pavlova"
 	food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
 	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
 	foodtypes = DAIRY | FRUIT | SUGAR
 
-/obj/item/food/cake/pavlovacream/MakeProcessable()
-	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlovacream, 5, 30)
+/obj/item/food/cake/pavlova/MakeProcessable()
+	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlova, 5, 30)
 
-/obj/item/food/cakeslice/pavlovacream
-	name = "Pavlova slice"
-	desc = "A cracked slice of pavlova stacked with berries"
-	icon_state = "pavlova_slice"
-	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
-	foodtypes = DAIRY | FRUIT | SUGAR
-
-/obj/item/food/cake/pavlovakorta
-	name = "pavlova"
-	desc = "A sweet berry pavlova. Invented in New Zealand, has become popular with Vox for some reason."
-	icon_state = "pavlova"
-	food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/vitamin = 5)
-	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
-	foodtypes = NUTS | FRUIT | SUGAR
-
-/obj/item/food/cake/pavlovakorta/MakeProcessable()
-	AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlovakorta, 5, 30)
-
-/obj/item/food/cakeslice/pavlovakorta
+/obj/item/food/cakeslice/pavlova
 	name = "pavlova slice"
-	desc = "A cracked slice of pavlova stacked with berries"
+	desc = "A cracked slice of pavlova stacked with berries. You even got it sliced in such a way that more berries ended up on your slice, how delightfully devilish."
 	icon_state = "pavlova_slice"
 	tastes = list("meringue" = 5, "creaminess" = 1, "berries" = 1)
+	foodtypes = DAIRY | FRUIT | SUGAR
+
+/obj/item/food/cakeslice/pavlova/nuts
 	foodtypes = NUTS | FRUIT | SUGAR
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index 0d0bcbd77cc..23600acdda4 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -159,7 +159,7 @@
 		/datum/reagent/consumable/whipped_cream = 10,
 		/obj/item/food/grown/berries = 5
 	)
-	result = /obj/item/food/cake/pavlovacream
+	result = /obj/item/food/cake/pavlova
 	subcategory = CAT_CAKE
 
 /datum/crafting_recipe/food/pavlovakorta
@@ -170,9 +170,13 @@
 		/datum/reagent/consumable/korta_milk = 10,
 		/obj/item/food/grown/berries = 5
 	)
-	result = /obj/item/food/cake/pavlovakorta
+	result = /obj/item/food/cake/pavlova
 	subcategory = CAT_CAKE
 
+/datum/crafting_recipe/food/pavlovakorta/on_craft_completion(mob/user, obj/item/food/cake/pavlova/result)
+	result.foodtypes = NUTS | FRUIT | SUGAR
+	result.AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlova/nuts, 5, 30)
+
 /datum/crafting_recipe/food/bscvcake
 	name = "blackberry and strawberry vanilla cake"
 	reqs = list(