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

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

Browse Source
This commit is contained in:
icomrade
2016-07-29 15:20:36 -04:00
parent c628ad8873 b1ae6c4a60
commit ac63a7d903
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp
View File

@@ -6,5 +6,5 @@ class ItemPadlock: CA_Magazine
displayName = $STR_BLD_name_ItemPadlock;//"Padlock"
picture = "\z\addons\dayz_buildings\equip\padlock.paa";
model = "z\addons\dayz_buildings\models\padlock.p3d";
descriptionShort = $STR_BLD_desc_ItemPadlock;//"Padlock - Used for securing Workshop's & Houses."
descriptionShort = $STR_BLD_desc_ItemPadlock;//"Padlock - Used for securing Workshop's and Houses."
};

2
SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
View File

@@ -16,7 +16,7 @@ _itemsCheckArray = [];
_itemsToLog = [[],[],[],"sell"];
_sellVehicle = {
private ["_distance","_damage","_tireDmg","_tires","_okToSell","_returnInfo","_textPartIn","_obj","_hitpoints","_objectID","_objectUID","_objectCharacterId","_notSetup","_part_in","_qty_in","_activatingPlayer","_objects","_qty","_vehicle"];
private ["_distance","_damage","_tireDmg","_tires","_okToSell","_returnInfo","_obj","_hitpoints","_objectID","_objectUID","_objectCharacterId","_notSetup","_part_in","_qty_in","_activatingPlayer","_objects","_qty","_vehicle"];
_vehicle = _this select 0;
_sellType = _this select 1;
_part_in = typeOf _vehicle;

8
SQF/dayz_code/stringtable.xml
View File

@@ -3938,12 +3938,12 @@
<Czech>Konzervované sardinky. Při správném skladování vydrží i pět let.</Czech>
</Key>
<Key ID="STR_EQUIP_NAME_28">
<English>Can (Frank &amp; Beans)</English>
<English>Can (Frank and Beans)</English>
<German>Dose (Bohnen und Würste)</German>
<Russian>Банка (Фасоль с мясом)</Russian>
<Spanish>Lata (Frank &amp; Beans)</Spanish>
<Spanish>Lata (Frank and Beans)</Spanish>
<French>Conserve (William Saurien)</French>
<Czech>Plechovka (Frank &amp; Beans)</Czech>
<Czech>Plechovka (Frank and Beans)</Czech>
</Key>
<Key ID="STR_EQUIP_DESC_28">
<English>Canned Beans and Sausages used for sustenance. Lasts well over five years if stored correctly.</English>
@@ -8966,7 +8966,7 @@
<German>Zahlenschloss</German>
</Key>
<Key ID="STR_BLD_desc_ItemPadlock">
<English>Padlock - Used for securing Workshop&apos;s &amp; Houses.</English>
<English>Padlock - Used for securing Workshop&apos;s and Houses.</English>
<Russian>Используется для запирания зданий.</Russian>
<French>Un cadenas pour protéger portes/portails</French>
<Czech>Tento visací zámek lze využít pro zabezpečení dílen a domů.</Czech>