Merge remote-tracking branch 'upstream/master'

This commit is contained in:
icomrade
2016-02-27 09:01:02 -05:00
70 changed files with 396 additions and 2822 deletions

View File

@@ -895,10 +895,10 @@ class CfgMagazines {
scope = 2;
count = 1;
type = 256;
displayName = "Safe";
displayName = $STR_EPOCH_SAFE;
model = "\z\addons\dayz_epoch\models\safe_onside.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_safe_ca.paa";
descriptionShort = "Personal Safe: A placeable object that is used for very secure storage. WARNING!!! Placing your safe will give you a 4 digit number that is used to open the safe, save that number!";
descriptionShort = $STR_EPOCH_SAFE_DESC;
class ItemActions
{
class Build {

View File

@@ -1,7 +1,7 @@
class VaultStorage: Land_A_tent {
placement = "vertical";
vehicleClass = "Survival";
displayName = "Safe";
displayName = $STR_EPOCH_SAFE;
model = "\z\addons\dayz_epoch\models\safe.p3d";
destrType = "DestructNo";
armor = 800;
@@ -14,7 +14,7 @@ class VaultStorage: Land_A_tent {
class VaultStorageLocked: Land_A_tent {
placement = "vertical";
vehicleClass = "Survival";
displayName = "Locked Safe";
displayName = $STR_EPOCH_SAFE_LOCKED;
model = "\z\addons\dayz_epoch\models\safe.p3d";
destrType = "DestructNo";
armor = 800;
@@ -30,6 +30,6 @@ class VaultStorageLocked: Land_A_tent {
class WeaponHolder_ItemVault: WeaponHolder {
scope = 2;
displayName = "Safe";
displayName = $STR_EPOCH_SAFE;
seedItem = "ItemVault";
};