diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index 7de07b5df1..4999aa91ca 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -1024,4 +1024,34 @@
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/genration = 8,
 					/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration = 8,
 					/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8)
-	contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2)
\ No newline at end of file
+	contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2)
+
+///////////////////////Radical Renard///////////////////////////////////////
+
+/obj/machinery/vending/radren
+	name = "Radical Renard Sodas"
+	desc = "A softdrink vendor owned by a frontier based soda company that's been contracted by NanoTrasen"
+	icon_state = "radren"
+	product_slogans = "Enjoy the rad refreshing taste of Radical Renard brand soda!"
+	product_ads = "Radically Refreshing!;Get Cool!;Have you tried our new Andromeda Apple?;Enjoy a cold one with Renard!"
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 10)
+	contraband = list()
+	prices = list(/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola  = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 2,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola = 1,
+					/obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 1)
+	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
+	vending_sound = "machines/vending/vending_cans.ogg"
\ No newline at end of file
diff --git a/code/modules/food/food/cans.dm b/code/modules/food/food/cans.dm
index 6b53a966dd..9a50547a04 100644
--- a/code/modules/food/food/cans.dm
+++ b/code/modules/food/food/cans.dm
@@ -137,7 +137,7 @@
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/tonic/Initialize()
 	. = ..()
-	reagents.add_reagent("tonic", 50)
+	reagents.add_reagent("tonic", 30)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater
 	name = "soda water"
@@ -147,7 +147,7 @@
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater/Initialize()
 	. = ..()
-	reagents.add_reagent("sodawater", 50)
+	reagents.add_reagent("sodawater", 30)
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale
 	name = "\improper Classic Ginger Ale"
@@ -171,7 +171,7 @@
 	. = ..()
 	reagents.add_reagent("rootbeer", 30)
 
-//ADDITIONS BELOW THIS LINE MADE ON 04/03/2021
+/////////////////////////BODA VENDOR DRINKS/////////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/kvass
 	name = "\improper Kvass"
@@ -203,4 +203,150 @@
 
 /obj/item/weapon/reagent_containers/food/drinks/cans/boda/Initialize()
 	. = ..()
-	reagents.add_reagent("sodawater", 30)
\ No newline at end of file
+	reagents.add_reagent("sodawater", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus
+	name = "\improper Boda-Plyus"
+	desc = "State regulated soda beverage, now with added surplus flavoring. Enjoy comrades."
+	icon_state = "bodaplus"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/bodaplus/Initialize()
+	. = ..()
+	reagents.add_reagent("sodawater", 15)
+	reagents.add_reagent(pick(list(
+				"applejuice",
+				"grapejuice",
+				"lemonjuice",
+				"limejuice",
+				"watermelonjuice",
+				"banana",
+				"berryjuice",
+				"pineapplejuice")), 15)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/redarmy
+	name = "\improper Red Army Twist"
+	desc = "A taste of what keeps our glorious nation running! Served as Space Commissariat Stahlin prefers it! Luke warm."
+	icon_state = "red_army"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/redarmy/Initialize()
+	. = ..()
+	reagents.add_reagent("potatojuice", 15)
+	reagents.add_reagent("sodawater", 15)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/arstbru
+	name = "\improper Arstotzka Brü"
+	desc = "Just what any bureaucrat needs to get through the day. Keep stamping those papers!"
+	icon_state = "arst_bru"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/arstbru/Initialize()
+	. = ..()
+	reagents.add_reagent("turnipjuice", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/terra_cola
+	name = "\improper Terra-Cola"
+	desc = "Made by the people. Served to the people."
+	description_fluff = "A can of the only soft drink state approved for the benefit of the people. Served at room temperature regardless of ambient temperatures thanks to innovative Terran insulation technology."
+	icon_state = "terra_cola"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/terra_cola/Initialize()
+	. = ..()
+	reagents.add_reagent("water", 25)
+	reagents.add_reagent("iron", 5)
+
+/////////////////////////MISC VENDOR DRINKS/////////////////////////
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola
+	name = "\improper Superior Strawberry"
+	desc = "Feel superior above all with Superior Strawberry!"
+	icon_state = "strawcoke"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/straw_cola/Initialize()
+	. = ..()
+	reagents.add_reagent("strawsoda", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola
+	name = "\improper Andromeda Apple"
+	desc = "Look to the stars and prepare to explore with Andromeda Apple!"
+	icon_state = "applecoke"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/apple_cola/Initialize()
+	. = ..()
+	reagents.add_reagent("applesoda", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola
+	name = "\improper Lunar Lemon"
+	desc = "Feel back at home on the Lunar Colonies with this classic berverage straight from the source!"
+	icon_state = "lemoncoke"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/lemon_cola/Initialize()
+	. = ..()
+	reagents.add_reagent("lemonsoda", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla
+	name = "\improper Starship Sarsaparilla"
+	desc = "Take off and shoot for the stars with this classic cowboy cola!"
+	icon_state = "sarsaparilla"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/sarsaparilla/Initialize()
+	. = ..()
+	reagents.add_reagent("sarsaparilla", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola
+	name = "\improper Gravity Grape"
+	desc = "Get down with Newton's favorite corbonated science experiment!"
+	icon_state = "grapesoda"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/grape_cola/Initialize()
+	. = ..()
+	reagents.add_reagent("grapesoda", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola
+	name = "\improper Orion Orange"
+	desc = "Take a taste-tastic trip to Orion's Belt with Orion Orange!"
+	icon_state = "orangesoda"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/orange_cola/Initialize()
+	. = ..()
+	reagents.add_reagent("orangesoda", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda
+	name = "\improper Bacon Soda"
+	desc = "Taste something out of this world with Bacon Soda!"
+	icon_state = "porkcoke"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/baconsoda/Initialize()
+	. = ..()
+	reagents.add_reagent("porksoda", 30)
+
+/////////////////////////CANNED BOOZE DRINKS/////////////////////////
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/beercan
+	name = "\improper Sunshine Brew"
+	desc = "Beat the heat with this refreshing brewed beverage."
+	icon_state = "beercan"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/beercan/Initialize()
+	. = ..()
+	reagents.add_reagent("beer", 30)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/alecan
+	name = "\improper Spacecastle Pale Ale"
+	desc = "A delicious IPA that's canned for your pleasure. Drink up!"
+	icon_state = "alecan"
+	center_of_mass = list("x"=16, "y"=8)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/alecan/Initialize()
+	. = ..()
+	reagents.add_reagent("ale", 30)
\ No newline at end of file
diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm
index 124240d906..6000c567ad 100644
--- a/code/modules/food/food/drinks/bottle.dm
+++ b/code/modules/food/food/drinks/bottle.dm
@@ -87,7 +87,7 @@
 		if(A.density && usr.Adjacent(A) && !istype(A, /mob))
 			things_to_smash_on += A
 
-	var/atom/choice = input("Select what you want to smash the bottle on.") as null|anything in things_to_smash_on
+	var/atom/choice = input(usr, "Select what you want to smash the bottle on.", "SMASH!", things_to_smash_on)
 	if(!choice)
 		return
 	if(!(choice.density && usr.Adjacent(choice)))
@@ -205,7 +205,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey
 	name = "Uncle Git's Special Reserve"
 	desc = "A premium single-malt whiskey, gently matured in a highly classified location."
-	icon_state = "whiskeybottle"
+	icon_state = "whiskeybottle1"
 	center_of_mass = list("x"=16, "y"=3)
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey/Initialize()
@@ -322,16 +322,6 @@
 	. = ..()
 	reagents.add_reagent("cognac", 100)
 
-/obj/item/weapon/reagent_containers/food/drinks/bottle/wine
-	name = "Doublebeard Bearded Special Wine"
-	desc = "Cheap cooking wine pretending to be drinkable."
-	icon_state = "winebottle"
-	center_of_mass = list("x"=16, "y"=4)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/Initialize()
-	. = ..()
-	reagents.add_reagent("wine", 100)
-
 /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe
 	name = "Jailbreaker Verte"
 	desc = "One sip of this and you just know you're gonna have a good time."
@@ -362,26 +352,6 @@
 	. = ..()
 	reagents.add_reagent("bluecuracao", 100)
 
-/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine
-	name = "Briar Rose Grenadine Syrup"
-	desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
-	icon_state = "grenadinebottle"
-	center_of_mass = list("x"=16, "y"=6)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine/Initialize()
-	. = ..()
-	reagents.add_reagent("grenadine", 100)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
-	name = "Warlock's Velvet"
-	desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
-	icon_state = "pwinebottle"
-	center_of_mass = list("x"=16, "y"=4)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine/Initialize()
-	. = ..()
-	reagents.add_reagent("pwine", 100)
-
 /obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew
 	name = "Redeemer's Brew"
 	desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart."
@@ -392,26 +362,6 @@
 	. = ..()
 	reagents.add_reagent("unathiliquor", 100)
 
-/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
-	name = "Mono-No-Aware Luxury Sake"
-	desc = "Dry alcohol made from rice, a favorite of businessmen."
-	icon_state = "sakebottle"
-	center_of_mass = list("x"=16, "y"=3)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/Initialize()
-	. = ..()
-	reagents.add_reagent("sake", 100)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne
-	name = "Gilthari Luxury Champagne"
-	desc = "For those special occassions."
-	icon_state = "champagne"
-	center_of_mass = list("x"=16, "y"=3)
-
-/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize()
-	. = ..()
-	reagents.add_reagent("champagne", 100)
-
 /obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps
 	name = "Dr. Bone's Peppermint Schnapps"
 	desc = "A flavoured grain liqueur with a fresh, minty taste."
@@ -452,6 +402,68 @@
 	. = ..()
 	reagents.add_reagent("jager", 100)
 
+/////////////////////////WINES/////////////////////////
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/wine
+	name = "Doublebeard Bearded Special Red"
+	desc = "Cheap cooking wine pretending to be drinkable."
+	icon_state = "winebottle"
+	center_of_mass = list("x"=16, "y"=4)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/Initialize()
+	. = ..()
+	reagents.add_reagent("redwine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine
+	name = "Doublebeard Bearded Special White"
+	desc = "Cooking wine pretending to be drinkable."
+	icon_state = "whitewinebottle"
+	center_of_mass = list("x"=16, "y"=4)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/whitewine/Initialize()
+	. = ..()
+	reagents.add_reagent("whitewine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth //anagram of 'ntcahors' where the bottle sprite originated from
+	name = "NanoTrasen Carnoth Red"
+	desc = "A NanoTrasen branded wine given to high ranking staff as gifts. Made special on the agricultural planet Carnoth."
+	icon_state = "carnoth"
+	center_of_mass = list("x"=16, "y"=4)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/carnoth/Initialize()
+	. = ..()
+	reagents.add_reagent("carnoth", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine
+	name = "Warlock's Velvet"
+	desc = "What a delightful packaging for a surely high quality wine! The vintage must be amazing!"
+	icon_state = "pwinebottle"
+	center_of_mass = list("x"=16, "y"=4)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/pwine/Initialize()
+	. = ..()
+	reagents.add_reagent("pwine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne
+	name = "Gilthari Luxury Champagne"
+	desc = "For those special occassions."
+	icon_state = "champagne"
+	center_of_mass = list("x"=16, "y"=3)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/champagne/Initialize()
+	. = ..()
+	reagents.add_reagent("champagne", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/sake
+	name = "Mono-No-Aware Luxury Sake"
+	desc = "Dry alcohol made from rice, a favorite of businessmen."
+	icon_state = "sakebottle"
+	center_of_mass = list("x"=16, "y"=3)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/sake/Initialize()
+	. = ..()
+	reagents.add_reagent("sake", 100)
+
 //////////////////////////JUICES AND STUFF///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/cola //MODIFIED ON 04/21/2021
@@ -578,6 +590,26 @@
 	. = ..()
 	reagents.add_reagent("lemonjuice", 100)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine
+	name = "Briar Rose Grenadine Syrup"
+	desc = "Sweet and tangy, a bar syrup used to add color or flavor to drinks."
+	icon_state = "grenadinebottle"
+	center_of_mass = list("x"=16, "y"=6)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine/Initialize()
+	. = ..()
+	reagents.add_reagent("grenadine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice
+	name = "Special Blend Grapejuice"
+	desc = "A delicious blend of various grape species in one succulent blend."
+	icon_state = "grapejuicebottle"
+	center_of_mass = list("x"=16, "y"=3)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/grapejuice/Initialize()
+	. = ..()
+	reagents.add_reagent("grapejuice", 100)
+
 //////////////////////////SMALL BOTTLES///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/small
@@ -629,7 +661,6 @@
 	. = ..()
 	reagents.add_reagent("cider", 50)
 
-
 /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale
 	name = "\improper Magm-Ale"
 	desc = "A true dorf's drink of choice."
@@ -650,3 +681,45 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle/small/ale/hushedwhisper/Initialize()
 	. = ..()
 	reagents.add_reagent("ale", 50)
+
+//////////////////////////SMALL BOTTLED SODA///////////////////////
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cola
+	name = "Space Cola"
+	desc = "Cola. In space."
+	icon_state = "colabottle2"
+	center_of_mass = list("x"=16, "y"=6)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/cola/Initialize()
+	. = ..()
+	reagents.add_reagent("cola", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_up
+	name = "Space-Up"
+	desc = "Tastes like a hull breach in your mouth."
+	icon_state = "space-up_bottle2"
+	center_of_mass = list("x"=16, "y"=6)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_up/Initialize()
+	. = ..()
+	reagents.add_reagent("space_up", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind
+	name = "Space Mountain Wind"
+	desc = "Blows right through you like a space wind."
+	icon_state = "space_mountain_wind_bottle2"
+	center_of_mass = list("x"=16, "y"=6)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/space_mountain_wind/Initialize()
+	. = ..()
+	reagents.add_reagent("spacemountainwind", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/dr_gibb
+	name = "Dr. Gibb"
+	desc = "A delicious mixture of 42 different flavors."
+	icon_state = "dr_gibb_bottle2"
+	center_of_mass = list("x"=16, "y"=6)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/small/dr_gibb/Initialize()
+	. = ..()
+	reagents.add_reagent("dr_gibb", 50)
\ No newline at end of file
diff --git a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
index 672356551b..bc1a199498 100644
--- a/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/cartridge_presets.dm
@@ -61,8 +61,10 @@
 	spawn_reagent = "kahlua"
 /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey
 	spawn_reagent = "whiskey"
-/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine
-	spawn_reagent = "wine"
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine
+	spawn_reagent = "redwine"
+/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine
+	spawn_reagent = "whitewine"
 /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka
 	spawn_reagent = "vodka"
 /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin
diff --git a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
index 84c5260c3f..0dc376fae3 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser2_energy.dm
@@ -52,7 +52,7 @@
 /obj/machinery/chemical_dispenser/bar_alc
 	dispense_reagents = list(
 		"lemon_lime", "sugar", "orangejuice", "limejuice", "sodawater", "tonic", "beer", "kahlua",
-		"whiskey", "wine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
+		"whiskey", "redwine", "whitewine", "vodka", "cider", "gin", "rum", "tequilla", "vermouth", "cognac", "ale", "mead", "bitters"
 		)
 
 /obj/machinery/chemical_dispenser/bar_coffee
diff --git a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm
index 6b90357a2c..537a980e6c 100644
--- a/code/modules/reagents/machinery/dispenser/dispenser_presets.dm
+++ b/code/modules/reagents/machinery/dispenser/dispenser_presets.dm
@@ -105,7 +105,8 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,
diff --git a/code/modules/reagents/machinery/dispenser/supply.dm b/code/modules/reagents/machinery/dispenser/supply.dm
index 984d7786a8..f011420516 100644
--- a/code/modules/reagents/machinery/dispenser/supply.dm
+++ b/code/modules/reagents/machinery/dispenser/supply.dm
@@ -66,7 +66,8 @@
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey,
-			/obj/item/weapon/reagent_containers/chem_disp_cartridge/wine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine,
+			/obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,
 			/obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,
@@ -191,19 +192,20 @@ SEC_PACK(tungsten,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/tung
 SEC_PACK(calcium,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/calcium,    "Reagent refill - Calcium",       "calcium reagent cartridge crate",       15, access_chemistry)
 
 // Bar-restricted (alcoholic drinks)
-//      Datum path Contents type                                                     Supply pack name             Container name                    Cost  Container access
-SEC_PACK(beer,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,     "Reagent refill - Beer",     "beer reagent cartridge crate",     15, access_bar)
-SEC_PACK(kahlua,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua,   "Reagent refill - Kahlua",   "kahlua reagent cartridge crate",   15, access_bar)
-SEC_PACK(whiskey,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey,  "Reagent refill - Whiskey",  "whiskey reagent cartridge crate",  15, access_bar)
-SEC_PACK(wine,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/wine,     "Reagent refill - Wine",     "wine reagent cartridge crate",     15, access_bar)
-SEC_PACK(vodka,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,    "Reagent refill - Vodka",    "vodka reagent cartridge crate",    15, access_bar)
-SEC_PACK(gin,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,      "Reagent refill - Gin",      "gin reagent cartridge crate",      15, access_bar)
-SEC_PACK(rum,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,      "Reagent refill - Rum",      "rum reagent cartridge crate",      15, access_bar)
-SEC_PACK(tequila,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila,  "Reagent refill - Tequila",  "tequila reagent cartridge crate",  15, access_bar)
-SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth, "Reagent refill - Vermouth", "vermouth reagent cartridge crate", 15, access_bar)
-SEC_PACK(cognac,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac,   "Reagent refill - Cognac",   "cognac reagent cartridge crate",   15, access_bar)
-SEC_PACK(ale,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale,      "Reagent refill - Ale",      "ale reagent cartridge crate",      15, access_bar)
-SEC_PACK(mead,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead,     "Reagent refill - Mead",     "mead reagent cartridge crate",     15, access_bar)
+//      Datum path Contents type                                                      Supply pack name                Container name                      Cost  Container access
+SEC_PACK(beer,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/beer,      "Reagent refill - Beer",        "beer reagent cartridge crate",       15, access_bar)
+SEC_PACK(kahlua,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/kahlua,    "Reagent refill - Kahlua",      "kahlua reagent cartridge crate",     15, access_bar)
+SEC_PACK(whiskey,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/whiskey,   "Reagent refill - Whiskey",     "whiskey reagent cartridge crate",    15, access_bar)
+SEC_PACK(rwine,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/redwine,   "Reagent refill - Red Wine",    "red wine reagent cartridge crate",   15, access_bar)
+SEC_PACK(wwine,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/whitewine, "Reagent refill - White Wine",  "white wine reagent cartridge crate", 15, access_bar)
+SEC_PACK(vodka,    /obj/item/weapon/reagent_containers/chem_disp_cartridge/vodka,     "Reagent refill - Vodka",       "vodka reagent cartridge crate",      15, access_bar)
+SEC_PACK(gin,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/gin,       "Reagent refill - Gin",         "gin reagent cartridge crate",        15, access_bar)
+SEC_PACK(rum,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/rum,       "Reagent refill - Rum",         "rum reagent cartridge crate",        15, access_bar)
+SEC_PACK(tequila,  /obj/item/weapon/reagent_containers/chem_disp_cartridge/tequila,   "Reagent refill - Tequila",     "tequila reagent cartridge crate",    15, access_bar)
+SEC_PACK(vermouth, /obj/item/weapon/reagent_containers/chem_disp_cartridge/vermouth,  "Reagent refill - Vermouth",    "vermouth reagent cartridge crate",   15, access_bar)
+SEC_PACK(cognac,   /obj/item/weapon/reagent_containers/chem_disp_cartridge/cognac,    "Reagent refill - Cognac",      "cognac reagent cartridge crate",     15, access_bar)
+SEC_PACK(ale,      /obj/item/weapon/reagent_containers/chem_disp_cartridge/ale,       "Reagent refill - Ale",         "ale reagent cartridge crate",        15, access_bar)
+SEC_PACK(mead,     /obj/item/weapon/reagent_containers/chem_disp_cartridge/mead,      "Reagent refill - Mead",        "mead reagent cartridge crate",       15, access_bar)
 
 // Unrestricted (water, sugar, non-alcoholic drinks)
 //  Datum path   Contents type                                                       Supply pack name                        Container name                                          Cost
diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm
index 75de64b284..5630500d63 100644
--- a/code/modules/reagents/reactions/instant/drinks.dm
+++ b/code/modules/reagents/reactions/instant/drinks.dm
@@ -107,8 +107,8 @@
 
 /decl/chemical_reaction/instant/drinks/wine
 	name = "Wine"
-	id = "wine"
-	result = "wine"
+	id = "redwine"
+	result = "redwine"
 	required_reagents = list("grapejuice" = 10)
 	catalysts = list("enzyme" = 5)
 	result_amount = 10
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index 47d724f7a3..3c85222c1b 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -1050,6 +1050,19 @@
 	glass_desc = "Juice from a potato. Bleh."
 	allergen_type = ALLERGEN_VEGETABLE //Potatoes are vegetables
 
+/datum/reagent/drink/juice/turnip
+	name = "Turnip Juice"
+	id = "turnipjuice"
+	description = "Juice of the turnip. A step below the potato."
+	taste_description = "turnips"
+	nutrition = 2
+	color = "#251e2e"
+	sugary = FALSE
+
+	glass_name = "turnip juice"
+	glass_desc = "Juice of the turnip. A step below the potato."
+	allergen_type = ALLERGEN_VEGETABLE //Turnips are vegetables
+
 /datum/reagent/drink/juice/tomato
 	name = "Tomato Juice"
 	id = "tomatojuice"
@@ -1714,6 +1727,110 @@
 	glass_desc = "A glass of refreshing Space Cola"
 	glass_special = list(DRINK_FIZZ)
 
+/datum/reagent/drink/soda/lemon_soda
+	name = "Lemon Soda"
+	id = "lemonsoda"
+	description = "Soda made using lemon concentrate. Sour."
+	taste_description = "strong sourness"
+	reagent_state = LIQUID
+	color = "#ffe658"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "lemon Soda"
+	glass_desc = "A glass of refreshing Lemon Soda. So sour!"
+	glass_special = list(DRINK_FIZZ)
+	allergen_type = ALLERGEN_FRUIT
+
+/datum/reagent/drink/soda/apple_soda
+	name = "Apple Soda"
+	id = "applesoda"
+	description = "Soda made using fresh apples."
+	taste_description = "crisp juiciness"
+	reagent_state = LIQUID
+	color = "#c73737"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Apple Soda"
+	glass_desc = "A glass of refreshing Apple Soda. Crisp!"
+	glass_special = list(DRINK_FIZZ)
+	allergen_type = ALLERGEN_FRUIT
+
+
+/datum/reagent/drink/soda/straw_soda
+	name = "Strawberry Soda"
+	id = "strawsoda"
+	description = "Soda made using sweet berries."
+	taste_description = "oddly bland"
+	reagent_state = LIQUID
+	color = "#ffa3a3"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Strawberry Soda"
+	glass_desc = "A glass of refreshing Strawberry Soda"
+	glass_special = list(DRINK_FIZZ)
+	allergen_type = ALLERGEN_FRUIT
+
+/datum/reagent/drink/soda/orangesoda
+	name = "Orange Soda"
+	id = "orangesoda"
+	description = "Soda made using fresh picked oranges."
+	taste_description = "sweet and citrusy"
+	reagent_state = LIQUID
+	color = "#ff992c"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Orange Soda"
+	glass_desc = "A glass of refreshing Orange Soda. Delicious!"
+	glass_special = list(DRINK_FIZZ)
+	allergen_type = ALLERGEN_FRUIT
+
+/datum/reagent/drink/soda/grapesoda
+	name = "Grape Soda"
+	id = "grapesoda"
+	description = "Soda made of carbonated grapejuice."
+	taste_description = "tangy goodness"
+	reagent_state = LIQUID
+	color = "#9862d2"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Grape Soda"
+	glass_desc = "A glass of refreshing Grape Soda. Tangy!"
+	glass_special = list(DRINK_FIZZ)
+	allergen_type = ALLERGEN_FRUIT
+
+/datum/reagent/drink/soda/sarsaparilla
+	name = "Sarsaparilla"
+	id = "sarsaparilla"
+	description = "Soda made from genetically modified Mexican sarsaparilla plants."
+	taste_description = "licorice and caramel"
+	reagent_state = LIQUID
+	color = "#e1bb59"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Sarsaparilla"
+	glass_desc = "A glass of refreshing Sarsaparilla. Delicious!"
+	glass_special = list(DRINK_FIZZ)
+
+/datum/reagent/drink/soda/pork_soda
+	name = "Bacon Soda"
+	id = "porksoda"
+	description = "Soda made using pork like flavoring."
+	taste_description = "sugar coated bacon"
+	reagent_state = LIQUID
+	color = "ff8080"
+	adj_drowsy = -3
+	adj_temp = -5
+
+	glass_name = "Bacon Soda"
+	glass_desc = "A glass of Bacon Soda, very odd..."
+	glass_special = list(DRINK_FIZZ)
+
 /datum/reagent/drink/soda/spacemountainwind
 	name = "Mountain Wind"
 	id = "spacemountainwind"
@@ -2502,19 +2619,71 @@
 
 	allergen_type = ALLERGEN_GRAINS //Whiskey is also made from grain.
 
-/datum/reagent/ethanol/wine
-	name = "Wine"
-	id = "wine"
+/datum/reagent/ethanol/redwine
+	name = "Red Wine"
+	id = "redwine"
 	description = "An premium alchoholic beverage made from distilled grape juice."
 	taste_description = "bitter sweetness"
 	color = "#7E4043" // rgb: 126, 64, 67
 	strength = 15
 
-	glass_name = "wine"
+	glass_name = "red wine"
 	glass_desc = "A very classy looking drink."
 
 	allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
 
+/datum/reagent/ethanol/whitewine
+	name = "White Wine"
+	id = "whitewine"
+	description = "An premium alchoholic beverage made from fermenting of the non-coloured pulp of grapes."
+	taste_description = "light fruity flavor"
+	color = "#F4EFB0" // rgb: 244, 239, 176
+	strength = 15
+
+	glass_name = "white wine"
+	glass_desc = "A very classy looking drink."
+
+	allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
+
+/datum/reagent/ethanol/carnoth
+	name = "Carnoth"
+	id = "carnoth"
+	description = "An premium alchoholic beverage made with multiple hybridized species of grapes that give it a dark maroon coloration."
+	taste_description = "alcoholic sweet flavor"
+	color = "#5B0000" // rgb: 0, 100, 35
+	strength = 20
+
+	glass_name = "carnoth"
+	glass_desc = "A very classy looking drink."
+
+	allergen_type = ALLERGEN_FRUIT //Wine is made from grapes (fruit)
+
+/datum/reagent/ethanol/pwine
+	name = "Poison Wine"
+	id = "pwine"
+	description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
+	color = "#000000"
+	strength = 10
+	druggy = 50
+	halluci = 10
+
+	glass_name = "???"
+	glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
+	allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit
+
+/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
+	..()
+	if(dose > 30)
+		M.adjustToxLoss(2 * removed)
+	if(dose > 60 && ishuman(M) && prob(5))
+		var/mob/living/carbon/human/H = M
+		var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART]
+		if (L && istype(L))
+			if(dose < 120)
+				L.take_damage(10 * removed, 0)
+			else
+				L.take_damage(100, 0)
+
 /datum/reagent/ethanol/wine/champagne
 	name = "Champagne"
 	id = "champagne"
@@ -3138,32 +3307,6 @@
 	glass_name = "Patron"
 	glass_desc = "Drinking patron in the bar, with all the subpar ladies."
 
-/datum/reagent/ethanol/pwine
-	name = "Poison Wine"
-	id = "pwine"
-	description = "Is this even wine? Toxic! Hallucinogenic! Probably consumed in boatloads by your superiors!"
-	color = "#000000"
-	strength = 10
-	druggy = 50
-	halluci = 10
-
-	glass_name = "???"
-	glass_desc = "A black ichor with an oily purple sheer on top. Are you sure you should drink this?"
-	allergen_type = ALLERGEN_FRUIT //Made from berries which are fruit
-
-/datum/reagent/ethanol/pwine/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
-	..()
-	if(dose > 30)
-		M.adjustToxLoss(2 * removed)
-	if(dose > 60 && ishuman(M) && prob(5))
-		var/mob/living/carbon/human/H = M
-		var/obj/item/organ/internal/heart/L = H.internal_organs_by_name[O_HEART]
-		if (L && istype(L))
-			if(dose < 120)
-				L.take_damage(10 * removed, 0)
-			else
-				L.take_damage(100, 0)
-
 /datum/reagent/ethanol/red_mead
 	name = "Red Mead"
 	id = "red_mead"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 6a05cf1443..24e8b94966 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index f03f9c56d8..cfd31736e9 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ