Food and seed update: the tobacco fixing (#5020)

-adds tobacco, peppercorn, onion and garlic seeds
-adds new cooking recipes, sprites from baystation and polaris
This commit is contained in:
Alberyk
2018-08-01 20:10:25 -03:00
committed by Werner
parent 047c3a4c83
commit eb63c1d178
14 changed files with 443 additions and 132 deletions

View File

@@ -1129,7 +1129,7 @@
name = "shand"
seed_name = "S'Rendarr's hand"
display_name = "S'Rendarr's hand leaves"
chems = list("tobaccorich" = list(1,10), "nicotine" = list(3,5))
chems = list("tobacco" = list(1,5), "bicaridine" = list(3,5), "nicotine" = list(1,3))
kitchen_tag = "shand"
/datum/seed/shand/setup_traits()
@@ -1329,4 +1329,92 @@
set_trait(TRAIT_PLANT_COLOUR,"#4D8F53")
set_trait(TRAIT_PLANT_ICON,"bush4")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/tobacco
name = "tobacco"
seed_name = "tobacco"
display_name = "tobacco leaves"
mutants = list("finetobacco")
chems = list("tobacco" = list(1,10), "nicotine" = list(1,3))
/datum/seed/tobacco/setup_traits()
..()
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,5)
set_trait(TRAIT_PRODUCT_ICON,"tobacco")
set_trait(TRAIT_PRODUCT_COLOUR,"#749733")
set_trait(TRAIT_PLANT_COLOUR,"#749733")
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_IDEAL_HEAT, 299)
set_trait(TRAIT_IDEAL_LIGHT, 7)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
/datum/seed/tobacco/finetobacco
name = "finetobacco"
seed_name = "fine tobacco"
display_name = "fine tobacco leaves"
chems = list("tobaccorich" = list(1,10), "nicotine" = list(3,5))
/datum/seed/tobacco/finetobacco/setup_traits()
..()
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_PRODUCT_COLOUR,"#33571b")
set_trait(TRAIT_PLANT_COLOUR,"#33571b")
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.20)
/datum/seed/peppercorn
name = "peppercorn"
seed_name = "peppercorn"
display_name = "black pepper"
chems = list("blackpepper" = list(10,10))
/datum/seed/peppercorn/setup_traits()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
set_trait(TRAIT_MATURATION,4)
set_trait(TRAIT_PRODUCTION,4)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_PRODUCT_ICON,"nuts")
set_trait(TRAIT_PRODUCT_COLOUR,"#4d4d4d")
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
/datum/seed/garlic
name = "garlic"
seed_name = "garlic"
display_name = "garlic"
chems = list("garlicjuice" = list(1,5))
kitchen_tag = "garlic"
/datum/seed/garlic/setup_traits()
..()
set_trait(TRAIT_MATURATION,10)
set_trait(TRAIT_PRODUCTION,1)
set_trait(TRAIT_YIELD,5)
set_trait(TRAIT_POTENCY,12)
set_trait(TRAIT_PRODUCT_ICON,"bulb")
set_trait(TRAIT_PRODUCT_COLOUR,"#fff8dd")
set_trait(TRAIT_PLANT_ICON,"stalk")
set_trait(TRAIT_WATER_CONSUMPTION, 7)
/datum/seed/onion
name = "onion"
seed_name = "onion"
display_name = "onions"
chems = list("onionjuice" = list(1,5))
kitchen_tag = "onion"
/datum/seed/onion/setup_traits()
..()
set_trait(TRAIT_MATURATION,10)
set_trait(TRAIT_PRODUCTION,1)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON,"bulb")
set_trait(TRAIT_PRODUCT_COLOUR,"#ffeedd")
set_trait(TRAIT_PLANT_ICON,"stalk")
set_trait(TRAIT_WATER_CONSUMPTION, 5)

View File

@@ -258,9 +258,6 @@ var/global/list/plant_seed_sprites = list()
/obj/item/seeds/cherryseed
seed_type = "cherry"
/obj/item/seeds/tobaccoseed
seed_type = "tobacco"
/obj/item/seeds/kudzuseed
seed_type = "kudzu"
@@ -295,4 +292,19 @@ var/global/list/plant_seed_sprites = list()
seed_type = "earthenroot"
/obj/item/seeds/nifberries
seed_type = "nifberries"
seed_type = "nifberries"
/obj/item/seeds/tobaccoseed
seed_type = "tobacco"
/obj/item/seeds/finetobacco
seed_type = "finetobacco"
/obj/item/seeds/peppercornseed
seed_type = "peppercorn"
/obj/item/seeds/garlicseed
seed_type = "garlic"
/obj/item/seeds/onionseed
seed_type = "onion"

View File

@@ -97,17 +97,23 @@
/obj/item/seeds/cocoapodseed = 3,
/obj/item/seeds/cornseed = 3,
/obj/item/seeds/replicapod = 3,
/obj/item/seeds/earthenroot = 2,
/obj/item/seeds/eggplantseed = 3,
/obj/item/seeds/garlicseed = 3,
/obj/item/seeds/glowshroom = 2,
/obj/item/seeds/grapeseed = 3,
/obj/item/seeds/grassseed = 3,
/obj/item/seeds/koisspore = 3,
/obj/item/seeds/lemonseed = 3,
/obj/item/seeds/libertymycelium = 2,
/obj/item/seeds/limeseed = 3,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/nifberries = 2,
/obj/item/seeds/onionseed = 3,
/obj/item/seeds/orangeseed = 3,
/obj/item/seeds/peanutseed = 3,
/obj/item/seeds/peppercornseed = 3,
/obj/item/seeds/plastiseed = 3,
/obj/item/seeds/plumpmycelium = 3,
/obj/item/seeds/poppyseed = 3,
@@ -124,10 +130,7 @@
/obj/item/seeds/towermycelium = 3,
/obj/item/seeds/watermelonseed = 3,
/obj/item/seeds/wheatseed = 3,
/obj/item/seeds/whitebeetseed = 3,
/obj/item/seeds/koisspore = 3,
/obj/item/seeds/earthenroot = 2,
/obj/item/seeds/nifberries = 2
/obj/item/seeds/whitebeetseed = 3
)
/obj/machinery/seed_storage/attack_hand(mob/user as mob)