•Removed the badly sprited drinks, left the good ones in. Check here for the actual changes.

•Boozeomat no longer vends that retarded icecup thing
•Cleared up and shaded a lot of drinks and bottles. New caccavo tequilla bottle.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2136 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/chemical/Chemistry-Reagents.dm

@@ -2207,7 +2207,7 @@ datum
 				..()
 				return
 
-		nuka_cola
+/*		nuka_cola
 			name = "Nuka Cola"
 			id = "nuka_cola"
 			description = "Cola, cola never changes."
@@ -2224,7 +2224,7 @@ datum
 					M.bodytemperature = max(310, M.bodytemperature-5)
 				M:nutrition += 1
 				..()
-				return
+				return*/
 
 		spacemountainwind
 			name = "Space Mountain Wind"
@@ -2884,25 +2884,6 @@ datum
 				..()
 				return
 
-		devilskiss
-			name = "Devils Kiss"
-			id = "devilskiss"
-			description = "Creepy time!"
-			reagent_state = LIQUID
-			color = "#A68310" // rgb: 166, 131, 16
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=4
-				if(data >= 55 && data <165)
-					if (!M.stuttering) M.stuttering = 1
-					M.stuttering += 4
-				else if(data >= 165 && prob(33))
-					M.confused = max(M:confused+4,0)
-				..()
-				return
-
 		bloody_mary
 			name = "Bloody Mary"
 			id = "bloodymary"
@@ -3385,7 +3366,28 @@ datum
 				..()
 				return
 
-		sbiten
+		singulo
+			name = "Singulo"
+			id = "singulo"
+			description = "A blue-space beverage!"
+			reagent_state = LIQUID
+			color = "#2E6671" // rgb: 46, 102, 113
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=15
+				if(data >= 55 && data <115)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 15
+				else if(data >= 115 && prob(33))
+					M.confused = max(M:confused+15,15)
+				..()
+				return
+
+////////////////////////// REMOVED COCKTAIL REAGENTS BELOW:: RE-ENABLE THEM IF THEY EVER GET SPRITES THAT DON'T LOOK FUCKING STUPID --Agouri ///////////////////////////
+
+/*		sbiten
 			name = "Sbiten"
 			id = "sbiten"
 			description = "A spicy Vodka! Might be a little hot for the little guys!"
@@ -3406,6 +3408,25 @@ datum
 				..()
 				return
 
+		devilskiss
+			name = "Devils Kiss"
+			id = "devilskiss"
+			description = "Creepy time!"
+			reagent_state = LIQUID
+			color = "#A68310" // rgb: 166, 131, 16
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!data) data = 1
+				data++
+				M.dizziness +=4
+				if(data >= 55 && data <165)
+					if (!M.stuttering) M.stuttering = 1
+					M.stuttering += 4
+				else if(data >= 165 && prob(33))
+					M.confused = max(M:confused+4,0)
+				..()
+				return
+
 		red_mead
 			name = "Red Mead"
 			id = "red_mead"
@@ -3530,7 +3551,7 @@ datum
 				..()
 				return
 
-/*		alliescocktail
+		alliescocktail
 			name = "Allies Cocktail"
 			id = "alliescocktail"
 			description = "A drink made from your allies."
@@ -3547,7 +3568,7 @@ datum
 				else if(data >= 250 && prob(60))
 					M.confused = max(M:confused+8,0)
 				..()
-				return*/
+				return
 
 		soy_latte
 			name = "Soy Latte"
@@ -3746,24 +3767,7 @@ datum
 					..()
 					return
 
-		singulo
-			name = "Singulo"
-			id = "singulo"
-			description = "A blue-space beverage!"
-			reagent_state = LIQUID
-			color = "#2E6671" // rgb: 46, 102, 113
 
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=15
-				if(data >= 55 && data <115)
-					if (!M.stuttering) M.stuttering = 1
-					M.stuttering += 15
-				else if(data >= 115 && prob(33))
-					M.confused = max(M:confused+15,15)
-				..()
-				return
 
 		changelingsting
 			name = "Changeling Sting"
@@ -3839,6 +3843,6 @@ datum
 				else if(data >= 115 && prob(60))
 					M.confused = max(M:confused+15,15)
 				..()
-				return
+				return*/
 
 

code/modules/chemical/Chemistry-Recipes.dm

@@ -1051,7 +1051,52 @@ datum
 			required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
 			result_amount = 6
 
-		sbiten
+		singulo
+			name = "Singulo"
+			id = "singulo"
+			result = "singulo"
+			required_reagents = list("vodka" = 5, "radium" = 1, "acid" = 1, "wine" = 5)
+			result_amount = 10
+
+/*		alliescocktail
+			name = "Allies Cocktail"
+			id = "alliescocktail"
+			result = "alliescocktail"
+			required_reagents = list("gin" = 1, "vermouth" = 1)
+			result_amount = 2*/
+
+		demonsblood
+			name = "Demons Blood"
+			id = "demonsblood"
+			result = "demonsblood"
+			required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
+			result_amount = 4
+
+		booger
+			name = "Booger"
+			id = "booger"
+			result = "booger"
+			required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
+			result_amount = 4
+
+		antifreeze
+			name = "Anti-freeze"
+			id = "antifreeze"
+			result = "antifreeze"
+			required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
+			result_amount = 4
+
+		barefoot
+			name = "Barefoot"
+			id = "barefoot"
+			result = "barefoot"
+			required_reagents = list("vodka" = 1, "cream" = 1, "vermouth" = 1, "whiskey" = 1)
+			result_amount = 4
+
+
+////DRINKS THAT REQUIRE IMPROVED SPRITES BELOW:: -Agouri/////
+
+/*		sbiten
 			name = "Sbiten"
 			id = "sbiten"
 			result = "sbiten"
@@ -1129,40 +1174,12 @@ datum
 			required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
 			result_amount = 10
 
-		neurotoxin
-			name = "Neurotoxin"
-			id = "neurotoxin"
-			result = "neurotoxin"
-			required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
-			result_amount = 2
-
-		hippiesdelight
-			name = "Hippies Delight"
-			id = "hippiesdelight"
-			result = "hippiesdelight"
-			required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
-			result_amount = 2
-
-		bananahonk
-			name = "Banana Honk"
-			id = "bananahonk"
-			result = "bananahonk"
-			required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
-			result_amount = 3
-
-		silencer
-			name = "Silencer"
-			id = "silencer"
-			result = "silencer"
-			required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
-			result_amount = 3
-
-		singulo
-			name = "Singulo"
-			id = "singulo"
-			result = "singulo"
-			required_reagents = list("vodka" = 5, "radium" = 1, "acid" = 1, "wine" = 5)
-			result_amount = 10
+		changelingsting
+			name = "Changeling Sting"
+			id = "changelingsting"
+			result = "changelingsting"
+			required_reagents = list("orangejuice" = 1, "limejuice" = 1, "lemonjuice" = 1, "vodka" = 1)
+			result_amount = 4
 
 		aloe
 			name = "Aloe"
@@ -1178,12 +1195,12 @@ datum
 			required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
 			result_amount = 3
 
-/*		alliescocktail
-			name = "Allies Cocktail"
-			id = "alliescocktail"
-			result = "alliescocktail"
-			required_reagents = list("gin" = 1, "vermouth" = 1)
-			result_amount = 2*/
+		neurotoxin
+			name = "Neurotoxin"
+			id = "neurotoxin"
+			result = "neurotoxin"
+			required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
+			result_amount = 2
 
 		snowwhite
 			name = "Snow White"
@@ -1192,48 +1209,6 @@ datum
 			required_reagents = list("beer" = 1, "lemon_lime" = 1)
 			result_amount = 2
 
-		devilskiss
-			name = "Devils Kiss"
-			id = "devilskiss"
-			result = "devilskiss"
-			required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
-			result_amount = 3
-
-		demonsblood
-			name = "Demons Blood"
-			id = "demonsblood"
-			result = "demonsblood"
-			required_reagents = list("rum" = 1, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
-			result_amount = 4
-
-		changelingsting
-			name = "Changeling Sting"
-			id = "changelingsting"
-			result = "changelingsting"
-			required_reagents = list("orangejuice" = 1, "limejuice" = 1, "lemonjuice" = 1, "vodka" = 1)
-			result_amount = 4
-
-		booger
-			name = "Booger"
-			id = "booger"
-			result = "booger"
-			required_reagents = list("cream" = 1, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
-			result_amount = 4
-
-		antifreeze
-			name = "Anti-freeze"
-			id = "antifreeze"
-			result = "antifreeze"
-			required_reagents = list("vodka" = 2, "cream" = 1, "ice" = 1)
-			result_amount = 4
-
-		barefoot
-			name = "Barefoot"
-			id = "barefoot"
-			result = "barefoot"
-			required_reagents = list("vodka" = 1, "cream" = 1, "vermouth" = 1, "whiskey" = 1)
-			result_amount = 4
-
 		irishcarbomb
 			name = "Irish Car Bomb"
 			id = "irishcarbomb"
@@ -1256,6 +1231,33 @@ datum
 			result_amount = 5
 
 
+		devilskiss
+			name = "Devils Kiss"
+			id = "devilskiss"
+			result = "devilskiss"
+			required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
+			result_amount = 3
+
+		hippiesdelight
+			name = "Hippies Delight"
+			id = "hippiesdelight"
+			result = "hippiesdelight"
+			required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
+			result_amount = 2
+
+		bananahonk
+			name = "Banana Honk"
+			id = "bananahonk"
+			result = "bananahonk"
+			required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
+			result_amount = 3
+
+		silencer
+			name = "Silencer"
+			id = "silencer"
+			result = "silencer"
+			required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
+			result_amount = 3*/
 
 
 

code/modules/chemical/Chemistry-Tools.dm

@@ -2748,14 +2748,14 @@
 	volume = 50
 
 	on_reagent_change()
-/*		if(reagents.reagent_list.len > 1 )
+		if(reagents.reagent_list.len > 1 )
 			icon_state = "glass_brown"
 			name = "Glass of Hooch"
 			desc = "Two or more drinks, mixed together."
-		else if(reagents.reagent_list.len == 1)
+		/*else if(reagents.reagent_list.len == 1)
 			for(var/datum/reagent/R in reagents.reagent_list)
 				switch(R.id)*/
-		if (reagents.reagent_list.len > 0)
+		else if (reagents.reagent_list.len == 1)
 			//mrid = R.get_master_reagent_id()
 			switch(reagents.get_master_reagent_id())
 				if("beer")
@@ -2937,7 +2937,7 @@
 				if("threemileisland")
 					icon_state = "threemileislandglass"
 					name = "Three Mile Island Ice Tea"
-					desc = "A glass of this is sure to prevent a melt down."
+					desc = "A glass of this is sure to prevent a meltdown."
 				if("margarita")
 					icon_state = "margaritaglass"
 					name = "Margarita"
@@ -2985,7 +2985,7 @@
 				if("water")
 					icon_state = "glass_clear"
 					name = "Glass of Water"
-					desc = "Are you really that boring?"
+					desc = "The father of all refreshments."
 				if("spacemountainwind")
 					icon_state = "Space_mountain_wind_glass"
 					name = "Glass of Space Mountain Wind"
@@ -3030,6 +3030,43 @@
 					icon_state = "bahama_mama"
 					name = "Bahama Mama"
 					desc = "Tropic cocktail"
+				if("singulo")
+					icon_state = "singulo"
+					name = "Singulo"
+					desc = "A blue-space beverage."
+				if("alliescocktail")
+					icon_state = "alliescocktail"
+					name = "Allies cocktail"
+					desc = "A drink made from your allies."
+				if("antifreeze")
+					icon_state = "antifreeze"
+					name = "Anti-freeze"
+					desc = "The ultimate refreshment."
+				if("barefoot")
+					icon_state = "b&p"
+					name = "Barefoot"
+					desc = "Barefoot and pregnant"
+				if("demonsblood")
+					icon_state = "demonsblood"
+					name = "Demons Blood"
+					desc = "Just looking at this thing makes the hair at the back of your neck stand up."
+				if("booger")
+					icon_state = "booger"
+					name = "Booger"
+					desc = "Ewww..."
+
+				/*if("snowwhite")  /// Dumbly-sprited drinks below. If your drink is on the list, shame on you --Agouri
+					icon_state = "snowwhite"
+					name = "Snow White"
+					desc = "A cold refreshment."
+				if("aloe")
+					icon_state = "aloe"
+					name = "Aloe"
+					desc = "Very, very, very good."
+				if("andalusia")
+					icon_state = "andalusia"
+					name = "Andalusia"
+					desc = "A nice, strange named drink."
 				if("sbiten")
 					icon_state = "sbitenglass"
 					name = "Sbiten"
@@ -3090,42 +3127,6 @@
 					icon_state = "nothing"
 					name = "Nothing"
 					desc = "Absolutely nothing."
-				if("singulo")
-					icon_state = "singulo"
-					name = "Singulo"
-					desc = "A blue-space beverage."
-				if("aloe")
-					icon_state = "aloe"
-					name = "Aloe"
-					desc = "Very, very, very good."
-				if("andalusia")
-					icon_state = "andalusia"
-					name = "Andalusia"
-					desc = "A nice, strange named drink."
-				if("alliescocktail")
-					icon_state = "alliescocktail"
-					name = "Allies cocktail"
-					desc = "A drink made from your allies."
-				if("snowwhite")
-					icon_state = "snowwhite"
-					name = "Snow White"
-					desc = "A cold refreshment."
-				if("antifreeze")
-					icon_state = "antifreeze"
-					name = "Anti-freeze"
-					desc = "The ultimate refreshment."
-				if("barefoot")
-					icon_state = "b&p"
-					name = "Barefoot"
-					desc = "Barefoot and pregnant"
-				if("demonsblood")
-					icon_state = "demonsblood"
-					name = "Demons Blood"
-					desc = "Scary....so...scary...AHHH!!!"
-				if("booger")
-					icon_state = "booger"
-					name = "Booger"
-					desc = "Ewww..."
 				if("devilskiss")
 					icon_state = "devilskiss"
 					name = "Devils Kiss"
@@ -3145,7 +3146,7 @@
 				if("erikasurprise")
 					icon_state = "erikasurprise"
 					name = "Erika Surprise"
-					desc = "A surprise of Erika"
+					desc = "A surprise of Erika"*/
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"