From abeea22566c5ce275140686f3a36e3378d3ff4ec Mon Sep 17 00:00:00 2001
From: Ren Erthilo <erthilo@gmail.com>
Date: Fri, 30 Mar 2012 05:52:18 +0100
Subject: [PATCH] Rebalanced beer and made ethanol the base alcohol. Slightly
 tweaked alcohol effect rates.

---
 code/modules/chemical/Chemistry-Reagents.dm | 89 +++++++--------------
 1 file changed, 30 insertions(+), 59 deletions(-)

diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index a1602f1192a..146e2895b6c 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -1752,27 +1752,6 @@ datum
 			reagent_state = LIQUID
 			color = "#181818" // rgb: 24, 24, 24
 
-		ethanol
-			name = "Ethanol"
-			id = "ethanol"
-			description = "A well-known alcohol with a variety of applications."
-			reagent_state = LIQUID
-			color = "#404030" // rgb: 64, 64, 48
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.make_dizzy(5)
-				M:jitteriness = max(M:jitteriness-5,0)
-				if(data >= 25)
-					if (!M:slurring) M:slurring = 1
-					M:slurring += 4
-				if(data >= 40 && prob(33))
-					if (!M:confused) M:confused = 1
-					M:confused += 3
-				..()
-				return
-
 		ammonia
 			name = "Ammonia"
 			id = "ammonia"
@@ -2557,32 +2536,6 @@ datum
 				..()
 				return
 
-		thirteenloko
-			name = "Thirteen Loko"
-			id = "thirteenloko"
-			description = "A potent mixture of caffeine and alcohol."
-			reagent_state = LIQUID
-			color = "#102000" // rgb: 16, 32, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				M:drowsyness = max(0,M:drowsyness-7)
-				if(!M:sleeping_willingly)
-					M:sleeping = 0
-				if (M.bodytemperature > 310)
-					M.bodytemperature = max(310, M.bodytemperature-5)
-				M.make_jittery(1)
-				M:nutrition += 1
-				if(!data) data = 1
-				data++
-				M.dizziness +=4
-				if(data >= 45 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 3
-				else if(data >= 125 && prob(33))
-					M.confused = max(M:confused+2,0)
-				..()
-				return
-
 		dr_gibb
 			name = "Dr. Gibb"
 			id = "dr_gibb"
@@ -2651,18 +2604,20 @@ datum
 
 
 //ALCOHOL WOO
-		alcohol	//Parent class for all alcoholic reagents.
-			name = "Alcohol"
-			id = "alcohol"
+		ethanol
+			name = "Ethanol" //Parent class for all alcoholic reagents.
+			id = "ethanol"
+			description = "A well-known alcohol with a variety of applications."
 			reagent_state = LIQUID
+			color = "#404030" // rgb: 64, 64, 48
 			var
 				dizzy_adj = 3
 				slurr_adj = 3
 				confused_adj = 2
-				slur_start = 45			//amount absorbed after which mob starts slurring
-				confused_start = 125	//amount absorbed after which mob starts confusing directions
-				blur_start = 245	//amount absorbed after which mob starts getting blurred vision
-				pass_out = 290	//amount absorbed after which mob starts passing out
+				slur_start = 65			//amount absorbed after which mob starts slurring
+				confused_start = 130	//amount absorbed after which mob starts confusing directions
+				blur_start = 260	//amount absorbed after which mob starts getting blurred vision
+				pass_out = 325	//amount absorbed after which mob starts passing out
 
 			on_mob_life(var/mob/living/M as mob)
 				if(!src.data) data = 1
@@ -2671,7 +2626,7 @@ datum
 				var/d = data
 
 				// make all the beverages work together
-				for(var/datum/reagent/alcohol/A in holder.reagent_list)
+				for(var/datum/reagent/ethanol/A in holder.reagent_list)
 					if(A.data) d += A.data
 
 				M.dizziness +=dizzy_adj.
@@ -2692,14 +2647,13 @@ datum
 				..()
 				return
 
-			beer	//It's really much more stronger than other drinks
+			beer	//It's really much more stronger than other drinks.
 				name = "Beer"
 				id = "beer"
 				description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
 				color = "#664300" // rgb: 102, 67, 0
-				slur_start = 25			//amount absorbed after which mob starts slurring
-				confused_start = 40		//amount absorbed after which mob starts confusing directions
-
+//				slur_start = 25			//amount absorbed after which mob starts slurring
+//				confused_start = 40		//amount absorbed after which mob starts confusing directions //This is quite silly - Erthilo
 				on_mob_life(var/mob/living/M as mob)
 					..()
 					M:jitteriness = max(M:jitteriness-3,0)
@@ -2784,6 +2738,23 @@ datum
 				description = "A dark alchoholic beverage made by malted barley and yeast."
 				color = "#664300" // rgb: 102, 67, 0
 
+			thirteenloko
+				name = "Thirteen Loko"
+				id = "thirteenloko"
+				description = "A potent mixture of caffeine and alcohol."
+				reagent_state = LIQUID
+				color = "#102000" // rgb: 16, 32, 0
+
+				on_mob_life(var/mob/living/M as mob)
+					M:drowsyness = max(0,M:drowsyness-7)
+					if(!M:sleeping_willingly)
+						M:sleeping = 0
+					if (M.bodytemperature > 310)
+						M.bodytemperature = max(310, M.bodytemperature-5)
+					M.make_jittery(1)
+					M:nutrition += 1
+					return
+
 
 /////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////