diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 9c35751867b..6348eb50e26 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -725,12 +725,44 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space."
 	products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10,
-					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10)
-	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6)
+	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 6)
 	premium = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1)
 	refill_canister = /obj/item/weapon/vending_refill/cola
 
+/obj/machinery/vending/cola/New()
+	..()
+	var/T = pick(subtypesof(/obj/machinery/vending/cola))
+	new T
+
+/obj/machinery/vending/cola/blue
+	icon_state = "Cola_Machine"
+
+/obj/machinery/vending/cola/black
+	icon_state = "cola_black"
+
+/obj/machinery/vending/cola/red
+	icon_state = "cola_red"
+
+/obj/machinery/vending/cola/space_up
+	icon_state = "space_up"
+
+/obj/machinery/vending/cola/pwr_game
+	icon_state = "pwr_game"
+
+/obj/machinery/vending/cola/shamblers
+	name = "\improper Shambler's Vendor"
+	desc = "~Shake me up some of that Shambler's Juice!~"
+	icon_state = "shamblers_juice"
+	products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
+					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 10)
+	product_slogans = "~Shake me up some of that Shambler's Juice!~"
+	product_ads = "Refreshing!;Ubcr lbh'er guvefgl!;Over 1 trillion souls drank!;Thirsty? Jul abg qevax gur qnexarff?;Gur Funzoyre yvxrf na rzcgl irffry!;Drink up!;Fyhec."
+
+
 //This one's from bay12
 /obj/machinery/vending/cart
 	name = "\improper PTech"
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index ac74d4274fc..26560b98ec3 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -380,4 +380,14 @@
 	icon_state = "dr_gibb"
 	list_reagents = list("dr_gibb" = 30)
 
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game
+	name = "Pwr Game"
+	desc = "The only drink with the PWR that true gamers crave."
+	icon_state = "purple_can"
+	list_reagents = list("pwr_game" = 30)
 
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers
+	name = "Shambler's Juice"
+	desc = "~Shake me up some of that Shambler's Juice!~"
+	icon_state = "shamblers"
+	list_reagents = list("shamblers" = 30)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index a3c076a81da..4af8e1db0e5 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -265,6 +265,14 @@
 				icon_state = "space-up_glass"
 				name = "glass of Space-up"
 				desc = "Space-up. It helps you keep your cool."
+			if("pwr_game")
+				icon_state = "glass_red"
+				name = "glass of Pwr Game"
+				desc = "Goes well with a valid salad."
+			if("shamblers")
+				icon_state = "glass_red"
+				name = "glass of Shambler's Juice"
+				desc = "Mmm mm, shambly."
 			if("lemon_lime")
 				icon_state = "glass_yellow"
 				name = "glass of Lemon-Lime"
@@ -648,7 +656,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola
 	name = "Space Cola"
 	list_reagents = list("cola" = 50)
-	
+
 /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola
 	name = "Nuka Cola"
 	list_reagents = list("nuka_cola" = 50)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 9c2b2229929..8e4a9ddb8bd 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -317,6 +317,8 @@
 		"tonic",
 		"sodawater",
 		"lemon_lime",
+		"pwr_game",
+		"shamblers",
 		"sugar",
 		"orangejuice",
 		"limejuice",
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 196aca498c5..45830037ebd 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -364,6 +364,27 @@
 		M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
 	..()
 
+/datum/reagent/consumable/pwr_game
+	name = "Pwr Game"
+	description = "The only drink with the PWR that true gamers crave."
+	id = "pwr_game"
+	color = "#9385bf" // rgb: 58, 52, 75
+
+/datum/reagent/consumable/pwr_game/on_mob_life(mob/living/M)
+	if (M.bodytemperature > 310)
+		M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+	..()
+
+/datum/reagent/consumable/shamblers
+	name = "Shambler's Juice"
+	description = "~Shake me up some of that Shambler's Juice!~"
+	id = "shamblers"
+	color = "#f00060" // rgb: 94, 0, 38
+
+/datum/reagent/consumable/shamblers/on_mob_life(mob/living/M)
+	if (M.bodytemperature > 310)
+		M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
+	..()
 /datum/reagent/consumable/sodawater
 	name = "Soda Water"
 	id = "sodawater"
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index c03eef34975..a62f1db360c 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index e8131065047..4ce9d864c87 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index b6ca3266ad8..21a235863fc 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ