diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 34ea3e3423..5170421e17 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -55,7 +55,7 @@
 	icon_state = "cshotgun"
 	max_shells = 8
 	origin_tech = "combat=5;materials=2"
-	ammo_type = "/obj/item/ammo_casing/shotgun/beanbag"
+	ammo_type = "/obj/item/ammo_casing/shotgun"
 
 //this is largely hacky and bad :(	-Pete
 /obj/item/weapon/gun/projectile/shotgun/doublebarrel
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 43c2642688..6382e2dcb8 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -2661,6 +2661,38 @@ datum
 					color = "#878F00" // rgb: 135, 40, 0
 					adj_temp = -8
 
+				lemonade
+					name = "Lemonade"
+					description = "Oh the nostalgia..."
+					id = "lemonade"
+					color = "#FFFF00" // rgb: 255, 255, 0
+
+				kiraspecial
+					name = "Kira Special"
+					description = "Long live the guy who everyone had mistaken for a girl. Baka!"
+					id = "kiraspecial"
+					color = "#CCCC99" // rgb: 204, 204, 153
+
+				brownstar
+					name = "Brown Star"
+					description = "Its not what it sounds like..."
+					id = "brownstar"
+					color = "#9F3400" // rgb: 159, 052, 000
+					adj_temp = - 2
+
+				milkshake
+					name = "Milkshake"
+					description = "Glorious brainfreezing mixture."
+					id = "milkshake"
+					color = "#AEE5E4" // rgb" 174, 229, 228
+					adj_temp = -9
+
+				rewriter
+					name = "Rewriter"
+					description = "The secert of the sanctuary of the Libarian..."
+					id = "rewriter"
+					color = "#485000" // rgb:72, 080, 0
+
 		hippies_delight
 			name = "Hippie's Delight"
 			id = "hippiesdelight"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 975b0b5801..0b807c91a0 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -1905,3 +1905,40 @@ datum
 			required_reagents = list("nothing" = 1, "gin" = 1)
 			result_amount = 2
 
+		lemonade
+			name = "Lemonade"
+			id = "lemonade"
+			result = "lemonade"
+			required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
+			result_amount = 3
+
+		kiraspecial
+			name = "Kira Special"
+			id = "kiraspecial"
+			result = "kiraspecial"
+			required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
+			result_amount = 2
+
+		brownstar
+			name = "Brown Star"
+			id = "brownstar"
+			result = "brownstar"
+			required_reagents = list("orangejuice" = 2, "cola" = 1)
+			result_amount = 2
+
+		milkshake
+			name = "Milkshake"
+			id = "milkshake"
+			result = "milkshake"
+			required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
+			result_amount = 5
+
+		rewriter
+			name = "Rewriter"
+			id = "milkshake"
+			result = "milkshake"
+			required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
+			result_amount = 2
+
+
+
diff --git a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
index f594990904..d919ca3277 100644
--- a/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
@@ -426,6 +426,30 @@
 					icon_state = "dr_gibb_glass"
 					name = "Glass of welder fuel"
 					desc = "Unless you are an industrial tool, this is probably not safe for consumption."
+				if("brownstar")
+					icon_state = "brownstar"
+					name = "Brown Star"
+					desc = "Its not what it sounds like..."
+				if("icetea")
+					icon_state = "icetea"
+					name = "Iced Tea"
+					desc = "No relation to a certain rap artist/ actor."
+				if("milkshake")
+					icon_state = "milkshake"
+					name = "Milkshake"
+					desc = "Glorious brainfreezing mixture."
+				if("lemonade")
+					icon_state = "lemonade"
+					name = "Lemonade"
+					desc = "Oh the nostalgia..."
+				if("kiraspecial")
+					icon_state = "kiraspecial"
+					name = "Kira Special"
+					desc = "Long live the guy who everyone had mistaken for a girl. Baka!"
+				if("rewriter")
+					icon_state = "rewriter"
+					name = "Rewriter"
+					desc = "The secert of the sanctuary of the Libarian..."
 				else
 					icon_state ="glass_brown"
 					name = "Glass of ..what?"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index dba6da9bb1..55cc4522f9 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ