cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

some moire

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:54:05 +01:00
parent 80edcd2c3d
commit 429398bdd7
231 changed files with 2484 additions and 1945 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/backtank.dm
+2 -2
View File
@@ -233,7 +233,7 @@
/obj/item/watertank/op/Initialize()
. = ..()
reagents.add_reagent("fuel", 500)
reagents.add_reagent(REAGENT_ID_FUEL, 500)
reagents.add_reagent("cryptobiolin", 500)
reagents.add_reagent(REAGENT_ID_PHORON, 500)
reagents.add_reagent("condensedcapsaicin", 500)
@@ -266,7 +266,7 @@
/obj/item/watertank/atmos/Initialize()
. = ..()
reagents.add_reagent("water", 200)
reagents.add_reagent(REAGENT_ID_WATER, 200)
/obj/item/watertank/atmos/make_noz()
return new /obj/item/reagent_containers/spray/mister/atmos(src)
code/modules/hydroponics/grown.dm
+6 -6
View File
@@ -52,7 +52,7 @@
var/list/data = list()
if(reagent_data.len > 1 && potency > 0)
rtotal += round(potency/reagent_data[2])
if(rid == "nutriment")
if(rid == REAGENT_ID_NUTRIMENT)
data[seed.seed_name] = max(1,rtotal)
reagents.add_reagent(rid,max(1,rtotal),data)
@@ -70,13 +70,13 @@
desc = SSplants.product_descs["[seed.uid]"]
else
var/list/descriptors = list()
if(reagents.has_reagent("sugar") || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
if(reagents.has_reagent(REAGENT_ID_SUGAR) || reagents.has_reagent("cherryjelly") || reagents.has_reagent("honey") || reagents.has_reagent("berryjuice"))
descriptors |= "sweet"
if(reagents.has_reagent("anti_toxin"))
descriptors |= "astringent"
if(reagents.has_reagent("frostoil"))
descriptors |= "numbing"
if(reagents.has_reagent("nutriment"))
if(reagents.has_reagent(REAGENT_ID_NUTRIMENT))
descriptors |= "nutritious"
if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
descriptors |= "spicy"
@@ -84,11 +84,11 @@
descriptors |= "bitter"
if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
descriptors |= "sweet-sour"
if(reagents.has_reagent("radium") || reagents.has_reagent("uranium"))
if(reagents.has_reagent(REAGENT_ID_RADIUM) || reagents.has_reagent("uranium"))
descriptors |= "radioactive"
if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin"))
descriptors |= "poisonous"
if(reagents.has_reagent("psilocybin") || reagents.has_reagent("bliss") || reagents.has_reagent("earthsblood"))
if(reagents.has_reagent(REAGENT_ID_PSILOCYBIN) || reagents.has_reagent(REAGENT_ID_BLISS) || reagents.has_reagent("earthsblood"))
descriptors |= "hallucinogenic"
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood"))
descriptors |= "medicinal"
@@ -96,7 +96,7 @@
descriptors |= "shiny"
if(reagents.has_reagent("lube"))
descriptors |= "slippery"
if(reagents.has_reagent("pacid") || reagents.has_reagent("sacid"))
if(reagents.has_reagent(REAGENT_ID_PACID) || reagents.has_reagent(REAGENT_ID_SACID))
descriptors |= "acidic"
if(seed.get_trait(TRAIT_JUICY))
descriptors |= "juicy"
code/modules/hydroponics/seed.dm
+6 -6
View File
@@ -390,7 +390,7 @@
"calvatia", "gigantea", "clitopilis", "prumulus", "entoloma", "abortivum",
"suillus", "tuber", "aestivum", "volvacea", "delica", "russula", "rozites")
possible_prefixes |= list("butter", "shad", "sugar", "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
possible_prefixes |= list("butter", "shad", REAGENT_ID_SUGAR, "june", "wild", "rigus", "curry", "hard", "soft", "dark", "brick", "stone", "red", "brown",
"black", "white", "paper", "slippery", "honey", "bitter")
prefix = pick(possible_prefixes)
@@ -455,7 +455,7 @@
chems = list()
if(prob(80))
chems["nutriment"] = list(rand(1,10),rand(10,20))
chems[REAGENT_ID_NUTRIMENT] = list(rand(1,10),rand(10,20))
var/additional_chems = rand(0,5)
@@ -463,10 +463,10 @@
// VOREStation Edit Start: Modified exclusion list
var/list/banned_chems = list(
"adminordrazine",
"nutriment",
"macrocillin",
"microcillin",
"normalcillin",
REAGENT_ID_NUTRIMENT,
REAGENT_ID_MACROCILLIN,
REAGENT_ID_MICROCILLIN,
REAGENT_ID_NORMALCILLIN,
"magicdust"
)
// VOREStation Edit End: Modified exclusion list
code/modules/hydroponics/seed_datums_vr.dm
+3 -3
View File
@@ -7,7 +7,7 @@
display_name = "Shrinking mushroom trees"
mutants = list("megam")
kitchen_tag = "microm"
chems = list("microcillin" = list(1,20))
chems = list(REAGENT_ID_MICROCILLIN = list(1,20))
/datum/seed/size/New()
..()
@@ -27,7 +27,7 @@
display_name = "Mega mushroom trees"
mutants = list("microm")
kitchen_tag = "megam"
chems = list("macrocillin" = list(1,20))
chems = list(REAGENT_ID_MACROCILLIN = list(1,20))
/datum/seed/size/megam/New()
..()
@@ -41,4 +41,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DADA00")
/datum/seed/gnomes
harvest_sound = 'sound/items/hooh.ogg'
harvest_sound = 'sound/items/hooh.ogg'
code/modules/hydroponics/seedtypes/amauri.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "amauri"
display_name = "amauri plant"
kitchen_tag = "amauri"
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),"nutriment" = list(1,5))
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/amauri/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_POTENCY,10)
code/modules/hydroponics/seedtypes/ambrosia.dm
+5 -5
View File
@@ -5,7 +5,7 @@
display_name = "ambrosia vulgaris"
kitchen_tag = "ambrosia"
mutants = list("ambrosiadeus")
chems = list("nutriment" = list(1), "ambrosia_extract" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1), REAGENT_ID_AMBROSIAEXTRACT = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1))
/datum/seed/ambrosia/New()
..()
@@ -25,7 +25,7 @@
display_name = "ambrosia deus"
kitchen_tag = "ambrosiadeus"
mutants = list("ambrosiainfernus", "ambrosiagaia")
chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "ambrosia_extract" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/deus/New()
..()
@@ -38,7 +38,7 @@
display_name = "ambrosia infernus"
kitchen_tag = "ambrosiainfernus"
mutants = null
chems = list("nutriment" = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), "ambrosia_extract" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "oxycodone" = list(1,8), "impedrezene" = list(1,10), "mindbreaker" = list(1,10), REAGENT_ID_AMBROSIAEXTRACT = list(1,10))
/datum/seed/ambrosia/infernus/New()
..()
@@ -51,7 +51,7 @@
display_name = "ambrosia gaia"
kitchen_tag = "ambrosiagaia"
mutants = null
chems = list ("earthsblood" = list(3,5), "nutriment" = list(1,3))
chems = list ("earthsblood" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,3))
/datum/seed/ambrosia/gaia/New()
..()
@@ -65,4 +65,4 @@
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#ffb500")
set_trait(TRAIT_PRODUCT_COLOUR, "#ffee00")
set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b")
code/modules/hydroponics/seedtypes/apples.dm
+4 -4
View File
@@ -5,7 +5,7 @@
display_name = "apple tree"
kitchen_tag = "apple"
mutants = list("poisonapple","goldapple")
chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10),"applejuice" = list(10,20))
/datum/seed/apple/New()
..()
@@ -31,7 +31,7 @@
display_name = "gold apple tree"
kitchen_tag = "goldapple"
mutants = null
chems = list("nutriment" = list(1,10), "gold" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "gold" = list(1,5))
/datum/seed/apple/gold/New()
..()
@@ -46,7 +46,7 @@
seed_name = "sivian pod"
display_name = "sivian pod"
kitchen_tag = "apple"
chems = list("nutriment" = list(1,5),"sifsap" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5),"sifsap" = list(10,20))
/datum/seed/apple/sif/New()
..()
@@ -59,4 +59,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#0720c3")
set_trait(TRAIT_PLANT_ICON,"tree5")
set_trait(TRAIT_FLESH_COLOUR,"#05157d")
set_trait(TRAIT_IDEAL_LIGHT, 1)
set_trait(TRAIT_IDEAL_LIGHT, 1)
code/modules/hydroponics/seedtypes/berries.dm
+5 -5
View File
@@ -5,7 +5,7 @@
display_name = "berry bush"
kitchen_tag = "berries"
mutants = list("glowberries","poisonberries")
chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "berryjuice" = list(10,10))
/datum/seed/berry/New()
..()
@@ -26,7 +26,7 @@
seed_name = "glowberry"
display_name = "glowberry bush"
mutants = null
chems = list("nutriment" = list(1,10), "uranium" = list(3,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "uranium" = list(3,5))
/datum/seed/berry/glow/New()
..()
@@ -47,7 +47,7 @@
kitchen_tag = "poisonberries"
display_name = "poison berry bush"
mutants = list("deathberries")
chems = list("nutriment" = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,5), "poisonberryjuice" = list(10,5))
/datum/seed/berry/poison/New()
..()
@@ -60,7 +60,7 @@
seed_name = "death berry"
display_name = "death berry bush"
mutants = null
chems = list("nutriment" = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "toxin" = list(3,3), "lexorin" = list(1,5))
/datum/seed/berry/poison/death/New()
..()
@@ -79,4 +79,4 @@
/datum/seed/berry/peppercorn/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#303030")
set_trait(TRAIT_WATER_CONSUMPTION, 2)
set_trait(TRAIT_WATER_CONSUMPTION, 2)
code/modules/hydroponics/seedtypes/cabbage.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "cabbage"
display_name = "cabbages"
kitchen_tag = "cabbage"
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/cabbage/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
code/modules/hydroponics/seedtypes/carrots.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "carrot"
display_name = "carrots"
kitchen_tag = "carrot"
chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
/datum/seed/carrots/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"carrot")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFDB4A")
set_trait(TRAIT_PLANT_ICON,"carrot")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/celery.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "celery"
display_name = "celery"
kitchen_tag = "celery"
chems = list("nutriment" = list(5,20))
chems = list(REAGENT_ID_NUTRIMENT = list(5,20))
/datum/seed/celery/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,8)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#56FD56")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_PLANT_ICON,"stalk3")
code/modules/hydroponics/seedtypes/cherries.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "cherry tree"
kitchen_tag = "cherries"
chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_SUGAR = list(1,15), "cherryjelly" = list(10,15))
/datum/seed/cherries/New()
..()
@@ -17,4 +17,4 @@
set_trait(TRAIT_PRODUCT_ICON,"cherry")
set_trait(TRAIT_PRODUCT_COLOUR,"#A80000")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
code/modules/hydroponics/seedtypes/chili.dm
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "chili"
display_name = "chili plants"
kitchen_tag = "chili"
chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
chems = list("capsaicin" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,25))
mutants = list("icechili", "ghostchili")
/datum/seed/chili/New()
@@ -26,7 +26,7 @@
display_name = "ice-pepper plants"
kitchen_tag = "icechili"
mutants = null
chems = list("frostoil" = list(3,5), "nutriment" = list(1,50))
chems = list("frostoil" = list(3,5), REAGENT_ID_NUTRIMENT = list(1,50))
/datum/seed/chili/ice/New()
..()
@@ -40,10 +40,10 @@
display_name = "ghost chili plants"
kitchen_tag = "ghostchili"
mutants = null
chems = list("condensedcapsaicin" = list (3,10), "nutriment" = list (1,25))
chems = list("condensedcapsaicin" = list (3,10), REAGENT_ID_NUTRIMENT = list (1,25))
/datum/seed/chili/ghost/New()
..()
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,3)
set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec")
code/modules/hydroponics/seedtypes/citrus.dm
+4 -4
View File
@@ -3,7 +3,7 @@
seed_name = "lime"
display_name = "lime trees"
kitchen_tag = "lime"
chems = list("nutriment" = list(1,20), "limejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "limejuice" = list(10,20))
/datum/seed/citrus/New()
..()
@@ -23,7 +23,7 @@
seed_name = "lemon"
display_name = "lemon trees"
kitchen_tag = "lemon"
chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lemonjuice" = list(10,20))
/datum/seed/citrus/lemon/New()
..()
@@ -38,9 +38,9 @@
seed_name = "orange"
display_name = "orange trees"
kitchen_tag = "orange"
chems = list("nutriment" = list(1,20), "orangejuice" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "orangejuice" = list(10,20))
/datum/seed/citrus/orange/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A")
set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
code/modules/hydroponics/seedtypes/cocoa.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "cacao"
display_name = "cacao tree"
kitchen_tag = "cocoa"
chems = list("nutriment" = list(1,10), "coco" = list(4,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "coco" = list(4,5))
/datum/seed/cocoa/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#CCA935")
set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/corn.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "corn"
display_name = "ears of corn"
kitchen_tag = "corn"
chems = list("nutriment" = list(1,10), "cornoil" = list(3,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "cornoil" = list(3,15))
trash_type = /obj/item/corncob
/datum/seed/corn/New()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/durian.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_noun = "pits"
display_name = "durian"
kitchen_tag = "durian"
chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "durianpaste" = list(1, 20))
/datum/seed/durian/New()
..()
@@ -18,4 +18,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"tree")
set_trait(TRAIT_IDEAL_LIGHT, 8)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
code/modules/hydroponics/seedtypes/eggplant.dm
+2 -2
View File
@@ -5,7 +5,7 @@
display_name = "eggplants"
kitchen_tag = "eggplant"
mutants = list("egg-plant")
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/eggplant/New()
..()
@@ -27,5 +27,5 @@
display_name = "egg-plants"
kitchen_tag = "egg-plant"
mutants = null
chems = list("nutriment" = list(1,5), "egg" = list(3,12))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "egg" = list(3,12))
has_item_product = /obj/item/reagent_containers/food/snacks/egg/purple
code/modules/hydroponics/seedtypes/flowers.dm
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "harebell"
display_name = "harebells"
kitchen_tag = "harebell"
chems = list("nutriment" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/flower/New()
..()
@@ -22,7 +22,7 @@
seed_name = "poppy"
display_name = "poppies"
kitchen_tag = "poppy"
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/poppy/New()
..()
@@ -58,7 +58,7 @@
seed_name = "lavender"
display_name = "lavender"
kitchen_tag = "lavender"
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "bicaridine" = list(1,10))
/datum/seed/flower/lavender/New()
..()
@@ -79,7 +79,7 @@
display_name = "rose"
kitchen_tag = "rose"
mutants = list("bloodrose")
chems = list("nutriment" = list(1,5), "stoxin" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(0,2))
/datum/seed/flower/rose/New()
..()
@@ -99,7 +99,7 @@
name = "bloodrose"
display_name = "bleeding rose"
mutants = null
chems = list("nutriment" = list(1,5), "stoxin" = list(1,5), "blood" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "stoxin" = list(1,5), REAGENT_ID_BLOOD = list(0,2))
/datum/seed/flower/rose/blood/New()
..()
code/modules/hydroponics/seedtypes/gelthi.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "gelthi"
display_name = "gelthi plant"
kitchen_tag = "gelthi"
chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),"nutriment" = list(1,5))
chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/gelthi/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,6)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,1)
set_trait(TRAIT_POTENCY,1)
code/modules/hydroponics/seedtypes/grapes.dm
+3 -3
View File
@@ -5,7 +5,7 @@
display_name = "grapevines"
kitchen_tag = "grapes"
mutants = list("greengrapes")
chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_SUGAR = list(1,5), "grapejuice" = list(10,10))
/datum/seed/grapes/New()
..()
@@ -26,8 +26,8 @@
seed_name = "green grape"
display_name = "green grapevines"
mutants = null
chems = list("nutriment" = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "kelotane" = list(3,5), "grapejuice" = list(10,10))
/datum/seed/grapes/green/New()
..()
set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
set_trait(TRAIT_PRODUCT_COLOUR,"42ed2f")
code/modules/hydroponics/seedtypes/grass.dm
+2 -2
View File
@@ -4,7 +4,7 @@
display_name = "grass"
kitchen_tag = "grass"
mutants = list("carpet")
chems = list("nutriment" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20))
/datum/seed/grass/New()
..()
@@ -33,4 +33,4 @@
set_trait(TRAIT_PRODUCT_ICON,"grass")
set_trait(TRAIT_PRODUCT_COLOUR,"#9e2500")
set_trait(TRAIT_PLANT_COLOUR,"#ee4401")
set_trait(TRAIT_PLANT_ICON,"grass")
set_trait(TRAIT_PLANT_ICON,"grass")
code/modules/hydroponics/seedtypes/jurlmah.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "jurl'mah"
display_name = "jurl'mah reeds"
kitchen_tag = "jurlmah"
chems = list("serotrotium" = list(1,5),"nutriment" = list(1,5))
chems = list("serotrotium" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/jurlmah/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_POTENCY,10)
code/modules/hydroponics/seedtypes/kudzu.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "kudzu"
display_name = "kudzu vines"
kitchen_tag = "kudzu"
chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "anti_toxin" = list(1,25))
/datum/seed/kudzu/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#96D278")
set_trait(TRAIT_PLANT_COLOUR,"#6F7A63")
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
set_trait(TRAIT_WATER_CONSUMPTION, 0.5)
code/modules/hydroponics/seedtypes/lettuce.dm
+3 -3
View File
@@ -4,7 +4,7 @@
seed_name = "lettuce"
display_name = "lettuce"
kitchen_tag = "lettuce"
chems = list("nutriment" = list(1,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/lettuce/New()
..()
@@ -26,9 +26,9 @@
seed_name = "glacial lettuce"
display_name = "glacial lettuce"
kitchen_tag = "icelettuce"
chems = list("nutriment" = list(1,5), "paracetamol" = list(0,2))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "paracetamol" = list(0,2))
/datum/seed/lettuce/ice/New()
..()
set_trait(TRAIT_ALTER_TEMP, -5)
set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9")
set_trait(TRAIT_PRODUCT_COLOUR,"#9ABCC9")
code/modules/hydroponics/seedtypes/mushrooms.dm
+8 -8
View File
@@ -5,7 +5,7 @@
seed_noun = "spores"
display_name = "chanterelle mushrooms"
mutants = list("reishi","amanita","plumphelmet")
chems = list("nutriment" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1,25))
splat_type = /obj/effect/plant
kitchen_tag = "mushroom"
@@ -44,7 +44,7 @@
seed_name = "plump helmet"
display_name = "plump helmet mushrooms"
mutants = list("walkingmushroom","towercap")
chems = list("nutriment" = list(2,10))
chems = list(REAGENT_ID_NUTRIMENT = list(2,10))
kitchen_tag = "plumphelmet"
/datum/seed/mushroom/plump/New()
@@ -62,7 +62,7 @@
seed_name = "reishi"
display_name = "reishi"
mutants = list("libertycap","glowshroom")
chems = list("nutriment" = list(1,50), "psilocybin" = list(3,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PSILOCYBIN = list(3,5))
/datum/seed/mushroom/hallucinogenic/New()
..()
@@ -80,7 +80,7 @@
seed_name = "liberty cap"
display_name = "liberty cap mushrooms"
mutants = null
chems = list("nutriment" = list(1), "stoxin" = list(3,3), "bliss" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "stoxin" = list(3,3), REAGENT_ID_BLISS = list(1,25))
/datum/seed/mushroom/hallucinogenic/strong/New()
..()
@@ -96,7 +96,7 @@
seed_name = "fly amanita"
display_name = "fly amanita mushrooms"
mutants = list("destroyingangel","plastic")
chems = list("nutriment" = list(1), "amatoxin" = list(3,3), "psilocybin" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1), "amatoxin" = list(3,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/New()
..()
@@ -114,7 +114,7 @@
seed_name = "destroying angel"
display_name = "destroying angel mushrooms"
mutants = null
chems = list("nutriment" = list(1,50), "amatoxin" = list(13,3), "psilocybin" = list(1,25))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), "amatoxin" = list(13,3), REAGENT_ID_PSILOCYBIN = list(1,25))
/datum/seed/mushroom/poison/death/New()
..()
@@ -159,7 +159,7 @@
seed_name = "glowshroom"
display_name = "glowshrooms"
mutants = null
chems = list("radium" = list(1,20))
chems = list(REAGENT_ID_RADIUM = list(1,20))
/datum/seed/mushroom/glowshroom/New()
..()
@@ -209,4 +209,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#e29cd2")
set_trait(TRAIT_PLANT_COLOUR,"#f8e6f4")
set_trait(TRAIT_PLANT_ICON,"mushroom9")
set_trait(TRAIT_SPORING, TRUE)
set_trait(TRAIT_SPORING, TRUE)
code/modules/hydroponics/seedtypes/nettles.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_name = "nettle"
display_name = "nettles"
mutants = list("deathnettle")
chems = list("nutriment" = list(1,50), "sacid" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_SACID = list(0,1))
kitchen_tag = "nettle"
/datum/seed/nettle/New()
@@ -25,7 +25,7 @@
display_name = "death nettles"
kitchen_tag = "deathnettle"
mutants = null
chems = list("nutriment" = list(1,50), "pacid" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,50), REAGENT_ID_PACID = list(0,1))
/datum/seed/nettle/death/New()
..()
code/modules/hydroponics/seedtypes/onion.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "onion"
display_name = "onions"
kitchen_tag = "onion"
chems = list("nutriment" = list(1,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10))
/datum/seed/onion/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_PRODUCT_ICON,"onion")
set_trait(TRAIT_PRODUCT_COLOUR,"#E0C367")
set_trait(TRAIT_PLANT_ICON,"carrot")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/peanuts.dm
+2 -2
View File
@@ -4,7 +4,7 @@
seed_name = "peanut"
display_name = "peanut vines"
kitchen_tag = "peanut"
chems = list("nutriment" = list(1,10), "peanutoil" = list(3,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "peanutoil" = list(3,10))
/datum/seed/peanuts/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_ICON,"nuts")
set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A")
set_trait(TRAIT_PLANT_ICON,"bush2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_IDEAL_LIGHT, 6)
code/modules/hydroponics/seedtypes/pineapple.dm
+3 -3
View File
@@ -6,7 +6,7 @@
display_name = "pineapple"
kitchen_tag = "pineapple"
mutants = list("spineapple")
chems = list("nutriment" = list(1,5), "pineapplejuice" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/pineapple/New()
..()
@@ -30,7 +30,7 @@
seed_name = "spineapple"
display_name = "spineapple"
kitchen_tag = "spineapple"
chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/spineapple/New()
..()
@@ -46,4 +46,4 @@
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 4)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_STINGS,1)
set_trait(TRAIT_STINGS,1)
code/modules/hydroponics/seedtypes/potato.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "potato"
display_name = "potatoes"
kitchen_tag = "potato"
chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "potatojuice" = list(10,10))
/datum/seed/potato/New()
..()
@@ -15,4 +15,4 @@
set_trait(TRAIT_PRODUCT_ICON,"potato")
set_trait(TRAIT_PRODUCT_COLOUR,"#D4CAB4")
set_trait(TRAIT_PLANT_ICON,"bush2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/pumpkin.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "pumpkin"
display_name = "pumpkin vine"
kitchen_tag = "pumpkin"
chems = list("nutriment" = list(1,6))
chems = list(REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/pumpkin/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#DBAC02")
set_trait(TRAIT_PLANT_COLOUR,"#21661E")
set_trait(TRAIT_PLANT_ICON,"vine2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/rhubarb.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "rhubarb"
display_name = "rhubarb"
kitchen_tag = "rhubarb"
chems = list("nutriment" = list(1,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15))
/datum/seed/rhubarb/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,6)
set_trait(TRAIT_PRODUCT_ICON,"stalk")
set_trait(TRAIT_PRODUCT_COLOUR,"#FD5656")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_PLANT_ICON,"stalk3")
code/modules/hydroponics/seedtypes/rice.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "rice"
display_name = "rice stalks"
kitchen_tag = "rice"
chems = list("nutriment" = list(1,25), "rice" = list(10,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "rice" = list(10,15))
/datum/seed/rice/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#8ED17D")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
code/modules/hydroponics/seedtypes/soybean.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "soybean"
display_name = "soybeans"
kitchen_tag = "soybeans"
chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "soymilk" = list(10,20))
/datum/seed/soybean/New()
..()
@@ -14,4 +14,4 @@
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_PRODUCT_ICON,"bean")
set_trait(TRAIT_PRODUCT_COLOUR,"#EBE7C0")
set_trait(TRAIT_PLANT_ICON,"stalk")
set_trait(TRAIT_PLANT_ICON,"stalk")
code/modules/hydroponics/seedtypes/sugarcane.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "sugarcane"
display_name = "sugarcanes"
kitchen_tag = "sugarcanes"
chems = list("sugar" = list(4,5))
chems = list(REAGENT_ID_SUGAR = list(4,5))
/datum/seed/sugarcane/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#B4D6BD")
set_trait(TRAIT_PLANT_COLOUR,"#6BBD68")
set_trait(TRAIT_PLANT_ICON,"stalk3")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_HEAT, 298)
code/modules/hydroponics/seedtypes/surik.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "surik"
display_name = "surik vine"
kitchen_tag = "surik"
chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),"nutriment" = list(1,5))
chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/surik/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,7)
set_trait(TRAIT_PRODUCTION,7)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,3)
set_trait(TRAIT_POTENCY,3)
code/modules/hydroponics/seedtypes/telriis.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "telriis"
display_name = "telriis grass"
kitchen_tag = "telriis"
chems = list("pwine" = list(1,5), "nutriment" = list(1,6))
chems = list("pwine" = list(1,5), REAGENT_ID_NUTRIMENT = list(1,6))
/datum/seed/telriis/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,5)
set_trait(TRAIT_YIELD,4)
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_POTENCY,5)
code/modules/hydroponics/seedtypes/thaadra.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "thaa'dra"
display_name = "thaa'dra lichen"
kitchen_tag = "thaadra"
chems = list("frostoil" = list(1,5),"nutriment" = list(1,5))
chems = list("frostoil" = list(1,5),REAGENT_ID_NUTRIMENT = list(1,5))
/datum/seed/thaadra/New()
..()
@@ -13,4 +13,4 @@
set_trait(TRAIT_MATURATION,5)
set_trait(TRAIT_PRODUCTION,9)
set_trait(TRAIT_YIELD,2)
set_trait(TRAIT_POTENCY,5)
set_trait(TRAIT_POTENCY,5)
code/modules/hydroponics/seedtypes/tobacco.dm
+2 -2
View File
@@ -5,7 +5,7 @@
display_name = "tobacco"
kitchen_tag = "tobacco"
mutants = list("stimbush")
chems = list("nutriment" = list(1,15), "nicotine" = list(1,20))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), REAGENT_ID_NICOTINE = list(1,20))
/datum/seed/tobacco/New()
..()
@@ -23,7 +23,7 @@
name = "stimbush"
seed_name = "stim-bush"
display_name = "stim-bush"
chems = list("nutriment" = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "hyperzine" = list(1,10), "synaptizine" = list(1,5))
/datum/seed/tobacco/stimbush/New()
..()
code/modules/hydroponics/seedtypes/tomatoes.dm
+5 -5
View File
@@ -4,7 +4,7 @@
seed_name = "tomato"
display_name = "tomato plant"
mutants = list("bluetomato","bloodtomato")
chems = list("nutriment" = list(1,10), "tomatojuice" = list(10,10))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "tomatojuice" = list(10,10))
kitchen_tag = "tomato"
/datum/seed/tomato/New()
@@ -27,7 +27,7 @@
seed_name = "blood tomato"
display_name = "blood tomato plant"
mutants = list("killertomato")
chems = list("nutriment" = list(1,10), "blood" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), REAGENT_ID_BLOOD = list(1,5))
splat_type = /obj/effect/decal/cleanable/blood/splatter
/datum/seed/tomato/blood/New()
@@ -53,7 +53,7 @@
seed_name = "blue tomato"
display_name = "blue tomato plant"
mutants = list("bluespacetomato")
chems = list("nutriment" = list(1,20), "lube" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "lube" = list(1,5))
/datum/seed/tomato/blue/New()
..()
@@ -65,11 +65,11 @@
seed_name = "bluespace tomato"
display_name = "bluespace tomato plant"
mutants = null
chems = list("nutriment" = list(1,20), "singulo" = list(10,5))
chems = list(REAGENT_ID_NUTRIMENT = list(1,20), "singulo" = list(10,5))
/datum/seed/tomato/blue/teleport/New()
..()
set_trait(TRAIT_TELEPORTING,1)
set_trait(TRAIT_PRODUCT_COLOUR,"#00E5FF")
set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8")
set_trait(TRAIT_BIOLUM_COLOUR,"#4DA4A8")
code/modules/hydroponics/seedtypes/vale.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "vale"
display_name = "vale bush"
kitchen_tag = "vale"
chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),"nutriment"= list(1,5))
chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),REAGENT_ID_NUTRIMENT= list(1,5))
/datum/seed/vale/New()
..()
@@ -12,4 +12,4 @@
set_trait(TRAIT_MATURATION,8)
set_trait(TRAIT_PRODUCTION,10)
set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,3)
set_trait(TRAIT_POTENCY,3)
code/modules/hydroponics/seedtypes/vanilla.dm
+1 -1
View File
@@ -3,7 +3,7 @@
seed_name = "vanilla"
display_name = "vanilla"
kitchen_tag = "vanilla"
chems = list("nutriment" = list(1,10), "vanilla" = list(2,8), "sugar" = list(1, 4))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "vanilla" = list(2,8), REAGENT_ID_SUGAR = list(1, 4))
/datum/seed/vanilla/New()
..()
code/modules/hydroponics/seedtypes/wabback.dm
+4 -4
View File
@@ -4,7 +4,7 @@
seed_name = "white wabback"
seed_noun = "nodes"
display_name = "white wabback"
chems = list("nutriment" = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "protein" = list(1,5), "enzyme" = list(0,3))
kitchen_tag = "wabback"
mutants = list("blackwabback","wildwabback")
has_item_product = /obj/item/stack/material/cloth
@@ -31,7 +31,7 @@
seed_name = "black wabback"
display_name = "black wabback"
mutants = null
chems = list("nutriment" = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,3), "protein" = list(1,10), "serotrotium_v" = list(0,1))
/datum/seed/wabback/vine/New()
..()
@@ -44,11 +44,11 @@
display_name = "wild wabback"
mutants = list("whitewabback")
has_item_product = null
chems = list("nutriment" = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
chems = list(REAGENT_ID_NUTRIMENT = list(1,15), "protein" = list(0,2), "enzyme" = list(0,1))
/datum/seed/wabback/wild/New()
..()
set_trait(TRAIT_IDEAL_LIGHT, 3)
set_trait(TRAIT_WATER_CONSUMPTION, 7)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.1)
set_trait(TRAIT_YIELD,5)
set_trait(TRAIT_YIELD,5)
code/modules/hydroponics/seedtypes/watermelon.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "watermelon"
display_name = "watermelon vine"
kitchen_tag = "watermelon"
chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6))
chems = list(REAGENT_ID_NUTRIMENT = list(1,6), "watermelonjuice" = list(10,6))
/datum/seed/watermelon/New()
..()
@@ -20,4 +20,4 @@
set_trait(TRAIT_FLESH_COLOUR,"#F22C2C")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/wheat.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "wheat"
display_name = "wheat stalks"
kitchen_tag = "wheat"
chems = list("nutriment" = list(1,25), "flour" = list(10,30))
chems = list(REAGENT_ID_NUTRIMENT = list(1,25), "flour" = list(10,30))
/datum/seed/wheat/New()
..()
@@ -16,4 +16,4 @@
set_trait(TRAIT_PLANT_COLOUR,"#BFAF82")
set_trait(TRAIT_PLANT_ICON,"stalk2")
set_trait(TRAIT_IDEAL_LIGHT, 6)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15)
code/modules/hydroponics/seedtypes/whitebeets.dm
+2 -2
View File
@@ -3,7 +3,7 @@
seed_name = "white-beet"
display_name = "white-beets"
kitchen_tag = "whitebeet"
chems = list("nutriment" = list(0,20), "sugar" = list(1,5))
chems = list(REAGENT_ID_NUTRIMENT = list(0,20), REAGENT_ID_SUGAR = list(1,5))
/datum/seed/whitebeets/New()
..()
@@ -15,4 +15,4 @@
set_trait(TRAIT_PRODUCT_COLOUR,"#EEF5B0")
set_trait(TRAIT_PLANT_COLOUR,"#4D8F53")
set_trait(TRAIT_PLANT_ICON,"carrot2")
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
code/modules/hydroponics/seedtypes/wurmwoad.dm
+1 -1
View File
@@ -4,7 +4,7 @@
name = "wurmwoad"
seed_name = "wurmwoad"
display_name = "wurmwoad growth"
chems = list("nutriment" = list(1,10), "spacespice" = list(5,15))
chems = list(REAGENT_ID_NUTRIMENT = list(1,10), "spacespice" = list(5,15))
kitchen_tag = "wurmwoad"
/datum/seed/wurmwoad/New()
code/modules/hydroponics/spreading/spreading.dm
+1 -1
View File
@@ -135,7 +135,7 @@
update_icon()
SSplants.add_plant(src)
//Some plants eat through plating.
if(islist(seed.chems) && !isnull(seed.chems["pacid"]))
if(islist(seed.chems) && !isnull(seed.chems[REAGENT_ID_PACID]))
var/turf/T = get_turf(src)
T.ex_act(prob(80) ? 3 : 2)
code/modules/hydroponics/spreading/spreading_growth.dm
+1 -1
View File
@@ -26,7 +26,7 @@
continue
if(floor.density)
if(!isnull(seed.chems["pacid"]))
if(!isnull(seed.chems[REAGENT_ID_PACID]))
spawn(rand(5,25)) floor.ex_act(3)
continue
code/modules/hydroponics/trays/tray.dm
+28 -28
View File
@@ -57,70 +57,70 @@
var/static/list/toxic_reagents = list(
"anti_toxin" = -2,
"toxin" = 2,
"fluorine" = 2.5,
"chlorine" = 1.5,
"sacid" = 1.5,
"pacid" = 3,
REAGENT_ID_FLUORINE = 2.5,
REAGENT_ID_CHLORINE = 1.5,
REAGENT_ID_SACID = 1.5,
REAGENT_ID_PACID = 3,
"plantbgone" = 3,
"cryoxadone" = -3,
"radium" = 2
REAGENT_ID_RADIUM = 2
)
var/static/list/nutrient_reagents = list(
"milk" = 0.1,
"beer" = 0.25,
"phosphorus" = 0.1,
"sugar" = 0.1,
REAGENT_ID_PHOSPHORUS = 0.1,
REAGENT_ID_SUGAR = 0.1,
"sodawater" = 0.1,
"ammonia" = 1,
"diethylamine" = 2,
"nutriment" = 1,
REAGENT_ID_NUTRIMENT = 1,
"adminordrazine" = 1,
"eznutrient" = 1,
"robustharvest" = 1,
"left4zed" = 1
)
var/static/list/weedkiller_reagents = list(
"fluorine" = -4,
"chlorine" = -3,
"phosphorus" = -2,
"sugar" = 2,
"sacid" = -2,
"pacid" = -4,
REAGENT_ID_FLUORINE = -4,
REAGENT_ID_CHLORINE = -3,
REAGENT_ID_PHOSPHORUS = -2,
REAGENT_ID_SUGAR = 2,
REAGENT_ID_SACID = -2,
REAGENT_ID_PACID = -4,
"plantbgone" = -8,
"adminordrazine" = -5
)
var/static/list/pestkiller_reagents = list(
"sugar" = 2,
REAGENT_ID_SUGAR = 2,
"diethylamine" = -2,
"adminordrazine" = -5
)
var/static/list/water_reagents = list(
"water" = 1,
REAGENT_ID_WATER = 1,
"adminordrazine" = 1,
"milk" = 0.9,
"beer" = 0.7,
"fluorine" = -0.5,
"chlorine" = -0.5,
"phosphorus" = -0.5,
"water" = 1,
REAGENT_ID_FLUORINE = -0.5,
REAGENT_ID_CHLORINE = -0.5,
REAGENT_ID_PHOSPHORUS = -0.5,
REAGENT_ID_WATER = 1,
"sodawater" = 1,
)
// Beneficial reagents also have values for modifying health, yield_mod and mut_mod (in that order).
var/static/list/beneficial_reagents = list(
"beer" = list( -0.05, 0, 0 ),
"fluorine" = list( -2, 0, 0 ),
"chlorine" = list( -1, 0, 0 ),
"phosphorus" = list( -0.75, 0, 0 ),
REAGENT_ID_FLUORINE = list( -2, 0, 0 ),
REAGENT_ID_CHLORINE = list( -1, 0, 0 ),
REAGENT_ID_PHOSPHORUS = list( -0.75, 0, 0 ),
"sodawater" = list( 0.1, 0, 0 ),
"sacid" = list( -1, 0, 0 ),
"pacid" = list( -2, 0, 0 ),
REAGENT_ID_SACID = list( -1, 0, 0 ),
REAGENT_ID_PACID = list( -2, 0, 0 ),
"plantbgone" = list( -2, 0, 0.2),
"cryoxadone" = list( 3, 0, 0 ),
"ammonia" = list( 0.5, 0, 0 ),
"diethylamine" = list( 1, 0, 0 ),
"nutriment" = list( 0.5, 0.1, 0 ),
"radium" = list( -1.5, 0, 0.2),
REAGENT_ID_NUTRIMENT = list( 0.5, 0.1, 0 ),
REAGENT_ID_RADIUM = list( -1.5, 0, 0.2),
"adminordrazine" = list( 1, 1, 1 ),
"robustharvest" = list( 0, 0.2, 0 ),
"left4zed" = list( 0, 0, 0.2)
@@ -129,7 +129,7 @@
// Mutagen list specifies minimum value for the mutation to take place, rather
// than a bound as the lists above specify.
var/static/list/mutagenic_reagents = list(
"radium" = 8,
REAGENT_ID_RADIUM = 8,
"mutagen" = 15
)