Skip to content

Commit

Permalink
Merge pull request #27736 from kevingranade/460-magazine-mag-fix
Browse files Browse the repository at this point in the history
Fix for magazine ammo type mismatch.
  • Loading branch information
ZhilkinSerg authored Jan 22, 2019
2 parents ab702bc + 4814b42 commit 28eb762
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions data/json/items/gunmod/magazine.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"color": "green",
"location": "magazine",
"mod_targets": [ "pistol", "rifle" ],
"acceptable_ammo": [ "9mm", "45", "223" ],
"acceptable_ammo": [ "9mm", "460", "223" ],
"install_time": 60000,
"magazine_adaptor": [
[ "9mm", [ "lw21mag" ] ],
[ "45", [ "lw12mag" ] ],
[ "460", [ "lw12mag" ] ],
[ "223", [ "lw223mag", "lw223bigmag" ] ]
],
"min_skills": [ [ "weapon", 4 ], [ "mechanics", 3 ] ],
Expand Down

0 comments on commit 28eb762

Please sign in to comment.