From f1f9ca235dd17f2edbe91957fc8c8639f4a52c5e Mon Sep 17 00:00:00 2001
From: SoundScopes <Musical.Flow@LIve.com>
Date: Sun, 12 Apr 2015 15:58:38 +0100
Subject: [PATCH] #491

Metropolitan - Taken out of the code until we have a sprite
Old Fashioned - Removed grenadine
Rusty Nail - Removed gin
John Collins - orangejuice > lemonjuice
Puossee Cafe - Renamed Pousse Cafe & Creme de Yvette not yet added to
the mix due to limits
---
 code/modules/reagents/Chemistry-Reagents.dm   |  6 +++---
 code/modules/reagents/Chemistry-Recipes.dm    | 20 +++++++++----------
 .../food/drinks/drinkingglass.dm              |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 8c849578..53c5dd8b 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -4016,9 +4016,9 @@ datum
 			color = "#664300" // rgb: 102, 67, 0
 			boozepwr = 1
 
-		ethanol/puosseecafe
-			name = "Puossee-Cafe"
-			id = "puosseecafe"
+		ethanol/poussecafe
+			name = "Pousse-Cafe"
+			id = "poussecafe"
 			description = "Smells of the French and liquore."
 			color = "#664300" // rgb: 102, 67, 0
 			boozepwr = 2
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 45f01a01..95764acd 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -2019,10 +2019,10 @@ datum
 			required_reagents = list("icetea" = 1, "vodka" = 1)
 			result_amount = 2
 
-		puosseecafe
-			name = "Puossee-Cafe"
-			id = "puosseecafe"
-			result = "puosseecafe"
+		poussecafe
+			name = "Pousse-Cafe"
+			id = "poussecafe"
+			result = "poussecafe"
 			required_reagents = list("brandy" = 1, "chartreusegreen" = 1, "chartreuseyellow" = 1, "cremewhite" = 1, "grenadine" = 1)
 			result_amount = 5
 
@@ -2037,7 +2037,7 @@ datum
 			name = "John Collins"
 			id = "johncollins"
 			result = "johncollins"
-			required_reagents = list("whiskeysoda" = 2, "orangejuice" = 1, "grenadine" = 1, "ice" = 1)
+			required_reagents = list("whiskeysoda" = 2, "lemonjuice" = 1, "grenadine" = 1, "ice" = 1)
 			result_amount = 5
 
 		gimlet
@@ -2095,22 +2095,22 @@ datum
 			name = "Rusty Nail"
 			id = "rustynail"
 			result = "rustynail"
-			required_reagents = list("whiskey" = 1, "gin" = 1, "drambuie" = 1)
+			required_reagents = list("whiskey" = 1, "drambuie" = 1)
 			result_amount = 2
 
 		oldfashioned
 			name = "Old Fashioned"
 			id = "oldfashioned"
 			result = "oldfashioned"
-			required_reagents = list("bluecuracao" = 1, "gin" = 1, "grenadine" = 1, "ice" = 1)
-			result_amount = 4
+			required_reagents = list("bluecuracao" = 1, "gin" = 1, "ice" = 1)
+			result_amount = 3
 
 		blindrussian
 			name = "Blind Russian"
 			id = "blindrussian"
 			result = "blindrussian"
 			required_reagents = list("kahlua" = 1, "irishcream" = 1, "cream" = 1)
-			result_amount = 2
+			result_amount = 3
 
 		tallrussian
 			name = "Tall Black Russian"
@@ -2118,7 +2118,7 @@ datum
 			result = "tallrussian"
 			required_reagents = list("blackrussian" = 1, "cola" = 1)
 
-			result_amount = 3
+			result_amount = 2
 
 
 ////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index 24e05cbc..e5944123 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -491,9 +491,9 @@
 					icon_state = "icepick"
 					name = "Glass of Ice Pick"
 					desc = "Big. And red. Hmm..."
-				if("puosseecafe")
+				if("poussecafe")
 					icon_state = "pousseecafe"
-					name = "Glass of Puossee-Cafe"
+					name = "Glass of Pousse-Cafe"
 					desc = "Smells of French and liquore."
 				if("mintjulep")
 					icon_state = "mintjulep"