Merge branch 'master' into development

This commit is contained in:
skull132
2017-05-16 14:46:36 +03:00
22 changed files with 132 additions and 14 deletions
+20
View File
@@ -238,6 +238,26 @@
set_trait(TRAIT_PLANT_ICON,"bush4")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 7)
//Placeholder mutation for the eggplant. Not as fun as the other mutations but better than nothing.
/datum/seed/realeggplant
name = "huge eggplant"
seed_name = "realeggplant"
display_name = "eggplants"
chems = list("nutriment" = list(15,30))
kitchen_tag = "realeggplant"
/datum/seed/realeggplant/New()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
set_trait(TRAIT_MATURATION,4)
set_trait(TRAIT_PRODUCTION,5)
set_trait(TRAIT_YIELD,1)
set_trait(TRAIT_POTENCY,40)
set_trait(TRAIT_PRODUCT_ICON,"eggplant")
set_trait(TRAIT_PRODUCT_COLOUR,"#892694")
set_trait(TRAIT_PLANT_ICON,"bush4")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 7)
//Apples/varieties.
/datum/seed/apple