From b2870e568becbdfe92e2ced19fac7784a7ee209b Mon Sep 17 00:00:00 2001
From: Gandalf <jzo123@hotmail.com>
Date: Tue, 14 Sep 2021 00:23:15 +0100
Subject: [PATCH] 0

---
 _maps/map_files/MetaStation/MetaStation_skyrat.dmm | 4 ++--
 code/datums/station_traits/positive_traits.dm      | 2 +-
 code/game/objects/items/storage/sixpack.dm         | 2 +-
 code/modules/cargo/packs.dm                        | 4 ++--
 code/modules/vending/boozeomat.dm                  | 2 +-
 code/modules/vending/liberation.dm                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
index 72423e3ec65..313c1f2a9cd 100644
--- a/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
+++ b/_maps/map_files/MetaStation/MetaStation_skyrat.dmm
@@ -11901,7 +11901,7 @@
 /turf/open/floor/engine,
 /area/maintenance/disposal/incinerator)
 "cmh" = (
-/obj/item/reagent_containers/food/drinksbottle/ale,
+/obj/item/reagent_containers/food/drinks/bottle/ale,
 /obj/structure/table/wood,
 /turf/open/floor/wood,
 /area/maintenance/port/aft)
@@ -44224,7 +44224,7 @@
 	pixel_x = -3;
 	pixel_y = 2
 	},
-/obj/item/reagent_containers/food/drinksbottle/ale,
+/obj/item/reagent_containers/food/drinks/bottle/ale,
 /obj/structure/table/wood,
 /obj/item/instrument/eguitar,
 /obj/structure/sign/poster/contraband/random{
diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm
index 00ce85eeef0..6afe9510f17 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -28,7 +28,7 @@
 	var/obj/item/pizzabox/pizza_to_spawn = pick(list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/vegetable, /obj/item/pizzabox/pineapple))
 	new pizza_to_spawn(toLaunch)
 	for(var/i in 1 to 6)
-		new /obj/item/reagent_containers/food/drinks/beer(toLaunch)
+		new /obj/item/reagent_containers/food/drinks/bottle/beer(toLaunch)
 	new /obj/effect/pod_landingzone(T, toLaunch)
 
 /datum/station_trait/galactic_grant
diff --git a/code/game/objects/items/storage/sixpack.dm b/code/game/objects/items/storage/sixpack.dm
index fb5ce70c3da..63eb2ab2b60 100644
--- a/code/game/objects/items/storage/sixpack.dm
+++ b/code/game/objects/items/storage/sixpack.dm
@@ -30,7 +30,7 @@
 	STR.set_holdable(list(
 		/obj/item/reagent_containers/food/drinks/soda_cans,
 		/obj/item/reagent_containers/food/drinks/bottle/beer,
-		/obj/item/reagent_containers/food/drinksbottle/ale,
+		/obj/item/reagent_containers/food/drinks/bottle/ale,
 		/obj/item/reagent_containers/food/drinks/waterbottle
 		))
 
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index c35e0db8e8e..ba3d26912b7 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1569,8 +1569,8 @@
 					/obj/item/reagent_containers/food/drinks/shaker,
 					/obj/item/reagent_containers/food/drinks/bottle/patron,
 					/obj/item/reagent_containers/food/drinks/bottle/goldschlager,
-					/obj/item/reagent_containers/food/drinksbottle/ale,
-					/obj/item/reagent_containers/food/drinksbottle/ale,
+					/obj/item/reagent_containers/food/drinks/bottle/ale,
+					/obj/item/reagent_containers/food/drinks/bottle/ale,
 					/obj/item/storage/cans/sixbeer,
 					/obj/item/storage/cans/sixsoda,
 					/obj/item/flashlight/glowstick,
diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm
index 981eb197496..c2e070bdd9a 100644
--- a/code/modules/vending/boozeomat.dm
+++ b/code/modules/vending/boozeomat.dm
@@ -17,7 +17,7 @@
 					/obj/item/reagent_containers/food/drinks/soda_cans/sol_dry = 8,
 					/obj/item/reagent_containers/food/drinks/bottle/grenadine = 4,
 					/obj/item/reagent_containers/food/drinks/bottle/menthol = 4,
-					/obj/item/reagent_containers/food/drinksbottle/ale = 6,
+					/obj/item/reagent_containers/food/drinks/bottle/ale = 6,
 					/obj/item/reagent_containers/food/drinks/bottle/beer = 6,
 					/obj/item/reagent_containers/food/drinks/bottle/maltliquor = 6,
 					/obj/item/reagent_containers/food/drinks/bottle/gin = 5,
diff --git a/code/modules/vending/liberation.dm b/code/modules/vending/liberation.dm
index 7f45074c2a4..f2848180c32 100644
--- a/code/modules/vending/liberation.dm
+++ b/code/modules/vending/liberation.dm
@@ -8,7 +8,7 @@
 	products = list(/obj/item/food/burger/plain = 5, //O say can you see, by the dawn's early light
 					/obj/item/food/burger/baseball = 3, //What so proudly we hailed at the twilight's last gleaming
 					/obj/item/food/fries = 5, //Whose broad stripes and bright stars through the perilous fight
-					/obj/item/reagent_containers/food/drinks/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
+					/obj/item/reagent_containers/food/drinks/bottle/beer/light = 10, //O'er the ramparts we watched, were so gallantly streaming?
 					/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2,
 		            /obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2,
 					/obj/item/gun/ballistic/automatic/pistol/m1911 = 2,