diff --git a/code/game/objects/stacks/metal.dm b/code/game/objects/stacks/metal.dm
index 02d72c107fe..9e6c74910eb 100644
--- a/code/game/objects/stacks/metal.dm
+++ b/code/game/objects/stacks/metal.dm
@@ -72,7 +72,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
 	new/datum/stack_recipe("rack parts", /obj/item/weapon/rack_parts), \
 	new/datum/stack_recipe("closet", /obj/structure/closet, 2, one_per_turf = 1, on_floor = 1), \
 	null, \
-	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 2, one_per_turf = 1, on_floor = 1), \
+	new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, one_per_turf = 1, on_floor = 1), \
 	null, \
 	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 10), \
 	new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm
index 94ce4d73519..9030fa6a071 100644
--- a/code/modules/chemical/Chemistry-Reagents.dm
+++ b/code/modules/chemical/Chemistry-Reagents.dm
@@ -2922,9 +2922,9 @@ datum
 				color = "#664300" // rgb: 102, 67, 0
 
 			tequilla_sunrise
-				name = "Tequilla Sunrise"
+				name = "Tequila Sunrise"
 				id = "tequillasunrise"
-				description = "Tequilla and orange juice. Much like a Screwdriver, only Mexican~"
+				description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
 				reagent_state = LIQUID
 				color = "#664300" // rgb: 102, 67, 0
 
@@ -3026,7 +3026,7 @@ datum
 			manhattan_proj
 				name = "Manhattan Project"
 				id = "manhattan_proj"
-				description = "A scienitst drink of choice, for thinking how to blow up the station."
+				description = "A scienitst's drink of choice, for pondering ways to blow up the station."
 				reagent_state = LIQUID
 				color = "#664300" // rgb: 102, 67, 0
 
@@ -3102,6 +3102,180 @@ datum
 				dizzy_adj = 15
 				slurr_adj = 15
 
+
+			sbiten
+				name = "Sbiten"
+				id = "sbiten"
+				description = "A spicy Vodka! Might be a little hot for the little guys!"
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+				on_mob_life(var/mob/living/M as mob)
+					if (M.bodytemperature < 360)
+						M.bodytemperature = min(360, M.bodytemperature+50) //310 is the normal bodytemp. 310.055
+					return
+	
+			devilskiss
+				name = "Devils Kiss"
+				id = "devilskiss"
+				description = "Creepy time!"
+				reagent_state = LIQUID
+				color = "#A68310" // rgb: 166, 131, 16
+	
+			red_mead
+				name = "Red Mead"
+				id = "red_mead"
+				description = "The true Viking drink! Even though it has a strange red color."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+			mead
+				name = "Mead"
+				id = "mead"
+				description = "A Vikings drink, though a cheap one."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+			iced_beer
+				name = "Iced Beer"
+				id = "iced_beer"
+				description = "A beer which is so cold the air around it freezes."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+				on_mob_life(var/mob/living/M as mob)
+					if (M.bodytemperature < 270)
+						M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055
+					return
+	
+			grog
+				name = "Grog"
+				id = "grog"
+				description = "Watered down rum, NanoTrasen approves!"
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+			aloe
+				name = "Aloe"
+				id = "aloe"
+				description = "So very, very, very good."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+			andalusia
+				name = "Andalusia"
+				id = "andalusia"
+				description = "A nice, strange named drink."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+			alliescocktail
+				name = "Allies Cocktail"
+				id = "alliescocktail"
+				description = "A drink made from your allies."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+			acid_spit
+				name = "Acid Spit"
+				id = "acidspit"
+				description = "A drink by Nanotrasen. Made from live aliens."
+				reagent_state = LIQUID
+				color = "#365000" // rgb: 54, 80, 0
+	
+			amasec
+				name = "Amasec"
+				id = "amasec"
+				description = "Official drink of the Imperium."
+				reagent_state = LIQUID
+				color = "#664300" // rgb: 102, 67, 0
+	
+				on_mob_life(var/mob/living/M as mob)
+					M.stunned = 4
+					return
+	
+			neurotoxin
+				name = "Neurotoxin"
+				id = "neurotoxin"
+				description = "A strong neurotoxin that puts the subject into a death-like state."
+				reagent_state = LIQUID
+				color = "#2E2E61" // rgb: 46, 46, 97
+	
+				on_mob_life(var/mob/living/M as mob)
+					if(!M) M = holder.my_atom
+					M:adjustOxyLoss(0.5)
+					M:adjustOxyLoss(0.5)
+					M:weakened = max(M:weakened, 15)
+					M:silent = max(M:silent, 15)
+					return
+
+			bananahonk
+				name = "Banana Mama"
+				id = "bananahonk"
+				description = "A drink from Clown Heaven."
+				nutriment_factor = 1 * REAGENTS_METABOLISM
+				color = "#664300" // rgb: 102, 67, 0
+
+			silencer
+				name = "Silencer"
+				id = "silencer"
+				description = "A drink from Mime Heaven."
+				nutriment_factor = 1 * REAGENTS_METABOLISM
+				color = "#664300" // rgb: 102, 67, 0
+	
+			changelingsting
+				name = "Changeling Sting"
+				id = "changelingsting"
+				description = "A stingy drink."
+				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 +=5
+					if(data >= 55 && data <115)
+						if (!M.slurring) M.slurring = 1
+						M.slurring += 5
+					else if(data >= 115 && prob(33))
+						M.confused = max(M:confused+15,15)
+					..()
+					return
+	
+			irishcarbomb
+				name = "Irish Car Bomb"
+				id = "irishcarbomb"
+				description = "Mmm, tastes like chocolate cake..."
+				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 +=5
+					if(data >= 55 && data <115)
+						if (!M.slurring) M.slurring = 1
+						M.slurring += 5
+					else if(data >= 115 && prob(33))
+						M.confused = max(M:confused+15,15)
+					..()
+					return
+	
+			syndicatebomb
+				name = "Syndicate Bomb"
+				id = "syndicatebomb"
+				description = "A Syndicate bomb"
+				reagent_state = LIQUID
+				color = "#2E6671" // rgb: 46, 102, 113
+	
+			erikasurprise
+				name = "Erika Surprise"
+				id = "erikasurprise"
+				description = "The surprise is, it's green!"
+				reagent_state = LIQUID
+				color = "#2E6671" // rgb: 46, 102, 113
+
+
 //ALCHOHOL end
 
 		tonic
@@ -3167,192 +3341,8 @@ datum
 				..()
 				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!"
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if (M.bodytemperature < 360)
-					M.bodytemperature = min(360, M.bodytemperature+50) //310 is the normal bodytemp. 310.055
-				if(!data) data = 1
-				data++
-				M.dizziness +=6
-				if(data >= 45 && data <125)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 6
-				else if(data >= 125 && prob(33))
-					M.confused = max(M:confused+5,5)
-				..()
-				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.slurring) M.slurring = 1
-					M.slurring += 4
-				else if(data >= 165 && prob(33))
-					M.confused = max(M:confused+4,0)
-				..()
-				return
-
-		red_mead
-			name = "Red Mead"
-			id = "red_mead"
-			description = "The true Viking drink! Even though it has a strange red color."
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=5
-				if(data >= 55 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 4
-				else if(data >= 115 && prob(33))
-					M.confused = max(M:confused+4,4)
-				..()
-				return
-
-		mead
-			name = "Mead"
-			id = "mead"
-			description = "A Vikings drink, though a cheap one."
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.make_dizzy(3)
-				M:jitteriness = max(M:jitteriness-3,0)
-				M:nutrition += 2
-				if(data >= 25)
-					if (!M:slurring) M:slurring = 1
-					M:slurring += 3
-				if(data >= 40 && prob(33))
-					if (!M:confused) M:confused = 1
-					M:confused += 2
-
-				..()
-				return
-
-		iced_beer
-			name = "Iced Beer"
-			id = "iced_beer"
-			description = "A beer which is so cold the air around it freezes."
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if (M.bodytemperature < 270)
-					M.bodytemperature = min(270, M.bodytemperature-40) //310 is the normal bodytemp. 310.055
-				if(!data) data = 1
-				data++
-				M.make_dizzy(3)
-				M:jitteriness = max(M:jitteriness-3,0)
-				M:nutrition += 2
-				if(data >= 25)
-					if (!M:slurring) M:slurring = 1
-					M:slurring += 3
-				if(data >= 40 && prob(33))
-					if (!M:confused) M:confused = 1
-					M:confused += 2
-
-				..()
-				return
-
-		grog
-			name = "Grog"
-			id = "grog"
-			description = "Watered down rum, Nanotrasen approves!"
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=2
-				if(data >= 90 && data <250)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 2
-				else if(data >= 250 && prob(33))
-					M.confused = max(M:confused+2,0)
-				..()
-				return
-
-		aloe
-			name = "Aloe"
-			id = "aloe"
-			description = "So very, very, very good."
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=2
-				if(data >= 90 && data <250)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 2
-				else if(data >= 250 && prob(33))
-					M.confused = max(M:confused+2,0)
-				..()
-				return
-
-		andalusia
-			name = "Andalusia"
-			id = "andalusia"
-			description = "A nice, strange named drink."
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=8
-				if(data >= 90 && data <250)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 1
-				else if(data >= 250 && prob(33))
-					M.confused = max(M:confused+2,0)
-				..()
-				return
-
-		alliescocktail
-			name = "Allies Cocktail"
-			id = "alliescocktail"
-			description = "A drink made from your allies."
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=4
-				if(data >= 90 && data <250)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 7
-				else if(data >= 250 && prob(60))
-					M.confused = max(M:confused+8,0)
-				..()
-				return
-
 		soy_latte
 			name = "Soy Latte"
 			id = "soy_latte"
@@ -3393,75 +3383,8 @@ datum
 				..()
 				return
 
-		acid_spit
-			name = "Acid Spit"
-			id = "acidspit"
-			description = "A drink by Nanotrasen. Made from live aliens."
-			reagent_state = LIQUID
-			color = "#365000" // rgb: 54, 80, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!data) data = 1
-				data++
-				M.dizziness +=10
-				if(data >= 55 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 10
-				else if(data >= 115 && prob(33))
-					M.confused = max(M:confused+10,0)
-				..()
-				return
-
-		amasec
-			name = "Amasec"
-			id = "amasec"
-			description = "Always before COMBAT!!!"
-			reagent_state = LIQUID
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				M.stunned = 4
-				if(!data) data = 1
-				data++
-				M.dizziness +=4
-				if(data >= 55 && data <165)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 4
-				else if(data >= 165 && prob(33))
-					M.confused = max(M:confused+5,0)
-				..()
-				return
-
-		neurotoxin
-			name = "Neurotoxin"
-			id = "neurotoxin"
-			description = "A strong neurotoxin that puts the subject into a death-like state."
-			reagent_state = LIQUID
-			color = "#2E2E61" // rgb: 46, 46, 97
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!M) M = holder.my_atom
-				M:adjustOxyLoss(0.5)
-				M:adjustOxyLoss(0.5)
-				M:weakened = max(M:weakened, 15)
-				M:silent = max(M:silent, 15)
-				if(!data) data = 1
-				data++
-				M.dizziness +=6
-				if(data >= 15 && data <45)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 3
-				else if(data >= 45 && prob(50) && data <55)
-					M.confused = max(M:confused+3,0)
-				else if(data >=55)
-					M.druggy = max(M.druggy, 55)
-				..()
-
-				return
-
-
 		hippies_delight
-			name = "Hippies Delight"
+			name = "Hippie's Delight"
 			id = "hippiesdelight"
 			description = "A drink enjoyed by people during the 1960's."
 			reagent_state = LIQUID
@@ -3491,139 +3414,4 @@ datum
 				holder.remove_reagent(src.id, 0.2)
 				data++
 				..()
-				return
-
-		bananahonk
-			name = "Banana Honk"
-			id = "bananahonk"
-			description = "A drink from Clown Heaven."
-			nutriment_factor = 1 * REAGENTS_METABOLISM
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				M:nutrition += nutriment_factor
-				if(!data) data = 1
-				data++
-				if(istype(M, /mob/living/carbon/human) && M.job in list("Clown"))
-					if(!M) M = holder.my_atom
-					M:heal_organ_damage(1,1)
-					M.dizziness +=5
-					if(data >= 55 && data <165)
-						if (!M.slurring) M.slurring = 1
-						M.slurring += 5
-					else if(data >= 165 && prob(33))
-						M.confused = max(M:confused+5,0)
-					..()
-					return
-				if(istype(M, /mob/living/carbon/monkey))
-					if(!M) M = holder.my_atom
-					M:heal_organ_damage(1,1)
-					M.dizziness +=5
-					if(data >= 55 && data <165)
-						if (!M.slurring) M.slurring = 1
-						M.slurring += 5
-					else if(data >= 165 && prob(33))
-						M.confused = max(M:confused+5,0)
-					..()
-					return
-
-		silencer
-			name = "Silencer"
-			id = "silencer"
-			description = "A drink from Mime Heaven."
-			nutriment_factor = 1 * REAGENTS_METABOLISM
-			color = "#664300" // rgb: 102, 67, 0
-
-			on_mob_life(var/mob/living/M as mob)
-				M:nutrition += nutriment_factor
-				if(!data) data = 1
-				data++
-				if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
-					if(!M) M = holder.my_atom
-					M:heal_organ_damage(1,1)
-					M.dizziness +=5
-					if(data >= 55 && data <165)
-						if (!M.slurring) M.slurring = 1
-						M.slurring += 5
-					else if(data >= 165 && prob(33))
-						M.confused = max(M:confused+5,0)
-					..()
-					return
-
-
-
-		changelingsting
-			name = "Changeling Sting"
-			id = "changelingsting"
-			description = "A stingy drink."
-			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 +=5
-				if(data >= 55 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 5
-				else if(data >= 115 && prob(33))
-					M.confused = max(M:confused+15,15)
-				..()
-				return
-
-		irishcarbomb
-			name = "Irish Car Bomb"
-			id = "irishcarbomb"
-			description = "An irish car bomb"
-			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 +=5
-				if(data >= 55 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 5
-				else if(data >= 115 && prob(33))
-					M.confused = max(M:confused+15,15)
-				..()
-				return
-
-		syndicatebomb
-			name = "Syndicate Bomb"
-			id = "syndicatebomb"
-			description = "A Syndicate bomb"
-			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 +=10
-				if(data >= 55 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 10
-				else if(data >= 115 && prob(33))
-					M.confused = max(M:confused+15,15)
-				..()
-				return
-
-		erikasurprise
-			name = "Erika Surprise"
-			id = "erikasurprise"
-			description = "A surprise of Erika"
-			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 +=30
-				if(data >= 55 && data <115)
-					if (!M.slurring) M.slurring = 1
-					M.slurring += 30
-				else if(data >= 115 && prob(60))
-					M.confused = max(M:confused+15,15)
-				..()
-				return*/
\ No newline at end of file
+				return
\ No newline at end of file
diff --git a/code/modules/chemical/Chemistry-Recipes.dm b/code/modules/chemical/Chemistry-Recipes.dm
index c20935039ff..89c44b841cf 100644
--- a/code/modules/chemical/Chemistry-Recipes.dm
+++ b/code/modules/chemical/Chemistry-Recipes.dm
@@ -1261,7 +1261,7 @@ datum
 
 ////DRINKS THAT REQUIRE IMPROVED SPRITES BELOW:: -Agouri/////
 
-/*		sbiten
+		sbiten
 			name = "Sbiten"
 			id = "sbiten"
 			result = "sbiten"
@@ -1415,7 +1415,7 @@ datum
 			id = "silencer"
 			result = "silencer"
 			required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
-			result_amount = 3*/
+			result_amount = 3
 
 
 
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 119c475d015..4fee2a243c3 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ