W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 17:20:26 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Revert "Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch""

Browse Source 
This reverts commit 109ec5c9a3.
This commit is contained in:
seelenapparat
2021-08-24 15:47:06 +02:00
parent c801365a1f
commit d1abb66e9f
145 changed files with 9200 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp
View File

@@ -50,7 +50,14 @@ class 100Rnd_556x45_BetaCMagSD: 100Rnd_556x45_BetaCMag {
};
/* STANAG <-> G36 */
class 20Rnd_556x45_Stanag;
class 20Rnd_556x45_Stanag : CA_Magazine
{
class ItemActions
{
COMBINE_MAG
};
};
class 30Rnd_556x45_Stanag : 20Rnd_556x45_Stanag
{
displayName = $STR_DZ_MAG_30RND_556x45_STANAG_NAME;