shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #37513 from ShizCalev/pineapple-memes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/food.dm
+1
View File
@@ -10,3 +10,4 @@
#define SUGAR (1<<9)
#define GROSS (1<<10)
#define TOXIC (1<<11)
#define PINEAPPLE (1<<12)
code/datums/traits/neutral.dm
+34
View File
@@ -12,6 +12,40 @@
/datum/trait/pineapple_liker
name = "Ananas Affinity"
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 = "<span class='notice'>You feel an intense craving for pineapple.</span>"
lose_text = "<span class='notice'>Your feelings towards pineapples seem to return to a lukewarm state.</span>"
/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 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 = "<span class='notice'>You find yourself pondering what kind of idiot actually enjoys pineapples...</span>"
lose_text = "<span class='notice'>Your feelings towards pineapples seem to return to a lukewarm state.</span>"
/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."
code/modules/food_and_drinks/food/snacks_other.dm
+1 -1
View File
@@ -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"
code/modules/food_and_drinks/food/snacks_pizza.dm
+2 -2
View File
@@ -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"
code/modules/hydroponics/grown/pineapple.dm
+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)