From 115e3274f296115fcbc2120e92d70c4c4eb36c5b Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:07:53 +0300 Subject: [PATCH] Makes xenobotany plants more interesting. (#1002) * Makes xenobotany plants more interesting. * vaporsac spelling fix There was a spelling error * Jurlmah change Replaces the hecuri in Jurlmah with fake beer, which should knock you out for the cryoxadone and frost oil to actually work. * More honey gelthi it's all people are gonna be using this plant for there's twice the honey now * thaadra sansufentanyl puts sansufentanyl, instead of super melatonin. Super melatonin is going to go into jurlmah instead * jurlman super melatonin replaces the fake beer in jurlmah with super melatonin. less overpowered knockout chem and also it will boost the healing Co-authored-by: Milk --- .../xenoarch/code/modules/hydroponics/amauri.dm | 12 ++++++------ .../xenoarch/code/modules/hydroponics/gelthi.dm | 12 ++++++------ .../xenoarch/code/modules/hydroponics/jurlmah.dm | 10 +++++----- .../xenoarch/code/modules/hydroponics/nofruit.dm | 8 ++++---- .../xenoarch/code/modules/hydroponics/shand.dm | 12 ++++++------ .../xenoarch/code/modules/hydroponics/surik.dm | 12 ++++++------ .../xenoarch/code/modules/hydroponics/telriis.dm | 12 ++++++------ .../xenoarch/code/modules/hydroponics/thaadra.dm | 8 ++++---- .../xenoarch/code/modules/hydroponics/vale.dm | 12 ++++++------ .../xenoarch/code/modules/hydroponics/vaporsac.dm | 8 ++++---- 10 files changed, 53 insertions(+), 53 deletions(-) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/amauri.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/amauri.dm index ed234b942e8..f0a94c1ea79 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/amauri.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/amauri.dm @@ -1,6 +1,6 @@ /obj/item/seeds/amauri name = "pack of amauri seeds" - desc = "These seeds grow into amauri plants." + desc = "These seeds grow into amauri plants. Grows bulbs full of potent toxins." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "amauri" species = "amauri" @@ -12,17 +12,17 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "amauri-stage" growthstages = 3 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/medicine/psicodine = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/preserved) + reagents_add = list(/datum/reagent/toxin = 0.1, /datum/reagent/toxin/venom = 0.1, /datum/reagent/toxin/hot_ice = 0.1) /obj/item/food/grown/amauri seed = /obj/item/seeds/amauri name = "amauri" - desc = "It's a little piece of amauri." + desc = "A toxic amauri bulb, you shouldn't eat this." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "amauri" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT - juice_typepath = /datum/reagent/medicine/psicodine - tastes = list("shadow" = 1) + juice_typepath = /datum/reagent/toxin + tastes = list("poison" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/gelthi.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/gelthi.dm index 3ff46763f1e..8fed3e82863 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/gelthi.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/gelthi.dm @@ -1,6 +1,6 @@ /obj/item/seeds/gelthi name = "pack of gelthi seeds" - desc = "These seeds grow into gelthi plants." + desc = "These seeds grow into gelthi plants. Lauded by chefs for its unique ability to produce honey, and often hoarded for this very reason." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "gelthi" species = "gelthi" @@ -12,17 +12,17 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "gelthi-stage" growthstages = 3 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/gold = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/squash) + reagents_add = list(/datum/reagent/consumable/sprinkles = 0.1, /datum/reagent/consumable/astrotame = 0.1, /datum/reagent/consumable/honey = 0.2) /obj/item/food/grown/gelthi seed = /obj/item/seeds/gelthi name = "gelthi" - desc = "It's a little piece of gelthi." + desc = "A cluster of gelthi pods. Each pod contains a different sweetener, and the pods can be juiced into raw sugar." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "gelthi" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT - juice_typepath = /datum/reagent/gold - tastes = list("gold" = 1) + juice_typepath = /datum/reagent/consumable/sugar + tastes = list("overpowering sweetness" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/jurlmah.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/jurlmah.dm index 5351435276b..5e9bcd3f68b 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/jurlmah.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/jurlmah.dm @@ -1,6 +1,6 @@ /obj/item/seeds/jurlmah name = "pack of jurlmah seeds" - desc = "These seeds grow into jurlmah plants." + desc = "These seeds grow into jurlmah plants. Often used as makeshift cryo-treatment in areas where a dedicated cryotube setup is impossible." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "jurlmah" species = "jurlmah" @@ -12,17 +12,17 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "jurlmah-stage" growthstages = 5 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/medicine/cryoxadone = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/blue) + reagents_add = list(/datum/reagent/medicine/cryoxadone = 0.1, /datum/reagent/inverse/healing/tirimol = 0.1, /datum/reagent/consumable/frostoil = 0.1) /obj/item/food/grown/jurlmah seed = /obj/item/seeds/jurlmah name = "jurlmah" - desc = "It's a little piece of jurlmah." + desc = "A frosty jurlmah fruit, it feels cold to the touch." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "jurlmah" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT juice_typepath = /datum/reagent/medicine/cryoxadone - tastes = list("cold" = 1) + tastes = list("snow" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/nofruit.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/nofruit.dm index 65d8625e5d8..c22b032d287 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/nofruit.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/nofruit.dm @@ -1,6 +1,6 @@ /obj/item/seeds/nofruit name = "pack of nofruit seeds" - desc = "These seeds grow into nofruit plants." + desc = "These seeds grow into nofruit plants. A strange plant often cultivated by silent performers." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "nofruit" species = "nofruit" @@ -13,16 +13,16 @@ icon_grow = "nofruit-stage" growthstages = 4 genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/consumable/laughter = 0.1) + reagents_add = list(/datum/reagent/consumable/nothing = 0.1, /datum/reagent/toxin/mimesbane = 0.1, /datum/reagent/toxin/mutetoxin = 0.1) /obj/item/food/grown/nofruit seed = /obj/item/seeds/nofruit name = "nofruit" - desc = "It's a little piece of nofruit." + desc = "A cubic nofruit, the leaf on top of the nofruit gesticulates wildly." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "nofruit" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT juice_typepath = /datum/reagent/consumable/nothing - tastes = list("entertainment" = 1) + tastes = list("nothing" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/shand.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/shand.dm index c028b7b6082..faa59ef21c0 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/shand.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/shand.dm @@ -1,6 +1,6 @@ /obj/item/seeds/shand name = "pack of shand seeds" - desc = "These seeds grow into shand plants." + desc = "These seeds grow into shand plants. While not very useful on it's own, it is full of chemicals that no other plant can produce. A good candidate for crossbreeding." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "shand" species = "shand" @@ -12,17 +12,17 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "shand-stage" growthstages = 3 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/pax = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/maxchem) + reagents_add = list(/datum/reagent/bromine = 0.1, /datum/reagent/sodium = 0.1, /datum/reagent/copper = 0.1) /obj/item/food/grown/shand seed = /obj/item/seeds/shand name = "shand" - desc = "It's a little piece of shand." + desc = "A handful of shand leaves, the leaves are oily and smell like a laboratory." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "shand" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT - juice_typepath = /datum/reagent/pax - tastes = list("peace" = 1) + juice_typepath = /datum/reagent/bromine + tastes = list("chemicals" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/surik.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/surik.dm index 073274209dd..cb1717fd887 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/surik.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/surik.dm @@ -1,6 +1,6 @@ /obj/item/seeds/surik name = "pack of surik seeds" - desc = "These seeds grow into surik plants." + desc = "These seeds grow into surik plants. Said to contain the very essence of Indecipheres." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "surik" species = "surik" @@ -12,17 +12,17 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "surik-stage" growthstages = 4 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/consumable/frostoil = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/fire_resistance) + reagents_add = list(/datum/reagent/brimdust = 0.1, /datum/reagent/medicine/omnizine/godblood = 0.1, /datum/reagent/wittel = 0.1) /obj/item/food/grown/surik seed = /obj/item/seeds/surik name = "surik" - desc = "It's a little piece of surik." + desc = "A shimmering surik crystal. The center of the gem thrums with volcanic activity." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "surik" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT - juice_typepath = /datum/reagent/consumable/frostoil - tastes = list("snow" = 1) + juice_typepath = /datum/reagent/brimdust + tastes = list("crystals" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm index 7783cbdac1b..a0b3d621dc6 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/telriis.dm @@ -1,6 +1,6 @@ /obj/item/seeds/telriis name = "pack of telriis seeds" - desc = "These seeds grow into telriis plants." + desc = "These seeds grow into telriis plants. A distant relative of milkweed, this grass can actually be juiced into milk." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "telriis" species = "telriis" @@ -13,17 +13,17 @@ icon_grow = "telriis-stage" growthstages = 4 plant_icon_offset = 7 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/medicine/higadrite = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/invasive) + reagents_add = list(/datum/reagent/consumable/milk = 0.1, /datum/reagent/consumable/soymilk = 0.1, /datum/reagent/consumable/korta_milk) /obj/item/food/grown/telriis seed = /obj/item/seeds/telriis name = "telriis" - desc = "It's a little piece of telriis." + desc = "A sheaf of telris, it can be ground or juiced into a milky liquid." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "telriis" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT - juice_typepath = /datum/reagent/medicine/higadrite - tastes = list("liver" = 1) + juice_typepath = /datum/reagent/consumable/coconut_milk + tastes = list("milk" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/thaadra.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/thaadra.dm index e9eeadb274e..da3b11d8fd5 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/thaadra.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/thaadra.dm @@ -1,6 +1,6 @@ /obj/item/seeds/thaadra name = "pack of thaadra seeds" - desc = "These seeds grow into thaadra plants." + desc = "These seeds grow into thaadra plants. A strange flower full of unique medicines and silver." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "thaadra" species = "thaadra" @@ -12,13 +12,13 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "thaadra-stage" growthstages = 4 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/silver = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/preserved) + reagents_add = list(/datum/reagent/silver = 0.1, /datum/reagent/medicine/sansufentanyl = 0.1, /datum/reagent/medicine/cordiolis_hepatico = 0.1) /obj/item/food/grown/thaadra seed = /obj/item/seeds/thaadra name = "thaadra" - desc = "It's a little piece of thaadra." + desc = "A cluster of thaadra petals, full of niche medicinal chemicals." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "thaadra" filling_color = "#FF4500" diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vale.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vale.dm index adf8654d6b6..aa0d333a7a6 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vale.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vale.dm @@ -1,6 +1,6 @@ /obj/item/seeds/vale name = "pack of vale seeds" - desc = "These seeds grow into vale plants." + desc = "These seeds grow into vale plants. Once sold as a luxury for their unique aesthetics, after the trees suddenly combusted they were taken off of the market." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "vale" species = "vale" @@ -12,17 +12,17 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "vale-stage" growthstages = 4 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/medicine/neurine = 0.1) + genes = list(/datum/plant_gene/trait/repeated_harvest, /datum/plant_gene/trait/glow/pink) + reagents_add = list(/datum/reagent/stable_plasma = 0.1, /datum/reagent/toxin/plasma = 0.1, /datum/reagent/napalm = 0.1) /obj/item/food/grown/vale seed = /obj/item/seeds/vale name = "vale" - desc = "It's a little piece of vale." + desc = "A cluster of vale leaves, keep away from open flames." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "vale" filling_color = "#FF4500" bite_consumption_mod = 0.5 foodtypes = FRUIT - juice_typepath = /datum/reagent/medicine/neurine - tastes = list("medicine" = 1) + juice_typepath = /datum/reagent/toxin/plasma + tastes = list("plasma" = 1) diff --git a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vaporsac.dm b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vaporsac.dm index 1f467a66ab6..cbc12ab3288 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vaporsac.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/hydroponics/vaporsac.dm @@ -1,6 +1,6 @@ /obj/item/seeds/vaporsac name = "pack of vaporsac seeds" - desc = "These seeds grow into vaporsac plants." + desc = "These seeds grow into vaporsac plants. Normally vaporsac plants spread by floating through the air and exploding, but this strand of vaporsac thankfully does not." icon = 'modular_skyrat/modules/xenoarch/icons/seeds.dmi' icon_state = "vaporsac" species = "vaporsac" @@ -12,13 +12,13 @@ growing_icon = 'modular_skyrat/modules/xenoarch/icons/growing.dmi' icon_grow = "vaporsac-stage" growthstages = 3 - genes = list(/datum/plant_gene/trait/repeated_harvest) - reagents_add = list(/datum/reagent/nitrous_oxide = 0.1) + genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/smoke) + reagents_add = list(/datum/reagent/nitrous_oxide = 0.1, /datum/reagent/medicine/muscle_stimulant = 0.1, /datum/reagent/medicine/coagulant = 0.1) /obj/item/food/grown/vaporsac seed = /obj/item/seeds/vaporsac name = "vaporsac" - desc = "It's a little piece of vaporsac." + desc = "An buoyant vaporsac, full of aerosolized chemicals." icon = 'modular_skyrat/modules/xenoarch/icons/harvest.dmi' icon_state = "vaporsac" filling_color = "#FF4500"