Merge pull request #592 from Shandriaa/master

New Drink: Hachi

code/modules/economy/price_list.dm

@@ -395,6 +395,9 @@
 	
 /datum/reagent/ethanol/sitonmyface
 	price_tag = 4
+
+/datum/reagent/ethanol/hachi
+	price_tag = 4
 	
 // The Cheap Shit //
 
@@ -1068,4 +1071,4 @@
 //******************************//
 
 /datum/reagent/ethanol/euphoria
-	price_tag = 30
+	price_tag = 30

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

@@ -3295,6 +3295,14 @@
 
 	glass_name = "Sit on my face"
 	glass_desc = "A drink made of irish coffee and nuts, mostly known for its vulgar name. Makes for a great pickup line though!"
+	
+/datum/reagent/ethanol/hachi
+	name = "Hachi"
+	id = "hachi"
+	description = "An unusual fusion of bourbon and sake infused with lemon juice, and mushrooms. Sweet, savory, but mostly weird."
+	taste_description = "sweet lemons, black pepper, and savory mushroom"
+	color = "#DC971D"
+	strength = 20
 
 /datum/reagent/drink/freshtea
 	name = "Green tea"
@@ -3376,4 +3384,4 @@
 
 	cup_icon_state = "cup_tea"
 	cup_name = "cup of tea"
-	cup_desc = "Green tea. It smells a bit off."
+	cup_desc = "Green tea. It smells a bit off."

code/modules/reagents/Chemistry-Recipes.dm

@@ -2342,6 +2342,13 @@
 	required_reagents = list("kahlua" = 1, "irishcream" = 1, "nutbutter" = 1)
 	result_amount = 3
 
+/datum/chemical_reaction/drinks/hachi
+	name = "Hachi"
+	id = "hachi"
+	result = "hachi"
+	required_reagents = list("burbon" = 2, "sake" = 1, "lemonjuice" = 1, "mushroom" = 1)
+	result_amount = 5
+
 //R-UST Port
 /datum/chemical_reaction/hyrdophoron
 	name = "Hydrophoron"
@@ -2376,4 +2383,4 @@
 	id = "qerr_quem"
 	result = "qerr_quem"
 	required_reagents = list("nicotine" = 1, "carbon" = 1, "sugar" = 2)
-	result_amount = 4
+	result_amount = 4

code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm

@@ -565,4 +565,7 @@ Drinks Data
 	glass_icon_state = "oilslide"
 
 /datum/reagent/ethanol/sitonmyface
-	glass_icon_state = "sitonmyface"
+	glass_icon_state = "sitonmyface"
+
+/datum/reagent/ethanol/hachi
+	glass_icon_state = "hachi"