diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 28d5bb11df3b1..85b7836910917 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -258,6 +258,28 @@
     "container": "metal_tank_little",
     "count": 10
   },
+  {
+    "type": "AMMO",
+    "id": "rock",
+    "symbol": "*",
+    "color": "light_gray",
+    "name": "rock",
+    "description": "A rock the size of a baseball.  Makes a decent melee weapon, and is also good for throwing at enemies.",
+    "category": "spare_parts",
+    "material": "stone",
+    "ammo_type": "rock",
+    "flags": "TRADER_AVOID",
+    "weight": "657 g",
+    "volume": "250 ml",
+    "bashing": 7,
+    "damage": 7,
+    "range": 10,
+    "dispersion": 14,
+    "loudness": 0,
+    "to_hit": -2,
+    "effects": [ "NEVER_MISFIRES", "NON-FOULING", "RECOVER_80" ],
+    "qualities": [ [ "HAMMER", 1 ] ]
+  },
   {
     "type": "AMMO",
     "id": "pebble",
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index ddd9cc673fb6b..5cc3e23802b12 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -59,6 +59,12 @@
     "name": "pebbles",
     "default": "pebble"
   },
+  {
+    "type": "ammunition_type",
+    "id": "rock",
+    "name": "rocks",
+    "default": "rock"
+  },
   {
     "type": "ammunition_type",
     "id": "shotcanister",
diff --git a/data/json/items/melee.json b/data/json/items/melee.json
index 053a89fae488c..67cc757dc1b6f 100644
--- a/data/json/items/melee.json
+++ b/data/json/items/melee.json
@@ -68,22 +68,6 @@
     "category": "weapons",
     "qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ]
   },
-  {
-    "type": "GENERIC",
-    "id": "rock",
-    "symbol": "*",
-    "color": "light_gray",
-    "name": "rock",
-    "description": "A rock the size of a baseball.  Makes a decent melee weapon, and is also good for throwing at enemies.",
-    "category": "spare_parts",
-    "material": "stone",
-    "flags": "TRADER_AVOID",
-    "weight": "657 g",
-    "volume": "250 ml",
-    "bashing": 7,
-    "to_hit": -2,
-    "qualities": [ [ "HAMMER", 1 ] ]
-  },
   {
     "type": "GENERIC",
     "id": "sharp_rock",
diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json
index f6689732d7a0d..70ee012afc17c 100644
--- a/data/json/items/ranged.json
+++ b/data/json/items/ranged.json
@@ -57,6 +57,40 @@
     "durability": 6,
     "clip_size": 1
   },
+  {
+    "id": "staff_sling",
+    "looks_like": "slingshot",
+    "type": "GUN",
+    "symbol": "(",
+    "color": "brown",
+    "name": "staff sling",
+    "description": "A leather sling attached to a staff, easy to use and accurate.  It uses rocks as ammunition.",
+    "price": 150,
+    "//": "The staff sling,consists of a staff with a short sling at one end. ",
+    "material": [ "wood", "leather" ],
+    "flags": [
+      "RELOAD_AND_SHOOT",
+      "NEVER_JAMS",
+      "PRIMITIVE_RANGED_WEAPON",
+      "BELTED",
+      "DURABLE_MELEE",
+      "NONCONDUCTIVE",
+      "SHEATH_SPEAR",
+      "ALWAYS_TWOHAND"
+    ],
+    "techniques": [ "WBLOCK_2", "RAPID", "SWEEP" ],
+    "skill": "throw",
+    "ammo": "rock",
+    "weight": "2000 g",
+    "volume": "3 L",
+    "to_hit": 1,
+    "ranged_damage": 10,
+    "bashing": 18,
+    "range": 10,
+    "dispersion": 200,
+    "durability": 8,
+    "clip_size": 1
+  },
   {
     "id": "slingshot",
     "//": "Tileset whitelist for sling & slingshots.",
diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json
index 48157a1d643e3..882e878e47d3d 100644
--- a/data/json/recipes/weapon/ranged.json
+++ b/data/json/recipes/weapon/ranged.json
@@ -14,6 +14,19 @@
     "using": [ [ "welding_standard", 40 ] ],
     "components": [ [ [ "pipe", 2 ] ], [ [ "hose", 2 ] ], [ [ "steel_lump", 1 ], [ "steel_chunk", 4 ], [ "scrap", 12 ] ] ]
   },
+  {
+    "type": "recipe",
+    "result": "staff_sling",
+    "category": "CC_WEAPON",
+    "subcategory": "CSC_WEAPON_RANGED",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "throw", 1 ],
+    "time": "1 h",
+    "autolearn": true,
+    "qualities": [ { "id": "HAMMER", "level": 3 }, { "id": "SAW_W", "level": 1 } ],
+    "components": [ [ [ "stick_long", 1 ] ], [ [ "sling", 1 ] ], [ [ "nail", 1 ] ] ]
+  },
   {
     "result": "nailrifle",
     "type": "recipe",