diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json
index bed87e98b39c6..44f531e9b5510 100644
--- a/data/json/itemgroups/misc.json
+++ b/data/json/itemgroups/misc.json
@@ -34,7 +34,7 @@
     "id": "stoner",
     "type": "item_group",
     "//": "Processed weed and weed accessories",
-    "items": [ [ "joint", 100 ], [ "joint_roach", 20 ], [ "pipe_glass", 10 ] ]
+    "items": [ [ "joint", 100 ], [ "joint_roach", 20 ], [ "pipe_glass", 10 ], [ "pipe_water", 10 ] ]
   },
   {
     "id": "butane_lighter_and_fuel",
diff --git a/data/json/itemgroups/stashes.json b/data/json/itemgroups/stashes.json
index a0424fea3e13c..5a067241a223e 100644
--- a/data/json/itemgroups/stashes.json
+++ b/data/json/itemgroups/stashes.json
@@ -76,6 +76,7 @@
       { "prob": 1, "group": "heroin_bag_zipper_1_4" },
       { "prob": 4, "group": "crack_bag_zipper_1_4" },
       [ "crackpipe", 7 ],
+      [ "pipe_water", 5 ],
       { "prob": 1, "group": "antifungal_bottle_plastic_pill_prescription_1_5" },
       { "prob": 2, "group": "antiparasitic_bottle_plastic_pill_prescription_1_10" },
       { "prob": 1, "group": "diazepam_bottle_plastic_pill_prescription_1_10" },
diff --git a/data/json/items/tool/smoking.json b/data/json/items/tool/smoking.json
index e36a0b22fb409..1428d048fdd4f 100644
--- a/data/json/items/tool/smoking.json
+++ b/data/json/items/tool/smoking.json
@@ -58,6 +58,81 @@
     "qualities": [ [ "SMOKE_PIPE", 1 ] ],
     "melee_damage": { "bash": 1 }
   },
+  {
+    "id": "pipe_water",
+    "type": "TOOL",
+    "name": { "str": "water pipe" },
+    "looks_like": "bottle_plastic",
+    "description": "A mass-manufactured water pipe, otherwise known as a 'bong'.  Head shops often insist these are used solely for tobacco, despite their iconic status as cannabis paraphernalia.",
+    "weight": "750 g",
+    "volume": "900 ml",
+    "longest_side": "30 cm",
+    "flags": [ "FRAGILE_MELEE", "NONCONDUCTIVE" ],
+    "price": "40 USD",
+    "price_postapoc": "50 cent",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "500 ml",
+        "max_item_volume": "500 ml",
+        "max_contains_weight": "1 kg",
+        "moves": 400
+      }
+    ],
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "material": [ "glass" ],
+    "symbol": ",",
+    "color": "cyan",
+    "qualities": [ [ "SMOKE_PIPE", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
+    "melee_damage": { "bash": 4 },
+    "variant_type": "generic",
+    "variants": [
+      {
+        "id": "pipe_water_normal",
+        "name": { "str": "bong" },
+        "description": "A mass-manufactured water pipe, otherwise known as a 'bong'.  This one is made of plain, clear, glass.",
+        "color": "light_gray"
+      },
+      {
+        "id": "pipe_water_cartoon",
+        "name": { "str": "cartoon bong" },
+        "description": "A mass-manufactured water pipe, otherwise known as a 'bong'.  It is covered in copyrighted cartoon characters, all smoking marijuana.",
+        "color": "green"
+      },
+      {
+        "id": "pipe_water_rasta",
+        "name": { "str": "rasta bong" },
+        "description": "A mass-manufactured water pipe, otherwise known as a 'bong'.  It is colored with the 'rasta' pattern of red, yellow, and green.",
+        "color": "red"
+      },
+      {
+        "id": "pipe_water_handblown",
+        "name": { "str": "handblown bong" },
+        "description": "A handblown water pipe, also known as a 'bong'.  Lovingly crafted by an artisan, a true fusion of aesthetic sensibilities and stoner functionalities.",
+        "color": "green"
+      },
+      {
+        "id": "pipe_water_psychedelic",
+        "name": { "str": "psychedelic bong" },
+        "description": "A mass-manufactured water pipe, also known as a 'bong'.  It is covered in stickers depicting 'psychedelic' art.",
+        "color": "blue"
+      },
+      {
+        "id": "pipe_water_frosted",
+        "name": { "str": "frosted bong" },
+        "description": "A mass-manufactured water pipe, also known as a 'bong'.  It is made out of frosted glass.",
+        "color": "white"
+      },
+      {
+        "id": "pipe_water_fakegold",
+        "name": { "str": "gold bong" },
+        "description": "A mass-manufactured water pipe, also known as a 'bong'.  Though it looks like it's made out of gold it is, in fact, just metallic paint.",
+        "color": "yellow"
+      }
+    ]
+  },
   {
     "id": "pipe_tobacco",
     "type": "TOOL",
diff --git a/data/json/mapgen/headshop.json b/data/json/mapgen/headshop.json
index 4ae6953964b6a..c1434f6f9a206 100644
--- a/data/json/mapgen/headshop.json
+++ b/data/json/mapgen/headshop.json
@@ -86,6 +86,8 @@
         { "item": "pipe_glass", "repeat": [ 1, 4 ], "x": 4, "y": 10 },
         { "item": "pipe_glass", "repeat": [ 1, 4 ], "x": 7, "y": 10 },
         { "item": "pipe_glass", "repeat": [ 1, 4 ], "x": 18, "y": 10 },
+        { "item": "pipe_water", "repeat": [ 1, 2 ], "x": 4, "y": 10 },
+        { "item": "pipe_water", "repeat": [ 1, 2 ], "x": 4, "y": 10 },
         { "item": "crackpipe", "repeat": [ 1, 2 ], "x": 21, "y": 10 }
       ],
       "place_items": [