Merge pull request #1590 from Arctaisia/kalyna

New Hydroponics plant, Kalyna (Red Viburnum/Guelder rose)

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -1001,3 +1001,5 @@
 	glass_desc = "A Summer time drink that can be frozen and eaten or Drinked from a glass!"
 	glass_name = "Orange Creamsicle"
 	hydration = 4
+
+

code/modules/vending/megaseed.dm

@@ -46,7 +46,8 @@
 					/obj/item/seeds/tower = 3,
 					/obj/item/seeds/watermelon = 3,
 					/obj/item/seeds/wheat = 3,
-					/obj/item/seeds/whitebeet = 3)
+					/obj/item/seeds/whitebeet = 3,
+					/obj/item/seeds/kalyna = 3) //Hyperstation addition
 
 	contraband=list(/obj/item/seeds/amanita = 2,
 					/obj/item/seeds/glowshroom = 2,

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)

hyperstation/code/modules/hydroponics/grown/kalyna.dm

@@ -0,0 +1,40 @@
+// 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 = 'hyperstation/icons/obj/hydroponics/seeds.dmi'
+	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 = 'hyperstation/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 = 'hyperstation/icons/obj/hydroponics/harvest.dmi'
+	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

hyperstation/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -0,0 +1,11 @@
+//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."

hyperstation/code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -21,3 +21,13 @@
 	if(holder.has_reagent(/datum/reagent/consumable/capsaicin))
 		holder.remove_reagent(/datum/reagent/consumable/capsaicin, 1)
 	..()
+
+/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

tgstation.dme

@@ -3164,6 +3164,7 @@
 #include "hyperstation\code\modules\events\crystalline_reentry.dm"
 #include "hyperstation\code\modules\events\crystalloid_entities.dm"
 #include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm"
+#include "hyperstation\code\modules\hydroponics\grown\kalyna.dm"
 #include "hyperstation\code\modules\integrated_electronics\input.dm"
 #include "hyperstation\code\modules\jobs\job_types\roleplay.dm"
 #include "hyperstation\code\modules\mining\shelters.dm"
@@ -3179,6 +3180,7 @@
 #include "hyperstation\code\modules\power\reactor\fuel_rods.dm"
 #include "hyperstation\code\modules\power\reactor\rbmk.dm"
 #include "hyperstation\code\modules\power\reactor\reactor_cargo.dm"
+#include "hyperstation\code\modules\reagents\chemistry\reagents\alcohol_reagents.dm"
 #include "hyperstation\code\modules\reagents\chemistry\reagents\drink_reagents.dm"
 #include "hyperstation\code\modules\reagents\chemistry\reagents\food_reagents.dm"
 #include "hyperstation\code\modules\reagents\chemistry\reagents\hydroponics_reactions.dm"