diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm
index ce175726a63..ac3de70fe06 100644
--- a/code/game/machinery/vendors/generic_vendors.dm
+++ b/code/game/machinery/vendors/generic_vendors.dm
@@ -35,7 +35,7 @@
 /obj/machinery/economy/vending/boozeomat
 	name = "\improper Booze-O-Mat"
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
-	icon_state = "boozeomat"        //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
+	icon_state = "boozeomat"        //////////////22 drink entities below, plus the glasses, in case someone wants to edit the number of bottles
 	icon_deny = "boozeomat_deny"
 	icon_lightmask = "smartfridge"
 	icon_panel = "smartfridge"
@@ -126,6 +126,7 @@
 					/obj/item/reagent_containers/drinks/tea = 25,
 					/obj/item/reagent_containers/drinks/h_chocolate = 25,
 					/obj/item/reagent_containers/drinks/chocolate = 10,
+					/obj/item/reagent_containers/drinks/bottle/chocolate_milk = 10,
 					/obj/item/reagent_containers/drinks/chicken_soup = 10,
 					/obj/item/reagent_containers/drinks/weightloss = 10,
 					/obj/item/reagent_containers/drinks/mug = 15,
@@ -137,6 +138,7 @@
 				/obj/item/reagent_containers/drinks/tea = 80,
 				/obj/item/reagent_containers/drinks/h_chocolate = 64,
 				/obj/item/reagent_containers/drinks/chocolate = 120,
+				/obj/item/reagent_containers/drinks/bottle/chocolate_milk = 64,
 				/obj/item/reagent_containers/drinks/chicken_soup = 100,
 				/obj/item/reagent_containers/drinks/weightloss = 50,
 				/obj/item/reagent_containers/drinks/mug = 75,
@@ -1106,6 +1108,7 @@
 					/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/bottle/chocolate_milk = 10,
 					/obj/item/reagent_containers/glass/beaker/waterbottle = 10)
 
 	contraband = list(/obj/item/reagent_containers/drinks/cans/thirteenloko = 5)
@@ -1118,6 +1121,7 @@
 				/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/bottle/chocolate_milk = 64,
 				/obj/item/reagent_containers/glass/beaker/waterbottle = 20)
 
 	refill_canister = /obj/item/vending_refill/cola
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index e984c549ec0..e3a202fabba 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -352,6 +352,16 @@
 	gender = PLURAL
 	list_reagents = list("milk" = 100)
 
+/obj/item/reagent_containers/drinks/bottle/chocolate_milk
+	name = "chocolate milk"
+	desc = "Brown milk from brown cows. Maybe."
+	icon_state = "chocolatebox"
+	inhand_icon_state = "contvapour"
+	throwforce = 0
+	is_glass = FALSE
+	gender = PLURAL
+	list_reagents = list("chocolate_milk" = 50)
+
 ////////////////////////// MOLOTOV ///////////////////////
 /obj/item/reagent_containers/drinks/bottle/molotov
 	name = "molotov cocktail"