diff --git a/code/modules/hydroponics/grown/kalyna.dm b/code/modules/hydroponics/grown/kalyna.dm new file mode 100644 index 000000000..139295ab7 --- /dev/null +++ b/code/modules/hydroponics/grown/kalyna.dm @@ -0,0 +1,38 @@ +// Kalyna Berries +/obj/item/seeds/kalyna + name = "pack of kalyna berry seeds" + desc = "Seeds that grow into Kalyna plants. Take that Red Kalyna and rise it up." + icon_state = "seed-kalyna" + species = "kalyna" + plantname = "Kalyna Shrub Tree" + product = /obj/item/reagent_containers/food/snacks/grown/kalyna + lifespan = 20 + maturation = 5 + production = 5 + growthstages = 5 + yield = 4 + growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi' + icon_grow = "kalyna-grow" + icon_dead = "kalyna-dead" + genes = list(/datum/plant_gene/trait/repeated_harvest) + reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.04, /datum/reagent/consumable/nutriment = 0.1) + +/obj/item/reagent_containers/food/snacks/grown/kalyna + seed = /obj/item/seeds/kalyna + name = "branch of kalyna" + desc = "Red berries, attached to a branch. Just looking at it makes you feel an aura of unity." + icon_state = "kalynaberries" + gender = PLURAL + filling_color = "#FF0000" + bitesize_mod = 2 + foodtype = FRUIT + juice_results = list(/datum/reagent/consumable/kalynajuice = 1) + tastes = list("sweet cranberries" = 1) + distill_reagent = /datum/reagent/consumable/ethanol/gin + +//For those of you wondering, yes, this is very much an addition in support of Ukraine. I decided to make these after a distant Ukranian relative of mine sent me Go_A's 'Kalyna' song. +//Our future as a free world could very well depend on the heroism of the people of glorious Ukraine. We owe our freedom to them. +//I know that this game should be for escapism, but there's only so much we should escape from. When people's lives are being upturned-- Or taken by a brutal invasive reigime, perhaps then it's when we should take a stand. +//And for those that oppose the freedom of the people of Ukraine, Russia, and Belarus; Prykhyl'nyk Putina, idy na khuy. And show some basic empathy for once, it's not that hard. +//Glory to Ukraine, Glory to the Heroes! +// - Arctaisia, Hyperstation developer and spriter, 23/04/2022 #StandWithUkraine \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 8547e5117..ada7c7a06 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -2439,3 +2439,15 @@ datum/reagent/consumable/ethanol/creme_de_coconut boozepwr = 65 taste_description = "viscous cream" glass_desc = "The name is probably exactly what it is." + +//Hope you're not a Russian T-90 +/datum/reagent/consumable/ethanol/javelin + name = "Javelin Cocktail" + boozepwr = 80 + color = "#F54F10" + quality = DRINK_FANTASTIC + taste_description = "explosive fireballs" + glass_icon_state = "javelin" + shot_glass_icon_state = "javelin_warhead" + glass_name = "Javelin Cocktail" + glass_desc = "A man-portable, delicious glass of justice." diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm index de4a4b684..8ed38e686 100644 --- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm @@ -1001,3 +1001,13 @@ glass_desc = "A Summer time drink that can be frozen and eaten or Drinked from a glass!" glass_name = "Orange Creamsicle" hydration = 4 + +/datum/reagent/consumable/kalynajuice + name = "Red Kalyna Juice" + description = "Juice from Kalyna plants." + color = "#E90501" // rgb: 233, 5, 1 + taste_description = "sweet cranberries" + glass_icon_state = "kalyna" + glass_name = "glass of red kalyna juice" + glass_desc = "A vibrantly red juice!" + hydration = 4 diff --git a/hyperstation/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/hyperstation/code/modules/food_and_drinks/recipes/drinks_recipes.dm index 05fedabf7..83e49f04f 100644 --- a/hyperstation/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/hyperstation/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -3,3 +3,9 @@ id = /datum/reagent/consumable/pilk results = list(/datum/reagent/consumable/pilk = 2) required_reagents = list(/datum/reagent/consumable/milk = 1, /datum/reagent/consumable/space_cola = 1) + +/datum/chemical_reaction/javelin + name = "Javelin" + id = /datum/reagent/consumable/ethanol/javelin + results = list(/datum/reagent/consumable/ethanol/javelin = 5) + required_reagents = list(/datum/reagent/consumable/kalynajuice = 1, /datum/reagent/consumable/ethanol/whiskey = 2, /datum/reagent/consumable/ethanol/vodka = 2) diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index 4ba28ee99..250fb561a 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi index ba0761035..8b05dcf6b 100644 Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 368b0e5c0..8de35ffaf 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi index be65d86d0..812f79cf1 100644 Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 968494d99..61fea1715 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1899,6 +1899,7 @@ #include "code\modules\hydroponics\grown\flowers.dm" #include "code\modules\hydroponics\grown\garlic.dm" #include "code\modules\hydroponics\grown\grass_carpet.dm" +#include "code\modules\hydroponics\grown\kalyna.dm" #include "code\modules\hydroponics\grown\kudzu.dm" #include "code\modules\hydroponics\grown\melon.dm" #include "code\modules\hydroponics\grown\misc.dm"