diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml
index 2b148e22a7..0e2b67a870 100644
--- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Drinks/goblet.yml
@@ -61,3 +61,34 @@
   - type: PhysicalComposition
     materialComposition:
       CP14Gold: 10
+      
+- type: entity
+  parent: CP14DrinkBaseGoblet
+  id: CP14SteelGobletBottomless
+  name: bottomless goblet
+  description: A jeweled goblet enchanted to have no bottom, fit for a never ending king's banquet.
+  categories: [ DoNotMap ]
+  suffix: Artifact
+  components:
+  - type: SolutionContainerVisuals
+    maxFillLevels: 2
+    fillBaseName: bottomless-fill-
+  - type: Sprite
+    sprite: _CP14/Objects/Consumable/Drinks/goblet.rsi
+    layers:
+      - state: bottomless_goblet
+      - map: [ "enum.SolutionContainerLayers.Fill" ]
+        state: bottomless-fill-2
+        visible: false
+  - type: SolutionContainerManager
+    solutions:
+      mug:
+        maxVol: 1000
+  - type: Injector
+    solutionName: mug
+    injectOnly: false
+    ignoreMobs: true
+    minTransferAmount: 1
+    maxTransferAmount: 100
+    transferAmount: 1
+    toggleState: 1 # draw
diff --git a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
index 991712dd93..6d3edafe51 100644
--- a/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
+++ b/Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml
@@ -54,3 +54,9 @@
   entity: CP14LockpickSkeletonArtifact
   tags:
   - CP14UniqueSpawnDemiplanetLoot
+  
+- type: uniqueSpawn
+  id: CP14SteelGobletBottomless
+  entity: CP14SteelGobletBottomless
+  tags:
+  - CP14UniqueSpawnDemiplanetLoot
diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-1.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-1.png
new file mode 100644
index 0000000000..8c231a273a
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-1.png differ
diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-2.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-2.png
new file mode 100644
index 0000000000..8c231a273a
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless-fill-2.png differ
diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless_goblet.png b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless_goblet.png
new file mode 100644
index 0000000000..c29c7338a5
Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/bottomless_goblet.png differ
diff --git a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json
index d6aabc8cd2..21820bfef2 100644
--- a/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Consumable/Drinks/goblet.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Created by prazat911",
+    "copyright": "Created by prazat911, Bottomless goblet by Afrokada",
     "size": {
         "x": 32,
         "y": 32
@@ -30,6 +30,33 @@
         },
         {
             "name": "fill-5"
-        }
+        },
+		{
+			"name": "bottomless_goblet"
+		},
+		{
+			"name": "bottomless-fill-1",
+			"delays": [
+				[
+					0.3,
+					0.3,
+					0.3,
+					0.3,
+					0.3
+				]
+			]
+		},
+		{
+			"name": "bottomless-fill-2",
+			"delays": [
+				[
+					0.1,
+					0.1,
+					0.1,
+					0.1,
+					0.1
+				]
+			]
+		}
     ]
 }
\ No newline at end of file