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.

Sign up for GitHub

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

Add missing shotgun modslots & remove double grip slots on MCS #36389

Merged
merged 3 commits into from Dec 25, 2019
Merged

Add missing shotgun modslots & remove double grip slots on MCS #36389

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
333be35
Add missing shotgun modslots, remove duplicate grip on MCS
TheShadowFerret Dec 23, 2019
b521a8f
Capitalize your acronyms
TheShadowFerret Dec 23, 2019
843d72a
Mechanisms
TheShadowFerret Dec 23, 2019
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
9 changes: 7 additions & 2 deletions data/json/items/gun/shot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@
"clip_size": 8,
"valid_mod_locations": [
[ "accessories", 2 ],
[ "mechanism", 4 ],
[ "sling", 1 ],
[ "barrel", 1 ],
[ "rail mount", 1 ],
Expand Down Expand Up @@ -209,9 +210,12 @@
[ "accessories", 2 ],
[ "sling", 1 ],
[ "barrel", 1 ],
[ "grip mount", 1 ],
[ "stock mount", 1 ],
[ "rail mount", 1 ],
[ "loading port", 1 ],
[ "brass catcher", 1 ],
[ "mechanism", 4 ],
[ "sights", 1 ],
[ "underbarrel mount", 1 ]
],
Expand Down Expand Up @@ -297,7 +301,7 @@
"copy-from": "remington_870",
"type": "GUN",
"name": "Remington 870 MCS",
"description": "This Remington 870 Modular Combat system shotgun is currently setup for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights.",
"description": "This Remington 870 Modular Combat System shotgun is currently setup for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights.",
"weight": "2812 g",
"volume": "1427 ml",
"looks_like": "remington_870",
Expand All @@ -316,7 +320,6 @@
[ "bore", 1 ],
[ "brass catcher", 1 ],
[ "grip", 1 ],
[ "grip mount", 1 ],
[ "loading port", 1 ],
[ "mechanism", 4 ],
[ "rail mount", 1 ],
Expand Down Expand Up @@ -364,6 +367,8 @@
[ "sling", 1 ],
[ "brass catcher", 1 ],
[ "barrel", 1 ],
[ "stock", 1 ],
[ "mechanism", 4 ],
[ "rail mount", 1 ],
[ "loading port", 1 ],
[ "sights mount", 1 ],
Expand Down