From 5ccdcc94cb8046d55b0bb0141ff3a98e1d1d3dd2 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Wed, 21 Feb 2024 14:57:09 +0100 Subject: [PATCH] Changes the Chocolate Hazelnut Spread Paths to Lowercase (#18452) * Changes the Chocolate Hazelnut Spread Paths to Lowercase * Changelog Entry Type --- code/modules/cooking/recipes/recipes_breads.dm | 4 ++-- code/modules/cooking/recipes/recipes_pastries.dm | 4 ++-- code/modules/item_worth/reagents.dm | 4 ++-- .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm | 4 ++-- code/modules/reagents/Chemistry-Recipes.dm | 8 ++++---- .../reagents/reagent_containers/food/snacks/breads.dm | 2 +- .../reagents/reagent_containers/food/snacks/pastries.dm | 6 +++--- .../SleepyGemmy-chocolate_hazelnut_spread_path.yml | 6 ++++++ maps/away/away_site/goon_base/goon_base.dmm | 2 +- 9 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 html/changelogs/SleepyGemmy-chocolate_hazelnut_spread_path.yml diff --git a/code/modules/cooking/recipes/recipes_breads.dm b/code/modules/cooking/recipes/recipes_breads.dm index 07bf88fb1dd..034f5c55646 100644 --- a/code/modules/cooking/recipes/recipes_breads.dm +++ b/code/modules/cooking/recipes/recipes_breads.dm @@ -234,13 +234,13 @@ ) result = /obj/item/reagent_containers/food/snacks/pbtoast -/singleton/recipe/NTellabread +/singleton/recipe/ntella_bread appliance = MIX reagents = list(/singleton/reagent/nutriment/choconutspread = 5) items = list( /obj/item/reagent_containers/food/snacks/breadslice ) - result = /obj/item/reagent_containers/food/snacks/NTellabread + result = /obj/item/reagent_containers/food/snacks/ntella_bread /singleton/recipe/slimetoast appliance = SKILLET diff --git a/code/modules/cooking/recipes/recipes_pastries.dm b/code/modules/cooking/recipes/recipes_pastries.dm index 0e613ba0a7a..5ed98b3a524 100644 --- a/code/modules/cooking/recipes/recipes_pastries.dm +++ b/code/modules/cooking/recipes/recipes_pastries.dm @@ -202,7 +202,7 @@ fruit = list("apple" = 2) result = /obj/item/reagent_containers/food/snacks/sliceable/cake/apple -/singleton/recipe/cake/NTellacheesecake +/singleton/recipe/cake/ntella_cheesecake reagents = list(/singleton/reagent/drink/milk = 5, /singleton/reagent/nutriment/choconutspread = 15, /singleton/reagent/sugar = 10) items = list( /obj/item/reagent_containers/food/snacks/cheesewedge, @@ -213,7 +213,7 @@ /obj/item/reagent_containers/food/snacks/cookiesnack, /obj/item/reagent_containers/food/snacks/cookiesnack //Oreo cookies aren't a thing in the game yet but if/when they're made, please replace this with them! ) - result = /obj/item/reagent_containers/food/snacks/sliceable/cake/NTellacheesecake + result = /obj/item/reagent_containers/food/snacks/sliceable/cake/ntella_cheesecake /singleton/recipe/cake/starcake fruit = list("orange" = 1) diff --git a/code/modules/item_worth/reagents.dm b/code/modules/item_worth/reagents.dm index fec650bc5e3..b8580501ef4 100644 --- a/code/modules/item_worth/reagents.dm +++ b/code/modules/item_worth/reagents.dm @@ -135,7 +135,7 @@ /singleton/reagent/drink/milkshake value = 0.12 -/singleton/reagent/drink/NTellamilkshake +/singleton/reagent/drink/ntella_milkshake value = 0.14 /singleton/reagent/drink/shake_caramel @@ -168,7 +168,7 @@ /singleton/reagent/drink/shake_choco_mint value = 0.13 -/singleton/reagent/drink/NTellahotchocolate +/singleton/reagent/drink/ntella_hot_chocolate value = 0.13 /singleton/reagent/drink/rewriter diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index a46e88da533..075ca58c1a3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -2465,7 +2465,7 @@ glass_name = "mug of apple cider juice" glass_desc = "It's just spiced up apple juice. Sometimes the barista can't work miracles." -/singleton/reagent/drink/NTellamilkshake +/singleton/reagent/drink/ntella_milkshake name = "NTella Milkshake" description = "An intensely sweet chocolatey concoction with whipped cream on top." color = "#6d4124" @@ -2586,7 +2586,7 @@ glass_desc = "For everyone who liked to eat their toothpaste as a kid and never grew out of it." glass_center_of_mass = list("x"=16, "y"=7) -/singleton/reagent/drink/NTellahotchocolate +/singleton/reagent/drink/ntella_hot_chocolate name = "NTella Hot Chocolate" description = "It's like a cup of hot chocolate except... More everything." color = "#63432e" diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 9a45a6ec12d..fe70060af87 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -3041,10 +3041,10 @@ catalysts = list(/singleton/reagent/enzyme = 5) result_amount = 1 -/datum/chemical_reaction/drink/NTellashake +/datum/chemical_reaction/drink/ntella_shake name = "NTella milkshake" id = "NTellamilkshake" - result = /singleton/reagent/drink/NTellamilkshake + result = /singleton/reagent/drink/ntella_milkshake required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/nutriment/choconutspread = 1) result_amount = 6 @@ -3118,10 +3118,10 @@ required_reagents = list(/singleton/reagent/drink/milkshake = 5, /singleton/reagent/drink/mintsyrup = 1) result_amount = 6 -/datum/chemical_reaction/drink/NTellahotchocolate +/datum/chemical_reaction/drink/ntella_hot_chocolate name = "NTella hot chocolate" id = "NTellahotchocolate" - result = /singleton/reagent/drink/NTellahotchocolate + result = /singleton/reagent/drink/ntella_hot_chocolate required_reagents = list(/singleton/reagent/drink/milk = 1, /singleton/reagent/nutriment/choconutspread = 1, /singleton/reagent/drink/milk/cream = 1) result_amount = 3 diff --git a/code/modules/reagents/reagent_containers/food/snacks/breads.dm b/code/modules/reagents/reagent_containers/food/snacks/breads.dm index 265a1337c5e..191750a79b0 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/breads.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/breads.dm @@ -395,7 +395,7 @@ reagent_data = list(/singleton/reagent/nutriment = list("toasted bread" = 2)) bitesize = 2 -/obj/item/reagent_containers/food/snacks/NTellabread +/obj/item/reagent_containers/food/snacks/ntella_bread name = "NTella bread slice" desc = "A slice of bread covered with delicious chocolate-hazelnut spread." icon = 'icons/obj/item/reagent_containers/food/bread.dmi' diff --git a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm index 4cab138ac2e..810957b0825 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/pastries.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/pastries.dm @@ -456,19 +456,19 @@ reagents_to_add = list(/singleton/reagent/nutriment = 3) reagent_data = list(/singleton/reagent/nutriment = list("cake" = 5, "sweetness" = 5, "apple" = 5)) -/obj/item/reagent_containers/food/snacks/sliceable/cake/NTellacheesecake +/obj/item/reagent_containers/food/snacks/sliceable/cake/ntella_cheesecake name = "NTella cheesecake" desc = "An elaborate layer cheesecake made with chocolate hazelnut spread. You gain calories just by looking at it for too long." icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' icon_state = "NTellacheesecake" - slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/NTellacheesecake_slice + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/ntella_cheesecake_slice slices_num = 5 filling_color = "#331c03" center_of_mass = list("x"=16, "y"=10) reagents_to_add = list(/singleton/reagent/nutriment = 20) reagent_data = list(/singleton/reagent/nutriment = list("hazelnut chocolate" = 15, "creamy cheese" = 10, "crunchy cookie base" = 5)) -/obj/item/reagent_containers/food/snacks/cakeslice/NTellacheesecake_slice +/obj/item/reagent_containers/food/snacks/cakeslice/ntella_cheesecake_slice name = "NTella cheesecake slice" desc = "A slice of cake marrying the chocolate taste of NTella with the creamy smoothness of cheesecake, all on a cookie crumble base." icon = 'icons/obj/item/reagent_containers/food/pastries.dmi' diff --git a/html/changelogs/SleepyGemmy-chocolate_hazelnut_spread_path.yml b/html/changelogs/SleepyGemmy-chocolate_hazelnut_spread_path.yml new file mode 100644 index 00000000000..5d8a8dbc09c --- /dev/null +++ b/html/changelogs/SleepyGemmy-chocolate_hazelnut_spread_path.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Changed the chocolate hazelnut spread paths to be lowercase." diff --git a/maps/away/away_site/goon_base/goon_base.dmm b/maps/away/away_site/goon_base/goon_base.dmm index 9d29fab242c..1f26a9bae56 100644 --- a/maps/away/away_site/goon_base/goon_base.dmm +++ b/maps/away/away_site/goon_base/goon_base.dmm @@ -2665,7 +2665,7 @@ /obj/item/reagent_containers/food/snacks/reubensandwich{ pixel_y = 10 }, -/obj/item/reagent_containers/food/snacks/NTellabread{ +/obj/item/reagent_containers/food/snacks/ntella_bread{ pixel_y = 11 }, /turf/simulated/floor/tiled/white,