diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index 32f66667816..8c673728418 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -44711,6 +44711,19 @@
 /obj/machinery/atmospherics/pipe/simple/visible,
 /turf/simulated/floor/engine,
 /area/station/science/misc_lab)
+"dLl" = (
+/obj/effect/turf_decal/tiles/dark/corner,
+/obj/effect/turf_decal/tiles/department/engineering/corner{
+	dir = 8
+	},
+/obj/structure/table,
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker,
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/blue{
+	pixel_x = 9;
+	pixel_y = 8
+	},
+/turf/simulated/floor/plasteel,
+/area/station/public/dorms)
 "dLs" = (
 /obj/effect/spawner/window/reinforced,
 /turf/simulated/floor/plating,
@@ -130775,7 +130788,7 @@ tKi
 eOj
 tuZ
 aPm
-aSM
+dLl
 aVt
 aZL
 aZL
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index 715a42ea618..d208b9e3e26 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -14410,6 +14410,18 @@
 /area/station/hallway/spacebridge/comeng)
 "ckn" = (
 /obj/structure/sign/poster/official/random/directional/north,
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker{
+	pixel_x = 1
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/blue{
+	pixel_x = -9;
+	pixel_y = 11
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/red{
+	pixel_x = 9;
+	pixel_y = 11
+	},
+/obj/structure/table,
 /turf/simulated/floor/carpet/cyan,
 /area/station/public/fitness)
 "ckp" = (
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 0957fbe2df3..583a0cad15b 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -33375,11 +33375,16 @@
 /area/station/public/sleep)
 "cAt" = (
 /obj/structure/table,
-/obj/item/paper_bin,
-/obj/item/pen,
 /obj/effect/turf_decal/tiles/neutral/corner{
 	dir = 1
 	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/blue{
+	pixel_x = 4
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/red{
+	pixel_y = 5;
+	pixel_x = -8
+	},
 /turf/simulated/floor/plasteel,
 /area/station/public/fitness)
 "cAu" = (
@@ -33802,10 +33807,18 @@
 /area/station/service/barber)
 "cBZ" = (
 /obj/structure/table,
-/obj/item/folder,
+/obj/item/folder{
+	pixel_x = -6
+	},
 /obj/effect/turf_decal/tiles/neutral/corner{
 	dir = 1
 	},
+/obj/item/paper_bin{
+	pixel_x = 6
+	},
+/obj/item/pen{
+	pixel_x = 6
+	},
 /turf/simulated/floor/plasteel,
 /area/station/public/fitness)
 "cCb" = (
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index eeac0260fa2..b6faa0c62dc 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -74231,6 +74231,17 @@
 /obj/effect/turf_decal/tiles/department/engineering/corner{
 	dir = 8
 	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/red{
+	pixel_y = 14
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/blue{
+	pixel_x = -10;
+	pixel_y = 5
+	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker{
+	pixel_x = 10;
+	pixel_y = 5
+	},
 /turf/simulated/floor/plasteel,
 /area/station/public/fitness)
 "oNG" = (
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 49044b84719..b2ef47ba840 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -77092,6 +77092,7 @@
 /obj/machinery/atmospherics/unary/outlet_injector/on{
 	dir = 1
 	},
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/red,
 /turf/simulated/floor/plasteel,
 /area/station/security/permabrig)
 "tfW" = (
diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index ac3de70fe06..277d90baa3f 100644
--- a/code/game/machinery/vendors/generic_vendors.dm
+++ b/code/game/machinery/vendors/generic_vendors.dm
@@ -48,6 +48,8 @@
 					/obj/item/reagent_containers/drinks/bottle/vermouth = 5,
 					/obj/item/reagent_containers/drinks/bottle/rum = 5,
 					/obj/item/reagent_containers/drinks/bottle/wine = 5,
+					/obj/item/reagent_containers/drinks/bottle/white_wine = 5,
+					/obj/item/reagent_containers/drinks/bottle/mezcal = 5,
 					/obj/item/reagent_containers/drinks/bag/goonbag = 3,
 					/obj/item/reagent_containers/drinks/bottle/cognac = 5,
 					/obj/item/reagent_containers/drinks/bottle/kahlua = 5,
@@ -68,7 +70,8 @@
 					/obj/item/reagent_containers/drinks/ice = 9)
 
 	contraband = list(/obj/item/reagent_containers/drinks/tea = 10,
-					/obj/item/reagent_containers/drinks/bottle/fernet = 5)
+					/obj/item/reagent_containers/drinks/bottle/fernet = 5,
+					/obj/item/reagent_containers/drinks/bottle/vampire_bestfriend = 5,)
 
 	vend_delay = 15
 	slogan_list = list("I hope nobody asks me for a bloody cup o' tea...",
@@ -1108,10 +1111,13 @@
 					/obj/item/reagent_containers/drinks/cans/grape_juice = 10,
 					/obj/item/reagent_containers/drinks/cans/ginger_ale = 10,
 					/obj/item/reagent_containers/drinks/cans/electrolytes = 10,
+					/obj/item/reagent_containers/drinks/cans/mrs_brown = 10,
 					/obj/item/reagent_containers/drinks/bottle/chocolate_milk = 10,
-					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
+					/obj/item/reagent_containers/glass/beaker/waterbottle = 10,)
 
-	contraband = list(/obj/item/reagent_containers/drinks/cans/thirteenloko = 5)
+	contraband = list(/obj/item/reagent_containers/drinks/cans/thirteenloko = 5,
+					/obj/item/reagent_containers/drinks/cans/behemoth_energy = 5,
+					/obj/item/reagent_containers/drinks/cans/behemoth_energy_lite = 5,)
 
 	prices = list(/obj/item/reagent_containers/drinks/cans/cola = 45,
 				/obj/item/reagent_containers/drinks/cans/space_mountain_wind = 50,
@@ -1121,8 +1127,9 @@
 				/obj/item/reagent_containers/drinks/cans/grape_juice = 50,
 				/obj/item/reagent_containers/drinks/cans/ginger_ale = 50,
 				/obj/item/reagent_containers/drinks/cans/electrolytes = 40,
+					/obj/item/reagent_containers/drinks/cans/mrs_brown = 50,
 				/obj/item/reagent_containers/drinks/bottle/chocolate_milk = 64,
-				/obj/item/reagent_containers/glass/beaker/waterbottle = 20)
+				/obj/item/reagent_containers/glass/beaker/waterbottle = 20,)
 
 	refill_canister = /obj/item/vending_refill/cola
 
diff --git a/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm b/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm
index f8908238a8a..17325f486b7 100644
--- a/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm
+++ b/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm
@@ -269,7 +269,8 @@
 		/obj/item/food/burger/ppatty/blue,
 		/obj/item/food/burger/ppatty/purple,
 		/obj/item/food/baguette,
-		/obj/item/food/rofflewaffles
+		/obj/item/food/rofflewaffles,
+		/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker,
 	)
 
 // Rare food pool
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 1a8564fee94..d9345bbd8d4 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -793,6 +793,8 @@
 				Mix 10 parts tequila to one part silver.
 				<h2>Synthignon:</h2>
 				Mix one part synthanol to one part wine.
+				<h2>Vampire's Best Friend:</h2>
+				Mix one part White Russian (<a href='byond://?src=[UID()];seek_page=4'>Easy Alcoholic Drinks</a>) to one part garlic juice. Botany can help.
 				<br><br><a href='byond://?src=[UID()];seek_page=1'>Back to Table of Contents</a>
 				</body>
 				</html>
@@ -806,6 +808,8 @@
 				<body>
 				<h1>Easy Alcoholic Drinks</h1>
 				Most of these drinks, you should be able to mix right at your dispenser. Drinks marked with a § are for synthetic customers.
+				<h2>Acapulco de Noche:</h2>
+				Mix one part each of tequila, rum, sugar, and ice.
 				<h2>Allies Cocktail:</h2>
 				Mix one part Classic Martini to one part vodka.
 				<h2>Aloe:</h2>
@@ -848,6 +852,10 @@
 				Mix one part each of blood, rum, and kahlua. Medical or Botany can help.
 				<h2>Driest Martini:</h2>
 				Mix one part nothing to one part gin.
+				<h2>Dublin Drop:</h2>
+				Mix one part each of Irish Cream (<a href='byond://?src=[UID()];seek_page=3'>Trivial Alcoholic Drinks</a>), stout, and whiskey.
+				<h2>Durkehiet: (a Vulpkanin favorite!)</h2>
+				Mix two parts vodka to one part each of triple citrus and honey.
 				<h2>Erika Surprise:</h2>
 				Mix one part each of ale, lime juice, whiskey, banana juice, and ice.
 				<h2>Fernet Cola:</h2>
@@ -860,10 +868,6 @@
 				Mix two parts gin to one part tonic water.
 				<h2>Grog:</h2>
 				Mix one part rum to one part water.
-				<h2>Durkehiet: (a Vulpkanin favorite!)</h2>
-				Mix two parts vodka to one part each of triple citrus and honey.
-				<h2>Dublin Drop:</h2>
-				Mix one part each of Irish Cream (<a href='byond://?src=[UID()];seek_page=3'>Trivial Alcoholic Drinks</a>), stout, and whiskey.
 				<h2>Irish Coffee:</h2>
 				Mix two parts Irish Cream (<a href='byond://?src=[UID()];seek_page=3'>Trivial Alcoholic Drinks</a>) to two parts coffee.
 				<h2>Long Island Iced Tea:</h2>
@@ -902,6 +906,8 @@
 				Mix one part each of synthanol, orange juice, and lime juice.
 				<h2>Uplink: §</h2>
 				Mix one part each of synthanol, rum, vodka, tequila, and whiskey.
+				<h2>Vampiro:</h2>
+				Mix two parts tomato juice to one part each of lime juice and tequila.
 				<h2>Vodka Martini:</h2>
 				Mix two parts vodka to one part vermouth.
 				<h2>Vodka and Tonic:</h2>
@@ -951,6 +957,8 @@
 				Mix one part each of vodka, lime juice, grape juice, and silicon. Heat above 373K. Chemistry can help.
 				<h2>Flaming Moe:</h2>
 				Mix one part each of cognac, gin, saline-glucose solution, tequila, and vodka. Heat to 374K. Chemistry can help.
+				<h2>Hanky Panky:</h2>
+				Mix one part each of Fernet, vermouth, gin, and orange juice.
 				<h2>Hooch:</h2>
 				Mix two parts ethanol with one part each welding fuel and universal enzyme. The Kitchen or Chemistry can help.
 				<h2>Islay Whiskey: (a Dionae favorite!)</h2>
@@ -959,10 +967,14 @@
 				Mix four parts Applejack to one part lemon juice.
 				<h2>Jungle Vox: (a Vox favorite!)</h2>
 				Mix one part each of rum, lime juice, sugar, kahlua, and nitrogen. Chemistry can help.
+				<h2>Michelada:</h2>
+				Mix two parts beer to one part each of capsaicin, salt, and lime juice. The Kitchen or Botany can help.
 				<h2>Moonshine:</h2>
 				Mix 10 parts nutriment to five parts universal enzyme. The Kitchen or Chemistry can help.
 				<h2>Neuro-toxin:</h2>
 				Mix one part ether to one part Pan-Galactic Gargle Blaster (<a href='byond://?src=[UID()];seek_page=4'>Easy Alcoholic Drinks</a>). Chemistry can help.
+				<h2>Peach Bellini:</h2>
+				Mix one part each of peach juice, wine and tonic. Botany can help.
 				<h2>Sbiten:</h2>
 				Mix 10 parts vodka to one part capsaicin. The Xenobiologist can help.
 				<h2>Singulo:</h2>
@@ -1008,6 +1020,8 @@
 				Mix one part each of ultra lube, oil, and synthanol. Chemistry can help.
 				<h2>Manhattan Project:</h2>
 				Mix 10 parts Manhattan (<a href='byond://?src=[UID()];seek_page=3'>Trivial Alcoholic Drinks</a>) to one part uranium. Cargo can help.
+				<h2>Matadora Beer</h2>
+				Mix one part each of tequila, Bilk (<a href='byond://?src=[UID()];seek_page=4'>Easy Alcoholic Drinks</a>), Red Mead, and ice.
 				<h2>Red Mead:</h2>
 				Mix one part mead to one part blood. Medical or Botany can help.
 				<h2>Shrub Julep:</h2>
@@ -1119,15 +1133,19 @@
 				<body>
 				<h1>Intermediate Soft Drinks</h1>
 				Most of these drinks require many steps or collaboration with other departments. Drinks marked with § are for synthetic customers only.
+				<h2>Annona and Blueberries:</h2>
+				Mix one part each of annona juice and berry juice. Botany can help.
+				<h2>Annona Cream:</h2>
+				Mix five parts each of sugar and water to two parts corn oil and one part annona juice. Botany or the Kitchen can help.
 				<h2>Arnold Palmer:</h2>
 				Mix one part Lemonade (<a href='byond://?src=[UID()];seek_page=8'>Easy Soft Drinks</a>) to one part Iced Tea (<a href='byond://?src=[UID()];seek_page=7'>Trivial Soft Drinks</a>).
 				<h2>Battery Acid: §</h2>
 				Mix one part TCP Sip (<a href='byond://?src=[UID()];seek_page=8'>Easy Soft Drinks</a>) to one part Triple Citrus (<a href='byond://?src=[UID()];seek_page=7'>Trivial Soft Drinks</a>).
 				<h2>Bubbly Beep: §</h2>
 				Mix one part space cleaner to one part soda water. Custodial or Chemistry can help.
-				<h2>Bubble Milk Tea</h2>
+				<h2>Bubble Milk Tea:</h2>
 				Mix three parts Milk Tea (<a href='byond://?src=[UID()];seek_page=8'>Easy Soft Drinks</a>) to one part cooked tapioca pearls. The Kitchen and Botany can help.
-				<h2>Bubble Tea</h2>
+				<h2>Bubble Tea:</h2>
 				Mix two parts tea to one part each of sugar and cooked tapioca pearls. The Kitchen and Botany can help.
 				<h2>Cherry Shake:</h2>
 				Mix one part each of cherry jelly, cream, and ice. Botany or the Kitchen can help.
@@ -1141,14 +1159,26 @@
 				Mix 10 parts sugar to five parts each of egg and milk. Cool to 280K. The Kitchen or Chemistry can help.
 				<h2>Horchata:</h2>
 				Mix four parts water, two parts rice, and one part each of sugar and vanilla. Botany or the Kitchen can help.
+				<h2>Mambo Smoothie:</h2>
+				Mix one part each of lettuce juice and mango juice. Botany can help.
+				<h2>Mango Punch:</h2>
+				Mix one part each of mango juice, lime juice, and Goldschlager (<a href='byond://?src=[UID()];seek_page=3'>Trivial Alcoholic Drinks</a>). Surprisingly non-alcoholic. Botany can help.
+				<h2>Peach Milkshake:</h2>
+				Mix one part each of peach juice, ice, and cream.
 				<h2>Peanut Butter Banana Smoothie:</h2>
 				Mix one part each of soy milk, banana juice, peanut butter, and ice. Botany or the Kitchen can help.
 				<h2>Pumpkin Space Latte:</h2>
 				Mix five parts each of coffee, cream, and pumpkin juice. Botany can help.
+				<h2>Refined Nispero Juice:</h2>
+				Mix ten parts sugar to one part each nispero juice, lemon juice, and ice. Botany can help.
+				<h2>Super Healthy Prickly-Pear Juice:</h2>
+				Mix five parts each of sugar, prickly pear juice, lemon juice, and ice. Botany can help.
 				<h2>Tears of Fyrsskar:</h2>
 				Mix one part each of plasma, oxygen, and Triple Citrus (<a href='byond://?src=[UID()];seek_page=7'>Trivial Soft Drinks</a>). Chemistry can help.
 				<h2>Tin and Tonic: §</h2>
 				Mix one part liquid solder to one part tonic water. Chemistry can help.
+				<h2>Uncle Git's Special Milk:</h2>
+				Mix five parts each of milk, cream, and egg to one part salt. The Kitchen or Botany can help.
 				<h2>Vanilla Pudding:</h2>
 				Mix five parts each of egg, coffee, and vanilla powder. Botany or the Kitchen can help.
 				<h2>Very Berry Smoothie:</h2>
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index e3a202fabba..95631f37d25 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -447,3 +447,40 @@
 		to_chat(user, SPAN_NOTICE("You snuff out the flame on \the [src]."))
 		active = FALSE
 		update_icon(UPDATE_OVERLAYS)
+
+// ----------- drinks from Hispania!
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker
+	name = "black fitness shaker"
+	desc = "Big enough to contain enough protein to get perfectly swole. Don't mind the bits."
+	icon_state = "fitness_cup_black"
+	materials = list(MAT_PLASTIC = 500)
+	list_reagents = list("nutriment" = 5, "iron" = 15, "protein" = 5, "water" = 25)
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/red
+	name = "red fitness shaker"
+	icon_state = "fitness_cup_red"
+
+/obj/item/reagent_containers/glass/beaker/waterbottle/fitnessshaker/blue
+	name = "blue fitness shaker"
+	icon_state = "fitness_cup_blue"
+
+/obj/item/reagent_containers/drinks/bottle/mezcal
+	name = "400 Conejos"
+	desc = "A thin bottle with very transparent alcohol inside... Wait, is that a worm?"
+	icon_state = "mezcal_bottle"
+	list_reagents = list("mezcal" = 100)
+
+/obj/item/reagent_containers/drinks/bottle/vampire_bestfriend
+	name = "Alucard's guilty sin"
+	desc = "You can distinguish pieces of garlic floating inside."
+	icon_state = "vampire_bf_flask"
+	list_reagents = list("vampire_bf" = 100)
+
+/obj/item/reagent_containers/drinks/bottle/white_wine
+	name = "Corton-Charlemagne Grand Cru"
+	desc = "."
+	icon_state = "white_wine_bottle"
+	list_reagents = list("whitewine" = 100)
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index fa8943ba16d..33db82f5b94 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -295,3 +295,35 @@
 	name = "metal can"
 	desc = "A metal can suitable for beverages."
 	icon_state = "metal_can"
+
+// ----------- drinks from Hispania!
+
+/obj/item/reagent_containers/drinks/cans/mrs_brown
+	name = "Mrs Brown"
+	desc = "A can of iced coffee. The can sports a big red star."
+	icon_state = "mrs_brown"
+	list_reagents = list("icecoffee" = 30)
+
+/obj/item/reagent_containers/drinks/cans/behemoth_energy
+	name = "Behemoth Energy"
+	desc = "Tear into a can of the meanest energy drink on the planet, Behemoth Energy."
+	icon_state = "behemoth"
+	list_reagents = list("sugar" = 5, "ale" = 10, "sodawater" = 10)
+
+/obj/item/reagent_containers/drinks/cans/behemoth_energy/Initialize(mapload)
+	..()
+	if(prob(30))
+		reagents.add_reagent("methamphetamine", 3)
+
+/obj/item/reagent_containers/drinks/cans/behemoth_energy_lite
+	name = "Behemoth Energy Zero"
+	desc = "Tear into a can of the meanest energy drink on the planet, Behemoth Energy. Yup, Quake was a good game."
+	icon_state = "behemoth_lite"
+	list_reagents = list("ale" = 10, "sodawater" = 20)
+
+/obj/item/reagent_containers/drinks/cans/behemoth_energy_lite/Initialize(mapload)
+	..()
+	if(prob(10))
+		reagents.add_reagent("methamphetamine", 3)
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index 1495824c759..5c8d39fdd2a 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -2280,3 +2280,115 @@
 		REMOVE_TRAIT(M, TRAIT_RESISTHEAT, id)
 	else
 		ADD_TRAIT(M, TRAIT_RESISTHEAT, id)
+
+// ----------- drinks from Hispania!
+
+/datum/reagent/consumable/ethanol/mezcal /// By mazapan
+	name = "Mezcal"
+	id = "mezcal"
+	description = "Tequila's older, more worldly cousin."
+	color = "#bcdbcf"
+	dizzy_adj = 3
+	alcohol_perc = 0.6
+	drink_icon = "mezcal_glass"
+	drink_name = "Glass of Mezcal"
+	drink_desc = "A crystal clear glass of 400 Conejos with a little worm inside."
+	taste_description = "tasty worm"
+
+/datum/reagent/consumable/ethanol/white_wine
+	name = "White Wine"
+	id = "whitewine"
+	description = "A fancy version of your regular wine."
+	color = "#EEEDC4"
+	dizzy_adj = 2
+	alcohol_perc = 0.2
+	drink_icon = "white_wine_glass"
+	drink_name = "Glass of White Wine"
+	drink_desc = "A classy glass of white wine."
+	taste_description = "vibrant"
+
+/datum/reagent/consumable/ethanol/michelada
+	name= "Michelada"
+	id = "michelada"
+	description = "Chili beer with lime."
+	color = "#b47b31"
+	alcohol_perc = 0.2
+	drink_icon = "michelada"
+	drink_name = "Glass of Michelada"
+	drink_desc = "Spicy beer served in a salt-rimmed glass."
+	taste_description ="hot pepper and lime"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/ethanol/vampiro
+	name= "Vampiro"
+	id = "vampiro"
+	description = "Tequila prepared with tomato juice for a blood-red look."
+	color = "#E6502F"
+	alcohol_perc = 0.2
+	drink_icon = "vampiro"
+	drink_name = "Glass of Vampiro"
+	drink_desc = "Tequila prepared with tomato juice for a blood-red look."
+	taste_description ="old Mexican spices"
+	goal_difficulty = REAGENT_GOAL_EASY
+
+/datum/reagent/consumable/ethanol/acapulco_de_noche
+	name= "Acapulco de Noche"
+	id = "acapulco_de_noche"
+	description = "A flamboyant cocktail perfect for the beach."
+	color = "#ff0033"
+	alcohol_perc = 0.3
+	drink_icon = "acapulco_de_noche"
+	drink_name = "Glass of Acapulco de Noche"
+	drink_desc = "A flamboyant cocktail that smells like medicine."
+	taste_description ="a citric dance"
+	goal_difficulty = REAGENT_GOAL_EASY
+
+/datum/reagent/consumable/ethanol/matadora_beer
+	name= "Matadora beer"
+	id = "matadora_beer"
+	description = "A mix of beer and everything that was in the fridge."
+	color = "#db002b"
+	nutriment_factor = 3 * REAGENTS_METABOLISM
+	alcohol_perc = 0.3
+	drink_icon = "matadora_beer"
+	drink_name = "Glass of Matadora Beer"
+	drink_desc = "It smells strangely good despite its hodge-podge appearance."
+	taste_description ="lemonade with strawberry soda and medicinal alcohol"
+	goal_difficulty = REAGENT_GOAL_HARD
+
+/datum/reagent/consumable/ethanol/hanky_panky
+	name= "Hanky Panky"
+	id = "hanky_panky"
+	description = "A cocktail ideal for after work."
+	color = "#ab4003"
+	alcohol_perc = 0.3
+	drink_icon = "hanky_panky"
+	drink_name = "Glass of Hanky Panky"
+	drink_desc = "Bad enough to be served in a pretty glass."
+	taste_description = "alcohol both strong and light at the same time"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/ethanol/peach_bellini
+	name= "Peach Bellini"
+	id = "peach_bellini"
+	description = "A mimosa made with peach purée."
+	color = "#ff7970"
+	alcohol_perc = 0.4
+	drink_icon = "peach_bellini"
+	drink_name = "Glass of Peach Bellini"
+	drink_desc = "A mimosa made with peach purée. Oh la la fancy man."
+	taste_description = "fresh peaches"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/ethanol/vampire_bf
+	name= "Vampire's Best Friend"
+	id = "vampire_bf"
+	description = "A creamy beverage with chunks of garlic inside."
+	color = "#E0C875"
+	alcohol_perc = 0.7
+	drink_icon = "vampire_bf_glass"
+	drink_name = "Glass of Vampire's Best Friend"
+	drink_desc = "A creamy beverage with chunks of garlic inside. Did you steal the chaplain's flask, son?"
+	taste_description ="garlic"
+
+// ----------- END of imports from Hispania!
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 860446c1ee8..93493cb6cd6 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -1509,8 +1509,8 @@
 
 /datum/reagent/consumable/drink/castor/on_mob_life(mob/living/carbon/M)
 	var/update_flags = STATUS_UPDATE_NONE
-	update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
-	update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+	update_flags |= M.adjustBruteLoss(-2 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+	update_flags |= M.adjustFireLoss(-2 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
 	return ..() | update_flags
 
 /datum/reagent/consumable/drink/coconutwater
@@ -1521,7 +1521,7 @@
 	drink_icon = "glass_white"
 	drink_name = "Glass of Coconut Water"
 	drink_desc = "Diaphanous water with coconut bits floating inside."
-	taste_description = "mildly sweet"
+	taste_description = "mild sweetness"
 	metabolization_rate = 0.15 * REAGENTS_METABOLISM
 
 /datum/reagent/consumable/drink/cactusjuice
@@ -1535,4 +1535,105 @@
 	taste_description = "bland water"
 	metabolization_rate = 0.15 * REAGENTS_METABOLISM
 
+/datum/reagent/consumable/drink/unclegits_specialmilk
+	name= "Uncle Git's Special Milk"
+	id = "unclegits_specialmilk"
+	description = "It is sticky and has a strong chlorine smell."
+	color = "#FFFEC6"
+	nutriment_factor = 2 * REAGENTS_METABOLISM
+	drink_icon = "gitsmilk"
+	drink_name = "Glass of Uncle Git's Special Milk"
+	drink_desc = "It is sticky and has a strong chlorine smell."
+	taste_description = "someone else's child"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/peach_milkshake
+	name = "Peach Milkshake"
+	id = "peach_milkshake"
+	description = "Pink and very light."
+	color = "#FF7391"
+	nutriment_factor = 2 * REAGENTS_METABOLISM
+	drink_icon = "peach_milkshake"
+	drink_name = "Glass of Peach Milkshake"
+	drink_desc = "Pink and very light. Essential on the first date."
+	taste_description = "dainty sweetness"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+// made with alcohol but apparently ceases to be alcoholic once mixed.
+/datum/reagent/consumable/drink/mango_punch
+	name= "Mango Punch"
+	id = "mango_punch"
+	description = "Packs a punch of sweetness."
+	color = "#fcba22"
+	nutriment_factor = 2 * REAGENTS_METABOLISM
+	drink_icon = "mango_punch"
+	drink_name = "Glass of Mango Punch"
+	drink_desc = "Packs a punch of sweetness."
+	taste_description = "tropical fruit"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/mambo_smoothie
+	name= "Mambo Smoothie"
+	id = "mambo_smoothie"
+	description = "A blend of mango and leafy greens."
+	color = "#A4C639"
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	drink_icon = "mambo_smoothie"
+	drink_name = "Glass of Mambo Smoothie"
+	drink_desc = "A blend of mango and leafy greens. Do you want to stay fit, mate?"
+	taste_description = "grass"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/annona_blueberries
+	name = "Annona and Blueberries"
+	id = "annona_blueberries"
+	description = "Tropical cocktail."
+	color = "#CE3B00"
+	nutriment_factor = 2 * REAGENTS_METABOLISM
+	drink_icon = "annona_blueberry"
+	drink_name = "Glass of Annona and Blueberries"
+	drink_desc = "Tropical cocktail."
+	taste_description = "sweet fruits"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/annona_cream
+	name = "Annona Cream"
+	id = "annona_cream"
+	description = "A tropical looking cream"
+	color = "#FFD484"
+	nutriment_factor = 2 * REAGENTS_METABOLISM
+	drink_icon = "annona_cream"
+	drink_name = "Glass of Anonna Cream"
+	drink_desc = "A really good tropical cream."
+	taste_description = "creamy edgy fruit"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/nisperorefinedjuice
+	name = "Refined Nispero Juice"
+	description = "Sweetened, refined nispero juice."
+	id = "nisperorefinedjuice"
+	color = "#F09D16"
+	drink_icon = "glass_sunnyorange"
+	drink_name = "Glass of Refined Nispero Juice"
+	drink_desc = "Sweetened, refined nispero juice."
+	taste_description = "cold citric nispero"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/cactus_healthus
+	name = "Super-Healthy Prickly Pear Juice"
+	id = "cactus_healthus"
+	description = "A smoothie mixed with a little of sugar, lemon juice and a prickly pear."
+	color = "#a3a105"
+	drink_icon = "cactus_healthus"
+	drink_name = "Glass of Super-Healthy Prickly Pear"
+	drink_desc = "A bright green cold smoothie. People say its good for weight loss."
+	taste_description = "fresh cold water with a little citric acid"
+	goal_difficulty = REAGENT_GOAL_NORMAL
+
+/datum/reagent/consumable/drink/cactus_healtus/on_mob_life(mob/living/M)
+	var/update_flags = STATUS_UPDATE_NONE
+	var/nutrition_value = -rand(3,4)
+	update_flags |= M.adjust_nutrition(nutrition_value)
+	return ..() | update_flags
+
 // ----------- END of imports from Hispania!
diff --git a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm
index 0a33da7b581..a3b4d7b19aa 100644
--- a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm
@@ -1430,3 +1430,141 @@
 	required_reagents = list("bungojuice" = 1, "mangojuice" = 1, "cream" = 1, "ether" = 1)
 	result_amount = 4
 	mix_message = "The liquids mix together into a yellow cream."
+
+// ----------- drinks from Hispania!
+
+/datum/chemical_reaction/unclegits_specialmilk ///By Ralph & Ume
+	name = "Uncle Git's Special Milk"
+	id = "unclegits_specialmilk"
+	result = "unclegits_specialmilk"
+	required_reagents = list("milk" = 5, "cream" = 5, "sodiumchloride" = 1, "egg" = 5)
+	result_amount = 15
+	mix_message = "The mixture becomes quite sticky."
+	mix_sound = 'sound/effects/blobattack.ogg'
+
+/datum/chemical_reaction/michelada /// By mazapan
+	name = "Michelada"
+	id = "michelada"
+	result = "michelada"
+	required_reagents = list("beer" = 2, "capsaicin" = 1, "sodiumchloride" = 1, "limejuice" = 1)
+	result_amount = 3
+	mix_message = "The beer looks a little more delicious."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/vampiro /// By mazapan
+	name = "Vampiro"
+	id = "vampiro"
+	result = "vampiro"
+	required_reagents = list("tequila" = 1, "tomatojuice" = 2, "limejuice" = 1)
+	result_amount = 4
+	mix_message = "Mariachi sounds loudly in the container."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/acapulco_de_noche /// By mazapan
+	name = "Acapulco de Noche"
+	id = "acapulco_de_noche"
+	result = "acapulco_de_noche"
+	required_reagents = list("tequila" = 1, "rum" = 1, "sugar" = 1, "ice" = 1)
+	result_amount = 4
+	mix_message = "The party has officially begun."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/matadora_beer /// By mazapan
+	name = "Matadora Beer"
+	id = "matadora_beer"
+	result = "matadora_beer"
+	required_reagents = list("tequila" = 1, "bilk" = 1, "red_mead" = 1, "ice" = 1)
+	result_amount = 4
+	mix_message = "Really?"
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/hanky_panky /// By mazapan
+	name = "Hanky Panky"
+	id = "hanky_panky"
+	result = "hanky_panky"
+	required_reagents = list("fernet" = 1, "vermouth" = 1, "gin" = 1, "orangejuice" = 1)
+	result_amount = 4
+	mix_message = "The ingredients mix into a dark brown substance."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/peach_milkshake
+	name = "Peach Milkshake"
+	id = "peach_milkshake"
+	result = "peach_milkshake"
+	required_reagents = list("peachjuice" = 1, "ice" = 1, "cream" = 1)
+	result_amount = 3
+	mix_message = "The ingredients blend together smoothly."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/peach_bellini
+	name= "Peach Bellini"
+	id = "peach_bellini"
+	result = "peach_bellini"
+	required_reagents = list("peachjuice" = 1, "wine" = 1, "tonic" = 1)
+	result_amount = 3
+	mix_message = "You hear Pachelbel's opus in the distance."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/mango_punch
+	name= "Mango Punch"
+	id = "mango_punch"
+	result = "mango_punch"
+	required_reagents = list("mangojuice" = 1, "limejuice" = 1, "goldschlager" = 1)
+	result_amount = 3
+	mix_message = "You get a strong whiff of summer."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/vampire_bf
+	name= "Vampire Bestfriend"
+	id = "vampire_bf"
+	result = "vampire_bf"
+	required_reagents = list("whiterussian" = 1, "garlic" = 1)
+	result_amount = 2
+	mix_message = "Smells like blood."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/mambo_smoothie
+	name= "Mambo Smoothie"
+	id = "mambo_smoothie"
+	result = "mambo_smoothie"
+	required_reagents = list("lettucejuice" = 1, "mangojuice" = 2)
+	result_amount = 3
+	mix_message = "Smells like hydroponics."
+
+/datum/chemical_reaction/annona_blueberries
+	name = "Annona and Blueberries"
+	id = "annona_blueberries"
+	result = "annona_blueberries"
+	required_reagents = list("berryjuice" = 1, "annonajuice" = 1)
+	result_amount = 2
+	mix_message = "Sweeeet fruits!"
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/annona_cream
+	name = "Annona Cream"
+	id = "annona_cream"
+	result = "annona_cream"
+	required_reagents = list("sugar" = 5, "water" = 5, "annonajuice" = 1, "cornoil" = 2)
+	result_amount = 10
+	mix_message = "Look at all that cream!"
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/nisperorefinedjuice
+	name = "Refined Nispero Juice"
+	id = "nisperorefinedjuice"
+	result = "nisperorefinedjuice"
+	required_reagents = list("sugar" = 10, "lemonjuice" = 1, "nisperojuice" = 1, "ice" = 1)
+	result_amount = 10
+	mix_message = "Better than orange juice? Maybe."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/cactus_healthus
+	name = "Super-Healthy Prickly Pear Juice"
+	id = "cactus_healthus"
+	result = "cactus_healthus"
+	required_reagents = list("sugar" = 5, "cactusjuice" = 5, "lemonjuice" = 5, "ice" = 1)
+	result_amount = 10
+	mix_message = "You mix up a tastier solution for the overfed crew."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+// ----------- END of imports from Hispania!
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 2544759a100..dcbe612b189 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ