Merge pull request #1787 from CHOMPStationBot/upstream-merge-10116

[MIRROR] [MIRROR] Boda Tweaks and Russian Drinks V2

code/game/machinery/vending_machines.dm

@@ -590,8 +590,9 @@
 	desc = "An old sweet water vending machine,how did this end up here?"
 	icon_state = "sovietsoda"
 	product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
-	products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/space_up = 30) // TODO Russian soda can
-	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/cola = 20) // TODO Russian cola can
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30,		//ADDITION 04/03/2021
+					/obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 20)	//ADDITION 04/03/2021
+	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 20) 	//ADDITION 04/03/2021
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 	vending_sound = "machines/vending/vending_cans.ogg"
 

code/modules/food/food/cans.dm

@@ -171,3 +171,36 @@
 	. = ..()
 	reagents.add_reagent("rootbeer", 30)
 
+//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/kvass
+	name = "\improper Kvass"
+	desc = "A true Slavic soda."
+	description_fluff = "A classic slavic beverage which many Space Russians still enjoy to this day. Fun fact, it is actually considered a weak beer by non-russians."
+	icon_state = "kvass"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/kvass/Initialize()
+	. = ..()
+	reagents.add_reagent("kvass", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/kompot
+	name = "\improper Kompot"
+	desc = "A taste of russia in the summertime - canned for you consumption."
+	description_fluff = "A sweet and fruity beverage that was traditionally used to preserve frutis in harsh Russian winters that is now available for widespread comsumption."
+	icon_state = "kompot"
+	center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/kompot/Initialize()
+	. = ..()
+	reagents.add_reagent("kompot", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/boda
+	name = "\improper Boda"
+	desc = "State regulated soda beverage. Enjoy comrades."
+	icon_state = "boda"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/boda/Initialize()
+	. = ..()
+	reagents.add_reagent("sodawater", 30)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -1712,7 +1712,7 @@
 
 	glass_name = "Rewriter"
 	glass_desc = "The secret of the sanctuary of the Libarian..."
-	allergen_type = FRUIT|COFFEE //Made with space mountain wind (Fruit) 
+	allergen_type = FRUIT|COFFEE //Made with space mountain wind (Fruit)
 
 /datum/reagent/drink/rewriter/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
 	..()
@@ -2750,7 +2750,7 @@
 	glass_name = "Banana Honk"
 	glass_desc = "A drink from Banana Heaven."
 
-	allergen_type = FRUIT|DAIRY //Made from banana juice(fruit) and cream(dairy) 
+	allergen_type = FRUIT|DAIRY //Made from banana juice(fruit) and cream(dairy)
 
 /datum/reagent/ethanol/barefoot
 	name = "Barefoot"
@@ -4197,3 +4197,28 @@
 	reagent_state = LIQUID
 	nutriment_factor = 40 //very filling
 	color = "#d169b2"
+
+//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021
+
+/datum/reagent/drink/soda/kompot
+	name = "Kompot"
+	id = "kompot"
+	description = "A traditional Eastern European beverage once used to preserve fruit in the 1980s"
+	taste_description = "refreshuingly sweet and fruity"
+	color = "#ed9415" // rgb: 237, 148, 21
+	adj_drowsy = -1
+	adj_temp = -6
+	glass_name = "kompot"
+	glass_desc = "A glass of refreshing kompot."
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/ethanol/kvass
+	name = "Kvass"
+	id = "kvass"
+	description = "A traditional fermented Slavic and Baltic beverage commonly made from rye bread."
+	taste_description = "a warm summer day at babushka's cabin"
+	color = "#b78315" // rgb: 183, 131, 21
+	strength = 95 //It's just soda to Russians
+	nutriment_factor = 2
+	glass_name = "kvass"
+	glass_desc = "A hearty glass of Slavic brew."