From 075766d674d29f8310ae2a71ea1a725226bda0fa Mon Sep 17 00:00:00 2001
From: Shandriaa <49291812+Shandriaa@users.noreply.github.com>
Date: Thu, 4 Apr 2019 16:38:23 -0500
Subject: [PATCH 1/5] Update Chemistry-Recipes.dm

---
 code/modules/reagents/Chemistry-Recipes.dm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 70c6bf3553..f9b3f0864b 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/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
\ No newline at end of file
+	result_amount = 4

From f784b8c08e2bc28f9bb1afdb07744fc1e7b6e918 Mon Sep 17 00:00:00 2001
From: Shandriaa <49291812+Shandriaa@users.noreply.github.com>
Date: Thu, 4 Apr 2019 16:59:20 -0500
Subject: [PATCH 2/5] Update Chemistry-Reagents-Food-Drinks.dm

---
 .../Chemistry-Reagents-Food-Drinks.dm                  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 8d14851c1b..455bc41837 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/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."
\ No newline at end of file
+	cup_desc = "Green tea. It smells a bit off."

From fa301acd780ecb93094ddb7c9a56a1c545f58f3d Mon Sep 17 00:00:00 2001
From: Shandriaa <49291812+Shandriaa@users.noreply.github.com>
Date: Thu, 4 Apr 2019 17:13:47 -0500
Subject: [PATCH 3/5] Update metaglass.dm

---
 .../reagents/reagent_containers/drinkingglass/metaglass.dm   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm b/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm
index 036ead19d4..2d9322fa80 100644
--- a/code/modules/reagents/reagent_containers/drinkingglass/metaglass.dm
+++ b/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"
\ No newline at end of file
+	glass_icon_state = "sitonmyface"
+
+/datum/reagent/ethanol/hachi
+	glass_icon_state = "hachi"

From 575193cf3237645ecf416f1f46f6dca5e5820505 Mon Sep 17 00:00:00 2001
From: Shandriaa <49291812+Shandriaa@users.noreply.github.com>
Date: Thu, 4 Apr 2019 17:16:19 -0500
Subject: [PATCH 4/5] Update price_list.dm

---
 code/modules/economy/price_list.dm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/economy/price_list.dm b/code/modules/economy/price_list.dm
index bd3ba0f989..82288ce785 100644
--- a/code/modules/economy/price_list.dm
+++ b/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
\ No newline at end of file
+	price_tag = 30

From 75b0037a00a7e1a25f776c414793261ad22bf054 Mon Sep 17 00:00:00 2001
From: AnonymousHybi <31137109+AnonymousHybi@users.noreply.github.com>
Date: Thu, 4 Apr 2019 23:47:50 +0100
Subject: [PATCH 5/5] Fixes compile error

Missing an " ^^
---
 .../Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 455bc41837..d0534ee42b 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -3299,7 +3299,7 @@
 /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.
+	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