Skip to content

Commit

Permalink
Merge branch 'CleverRaven:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
AnotherSeawhite authored Apr 6, 2024
2 parents aefb413 + b18c849 commit a7dfcf1
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@
"install_time": "5 s"
},
"min_skills": [ [ "weapon", 2 ], [ "melee", 1 ] ],
"techniques": [ "RAPID" ],
"qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 19 ] ],
"thrown_damage": [ { "damage_type": "stab", "amount": 14 } ],
"flags": [
Expand All @@ -487,7 +486,7 @@
"CONDUCTIVE"
],
"weapon_category": [ "KNIVES" ],
"melee_damage": { "stab": 22 }
"melee_damage": { "stab": 21 }
},
{
"id": "knife_hunting",
Expand Down

0 comments on commit a7dfcf1

Please sign in to comment.