cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 16:44:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207 from FalseIncarnate/master

Browse Source 
Botany Plant Additions
This commit is contained in:
Fox-McCloud
2015-01-30 16:35:37 -05:00
parent b5e1126083 5575ca217c
commit 0d93278247
9 changed files with 282 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/seed_datums.dm
+190 -19
View File
@@ -466,7 +466,7 @@ proc/populate_seed_list()
display_name = "chili plants"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/chili)
chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
mutants = list("icechili")
mutants = list("icechili", "ghostchili")
packet_icon = "seed-chili"
plant_icon = "chili"
harvest_repeat = 1
@@ -490,6 +490,21 @@ proc/populate_seed_list()
maturation = 4
production = 4
/datum/seed/chili/ghost
name = "ghostchili"
seed_name = "ghost chili pepper"
display_name = "ghost chili pepper plants"
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli)
chems = list("capsaicin" = list(8,2), "condensedcapsaicin" = list(4,4), "nutriment" = list(1,25))
packet_icon = "seed-chilighost"
plant_icon = "chilighost"
growth_stages = 6
maturation = 10
production = 10
yield = 3
// Berry plants/variants.
/datum/seed/berry
name = "berries"
@@ -601,7 +616,7 @@ proc/populate_seed_list()
seed_name = "blood tomato"
display_name = "blood tomato plant"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/bloodtomato)
mutants = list("killer")
mutants = list("killertomato")
packet_icon = "seed-bloodtomato"
plant_icon = "bloodtomato"
chems = list("nutriment" = list(1,10), "blood" = list(1,5))
@@ -938,13 +953,13 @@ proc/populate_seed_list()
production = 6
yield = 6
growth_stages = 3
plant_icon = ""
/datum/seed/flower/sunflower
name = "sunflowers"
seed_name = "sunflower"
display_name = "sunflowers"
packet_icon = "seed-sunflower"
mutants = list("moonflower", "novaflower")
products = list(/obj/item/weapon/grown/sunflower)
plant_icon = "sunflower"
@@ -952,6 +967,33 @@ proc/populate_seed_list()
maturation = 6
growth_stages = 3
/datum/seed/flower/moonflower
name = "moonflowers"
seed_name = "moonflower"
display_name = "moonflowers"
packet_icon = "seed-moonflower"
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower)
plant_icon = "moonflower"
chems = list("nutriment" = list(1,50), "moonshine" = list(1,10))
lifespan = 25
maturation = 6
growth_stages = 3
/datum/seed/flower/novaflower
name = "novaflowers"
seed_name = "novaflower"
display_name = "novaflowers"
packet_icon = "seed-novaflower"
mutants = null
products = list(/obj/item/weapon/grown/novaflower)
plant_icon = "novaflower"
lifespan = 25
maturation = 6
growth_stages = 3
//Grapes/varieties
/datum/seed/grapes
name = "grapes"
@@ -980,6 +1022,151 @@ proc/populate_seed_list()
plant_icon = "greengrape"
chems = list("nutriment" = list(1,10), "kelotane" = list(3,5))
//Soybeans/varieties
/datum/seed/soybean
name = "soybean"
seed_name = "soybean"
display_name = "soybeans"
packet_icon = "seed-soybean"
mutants = list("koibean")
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans)
plant_icon = "soybean"
harvest_repeat = 1
chems = list("nutriment" = list(1,20))
lifespan = 25
maturation = 4
production = 4
yield = 3
potency = 5
/datum/seed/soybean/koi
name = "koibean"
seed_name = "koibean"
display_name = "koi beans"
packet_icon = "seed-koibean"
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/koibeans)
plant_icon = "soybean"
harvest_repeat = 1
chems = list("nutriment" = list(1,30), "carpotoxin" = list(1,20))
lifespan = 25
maturation = 4
production = 4
yield = 3
potency = 5
//Tobacco/varieties
/datum/seed/tobacco
name = "tobacco"
seed_name = "tobacco"
display_name = "tobacco"
packet_icon = "seed-tobacco"
mutants = list("stobacco")
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco)
plant_icon = "tobacco"
harvest_repeat = 1
chems = list("nutriment" = list(1,40), "nicotine" = list(1,40))
lifespan = 25
maturation = 5
production = 5
yield = 6
potency = 10
growth_stages = 3
/datum/seed/tobacco/space
name = "stobacco"
seed_name = "space tobacco"
display_name = "space tobacco"
packet_icon = "seed-stobacco"
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space)
plant_icon = "stobacco"
harvest_repeat = 1
chems = list("nutriment" = list(1,40), "nicotine" = list(1,20), "inaprovaline" = list(1,30))
lifespan = 25
maturation = 5
production = 5
yield = 4
potency = 5
growth_stages = 3
//Tea/varieties
/datum/seed/teaaspera
name = "teaaspera"
seed_name = "tea aspera"
display_name = "tea aspera"
packet_icon = "seed-teaaspera"
mutants = list("teaastra")
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/teaaspera)
plant_icon = "teaaspera"
harvest_repeat = 1
chems = list("teapowder" = list(1,20), "anti_toxin" = list(1,30))
lifespan = 30
maturation = 5
production = 5
yield = 6
potency = 10
growth_stages = 5
/datum/seed/teaastra
name = "teaastra"
seed_name = "tea astra"
display_name = "tea astra"
packet_icon = "seed-teaastra"
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/teaastra)
plant_icon = "teaastra"
harvest_repeat = 1
chems = list("teapowder" = list(1,20), "impedrezene" = list(1,30))
lifespan = 30
maturation = 5
production = 5
yield = 6
potency = 10
growth_stages = 5
//Coffee/varieties
/datum/seed/coffeea
name = "coffeea"
seed_name = "coffee arabica"
display_name = "coffee arabica"
packet_icon = "seed-coffeea"
mutants = list("coffeer")
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/coffeea)
plant_icon = "coffeea"
harvest_repeat = 1
chems = list("coffeepowder" = list(1,20), "synaptizine" = list(1,40))
lifespan = 30
maturation = 5
production = 5
yield = 6
potency = 10
growth_stages = 5
/datum/seed/coffeer
name = "coffeer"
seed_name = "coffee robusta"
display_name = "coffee robusta"
mutants = null
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/coffeer)
plant_icon = "coffeer"
harvest_repeat = 1
chems = list("coffeepowder" = list(1,20), "synaptizine" = list(1,20), "hyperzine" = list(1,40))
lifespan = 30
maturation = 5
production = 5
yield = 4
potency = 10
growth_stages = 5
//Everything else
/datum/seed/peanuts
name = "peanut"
@@ -1093,22 +1280,6 @@ proc/populate_seed_list()
potency = 10
growth_stages = 4
/datum/seed/soybean
name = "soybean"
seed_name = "soybean"
display_name = "soybeans"
packet_icon = "seed-soybean"
products = list(/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans)
plant_icon = "soybean"
harvest_repeat = 1
chems = list("nutriment" = list(1,20))
lifespan = 25
maturation = 4
production = 4
yield = 3
potency = 5
/datum/seed/wheat
name = "wheat"
seed_name = "wheat"
code/modules/hydroponics/seeds.dm
+29 -1
View File
@@ -115,6 +115,9 @@
/obj/item/seeds/soyaseed
seed_type = "soybean"
/obj/item/seeds/koiseed
seed_type = "koibean"
/obj/item/seeds/wheatseed
seed_type = "wheat"
@@ -221,4 +224,29 @@
seed_type = "cherry"
/obj/item/seeds/kudzuseed
seed_type = "kudzu"
seed_type = "kudzu"
/obj/item/seeds/tobaccoseed
seed_type = "tobacco"
/obj/item/seeds/stobaccoseed
seed_type = "stobacco"
/obj/item/seeds/teaasperaseed
seed_type = "teaaspera"
/obj/item/seeds/teaastraseed
seed_type = "teaastra"
/obj/item/seeds/coffeeaseed
seed_type = "coffeea"
/obj/item/seeds/coffeerseed
seed_type = "coffeer"
/obj/item/seeds/moonflowerseed
seed_type = "moonflower"
/obj/item/seeds/novaflowerseed
seed_type = "novaflower"
code/modules/reagents/Chemistry-Reagents.dm
+10 -11
View File
@@ -2797,14 +2797,14 @@ datum
toxin/coffeepowder
name = "Coffee Grounds"
id = "coffeepowder"
description = "Finely ground coffee beans, used to make coffee."
description = "Finely ground Coffee beans, used to make coffee."
reagent_state = SOLID
color = "#5B2E0D" // rgb: 91, 46, 13
toxin/teapowder
name = "Ground Tea Leaves"
id = "teapowder"
description = "Finely shredded tea leaves, used for making tea."
description = "Finely shredded Tea leaves, used for making tea."
reagent_state = SOLID
color = "#7F8400" // rgb: 127, 132, 0
@@ -3048,8 +3048,8 @@ datum
M.Jitter(5)
if(adj_temp > 0 && holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 10*REAGENTS_METABOLISM)
holder.remove_reagent(src.id, 0.1)
icecoffee
name = "Iced Coffee"
id = "icecoffee"
@@ -3088,7 +3088,7 @@ datum
tea
name = "Tea"
id = "tea"
description = "Tasty black tea, it has antioxidants, it's good for you!"
description = "Tasty black tea: It has antioxidants. It's good for you!"
color = "#101000" // rgb: 16, 16, 0
adj_dizzy = -2
adj_drowsy = -1
@@ -3101,13 +3101,12 @@ datum
M.adjustToxLoss(-1)
return
icetea
name = "Iced Tea"
id = "icetea"
description = "No relation to a certain rap artist/ actor."
color = "#104038" // rgb: 16, 64, 56
adj_temp = -5
icetea
name = "Iced Tea"
id = "icetea"
description = "No relation to a certain rap artist/ actor."
color = "#104038" // rgb: 16, 64, 56
adj_temp = -5
kahlua
name = "Kahlua"
code/modules/reagents/Chemistry-Recipes.dm
-1
View File
@@ -1601,7 +1601,6 @@ datum
required_reagents = list("teapowder" = 1, "water" = 5)
result_amount = 5
soysauce
name = "Soy Sauce"
id = "soysauce"
code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+4
View File
@@ -516,6 +516,10 @@
icon_state = "brownstar"
name = "Brown Star"
desc = "Its not what it sounds like..."
if("tea")
icon_state = "glass_brown"
name = "Glass of Tea"
desc = "A glass of hot tea. Perhaps a cup with a handle would have been smarter?"
if("icetea")
icon_state = "icetea"
name = "Iced Tea"
code/modules/reagents/reagent_containers/food/snacks/grown.dm
+44 -19
View File
@@ -393,36 +393,17 @@
name = "koibean"
desc = "Something about these seems fishy."
icon_state = "koibeans"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 30), 1))
reagents.add_reagent("carpotoxin", 1+round((potency / 20), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/moonflower
name = "moonflower"
desc = "Store in a location at least 50 yards away from werewolves."
icon_state = "moonflower"
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 50), 1))
reagents.add_reagent("moonshine", 1+round((potency / 10), 1))
bitesize = 1+round(reagents.total_volume / 2, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli
name = "ghost chili"
desc = "It seems to be vibrating gently."
icon_state = "ghostchilipepper"
var/mob/held_mob
New()
..()
spawn(5) //So potency can be set in the proc that creates these crops
reagents.add_reagent("nutriment", 1+round((potency / 25), 1))
reagents.add_reagent("capsaicin", 8+round(potency / 2, 1))
reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1))
bitesize = 1+round(reagents.total_volume / 4, 1)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato
name = "tomato"
@@ -643,6 +624,50 @@
user.SetLuminosity(round(user.luminosity - (potency/10),1))
SetLuminosity(round(potency/10,1))
//Tobacco/varieties
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco
name = "tobacco leaves"
desc = "It's tobacco... Put that in your pipe and smoke it."
icon_state = "tobacco_leaves"
filling_color = "#FFE991"
plantname = "tobacco"
/obj/item/weapon/reagent_containers/food/snacks/grown/tobacco/space
name = "space-tobacco leaves"
desc = "It's tobacco... From SPACE!"
icon_state = "stobacco_leaves"
filling_color = "#FFE991"
plantname = "stobacco"
//Tea/varieties
/obj/item/weapon/reagent_containers/food/snacks/grown/teaaspera
name = "tea-aspera leaves"
desc = "Tea Aspera is well documented to have beneficial health effects!"
icon_state = "tea_aspera_leaves"
filling_color = "#7F8400"
plantname = "teaaspera"
/obj/item/weapon/reagent_containers/food/snacks/grown/teaastra
name = "tea-astra leaves"
desc = "Tea Astra is well documented to have significant health effects."
icon_state = "tea_astra_leaves"
filling_color = "#7F8400"
plantname = "teaastra"
//Coffee/varieties
/obj/item/weapon/reagent_containers/food/snacks/grown/coffeea
name = "coffee-arabica beans"
desc = "Coffee Arabica: A great way start to your morning, or to prolong your nights."
icon_state = "coffee_arabica"
filling_color = "#5B2E0D"
plantname = "coffeea"
/obj/item/weapon/reagent_containers/food/snacks/grown/coffeer
name = "coffee-robusta beans"
desc = "Coffee Robusta: Coffe so robust we had to put it in the name."
icon_state = "coffee_robusta"
filling_color = "#5B2E0D"
plantname = "coffeer"
// *************************************
// Complex Grown Object Defines -