Space Bar + Orion Express QOL mapping and Additions (#13975)

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -2634,6 +2634,15 @@
 	glass_desc = "A very classy looking drink."
 	glass_center_of_mass = list("x"=15, "y"=7)
 
+/decl/reagent/alcohol/wine/vintage
+	name = "Fine Wine"
+	description = "A high-class artisan wine, made in a small batch and aged for decades or centuries."
+	strength = 20
+	taste_description = "rich and full-bodied sweetness unlike anything you've ever had"
+
+	glass_name = "glass of vintage wine"
+	glass_desc = "A very classy and expensive-looking drink."
+
 // Cocktails
 
 /decl/reagent/alcohol/acid_spit

code/modules/reagents/dispenser/cartridge_presets.dm

@@ -25,6 +25,7 @@
 	phosphorus	spawn_reagent = /decl/reagent/phosphorus
 	potassium	spawn_reagent = /decl/reagent/potassium
 	radium		spawn_reagent = /decl/reagent/radium
+	radium/small	volume = CARTRIDGE_VOLUME_SMALL //For bar drinks
 	sacid		spawn_reagent = /decl/reagent/acid
 	silicon		spawn_reagent = /decl/reagent/silicon
 	sodium		spawn_reagent = /decl/reagent/sodium
@@ -49,6 +50,7 @@
 	// Bar, soft
 	apple   	spawn_reagent = /decl/reagent/drink/applejuice
 	banana  	spawn_reagent = /decl/reagent/drink/banana
+	berryjuice	spawn_reagent = /decl/reagent/drink/berryjuice
 	brownstar	spawn_reagent = /decl/reagent/drink/brownstar
 	clean_kois	spawn_reagent = /decl/reagent/kois/clean
 	cola		spawn_reagent = /decl/reagent/drink/space_cola
@@ -79,6 +81,11 @@
 	milk		spawn_reagent = /decl/reagent/drink/milk
 	soymilk		spawn_reagent = /decl/reagent/drink/milk/soymilk
 
+	// Bar, misc. mixed drink ingredients
+	uranium		spawn_reagent = /decl/reagent/uranium
+	uranium/small	volume = CARTRIDGE_VOLUME_SMALL
+	toothpaste	spawn_reagent = /decl/reagent/drink/toothpaste
+
 	// ERT
 	alkysine	spawn_reagent = /decl/reagent/alkysine
 	arithrazine	spawn_reagent = /decl/reagent/arithrazine

code/modules/reagents/dispenser/dispenser_presets.dm

@@ -136,6 +136,37 @@
 			/obj/item/reagent_containers/chem_disp_cartridge/cream
 		)
 
+/obj/machinery/chemical_dispenser/bar_alc/full/space //Spacebar away site. Gets much more to make the best drinks, hassle-free. 
+	spawn_cartridges = list(
+			/obj/item/reagent_containers/chem_disp_cartridge/lemon_lime,
+			/obj/item/reagent_containers/chem_disp_cartridge/sugar,
+			/obj/item/reagent_containers/chem_disp_cartridge/orange,
+			/obj/item/reagent_containers/chem_disp_cartridge/lime,
+			/obj/item/reagent_containers/chem_disp_cartridge/sodawater,
+			/obj/item/reagent_containers/chem_disp_cartridge/tonic,
+			/obj/item/reagent_containers/chem_disp_cartridge/beer,
+			/obj/item/reagent_containers/chem_disp_cartridge/kahlua,
+			/obj/item/reagent_containers/chem_disp_cartridge/whiskey,
+			/obj/item/reagent_containers/chem_disp_cartridge/wine,
+			/obj/item/reagent_containers/chem_disp_cartridge/vodka,
+			/obj/item/reagent_containers/chem_disp_cartridge/gin,
+			/obj/item/reagent_containers/chem_disp_cartridge/champagne,
+			/obj/item/reagent_containers/chem_disp_cartridge/rum,
+			/obj/item/reagent_containers/chem_disp_cartridge/tequila,
+			/obj/item/reagent_containers/chem_disp_cartridge/vermouth,
+			/obj/item/reagent_containers/chem_disp_cartridge/cognac,
+			/obj/item/reagent_containers/chem_disp_cartridge/ale,
+			/obj/item/reagent_containers/chem_disp_cartridge/mead,
+			/obj/item/reagent_containers/chem_disp_cartridge/grenadine,
+			/obj/item/reagent_containers/chem_disp_cartridge/cream,
+			/obj/item/reagent_containers/chem_disp_cartridge/ethanol,
+			/obj/item/reagent_containers/chem_disp_cartridge/berryjuice,
+			/obj/item/reagent_containers/chem_disp_cartridge/radium/small,
+			/obj/item/reagent_containers/chem_disp_cartridge/uranium/small,
+			/obj/item/reagent_containers/chem_disp_cartridge/toothpaste,
+			/obj/item/reagent_containers/chem_disp_cartridge/iron
+		)
+
 /obj/machinery/chemical_dispenser/coffeemaster
 	name = "Coffee Master 3000"
 	desc = "The only thing that can get some workers though the day, a coffee maker on steroids!"

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -667,6 +667,21 @@
 	center_of_mass = list("x" = 16, "y" = 5)
 	reagents_to_add = list(/decl/reagent/alcohol/pulque = 100)
 
+/obj/item/reagent_containers/food/drinks/bottle/vintage_wine //can't make it a child of wine, or else reagents double-fill 
+	name = "Vintage Wine"
+	desc = "A fine bottle of high-quality wine, produced in a small batch and aged for decades, if not centuries. It's likely that few bottles like it remain."
+	icon_state = "vwinebottle"
+	desc_fluff = "Small-batch wines produced by local, independent wineries are highly sought-after by those who can afford them. They are considered highly-collectable items \
+	due to how relatively few exist compared to more mass-produced wines. The attention to detail can be seen in the bottle, and felt in the taste. While megacorporations and their \
+	subsidiaries don't produce bad products, wine afficianados across the spur agree that nothing comes close to these locally-produced treasures. They can easily be worth thousands of credits."
+	center_of_mass = list("x"=16, "y"=4)
+	reagents_to_add = list(/decl/reagent/alcohol/wine/vintage = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/vintage_wine/Initialize()
+	. = ..()
+	name = pick("Triesto Pre-Dimming Sangiovese", "New Beirut 2340", "Vysokan Artisans Merlot", "Silver Seas Original Merlot", "Domelkos Morozian Treasure", "Belle Cote Serene Moth 2395",
+			"Malta Sol Nebbiolo", "Ashkhaimi Gardens Shiraz", "Old Cairo 2375", "Artisan Empire 2354")
+
 // Butanol-based alcoholic drinks
 //=====================================
 //These are mainly for unathi, and have very little (but still some) effect on other species