diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 0df9db60fb..d974a64205 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -61,6 +61,22 @@
         - ReagentId: Water
           Quantity: 1500
 
+- type: entity
+  parent: WaterTankFull
+  id: WaterCooler
+  name: water cooler
+  description: Seems like a good place to stand and waste time.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/tanks.rsi
+    state: watercooler
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Water
+          Quantity: 500
+
 - type: entity
   parent: StorageTank
   id: WaterTankHighCapacity
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
index 2ada732ac6..837721bd22 100644
--- a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e",
   "size": {
     "x": 32,
     "y": 32
@@ -15,6 +15,9 @@
     },
     {
       "name": "highwatertank"
+    },
+    {
+      "name": "watercooler"
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watercooler.png b/Resources/Textures/Structures/Storage/tanks.rsi/watercooler.png
new file mode 100644
index 0000000000..9d0e2ce79d
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/watercooler.png differ