Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish modernizing volume and weight #41627

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into modernize-volume-weight
ZhilkinSerg authored Jun 30, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 67213f26cddff4885ccbc37c14222e1686f29a20
6 changes: 4 additions & 2 deletions data/json/items/gun/9mm.json
Original file line number Diff line number Diff line change
@@ -263,8 +263,10 @@
"copy-from": "hk_mp5",
"name": { "str": "PTR 603" },
"description": "The PTR 603 is a semi-automatic copy of the famous MP5 series, domestically produced for the US market on original Heckler and Koch tooling by PTR Industries. Like the MP5, its roller delayed blowback action offers smooth shooting and precision, setting it apart from other submachine guns and pistol caliber carbines. This model is configured as a pistol to avoid inconvenient and costly NFA regulations. A welded on section of M1913 rail offers convenient mounting for aftermarket optics, but precludes the use of claw mounts.",
"relative": { "weight": "-550 g", "volume": "-500 ml", "handling_modifier": -6 },
"//": "Attach a pistol stock and you get a semi MP5 again.",
"weight": "2177 g",
"volume": "2110 ml",
"longest_side": "377 mm",
"skill": "pistol",
"modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
"bashing": 7,
"dispersion": 270,
You are viewing a condensed version of this merge commit. You can view the full changes here.