diff --git a/code/datums/diseases/food_poisoning.dm b/code/datums/diseases/food_poisoning.dm
index c28bc006343..df14f79056f 100644
--- a/code/datums/diseases/food_poisoning.dm
+++ b/code/datums/diseases/food_poisoning.dm
@@ -6,7 +6,7 @@
 	spread_flags = SPREAD_NON_CONTAGIOUS
 	cure_text = "Sleep"
 	agent = "Salmonella"
-	cures = list("chicken_soup")
+	cures = list("chicken_soup", "ginger_ale")
 	cure_chance = 10
 	viable_mobtypes = list(/mob/living/carbon/human)
 	desc = "Nausea, sickness, and vomitting."
diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index 2e378fba131..44d1c150ad4 100644
--- a/code/game/machinery/vendors/generic_vendors.dm
+++ b/code/game/machinery/vendors/generic_vendors.dm
@@ -62,6 +62,7 @@
 					/obj/item/reagent_containers/drinks/cans/cola = 8,
 					/obj/item/reagent_containers/drinks/cans/electrolytes = 4,
 					/obj/item/reagent_containers/drinks/cans/sodawater = 15,
+					/obj/item/reagent_containers/drinks/cans/ginger_ale = 8,
 					/obj/item/reagent_containers/drinks/drinkingglass = 30,
 					/obj/item/reagent_containers/drinks/drinkingglass/shotglass = 30,
 					/obj/item/reagent_containers/drinks/ice = 9)
@@ -1081,6 +1082,7 @@
 					/obj/item/reagent_containers/drinks/cans/starkist = 10,
 					/obj/item/reagent_containers/drinks/cans/space_up = 10,
 					/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/glass/beaker/waterbottle = 10)
 
@@ -1092,6 +1094,7 @@
 				/obj/item/reagent_containers/drinks/cans/starkist = 50,
 				/obj/item/reagent_containers/drinks/cans/space_up = 50,
 				/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/glass/beaker/waterbottle = 20)
 
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index 312805cbde1..b6f732f245c 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -237,6 +237,12 @@
 	icon_state = "sodawater"
 	list_reagents = list("sodawater" = 50)
 
+/obj/item/reagent_containers/drinks/cans/ginger_ale
+	name = "Zingiber Gold"
+	desc = "A can of ginger ale. Second-best thing for a tummy ache."
+	icon_state = "ginger_ale_can"
+	list_reagents = list("ginger_ale" = 50)
+
 /obj/item/reagent_containers/drinks/cans/synthanol
 	name = "Beep's Classic Synthanol"
 	desc = "A can of IPC booze, however that works."
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 20bfdaa88c5..8dff4927424 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -351,7 +351,7 @@
 	dispensable_reagents = list("water", "ice", "milk", "soymilk", "coffee", "tea", "hot_coco", "cola", "spacemountainwind", "dr_gibb", "space_up",
 	"tonic", "sodawater", "lemon_lime", "grapejuice", "sugar", "orangejuice", "lemonjuice", "limejuice", "tomatojuice", "banana",
 	"watermelonjuice", "pineapplejuice", "cream", "berryjuice")
-	upgrade_reagents = list("electrolytes", "bananahonk", "milkshake", "cafe_latte", "cafe_mocha", "triple_citrus", "icecoffe","icetea")
+	upgrade_reagents = list("electrolytes", "ginger_ale", "bananahonk", "milkshake", "cafe_latte", "cafe_mocha", "triple_citrus", "icecoffe","icetea")
 	hacked_reagents = list("thirteenloko")
 	hack_message = "You change the mode from 'McNano' to 'Pizza King'."
 	unhack_message = "You change the mode from 'Pizza King' to 'McNano'."
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 8b25d4a1f37..b644ccab414 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -996,3 +996,13 @@
 			if(H.blood_volume < BLOOD_VOLUME_NORMAL)
 				H.blood_volume += 0.5
 	return ..()
+
+/datum/reagent/consumable/drink/gingerale
+	name = "Ginger Ale"
+	description = "Spicy and fizzy soda."
+	id = "ginger_ale"
+	color = "#996B2B"
+	drink_icon = "ginger_ale_glass"
+	drink_name = "Glass of Ginger Ale"
+	drink_desc = "Spicy and fizzy soda."
+	taste_description = "sweet, carbonated ginger"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 4310b650f38..f14770c374b 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ