From 08f9dc0e8a9733a15d7950a272092dd796997210 Mon Sep 17 00:00:00 2001 From: oranges Date: Sat, 28 Apr 2018 00:28:37 +1200 Subject: [PATCH 1/2] Merge pull request #37480 from ShizCalev/pineapple-meme Fixes pineapple pizza not actually tasting like pineapple --- code/modules/food_and_drinks/food/snacks_pizza.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index a5269742f9..2f49c00371 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -145,7 +145,7 @@ icon_state = "pineapplepizza" slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple bonus_reagents = list("nutriment" = 6, "vitamin" = 6) - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapples" = 2, "ham" = 2) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple @@ -153,7 +153,7 @@ desc = "A slice of delicious controversy." icon_state = "pineapplepizzaslice" filling_color = "#FF4500" - tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapples" = 2, "ham" = 2) + tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2) foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT /obj/item/reagent_containers/food/snacks/pizzaslice/custom