diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index 6d35b2a4c88..76d8aeb43b4 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -88,50 +88,102 @@
 - type: entity
   parent: BaseStorageItem
   id: DrinkCanPack
-  name: 6pack
+  name: 6pack of cola
   components:
   - type: Sprite
     sprite: Objects/Misc/6pack.rsi
     layers:
     - state: plastic-thingy
-    - state: 6pack1
-      map: ["6pack1"]
-    - state: 6pack2
-      map: ["6pack2"]
-    - state: 6pack3
-      map: ["6pack3"]
-    - state: 6pack4
-      map: ["6pack4"]
-    - state: 6pack5
-      map: ["6pack5"]
-    - state: 6pack6
-      map: ["6pack6"]
   - type: Item
     size: Normal
-  - type: Storage
-    grid:
-    - 0,0,2,3
-    whitelist:
-      tags:
-      - Cola
-    hideStackVisualsWhenClosed: false
-  - type: EntityTableContainerFill
-    containers:
-      storagebase:
-        id: DrinkColaCan
-        amount: 6
-  - type: ItemCounter
-    count:
-      tags: [Cola]
-    composite: true
-    layerStates:
-    - 6pack1
-    - 6pack2
-    - 6pack3
-    - 6pack4
-    - 6pack5
-    - 6pack6
   - type: Appearance
+  - type: ItemSlots
+    slots:
+      6pack_slot6:
+        ejectOnUse: true
+        startingItem: DrinkColaCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 6
+      6pack_slot5:
+        ejectOnUse: true
+        startingItem: DrinkColaCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 5
+      6pack_slot4:
+        ejectOnUse: true
+        startingItem: DrinkColaCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 4
+      6pack_slot3:
+        ejectOnUse: true
+        startingItem: DrinkColaCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 3
+      6pack_slot2:
+        ejectOnUse: true
+        startingItem: DrinkColaCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 2
+      6pack_slot1:
+        ejectOnUse: true
+        startingItem: DrinkColaCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 1
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+        ents: [ ]
+      6pack_slot6: !type:ContainerSlot { }
+      6pack_slot5: !type:ContainerSlot { }
+      6pack_slot4: !type:ContainerSlot { }
+      6pack_slot3: !type:ContainerSlot { }
+      6pack_slot2: !type:ContainerSlot { }
+      6pack_slot1: !type:ContainerSlot { }
+  - type: ItemMapper
+    mapLayers:
+      6pack1:
+        minCount: 1
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack2:
+        minCount: 2
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack3:
+        minCount: 3
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack4:
+        minCount: 4
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack5:
+        minCount: 5
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack6:
+        minCount: 6
+        whitelist:
+          tags:
+          - DrinkCan
+    sprite: Objects/Misc/6pack.rsi
 
 # Bartender tools
 
diff --git a/Resources/Prototypes/_Funkystation/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/_Funkystation/Entities/Objects/Consumable/Drinks/drinks.yml
new file mode 100644
index 00000000000..30f832fc206
--- /dev/null
+++ b/Resources/Prototypes/_Funkystation/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -0,0 +1,86 @@
+- type: entity
+  parent: DrinkCanPack
+  id: DrinkCanPackBeer
+  name: 6pack of beer
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/6pack.rsi
+    layers:
+    - state: plastic-thingy
+  - type: ItemSlots
+    slots:
+      6pack_slot6:
+        ejectOnUse: true
+        startingItem: DrinkBeerCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 6
+      6pack_slot5:
+        ejectOnUse: true
+        startingItem: DrinkBeerCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 5
+      6pack_slot4:
+        ejectOnUse: true
+        startingItem: DrinkBeerCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 4
+      6pack_slot3:
+        ejectOnUse: true
+        startingItem: DrinkBeerCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 3
+      6pack_slot2:
+        ejectOnUse: true
+        startingItem: DrinkBeerCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 2
+      6pack_slot1:
+        ejectOnUse: true
+        startingItem: DrinkBeerCan
+        whitelist:
+          tags:
+          - DrinkCan
+        priority: 1
+  - type: ItemMapper
+    mapLayers:
+      6pack1:
+        minCount: 1
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack2:
+        minCount: 2
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack3:
+        minCount: 3
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack4:
+        minCount: 4
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack5:
+        minCount: 5
+        whitelist:
+          tags:
+          - DrinkCan
+      6pack6:
+        minCount: 6
+        whitelist:
+          tags:
+          - DrinkCan
+    sprite: _Funkystation/Objects/Consumable/Drinks/6packbeer.rsi
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack1.png b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack1.png
new file mode 100644
index 00000000000..42652bca015
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack1.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack2.png b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack2.png
new file mode 100644
index 00000000000..33cbcf95642
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack2.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack3.png b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack3.png
new file mode 100644
index 00000000000..a6425260bb9
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack3.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack4.png b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack4.png
new file mode 100644
index 00000000000..40dc0bd6570
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack4.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack5.png b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack5.png
new file mode 100644
index 00000000000..b63b6606ceb
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack5.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack6.png b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack6.png
new file mode 100644
index 00000000000..479f75613f8
Binary files /dev/null and b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/6pack6.png differ
diff --git a/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/meta.json b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/meta.json
new file mode 100644
index 00000000000..c020f736a49
--- /dev/null
+++ b/Resources/Textures/_Funkystation/Objects/Consumable/Drinks/6packbeer.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Modified by mkanke from beer can visuals by Github #DrMelon",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "6pack1"
+        },
+        {
+            "name": "6pack2"
+        },
+        {
+            "name": "6pack3"
+        },
+        {
+            "name": "6pack4"
+        },
+        {
+            "name": "6pack5"
+        },
+        {
+            "name": "6pack6"
+        }
+    ]
+}