W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-21 19:06:29 +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

5
SQF/dayz_code/Configs/CfgMagazines/Magazines/50AE.hpp
View File

@@ -9,4 +9,9 @@ class 7Rnd_50AE_Deagle: CA_Magazine
ammo = "B_357mag_Ball";
count = 7;
initSpeed = 400;
class ItemActions
{
COMBINE_MAG
};
};

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;

2
SQF/dayz_code/Configs/CfgMagazines/Magazines/VehicleAmmo.hpp
View File

@@ -1484,7 +1484,7 @@ class 8Rnd_82mmILLUM_2B14: 8Rnd_82mmHE_2B14
};
class 200Rnd_40mmHE_FV510: Vehicle_ammo_base
{
scope = 1;
scope = 2;
displayName = $STR_DZ_MAG_200RND_FV510HE_NAME;
descriptionShort = $STR_DZ_MAG_200RND_FV510HE_DESC;
ammo = "Sh_40_HE";