From 7e4cbb5c726e463c5db595f0d35d0194f3a0f449 Mon Sep 17 00:00:00 2001
From: TJKing293 <TJKing293@users.noreply.github.com>
Date: Fri, 1 Apr 2022 16:09:03 -0400
Subject: [PATCH 1/3] Update swords_and_blades.json

---
 data/json/items/melee/swords_and_blades.json | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index 734a6e551bab3..ba60d4f154e43 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -906,6 +906,28 @@
     "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 4 ] ],
     "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ]
   },
+  {
+    "id": "karambit",
+    "type": "TOOL",
+    "name": { "str": "karambit" },
+    "description": "A traditional Indonesian small knife.  This one is sharp and could be an effective weapon.",
+    "looks_like": "kirpan",
+    "weight": "153 g",
+    "volume": "260 ml",
+    "longest_side": "22 cm",
+    "price": 50,
+    "price_postapoc": 50,
+    "bashing": 2,
+    "stab": 10,
+    "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "uneven" },
+    "material": [ "steel" ],
+    "symbol": "/",
+    "color": "dark_gray",
+    "techniques": [ "RAPID" ],
+    "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ],
+    "flags": [ "STAB", "SHEATH_KNIFE" ],
+    "weapon_category": [ "KNIVES" ]
+  },
   {
     "id": "kirpan",
     "type": "TOOL",

From 8821e6f8bb7c1e296b67fc79da79167a2454865d Mon Sep 17 00:00:00 2001
From: TJKing293 <TJKing293@users.noreply.github.com>
Date: Fri, 1 Apr 2022 16:50:44 -0400
Subject: [PATCH 2/3] Update swords_and_blades.json

---
 data/json/items/melee/swords_and_blades.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index ba60d4f154e43..c751e122b3cba 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -918,7 +918,7 @@
     "price": 50,
     "price_postapoc": 50,
     "bashing": 2,
-    "stab": 10,
+    "cutting": 10,
     "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "uneven" },
     "material": [ "steel" ],
     "symbol": "/",

From 10f42fc4ba68b0a3c1821a0d96036f9cad4af024 Mon Sep 17 00:00:00 2001
From: Kevin Granade <kevin.granade@gmail.com>
Date: Fri, 1 Apr 2022 14:12:36 -0700
Subject: [PATCH 3/3] No bash when used normally.

---
 data/json/items/melee/swords_and_blades.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
index c751e122b3cba..66e8419df0486 100644
--- a/data/json/items/melee/swords_and_blades.json
+++ b/data/json/items/melee/swords_and_blades.json
@@ -917,7 +917,6 @@
     "longest_side": "22 cm",
     "price": 50,
     "price_postapoc": 50,
-    "bashing": 2,
     "cutting": 10,
     "to_hit": { "grip": "weapon", "length": "hand", "surface": "point", "balance": "uneven" },
     "material": [ "steel" ],