From e6ef83f0590b45b757385eec87821015c13cb003 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 28 Apr 2018 02:55:59 -0400 Subject: [PATCH 1/2] Adds pineapple traits --- code/__DEFINES/food.dm | 1 + code/datums/traits/neutral.dm | 34 +++++++++++++++++++ .../food_and_drinks/food/snacks_other.dm | 2 +- .../food_and_drinks/food/snacks_pizza.dm | 4 +-- code/modules/hydroponics/grown/pineapple.dm | 2 +- 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 44df6695a2e..a68d29c14ca 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -10,3 +10,4 @@ #define SUGAR (1<<9) #define GROSS (1<<10) #define TOXIC (1<<11) +#define PINEAPPLE (1<<12) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 5b0fbefe107..17466f7e57a 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -12,6 +12,40 @@ +/datum/trait/pineapple_liker + name = "Ananas Affinity" + desc = "You find yourself greatly enjoying fruits of the ananas genius. You can't seem to ever get enough of their sweet goodness!" + value = 0 + gain_text = "You feel an intense craving for pineapple." + lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." + +/datum/trait/pineapple_liker/add() + var/mob/living/carbon/human/H = trait_holder + var/datum/species/species = H.dna.species + species.liked_food |= PINEAPPLE + +/datum/trait/pineapple_liker/remove() + var/mob/living/carbon/human/H = trait_holder + var/datum/species/species = H.dna.species + species.liked_food &= ~PINEAPPLE + +/datum/trait/pineapple_hater + name = "Ananas Aversion" + desc = "You find yourself greatly detesting fruits of the ananas genius. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?" + value = 0 + gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..." + lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." + +/datum/trait/pineapple_hater/add() + var/mob/living/carbon/human/H = trait_holder + var/datum/species/species = H.dna.species + species.disliked_food |= PINEAPPLE + +/datum/trait/pineapple_hater/remove() + var/mob/living/carbon/human/H = trait_holder + var/datum/species/species = H.dna.species + species.disliked_food &= ~PINEAPPLE + /datum/trait/deviant_tastes name = "Deviant Tastes" desc = "You dislike food that most people enjoy, and find delicious what they don't." diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 4645993758b..ecb3cfb2ba5 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -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" diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index 2f49c003712..a94c1a25c77 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -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" diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index 443190942ad..7b58c7553d8 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -29,5 +29,5 @@ slices_num = 3 filling_color = "#F6CB0B" w_class = WEIGHT_CLASS_NORMAL - foodtype = FRUIT + foodtype = FRUIT | PINEAPPLE tastes = list("pineapple" = 1) From 0cca54616755cc4dc8236dd5f08e7b2d401b5362 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Sat, 28 Apr 2018 15:46:26 -0400 Subject: [PATCH 2/2] typo --- code/datums/traits/neutral.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 17466f7e57a..61c7addd6cf 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -14,7 +14,7 @@ /datum/trait/pineapple_liker name = "Ananas Affinity" - desc = "You find yourself greatly enjoying fruits of the ananas genius. You can't seem to ever get enough of their sweet goodness!" + desc = "You find yourself greatly enjoying fruits of the ananas genus. You can't seem to ever get enough of their sweet goodness!" value = 0 gain_text = "You feel an intense craving for pineapple." lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." @@ -31,7 +31,7 @@ /datum/trait/pineapple_hater name = "Ananas Aversion" - desc = "You find yourself greatly detesting fruits of the ananas genius. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?" + desc = "You find yourself greatly detesting fruits of the ananas genus. Serious, how the hell can anyone say these things are good? And what kind of madman would even dare putting it on a pizza!?" value = 0 gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..." lose_text = "Your feelings towards pineapples seem to return to a lukewarm state."