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

Add AK-47 semi-auto rifle, Mini Draco pistol, AK magazines #39041

Merged
merged 28 commits into from
Apr 14, 2020
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
7e0f272
Add WASR-10, Mini Draco
carmakazi Mar 26, 2020
d067c8d
Add WASR-10, Mini Draco to itemgroups
carmakazi Mar 26, 2020
573ba82
Add WASR-10 and Mini Draco IDs
carmakazi Mar 26, 2020
ce00ec6
Fix double quotes
carmakazi Mar 26, 2020
24b2fc9
Fix quotations
carmakazi Mar 26, 2020
68532f8
Update WASR-10 and Draco stats
carmakazi Mar 26, 2020
b6c044e
Formatting
carmakazi Mar 26, 2020
17d640b
Lint JSON
carmakazi Mar 26, 2020
a1b382d
Add Generic Guns support for WASR-10, Mini Draco
carmakazi Mar 26, 2020
aac2d64
WASR-10/Draco: Audit weight, volume, and mod slots
carmakazi Mar 30, 2020
c1a01c0
Change WASR-10 to generic AK-47
carmakazi Apr 1, 2020
66ce2df
Update wasr10 to aksemi
carmakazi Apr 1, 2020
518eec3
Add/rework AK magazines
carmakazi Apr 2, 2020
3ec8daf
Add new AK magazines to itemgroups
carmakazi Apr 2, 2020
14838b4
Update magazine compatibility to new magazines
carmakazi Apr 2, 2020
f201c50
Obsolete old AK magazine IDs
carmakazi Apr 2, 2020
860bf04
Change reference to new AK mag
carmakazi Apr 2, 2020
d6b0830
Merge branch 'master' into carmakazi_addgun2
carmakazi Apr 2, 2020
51f747a
Lint JSON
carmakazi Apr 2, 2020
b85ed7a
Undo obsolete AK mags
carmakazi Apr 2, 2020
1b3e9c2
Migrate AK mags
carmakazi Apr 2, 2020
e8b9610
lint JSON
carmakazi Apr 2, 2020
d138db0
Description edit
carmakazi Apr 3, 2020
2b0d4ce
Update GG for AK-47
carmakazi Apr 3, 2020
0165b3f
Update GG migration for new AK mags
carmakazi Apr 3, 2020
b74bf94
Update 762.json
carmakazi Apr 4, 2020
bb537a8
Update 7.62 weapons to new AK mags
carmakazi Apr 10, 2020
50c75f4
Merge branch 'master' into carmakazi_addgun2
carmakazi Apr 11, 2020
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 GG migration for new AK mags
carmakazi authored Apr 3, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 0165b3f9254b05cdfc1a0b71ba205741057a0bb2
7 changes: 5 additions & 2 deletions data/mods/Generic_Guns/magazines/gg_magazines_migration.json
Original file line number Diff line number Diff line change
@@ -158,8 +158,11 @@
"ar10mag_20rd",
"ak74mag",
"rpk74mag",
"akmbigmag",
"akmmag",
"akmag10",
"akmag20",
"akmag30",
"akmag40",
"akdrum75",
"8x40_100_mag",
"8x40_250_mag",
"8x40_25_mag",