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

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

View File

@@ -262,6 +262,160 @@ class ItemCeramicParts : CA_Magazine
type = 256;
};
class ItemWeaponPartsPistol : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_PISTOL;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_PISTOL_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsSMG : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_SMG;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_SMG_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsShotgun : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_SHOTGUN;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_SHOTGUN_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsRifle : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_RIFLE;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_RIFLE_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsSniperRilfe : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_SNIPERRIFLE;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_SNIPERRIFLE_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsMG : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_MG;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_MG_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsUnknown : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_UNKNOWN_MG;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_UNKNOWN_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsBad : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_BAD;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_BAD_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsNormal : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_NORMAL;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_NORMAL_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsGood : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_GOOD;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_GOOD_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemWeaponPartsExecellent : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_WEAPON_PARTS_EXCELLENT;
descriptionShort = $STR_EPOCH_WEAPON_PARTS_EXCELLENT_DESC;
model = "\z\addons\dayz_communityassets\models\crate.p3d";
picture = "\z\addons\dayz_communityassets\CraftingPlaceholders\equip_part_somegeneric.paa";
type = 256;
};
class ItemGunPowderSmall : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_GUN_POWDER_SMALL;
descriptionShort = $STR_EPOCH_GUN_POWDER_SMALL_DESC;
model = "\z\addons\dayz_communityassets\models\tin_powder.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_tin_powder_co.paa";
type = 256;
};
class ItemGunPowder : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_GUN_POWDER;
descriptionShort = $STR_EPOCH_GUN_POWDER_DESC;
model = "\z\addons\dayz_communityassets\models\tin_powder.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_tin_powder_co.paa";
type = 256;
};
class ItemGunPowderBig : CA_Magazine
{
scope = 2;
count = 1;
displayName = $STR_EPOCH_GUN_POWDER_BIG;
descriptionShort = $STR_EPOCH_GUN_POWDER_BIG_DESC;
model = "\z\addons\dayz_communityassets\models\tin_powder.p3d";
picture = "\z\addons\dayz_communityassets\pictures\equip_tin_powder_co.paa";
type = 256;
};
//No models
class equip_cable_tie : CA_Magazine
{