From 1fc5aa0570179c6924dfc1eb0fd13b11c9dcfc5a Mon Sep 17 00:00:00 2001
From: Schnayy <ittaschnee@gmail.com>
Date: Fri, 19 Feb 2021 16:41:44 -0600
Subject: [PATCH 1/2] Makes some juices not sugary

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

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 e8c39d05b0f..59220465736 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -936,6 +936,7 @@
 	description = "It's grrrrrape!"
 	taste_description = "grapes"
 	color = "#863333"
+	var/sugary = TRUE ///So non-sugary juices don't make Unathi snooze.
 
 	glass_name = "grape juice"
 	glass_desc = "It's grrrrrape!"
@@ -949,6 +950,7 @@
 
 /* //VOREStation Removal - Assuming all juice has sugar is silly
 	if(alien == IS_UNATHI)
+<<<<<<< HEAD
 		if(effective_dose < 2)
 			if(effective_dose == metabolism * 2 || prob(5))
 				M.emote("yawn")
@@ -962,6 +964,21 @@
 			M.Sleeping(20)
 			M.drowsyness = max(M.drowsyness, 60)
 */
+=======
+		if(sugary == TRUE)
+			if(effective_dose < 2)
+				if(effective_dose == metabolism * 2 || prob(5))
+					M.emote("yawn")
+			else if(effective_dose < 5)
+				M.eye_blurry = max(M.eye_blurry, 10)
+			else if(effective_dose < 20)
+				if(prob(50))
+					M.Weaken(2)
+				M.drowsyness = max(M.drowsyness, 20)
+			else
+				M.Sleeping(20)
+				M.drowsyness = max(M.drowsyness, 60)
+>>>>>>> 83e0c14... adds sugary var (#7897)
 
 /datum/reagent/drink/juice/lemon
 	name = "Lemon Juice"
@@ -1036,6 +1053,7 @@
 	taste_description = "potatoes"
 	nutrition = 2
 	color = "#302000"
+	sugary = FALSE
 
 	glass_name = "potato juice"
 	glass_desc = "Juice from a potato. Bleh."
@@ -1046,6 +1064,7 @@
 	description = "Tomatoes made into juice. What a waste of big, juicy tomatoes, huh?"
 	taste_description = "tomatoes"
 	color = "#731008"
+	sugary = FALSE
 
 	glass_name = "tomato juice"
 	glass_desc = "Are you sure this is tomato juice?"

From c2ca8630e45d7a82da8369a14c499a147051fc99 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Fri, 19 Feb 2021 17:45:12 -0500
Subject: [PATCH 2/2] Update Chemistry-Reagents-Food-Drinks.dm

---
 .../Chemistry-Reagents-Food-Drinks.dm           | 17 -----------------
 1 file changed, 17 deletions(-)

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 59220465736..1e0cb46f397 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -948,23 +948,7 @@
 	if(issmall(M))
 		effective_dose *= 2
 
-/* //VOREStation Removal - Assuming all juice has sugar is silly
 	if(alien == IS_UNATHI)
-<<<<<<< HEAD
-		if(effective_dose < 2)
-			if(effective_dose == metabolism * 2 || prob(5))
-				M.emote("yawn")
-		else if(effective_dose < 5)
-			M.eye_blurry = max(M.eye_blurry, 10)
-		else if(effective_dose < 20)
-			if(prob(50))
-				M.Weaken(2)
-			M.drowsyness = max(M.drowsyness, 20)
-		else
-			M.Sleeping(20)
-			M.drowsyness = max(M.drowsyness, 60)
-*/
-=======
 		if(sugary == TRUE)
 			if(effective_dose < 2)
 				if(effective_dose == metabolism * 2 || prob(5))
@@ -978,7 +962,6 @@
 			else
 				M.Sleeping(20)
 				M.drowsyness = max(M.drowsyness, 60)
->>>>>>> 83e0c14... adds sugary var (#7897)
 
 /datum/reagent/drink/juice/lemon
 	name = "Lemon Juice"