Merge pull request #37513 from ShizCalev/pineapple-memes

Adds traits for a character's preference towards pineapples.
This commit is contained in:
Jordan Brown
2018-04-30 14:02:59 -04:00
committed by CitadelStationBot
parent 7205a15ef7
commit 12eb6a8a97
5 changed files with 39 additions and 4 deletions
@@ -559,7 +559,7 @@
icon_state = "pineapple_slice"
filling_color = "#F6CB0B"
tastes = list("pineapple" = 1)
foodtype = FRUIT
foodtype = FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/tinychocolate
name = "chocolate"
@@ -146,7 +146,7 @@
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, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
name = "\improper Hawaiian pizza slice"
@@ -154,7 +154,7 @@
icon_state = "pineapplepizzaslice"
filling_color = "#FF4500"
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT
foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/snacks/pizzaslice/custom
name = "pizza slice"
+1 -1
View File
@@ -29,5 +29,5 @@
slices_num = 3
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
foodtype = FRUIT
foodtype = FRUIT | PINEAPPLE
tastes = list("pineapple" = 1)