mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-26 10:02:28 +00:00
A new skrellian plant, and associated stuff (#6340)
Adds dyn, a Skrellian herb. Renowned as a medicine, its juice has mild anti-toxin properties identical to how powerful tea was before Burger nerfed it; lower than tea because Arrow considered old tea to be too OP, and any beverages made from it do too. Seeds are available both in the garden and hydroponics, and the plant may occasionally contain actual dylovene in it. The new drinks are the raw juice of the herb, a tea (1 juice to 4 water), and an icy/fizzy iced tea thing (1 juice to 2 ice to 2 soda water). The last comes as a soda can in the vendor, and a carton of juice is available at the bartender's boozemat. This is the first in a series of PRs expanding upon skrellian cuisine/drinks.
This commit is contained in:
@@ -92,7 +92,7 @@
|
||||
descriptors |= "poisonous"
|
||||
if(reagents.has_reagent("psilocybin") || reagents.has_reagent("space_drugs"))
|
||||
descriptors |= "hallucinogenic"
|
||||
if(reagents.has_reagent("bicaridine"))
|
||||
if(reagents.has_reagent("bicaridine") || reagents.has_reagent("dylovene"))
|
||||
descriptors |= "medicinal"
|
||||
if(reagents.has_reagent("gold"))
|
||||
descriptors |= "shiny"
|
||||
|
||||
@@ -1332,4 +1332,22 @@
|
||||
set_trait(TRAIT_PRODUCT_ICON,"bulb")
|
||||
set_trait(TRAIT_PRODUCT_COLOUR,"#ffeedd")
|
||||
set_trait(TRAIT_PLANT_ICON,"stalk")
|
||||
set_trait(TRAIT_WATER_CONSUMPTION, 5)
|
||||
set_trait(TRAIT_WATER_CONSUMPTION, 5)
|
||||
|
||||
/datum/seed/dyn
|
||||
name = "dyn"
|
||||
seed_name = "dyn"
|
||||
display_name = "dyn bush"
|
||||
mutants = null
|
||||
chems = list("dynjuice" = list(2,2), "dylovene" = list(0,1))
|
||||
kitchen_tag = "dyn leaf"
|
||||
|
||||
/datum/seed/dyn/setup_traits()
|
||||
..()
|
||||
set_trait(TRAIT_MATURATION,10)
|
||||
set_trait(TRAIT_PRODUCTION,10)
|
||||
set_trait(TRAIT_YIELD,3)
|
||||
set_trait(TRAIT_POTENCY,10)
|
||||
set_trait(TRAIT_PRODUCT_ICON,"leaves")
|
||||
set_trait(TRAIT_PRODUCT_COLOUR,"#00e0e0")
|
||||
set_trait(TRAIT_PLANT_ICON,"bush8")
|
||||
@@ -290,3 +290,6 @@ var/global/list/plant_seed_sprites = list()
|
||||
|
||||
/obj/item/seeds/ghostmushroomseed
|
||||
seed_type = "ghostmushroom"
|
||||
|
||||
/obj/item/seeds/dynseed
|
||||
seed_type = "dyn"
|
||||
@@ -83,6 +83,7 @@
|
||||
/obj/item/seeds/watermelonseed = 3,
|
||||
/obj/item/seeds/wheatseed = 3,
|
||||
/obj/item/seeds/whitebeetseed = 3,
|
||||
/obj/item/seeds/dynseed = 2
|
||||
)
|
||||
|
||||
/obj/machinery/seed_storage/xenobotany
|
||||
@@ -136,7 +137,8 @@
|
||||
/obj/item/seeds/towermycelium = 3,
|
||||
/obj/item/seeds/watermelonseed = 3,
|
||||
/obj/item/seeds/wheatseed = 3,
|
||||
/obj/item/seeds/whitebeetseed = 3
|
||||
/obj/item/seeds/whitebeetseed = 3,
|
||||
/obj/item/seeds/dynseed = 2
|
||||
)
|
||||
|
||||
/obj/machinery/seed_storage/attack_hand(mob/user as mob)
|
||||
|
||||
@@ -933,6 +933,45 @@
|
||||
glass_name = "glass of onion juice"
|
||||
glass_desc = "Juice from an onion, for when you need to cry."
|
||||
|
||||
/datum/reagent/drink/dynjuice
|
||||
name = "Dyn Juice"
|
||||
id = "dynjuice"
|
||||
description = "Juice from a dyn leaf. Good for you, but normally not consumed undiluted."
|
||||
taste_description = "astringent menthol"
|
||||
color = "#00e0e0"
|
||||
|
||||
glass_icon_state = "dynjuice"
|
||||
glass_name = "glass of dyn juice"
|
||||
glass_desc = "Juice from a dyn leaf. Good for you, but normally not consumed undiluted."
|
||||
|
||||
/datum/reagent/drink/dynjuice/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
..()
|
||||
M.adjustToxLoss(-0.3 * removed)
|
||||
|
||||
|
||||
/datum/reagent/drink/dynjuice/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
M.adjustToxLoss(-0.3 * removed)
|
||||
|
||||
/datum/reagent/drink/dynjuice/hot
|
||||
name = "Dyn Tea"
|
||||
id = "dynhot"
|
||||
taste_description = "peppermint water"
|
||||
description = "An old-fashioned, but traditional Skrell drink with documented medicinal properties."
|
||||
|
||||
glass_icon_state = "dynhot"
|
||||
glass_name = "cup of dyn tea"
|
||||
glass_desc = "An old-fashioned, but traditional Skrell drink with documented medicinal properties."
|
||||
|
||||
/datum/reagent/drink/dynjuice/cold
|
||||
name = "Dyn Ice Tea"
|
||||
id = "dyncold"
|
||||
taste_description = "fizzy mint tea"
|
||||
description = "A modern spin on an old formula, popular among Skrell youngsters. Good for you."
|
||||
|
||||
glass_icon_state = "dyncold"
|
||||
glass_name = "glass of dyn ice tea"
|
||||
glass_desc = "A modern spin on an old formula, popular among Skrell youngsters. Good for you."
|
||||
|
||||
// Everything else
|
||||
|
||||
/datum/reagent/drink/milk
|
||||
@@ -4019,4 +4058,3 @@
|
||||
description = "A delicious seasonal flavoring."
|
||||
color = "#AE771C"
|
||||
taste_description = "autumn bliss"
|
||||
|
||||
|
||||
@@ -2959,6 +2959,20 @@
|
||||
required_reagents = list("wine" = 4, "vodka" = 2, "sodawater" = 3, "radium" = 1 )
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/dynhot
|
||||
name = "Dyn Tea"
|
||||
id = "dynhot"
|
||||
result = "dynhot"
|
||||
required_reagents = list("dynjuice" = 1, "water" = 4)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/dyncold
|
||||
name = "Dyn Ice Tea"
|
||||
id = "dyncold"
|
||||
result = "dyncold"
|
||||
required_reagents = list("dynjuice" = 1, "ice" = 2, "sodawater" = 2)
|
||||
result_amount = 5
|
||||
|
||||
//transmutation
|
||||
|
||||
/datum/chemical_reaction/transmutation_silver
|
||||
|
||||
@@ -265,3 +265,14 @@
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/beetle_milk/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("beetle_milk", 30)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/dyn
|
||||
name = "Cooling Breeze"
|
||||
desc = "The most refreshing thing you can find on the market, based on a Skrell medicinal plant. No salt or sugar. "
|
||||
icon_state = "dyncan"
|
||||
center_of_mass = list("x"=16, "y"=10)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/cans/dyn/Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("dyncold", 30)
|
||||
|
||||
|
||||
@@ -467,6 +467,17 @@
|
||||
. = ..()
|
||||
reagents.add_reagent("lemonjuice", 100)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/dynjuice
|
||||
name = "dyn juice"
|
||||
desc = "Juice from a Skrell medicinal herb. It's supposed to be diluted."
|
||||
icon_state = "dyncarton"
|
||||
item_state = "carton"
|
||||
center_of_mass = list("x"=16, "y"=8)
|
||||
isGlass = 0
|
||||
Initialize()
|
||||
. = ..()
|
||||
reagents.add_reagent("dynjuice", 100)
|
||||
|
||||
//Small bottles
|
||||
/obj/item/weapon/reagent_containers/food/drinks/bottle/small
|
||||
name = "empty small bottle"
|
||||
|
||||
Reference in New Issue
Block a user