Merge pull request #8756 from VOREStation/upstream-merge-7449

[MIRROR] Flavour Enhancement: Vending

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

@@ -152,7 +152,7 @@
 /datum/reagent/nutriment/triglyceride/oil/touch_turf(var/turf/simulated/T)
 	if(!istype(T))
 		return
-	
+
 	var/hotspot = (locate(/obj/fire) in T)
 	if(hotspot && !istype(T, /turf/space))
 		var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles)
@@ -224,7 +224,7 @@
 	taste_description = "oil"
 	taste_mult = 0.1
 	reagent_state = LIQUID
-	
+
 /datum/reagent/nutriment/triglyceride/oil/peanut
 	name = "Peanut Oil"
 	id = "peanutoil"
@@ -584,7 +584,7 @@
 	reagent_state = LIQUID
 	color = "#365E30"
 	overdose = REAGENTS_OVERDOSE
-	
+
 //SYNNONO MEME FOODS EXPANSION - Credit to Synnono
 
 /datum/reagent/spacespice
@@ -1242,6 +1242,32 @@
 	cup_name = "cup of berry tea"
 	cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
 
+/datum/reagent/drink/greentea
+	name = "Green Tea"
+	id = "greentea"
+	description = "A subtle blend of green tea. It's apparently good for you!"
+	color = "#A8442C"
+	taste_description = "green tea"
+
+	glass_name = "green tea"
+	glass_desc = "A subtle blend of green tea. It's apparently good for you!"
+
+	cup_name = "cup of green tea"
+	cup_desc = "A subtle blend of green tea. It's apparently good for you!"
+
+/datum/reagent/drink/chaitea
+	name = "Chai Tea"
+	id = "chaitea"
+	description = "A tea spiced with cinnamon and cloves."
+	color = "#A8442C"
+	taste_description = "creamy cinnamon and spice"
+
+	glass_name = "chai tea"
+	glass_desc = "A tea spiced with cinnamon and cloves."
+
+	cup_name = "cup of chai tea"
+	cup_desc = "A tea spiced with cinnamon and cloves."
+
 /datum/reagent/drink/coffee
 	name = "Coffee"
 	id = "coffee"
@@ -1683,7 +1709,7 @@
 	glass_special = list(DRINK_FIZZ)
 
 /datum/reagent/drink/soda/lemon_lime
-	name = "Lemon Lime"
+	name = "Lemon-Lime"
 	id = "lemon_lime"
 	description = "A tangy substance made of 0.5% natural citrus!"
 	taste_description = "tangy lime and lemon soda"
@@ -1706,6 +1732,26 @@
 	glass_desc = "The original, refreshing not-actually-ale."
 	glass_special = list(DRINK_FIZZ)
 
+/datum/reagent/drink/root_beer
+	name = "R&D Root Beer"
+	id = "rootbeer"
+	color = "#211100"
+	adj_drowsy = -6
+	taste_description = "sassafras and anise soda"
+
+	glass_name = "glass of R&D Root Beer"
+	glass_desc = "A glass of bubbly R&D Root Beer."
+
+/datum/reagent/drink/dr_gibb_diet
+	name = "Diet Dr. Gibb"
+	id = "diet_dr_gibb"
+	color = "#102000"
+	taste_description = "watered down cherry soda"
+
+	glass_name = "glass of Diet Dr. Gibb"
+	glass_desc = "Regular Dr.Gibb is probably healthier than this cocktail of artificial flavors."
+	glass_special = list(DRINK_FIZZ)
+
 /datum/reagent/drink/shirley_temple
 	name = "Shirley Temple"
 	id =  "shirley_temple"
@@ -2073,6 +2119,7 @@
 	glass_icon = DRINK_ICON_NOISY
 	glass_special = list(DRINK_FIZZ)
 
+
 /* Alcohol */
 
 // Basic
@@ -2118,6 +2165,18 @@
 		return
 	M.jitteriness = max(M.jitteriness - 3, 0)
 
+/datum/reagent/ethanol/beer/lite
+	name = "Lite Beer"
+	id = "litebeer"
+	description = "An alcoholic beverage made from malted grains, hops, yeast, water, and water."
+	taste_description = "bad beer"
+	color = "#FFD300"
+	strength = 75
+	nutriment_factor = 1
+
+	glass_name = "lite beer"
+	glass_desc = "A freezing pint of lite beer"
+
 /datum/reagent/ethanol/bluecuracao
 	name = "Blue Curacao"
 	id = "bluecuracao"

code/modules/reagents/dispenser/cartridge_presets.dm

@@ -73,6 +73,7 @@
 	cream		spawn_reagent = "cream"
 	mint		spawn_reagent = "mint"
 	berry		spawn_reagent = "berryjuice"
+	greentea	spawn_reagent = "greentea"
 	decaf		spawn_reagent = "decaf"
 
 	// ERT

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -139,5 +139,6 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/greentea,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/decaf
 		)