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

Shotgun Speedloader Hotfix #35806

Closed
wants to merge 45 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
1a05e5e
come with me if you want to live
tenmillimaster Oct 11, 2019
58571f7
mag and mod spawn
tenmillimaster Oct 11, 2019
104dc03
Gatty shot updates.
tenmillimaster Oct 11, 2019
de3e41f
very important typo fix in a json comment
tenmillimaster Oct 11, 2019
2ebddea
fixes to charges
tenmillimaster Oct 11, 2019
f1d8b52
looks like's
tenmillimaster Oct 11, 2019
71fa4a5
lint guns.json
tenmillimaster Oct 11, 2019
45d9806
recipe, other fixes
tenmillimaster Oct 11, 2019
a2c425d
batteries not included
tenmillimaster Oct 11, 2019
e0984a0
firemodes, no muzzle on pgo, usas20 weight
tenmillimaster Oct 11, 2019
d97600e
price fix
tenmillimaster Oct 11, 2019
c7da249
lentils
tenmillimaster Oct 11, 2019
6904270
more stat fixes, 1100, barrel_len documentation, new slot
tenmillimaster Oct 12, 2019
be00dc3
properly handle abzats removal
tenmillimaster Oct 16, 2019
574e681
bigun instead of tavor12
tenmillimaster Oct 16, 2019
7aa15d0
come with me if you want to live
tenmillimaster Oct 11, 2019
ed7bfcb
mag and mod spawn
tenmillimaster Oct 11, 2019
a6c3426
Gatty shot updates.
tenmillimaster Oct 11, 2019
04036f8
very important typo fix in a json comment
tenmillimaster Oct 11, 2019
4574c33
fixes to charges
tenmillimaster Oct 11, 2019
22db647
looks like's
tenmillimaster Oct 11, 2019
2643e28
lint guns.json
tenmillimaster Oct 11, 2019
21b96ba
recipe, other fixes
tenmillimaster Oct 11, 2019
a79db4f
batteries not included
tenmillimaster Oct 11, 2019
a0e92bd
firemodes, no muzzle on pgo, usas20 weight
tenmillimaster Oct 11, 2019
a4a17d5
price fix
tenmillimaster Oct 11, 2019
4b50bdc
lentils
tenmillimaster Oct 11, 2019
a092426
more stat fixes, 1100, barrel_len documentation, new slot
tenmillimaster Oct 12, 2019
781a136
properly handle abzats removal
tenmillimaster Oct 16, 2019
ef47351
bigun instead of tavor12
tenmillimaster Oct 16, 2019
4c02fd9
Merge branch 'shotguns2' of https://github.com/tenmillimaster/Catacly…
tenmillimaster Oct 25, 2019
91c5e15
Merge branch 'master' into shotguns2
tenmillimaster Oct 25, 2019
15a27b2
Update data/json/items/migration.json
tenmillimaster Oct 25, 2019
0dd68ea
Update ranged_balance.cpp
tenmillimaster Oct 26, 2019
c7eae93
Aftermarket sight groups, shot group updates, dispersion value updates
tenmillimaster Nov 5, 2019
2b3c9b6
Merge branch 'master' into shotguns2
tenmillimaster Nov 5, 2019
719e18f
aux tubes
tenmillimaster Nov 7, 2019
b649233
Merge branch 'master' into shotguns2
tenmillimaster Nov 7, 2019
89a1385
typo, neverjams for single/revolvers, copy-from for ashot
tenmillimaster Nov 10, 2019
656670b
Merge branch 'master' into shotguns2
tenmillimaster Nov 10, 2019
86a2943
Update shot.json
tenmillimaster Nov 10, 2019
6e6d693
Merge branch 'master' into shotguns2
tenmillimaster Nov 11, 2019
30cbfe2
Merge branch 'master' into shotguns2
tenmillimaster Nov 15, 2019
fc79a7e
Merge branch 'master' into shotguns2
ZhilkinSerg Dec 1, 2019
8b6fd8b
hotfix
tenmillimaster Dec 1, 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
Prev Previous commit
Next Next commit
Update shot.json
tenmillimaster authored Nov 10, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 86a2943cf6e6c87e44bd7c5dc57986a18ad44438
2 changes: 0 additions & 2 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@
"copy-from": "pistol_base",
"looks_like": "glock_17",
"type": "GUN",
"reload_noise_volume": 10,
"name": "12 gauge pistol",
"description": "A single shot pistol that loads 12 gauge shotgun shells, handcrafted from scrap.",
"weight": "828 g",
@@ -486,7 +485,6 @@
{
"id": "streetsweeper",
"copy-from": "shotgun_base",
"looks_like": "remington_870",
"type": "GUN",
"name": "Cobray Streetsweeper",
"description": "Less shotgun and more comically oversized revolver, the Cobray Streetsweeper sold poorly before it was deemed a Destructive Device. The cylinder is driven by a clockspring, cannot be indexed by hand, and must be ejected with an ejector rod. Its unique design allows for all 12 shells to be fired in under 3 seconds, as demonstrated by the ATF technical branch.",