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

Jump to bottom

JAM - More magwells #1009

Merged
merged 8 commits into from
Nov 12, 2018
Merged

JAM - More magwells #1009

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
50c7696
Add 9x21mm SR-1M, 9x19 PP-2000, .338 T-5000 magwells
robalo Oct 16, 2018
28edf14
add the rest of HK417 magwells, ref #1010
robalo Oct 17, 2018
0e4bca9
make pretty
robalo Oct 17, 2018
dc3b90c
Merge branch 'master' of https://github.com/CBATeam/CBA_A3 into jam_more
robalo Oct 19, 2018
7b630e5
+ .308 5rnd loose mag, AICS short action
robalo Oct 20, 2018
fd311c7
+ MP7, .300WM AICS, 40mm 6-pack, .308 loose rnds
robalo Oct 20, 2018
11c82aa
20Rnd_762x51_Mag can't be both, so it's neither.
robalo Nov 5, 2018
f3afe81
Merge branch 'master' into jam_more
robalo Nov 9, 2018
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
1 change: 1 addition & 0 deletions addons/jam/CfgMagazineWells.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class CfgMagazineWells {
#include "magwells_8x22.hpp" // 8x22mm Nambu
#include "magwells_9x18.hpp" // 9x18mm Makarov | 9mm Makarov | 9x18mm PM
#include "magwells_9x19.hpp" // 9x19mm Parabellum | 9mm Luger
#include "magwells_9x21.hpp" // 9x21mm IMI | 9x21mm Gyurza

#include "magwells_22LR.hpp" // .22 LR | .22 Long Rifle | 5.6x15mmR
#include "magwells_32ACP.hpp" // .32 ACP | .32 Automatic | 7.65x17mmSR Browning | 7.65 mm Browning Short
Expand Down
1 change: 1 addition & 0 deletions addons/jam/magwells_338LM.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
class CBA_338LM_AI {}; // AI .338 Lapua Magnum
class CBA_338LM_T5K {}; // ORSIS T-5000
1 change: 1 addition & 0 deletions addons/jam/magwells_9x19.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
class CBA_9x19_Vityaz {}; // Vityaz-SN
class CBA_9x19_Vz68 {}; // Škorpion (vz. 68)
class CBA_9x19_Welrod {}; // Welrod pistol in 9x19mm
class CBA_9x19_PP2000 {}; // PP-2000 SMG
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alphabetize?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

right, forgot, ty

1 change: 1 addition & 0 deletions addons/jam/magwells_9x21.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
class CBA_9x21_SR1M {}; // 6P53/SR1M