diff --git a/CHANGE LOG 1.0.7.1.txt b/CHANGE LOG 1.0.7.1.txt index aa8d8ef53..5c8e96ac9 100644 --- a/CHANGE LOG 1.0.7.1.txt +++ b/CHANGE LOG 1.0.7.1.txt @@ -1,4 +1,11 @@ -[FIXED] Side Chat was unintentionally disabled on Podagorsk Mission. (cf43c20d) @AirwavesMan +[ADDED] Blunt hatchet and wet box of matches. (69408ab3) @AirwavesMan +[FIXED] Side Chat was unintentionally disabled on Podagorsk Mission. (cf43c20d) @Voltan, @AirwavesMan [FIXED] English string from the Broken APSI got overwritten by the german string. (43786eec) @seelenapparat, @AirwavesMan [FIXED] Open or close a winter lockbox or an upgraded lockbox had the wrong sound. (ffccff6a, cdfc57fd) @AirwavesMan -[FIXED] MK12 SPR and DMR had always night vision optics even when the player had no NVG. (6f7a17ca) @AirwavesMan \ No newline at end of file +[FIXED] MK12 SPR and DMR had always night vision optics even when the player had no NVG. (6f7a17ca) @Voltan, @AirwavesMan +[FIXED] DayZ Mod gates could not be removed. (2bbb126a) @Aschalder, @AirwavesMan +[FIXED] The AK74 taped magazine could not be used with the AN94. (31c4a0a7) @Schalldampfer, @AirwavesMan +[FIXED] Dupe with player_emptyContainer and dayz_actionInProgress bug. (44c94541) @F507DMT, @AirwavesMan +[FIXED] Remove the iron sight view from the RK95 ACOG since it does not work. (ee259c4a) @IsGoose, @AirwavesMan +[FIXED] Some building wrecks could not be removed. (b43279cd) @Seelenapparat, @AirwavesMan +[REMOVED] gsc_cloth_loner_head_DZ model and Skin_gsc_cloth_loner_head_DZ due to model issues. (b1e77a39) @Seelenapparat, @AirwavesMan \ No newline at end of file diff --git a/Documents/Epoch 1.0.7 Classnames/CfgMagazines all.txt b/Documents/Epoch 1.0.7 Classnames/CfgMagazines all.txt index 6bdb351a5..7bd555c81 100644 --- a/Documents/Epoch 1.0.7 Classnames/CfgMagazines all.txt +++ b/Documents/Epoch 1.0.7 Classnames/CfgMagazines all.txt @@ -740,7 +740,6 @@ Skin_gsc_scientist1_DZ Skin_gsc_scientist1_head_DZ Skin_gsc_scientist2_DZ Skin_gsc_scientist2_head_DZ -Skin_gsc_cloth_loner_head_DZ Skin_gsc_eco_stalker_mask_neutral_DZ Skin_gsc_eco_stalker_head_neutral_DZ Skin_gsc_eco_stalker_mask_fred_DZ diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp index f1e8d5803..9c3fb8f04 100644 --- a/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp @@ -169,7 +169,6 @@ stalkerclothes[] = { {Loot_MAGAZINE, 1, Skin_gsc_scientist2_DZ}, {Loot_MAGAZINE, 1, Skin_gsc_scientist2W_DZ}, {Loot_MAGAZINE, 1, Skin_gsc_scientist2_head_DZ}, - //{Loot_MAGAZINE, 1, Skin_gsc_cloth_loner_head_DZ}, has some rpt errors, it is up to server admins to add it, skin still works {Loot_MAGAZINE, 1, Skin_gsc_eco_stalker_mask_neutral_DZ}, {Loot_MAGAZINE, 1, Skin_gsc_eco_stalker_mask_neutralW_DZ}, {Loot_MAGAZINE, 1, Skin_gsc_eco_stalker_head_neutral_DZ}, diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp index 0d975fc94..eb2becd54 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Misc.hpp @@ -212,8 +212,8 @@ class ItemWire : CA_Magazine type = 256; model = "\dayz_equip\models\Fence_wire_kit.p3d"; picture = "\dayz_equip\textures\equip_fencewire_kit_CA.paa"; - displayName = $STR_EQUIP_NAME_23; - descriptionShort = $STR_EQUIP_DESC_23; + displayName = $STR_EQUIP_NAME_WIRE_FENCE; + descriptionShort = $STR_EQUIP_DESC_WIRE_FENCE; class ItemActions { @@ -236,8 +236,8 @@ class ItemTankTrap : CA_Magazine type = 256; model = "\dayz_equip\models\tank_trap_kit.p3d"; picture = "\dayz_equip\textures\equip_tanktrap_kit_CA.paa"; - displayName = $STR_EQUIP_NAME_22; - descriptionShort = $STR_EQUIP_DESC_22; + displayName = $STR_EQUIP_NAME_TANK_TRAP; + descriptionShort = $STR_EQUIP_DESC_TANK_TRAP; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp index 578f28988..a83522996 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Sandbag.hpp @@ -5,8 +5,8 @@ class ItemSandbag : CA_Magazine type = 256; model = "\dayz_equip\models\sandbags.p3d"; picture = "\dayz_equip\textures\equip_sandbag_ca.paa"; - displayName = $STR_EQUIP_NAME_21; - descriptionShort = $STR_EQUIP_DESC_21; + displayName = $STR_EQUIP_NAME_SANDBAGS; + descriptionShort = $STR_EQUIP_DESC_SANDBAGS; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp index accdebebe..a7386b250 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Buildings/Tent.hpp @@ -5,8 +5,8 @@ class ItemTent : CA_Magazine type = 256; model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; - displayName = $STR_EQUIP_NAME_20; - descriptionShort = $STR_EQUIP_DESC_20; + displayName = $STR_EQUIP_NAME_CAMPING_TENT; + descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT; class ItemActions { @@ -37,7 +37,7 @@ class ItemTentWinter : CA_Magazine model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_TENTWINTER; - descriptionShort = $STR_EQUIP_DESC_20; + descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT; class ItemActions { @@ -68,7 +68,7 @@ class ItemDomeTent : CA_Magazine model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_DOME_TENT; - descriptionShort = $STR_EQUIP_DESC_20; + descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT; class ItemActions { @@ -99,7 +99,7 @@ class ItemWinterDomeTent : CA_Magazine model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_WINTER_DOME_TENT; - descriptionShort = $STR_EQUIP_DESC_20; + descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT; class ItemActions { @@ -130,7 +130,7 @@ class ItemDesertTent : CA_Magazine model = "\dayz_equip\models\tentbag_gear.p3d"; picture = "\dayz_equip\textures\equip_tentbag_ca.paa"; displayName = $STR_VEH_NAME_DESERT_TENT; - descriptionShort = $STR_EQUIP_DESC_20; + descriptionShort = $STR_EQUIP_DESC_CAMPING_TENT; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp index f18faa81e..0996b2281 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Clothing/EpochSkins.hpp @@ -742,13 +742,6 @@ class Skin_gsc_scientist2_head_DZ : SkinBase { sex = "male"; playerModel = "gsc_scientist2_head_DZ"; }; -class Skin_gsc_cloth_loner_head_DZ : SkinBase { - scope = 2; - displayName = $STR_DZE_EQUIP_STALKER_ROOKIE_NAME; - descriptionShort = $STR_DZE_EQUIP_STALKER_ROOKIE_DESC; - sex = "male"; - playerModel = "gsc_cloth_loner_head_DZ"; -}; class Skin_gsc_eco_stalker_mask_neutral_DZ : SkinBase { scope = 2; displayName = $STR_DZE_EQUIP_STALKER_LONER_MASK_NAME; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp index eac361113..956bb5aa0 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Meat.hpp @@ -3,8 +3,8 @@ class FoodGoatRaw : FoodRaw scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; - displayName = $STR_FOOD_NAME_GOAT_RAW; - descriptionShort = $STR_FOOD_EQUIP_GOAT_RAW; + displayName = $STR_EQUIP_FOOD_NAME_GOAT_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_GOAT_RAW; bloodRegen = 300; Nutrition[] = {143,300,0,0}; cookOutput = "FoodGoatCooked"; @@ -15,8 +15,8 @@ class FoodGoatCooked : FoodCooked scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; - displayName = $STR_FOOD_NAME_GOAT_COOKED; - descriptionShort = $STR_FOOD_EQUIP_GOAT_COOKED; + displayName = $STR_EQUIP_FOOD_NAME_GOAT_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_GOAT_COOKED; bloodRegen = 600; Nutrition[] = {143,600,0,0}; }; @@ -26,8 +26,8 @@ class FoodMuttonRaw : FoodRaw scope = 2; model = "z\addons\dayz_communityassets\models\mutton_raw.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_raw_CA.paa"; - displayName = $STR_FOOD_EQUIP_CODE_NAME_1; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_1; + displayName = $STR_EQUIP_FOOD_NAME_MUTTON_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_MUTTON_RAW; bloodRegen = 400; Nutrition[] = {294,350,0,0}; cookOutput = "FoodMuttonCooked"; @@ -39,8 +39,8 @@ class FoodMuttonCooked : FoodCooked model = "z\addons\dayz_communityassets\models\mutton_cooked.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_mutton_cooked_CA.paa"; - displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_1; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_1; + displayName = $STR_EQUIP_FOOD_NAME_MUTTON_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_MUTTON_COOKED; bloodRegen = 800; Nutrition[] = {294,700,0,0}; }; @@ -50,8 +50,8 @@ class FoodChickenRaw : FoodRaw scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; - displayName = $STR_FOOD_EQUIP_CODE_NAME_2; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_2; + displayName = $STR_EQUIP_FOOD_NAME_CHICKEN_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_CHICKEN_RAW; bloodRegen = 400; Nutrition[] = {219,350,0,0}; cookOutput = "FoodChickenCooked"; @@ -62,8 +62,8 @@ class FoodChickenCooked : FoodCooked scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; - displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_2; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_2; + displayName = $STR_EQUIP_FOOD_NAME_CHICKEN_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_CHICKEN_COOKED; bloodRegen = 800; Nutrition[] = {219,700,0,0}; }; @@ -73,8 +73,8 @@ class FoodBaconRaw : FoodRaw scope = 2; model = "z\addons\dayz_communityassets\models\bacon_raw.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_raw_CA.paa"; - displayName = $STR_FOOD_EQUIP_CODE_NAME_4; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_4; + displayName = $STR_EQUIP_FOOD_NAME_BACON_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_BACON_RAW; bloodRegen = 300; Nutrition[] = {417,350,0,0}; cookOutput = "FoodBaconCooked"; @@ -85,8 +85,8 @@ class FoodBaconCooked : FoodCooked scope = 2; model = "z\addons\dayz_communityassets\models\bacon_fried.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_bacon_fried_CA.paa"; - displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_4; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_4; + displayName = $STR_EQUIP_FOOD_NAME_BACON_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_BACON_COOKED; bloodRegen = 600; Nutrition[] = {417,700,0,0}; }; @@ -96,8 +96,8 @@ class FoodRabbitRaw : FoodRaw scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; - displayName = $STR_FOOD_EQUIP_CODE_NAME_3; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_3; + displayName = $STR_EQUIP_FOOD_NAME_RABBIT_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_RABBIT_RAW; bloodRegen = 500; Nutrition[] = {517,450,0,0}; cookOutput = "FoodRabbitCooked"; @@ -108,8 +108,8 @@ class FoodRabbitCooked : FoodCooked scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; - displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_3; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_3; + displayName = $STR_EQUIP_FOOD_NAME_RABBIT_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_RABBIT_COOKED; bloodRegen = 1000; Nutrition[] = {517,900,0,0}; }; @@ -119,8 +119,8 @@ class FoodBeefRaw : FoodRaw scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; - displayName = $STR_FOOD_EQUIP_CODE_NAME_6; - descriptionShort = $STR_FOOD_EQUIP_CODE_DESC_6; + displayName = $STR_EQUIP_FOOD_NAME_BEEF_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_BEEF_RAW; bloodRegen = 400; Nutrition[] = {332,350,0,0}; cookOutput = "FoodBeefCooked"; @@ -131,8 +131,8 @@ class FoodBeefCooked : FoodCooked scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; - displayName = $STR_FOODCOOKED_EQUIP_CODE_NAME_6; - descriptionShort = $STR_FOODCOOKED_EQUIP_CODE_DESC_6; + displayName = $STR_EQUIP_FOOD_NAME_BEEF_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_BEEF_COOKED; bloodRegen = 800; Nutrition[] = {332,700,0,0}; }; @@ -142,8 +142,8 @@ class FoodDogRaw : FoodRaw scope = 2; model = "\dayz_equip\models\food_steak_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_ca.paa"; - displayName = $STR_FOOD_NAME_DOG_RAW; - descriptionShort = $STR_EQUIP_DESC_47; + displayName = $STR_EQUIP_FOOD_NAME_DOG_RAW; + descriptionShort = $STR_EQUIP_FOOD_DESC_DOG_RAW; bloodRegen = 300; Nutrition[] = {143,300,0,0}; cookOutput = "FoodDogCooked"; @@ -154,8 +154,8 @@ class FoodDogCooked : FoodCooked scope = 2; model = "\dayz_equip\models\food_steak_cooked_gear.p3d"; picture = "\dayz_equip\textures\equip_steak_cooked_ca.paa"; - displayName = $STR_FOOD_NAME_DOG_COOKED; - descriptionShort = $STR_EQUIP_DESC_25; + displayName = $STR_EQUIP_FOOD_NAME_DOG_COOKED; + descriptionShort = $STR_EQUIP_FOOD_DESC_DOG_COOKED; bloodRegen = 600; Nutrition[] = {143,600,0,0}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp index 1dafd752c..4a51deae1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/PackagedFood.hpp @@ -388,8 +388,8 @@ class FoodCanBakedBeans : FoodPackaged scope = 2; model = "\dayz_equip\models\food_bbtin.p3d"; picture = "\dayz_equip\textures\equip_bbtin_ca.paa"; - displayName = $STR_EQUIP_NAME_26; - descriptionShort = $STR_EQUIP_DESC_26; + displayName = $STR_EQUIP_NAME_BAKED_BEANS; + descriptionShort = $STR_EQUIP_DESC_BAKED_BEANS; bloodRegen = 100; Nutrition[] = {0,400,320,0}; consumeOutput = "FoodCanUnlabeledEmpty"; @@ -400,8 +400,8 @@ class FoodCanSardines : FoodPackaged scope = 2; model = "\dayz_equip\models\food_sardinestin.p3d"; picture = "\dayz_equip\textures\equip_Sardinestin_ca.paa"; - displayName = $STR_EQUIP_NAME_27; - descriptionShort = $STR_EQUIP_DESC_27; + displayName = $STR_EQUIP_NAME_SARDINES; + descriptionShort = $STR_EQUIP_DESC_SARDINES; bloodRegen = 100; Nutrition[] = {0,450,320,0}; consumeOutput = "FoodCanUnlabeledEmpty"; @@ -412,8 +412,8 @@ class FoodCanFrankBeans : FoodPackaged scope = 2; model = "\dayz_equip\models\food_fbtin.p3d"; picture = "\dayz_equip\textures\equip_fbtin_ca.paa"; - displayName = $STR_EQUIP_NAME_28; - descriptionShort = $STR_EQUIP_DESC_28; + displayName = $STR_EQUIP_NAME_FRANK_BEANS; + descriptionShort = $STR_EQUIP_DESC_FRANK_BEANS; bloodRegen = 100; Nutrition[] = {0,450,320,0}; consumeOutput = "FoodCanUnlabeledEmpty"; @@ -424,8 +424,8 @@ class FoodCanPasta : FoodPackaged scope = 2; model = "\dayz_equip\models\food_pastatin.p3d"; picture = "\dayz_equip\textures\equip_pastatin_ca.paa"; - displayName = $STR_EQUIP_NAME_29; - descriptionShort = $STR_EQUIP_DESC_29; + displayName = $STR_EQUIP_NAME_PASTA; + descriptionShort = $STR_EQUIP_DESC_PASTA; bloodRegen = 100; Nutrition[] = {0,500,0,0}; consumeOutput = "FoodCanUnlabeledEmpty"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp index a50580f3f..ede86aac8 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp @@ -3,8 +3,8 @@ class ItemSodaCoke : ItemSoda scope = 2; model = "\dayz_equip\models\soda_coke.p3d"; picture = "\dayz_equip\textures\equip_soda_coke_ca.paa"; - displayName = $STR_EQUIP_NAME_36a; - descriptionShort = $STR_EQUIP_DESC_36; + displayName = $STR_EQUIP_NAME_SODA_CAN_COKE; + descriptionShort = $STR_EQUIP_DESC_SODA_CAN; Nutrition[] = {90,0,300,0}; }; @@ -13,8 +13,8 @@ class ItemSodaPepsi : ItemSoda scope = 2; model = "\dayz_equip\models\soda_pepsi.p3d"; picture = "\dayz_equip\textures\equip_soda_pepsi_ca.paa"; - displayName = $STR_EQUIP_NAME_36b; - descriptionShort = $STR_EQUIP_DESC_36; + displayName = $STR_EQUIP_NAME_SODA_CAN_PEPSI; + descriptionShort = $STR_EQUIP_DESC_SODA_CAN; Nutrition[] = {90,0,300,0}; }; @@ -23,8 +23,8 @@ class ItemSodaMdew : ItemSoda scope = 2; model = "\dayz_equip\models\soda_mdew.p3d"; picture = "\dayz_equip\textures\equip_soda_mdew_ca.paa"; - displayName = $STR_EQUIP_NAME_37; - descriptionShort = $STR_EQUIP_NAME_37; + displayName = $STR_EQUIP_NAME_MOUNTAIN_DEW; + descriptionShort = $STR_EQUIP_DESC_MOUNTAIN_DEW; Nutrition[] = {90,0,400,0}; }; @@ -110,12 +110,11 @@ class ItemSodaLemonade : ItemSoda class ItemSodaLirik : ItemSoda { - scope = 2; - + scope = 2; model = "z\addons\dayz_communityassets\models\soda_lirik_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_lirik_clean_full_ca.paa"; - displayName = $STR_EQUIP_NAME_36a; - descriptionShort = $STR_EQUIP_DESC_36; + displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_7; + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_7; Nutrition[] = {90,0,300,0}; consumeOutput = "ItemSodaLirikEmpty"; }; @@ -147,8 +146,8 @@ class ItemSodaPeppsy : ItemSoda scope = 2; model = "z\addons\dayz_communityassets\models\soda_peppsy_clean_full.p3d"; picture = "\z\addons\dayz_communityassets\pictures\equip_soda_peppsy_clean_full_ca.paa"; - displayName = $STR_EQUIP_NAME_36b; - descriptionShort = $STR_EQUIP_DESC_36; + displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_10; + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_DESC_10; Nutrition[] = {90,0,300,0}; consumeOutput = "ItemSodaPeppsyEmpty"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp index 4f9ba5734..62e5a0997 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp @@ -3,8 +3,8 @@ class ItemWaterBottle : FoodDrink scope = 2; model = "\dayz_equip\models\waterbottle_gear.p3d"; picture = "\z\addons\dayz_epoch\pictures\equip_waterbottle10oz_ca.paa"; - displayName = $STR_EQUIP_NAME_12; - descriptionShort = $STR_EQUIP_DESC_12; + displayName = $STR_EQUIP_NAME_WATER_BOTTLE; + descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE; Nutrition[] = {0,0,1000,0}; @@ -81,8 +81,8 @@ class ItemWaterBottleUnfilled : CA_Magazine type = 256; model = "\dayz_equip\models\waterbottle_gear.p3d"; picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa"; - displayName = $STR_EQUIP_NAME_13; - descriptionShort = $STR_EQUIP_DESC_13; + displayName = $STR_EQUIP_NAME_WATER_BOTTLE_EMPTY; + descriptionShort = $STR_EQUIP_DESC_WATER_BOTTLE_EMPTY; containerWater = "ItemWaterBottle"; containerWaterSafe = "ItemWaterBottleSafe"; containerWaterInfected = "ItemWaterBottleInfected"; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp index 0e090f595..55646305f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Flares.hpp @@ -3,8 +3,8 @@ class HandRoadFlare : HandGrenade scope = 2; picture = "\dayz_weapons\textures\equip_roadflare_ca.paa"; model = "\dayz_weapons\models\roadflare"; - displayName = $STR_MAG_NAME_4; - descriptionShort = $STR_MAG_DESC_4; + displayName = $STR_MAG_NAME_ROAD_FLARE; + descriptionShort = $STR_MAG_DESC_ROAD_FLARE; ammo = "RoadFlare"; count = 10; @@ -23,8 +23,8 @@ class HandChemBlue : HandGrenade scope = 2; picture = "\dayz_weapons\textures\equip_chem_blue_ca.paa"; model = "\dayz_weapons\models\chem_gear_blue"; - displayName = $STR_MAG_NAME_7; - descriptionShort = $STR_MAG_DESC_5; + displayName = $STR_MAG_NAME_CHEMLIGHT_BLUE; + descriptionShort = $STR_MAG_DESC_CHEMLIGHT; ammo = "ChemBlue"; count = 10; @@ -43,8 +43,8 @@ class HandChemGreen : HandGrenade scope = 2; picture = "\dayz_weapons\textures\equip_chem_green_ca.paa"; model = "\dayz_weapons\models\chem_gear_green"; - displayName = $STR_MAG_NAME_5; - descriptionShort = $STR_MAG_DESC_5; + displayName = $STR_MAG_NAME_CHEMLIGHT_GREEN; + descriptionShort = $STR_MAG_DESC_CHEMLIGHT; ammo = "ChemGreen"; count = 10; @@ -63,8 +63,8 @@ class HandChemRed : HandGrenade scope = 2; picture = "\dayz_weapons\textures\equip_chem_red_ca.paa"; model = "\dayz_weapons\models\chem_gear_red"; - displayName = $STR_MAG_NAME_6; - descriptionShort = $STR_MAG_DESC_5; + displayName = $STR_MAG_NAME_CHEMLIGHT_RED; + descriptionShort = $STR_MAG_DESC_CHEMLIGHT; ammo = "ChemRed"; count = 10; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp index af0350a04..52f666d0c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Metal.hpp @@ -5,8 +5,8 @@ class PartGeneric : CA_Magazine type = 256; model = "\dayz_equip\models\genericparts.p3d"; picture = "\dayz_equip\textures\equip_genericparts_ca.paa"; - displayName = $STR_EQUIP_NAME_10; - descriptionShort = $STR_EQUIP_DESC_10; + displayName = $STR_EQUIP_NAME_SCRAP_METAL; + descriptionShort = $STR_EQUIP_DESC_SCRAP_METAL; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp index 3cb7a8709..5dbc7c708 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/VehicleParts.hpp @@ -5,8 +5,8 @@ class PartFueltank : CA_Magazine type = 256; model = "\dayz_equip\models\fueltank.p3d"; picture = "\dayz_equip\textures\equip_fueltank_ca.paa"; - displayName = $STR_EQUIP_NAME_8; - descriptionShort = $STR_EQUIP_DESC_8; + displayName = $STR_EQUIP_NAME_FUELTANK; + descriptionShort = $STR_EQUIP_DESC_FUELTANK; class ItemActions { @@ -29,8 +29,8 @@ class PartWheel : CA_Magazine type = 256; model = "\dayz_equip\models\wheel.p3d"; picture = "\dayz_equip\textures\equip_wheel_ca.paa"; - displayName = $STR_EQUIP_NAME_9; - descriptionShort = $STR_EQUIP_DESC_9; + displayName = $STR_EQUIP_NAME_CAR_WHEEL; + descriptionShort = $STR_EQUIP_DESC_CAR_WHEEL; }; class PartEngine : CA_Magazine @@ -40,8 +40,8 @@ class PartEngine : CA_Magazine type = 256; model = "\dayz_equip\models\engine.p3d"; picture = "\dayz_equip\textures\equip_engine_ca.paa"; - displayName = $STR_EQUIP_NAME_11; - descriptionShort = $STR_EQUIP_DESC_11; + displayName = $STR_EQUIP_NAME_ENGINE; + descriptionShort = $STR_EQUIP_DESC_ENGINE; class ItemActions { @@ -64,8 +64,8 @@ class PartVRotor : CA_Magazine type = 256; model = "\dayz_equip\models\vrotor.p3d"; picture = "\dayz_equip\textures\equip_vrotor_ca.paa"; - displayName = $STR_EQUIP_NAME_32; - descriptionShort = $STR_EQUIP_DESC_32; + displayName = $STR_EQUIP_NAME_MAIN_ROTOR; + descriptionShort = $STR_EQUIP_DESC_MAIN_ROTOR; class ItemActions { @@ -88,8 +88,8 @@ class PartGlass : CA_Magazine type = 256; model = "\dayz_equip\models\carglass.p3d"; picture = "\dayz_equip\textures\equip_carglass_ca.paa"; - displayName = $STR_EQUIP_NAME_30; - descriptionShort = $STR_EQUIP_DESC_30; + displayName = $STR_EQUIP_NAME_WINDSCREEN_GLASS; + descriptionShort = $STR_EQUIP_DESC_WINDSCREEN_GLASS; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp index d389bf468..02526d6f9 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp @@ -37,7 +37,7 @@ class ItemLog : CA_Magazine }; class Crafting2 { - text = $STR_EQUIP_NAME_40;//"Wood Piles" + text = $STR_EQUIP_NAME_WOOD_PILE;//"Wood Piles" script = ";['Crafting2','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; requiretools[] = {"ItemHatchet"}; @@ -79,7 +79,7 @@ class ItemPlank : CA_Magazine { class Crafting { - text = $STR_EQUIP_NAME_40;//"Wood Piles" + text = $STR_EQUIP_NAME_WOOD_PILE;//"Wood Piles" script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; neednearby[] = {}; requiretools[] = {"ItemHatchet"}; @@ -141,8 +141,8 @@ class PartWoodPile : CA_Magazine type = 256; model = "\dayz_equip\models\woodPile.p3d"; picture = "\dayz_equip\textures\equip_woodPile_ca.paa"; - displayName = $STR_EQUIP_NAME_40; - descriptionShort = $STR_EQUIP_DESC_40; + displayName = $STR_EQUIP_NAME_WOOD_PILE; + descriptionShort = $STR_EQUIP_DESC_WOOD_PILE; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp index 025859455..185ee6efe 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp @@ -5,13 +5,13 @@ class ItemAntibiotic_base : CA_Magazine type = 256; model = "\dayz_equip\models\med_antibiotic_gear.p3d"; picture = "\dayz_equip\textures\equip_antibiotics_ca.paa"; - displayName = $STR_EQUIP_NAME_17; + displayName = $STR_EQUIP_NAME_ANTIBIOTICS; }; class ItemAntibiotic : ItemAntibiotic_base { scope = 2; - descriptionShort = $STR_EQUIP_DESC_17; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS; class medical { @@ -37,7 +37,7 @@ class ItemAntibiotic : ItemAntibiotic_base class ItemAntibiotic6 : ItemAntibiotic { displayName = $STR_EQUIP_NAME_ANTIBIOTICS_6; - descriptionShort = $STR_EQUIP_DESC_48; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_6; class medical { @@ -49,7 +49,7 @@ class ItemAntibiotic6 : ItemAntibiotic class ItemAntibiotic5 : ItemAntibiotic { displayName = $STR_EQUIP_NAME_ANTIBIOTICS_5; - descriptionShort = $STR_EQUIP_DESC_49; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_5; class medical { @@ -61,7 +61,7 @@ class ItemAntibiotic5 : ItemAntibiotic class ItemAntibiotic4 : ItemAntibiotic { displayName = $STR_EQUIP_NAME_ANTIBIOTICS_4; - descriptionShort = $STR_EQUIP_DESC_50; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_4; class medical { @@ -73,7 +73,7 @@ class ItemAntibiotic4 : ItemAntibiotic class ItemAntibiotic3 : ItemAntibiotic { displayName = $STR_EQUIP_NAME_ANTIBIOTICS_3; - descriptionShort = $STR_EQUIP_DESC_51; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_3; class medical { @@ -85,7 +85,7 @@ class ItemAntibiotic3 : ItemAntibiotic class ItemAntibiotic2 : ItemAntibiotic { displayName = $STR_EQUIP_NAME_ANTIBIOTICS_2; - descriptionShort = $STR_EQUIP_DESC_52; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_2; class medical { @@ -97,7 +97,7 @@ class ItemAntibiotic2 : ItemAntibiotic class ItemAntibiotic1 : ItemAntibiotic { displayName = $STR_EQUIP_NAME_ANTIBIOTICS_1; - descriptionShort = $STR_EQUIP_DESC_53; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_1; class medical { @@ -110,6 +110,6 @@ class ItemAntibioticEmpty : ItemAntibiotic_base { scope = 2; displayName = $STR_EQUIP_NAME_ANTIBIOTICS_EMPTY; - descriptionShort = $STR_EQUIP_DESC_54; + descriptionShort = $STR_EQUIP_DESC_ANTIBIOTICS_EMPTY; picture = "\dayz_epoch_c\icons\equipment\ItemAntibioticsEmpty.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp index 507158c34..7f888a56c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/BloodBags.hpp @@ -207,10 +207,10 @@ class ItemBloodbag: CA_Magazine scope = 2; count = 1; type = 256; - displayName = "$STR_EQUIP_NAME_16"; + displayName = $STR_EQUIP_NAME_BLOOD_BAG; model = "\dayz_equip\models\bloodbag.p3d"; picture = "\dayz_equip\textures\equip_bloodbag_ca.paa"; - descriptionShort = "$STR_EQUIP_DESC_16"; + descriptionShort = $STR_EQUIP_DESC_BLOOD_BAG; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp index da9870c62..bb721b894 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Medical.hpp @@ -29,8 +29,8 @@ class ItemBandage : CA_Magazine type = 16; model = "\dayz_equip\models\fad.p3d"; picture = "\dayz_equip\textures\equip_fad_ca.paa"; - displayName = $STR_EQUIP_NAME_7; - descriptionShort = $STR_EQUIP_DESC_7; + displayName = $STR_EQUIP_NAME_BANDAGE; + descriptionShort = $STR_EQUIP_DESC_BANDAGE; class ItemActions { @@ -79,8 +79,8 @@ class ItemEpinephrine : CA_Magazine type = 256; model = "\dayz_equip\models\epi.p3d"; picture = "\dayz_equip\textures\equip_epi_ca.paa"; - displayName = $STR_EQUIP_NAME_14; - descriptionShort = $STR_EQUIP_DESC_14; + displayName = $STR_EQUIP_NAME_EPI_PEN; + descriptionShort = $STR_EQUIP_DESC_EPI_PEN; }; class ItemMorphine : CA_Magazine @@ -90,8 +90,8 @@ class ItemMorphine : CA_Magazine type = 256; model = "\dayz_equip\models\morphine.p3d"; picture = "\dayz_equip\textures\equip_morphine_ca.paa"; - displayName = $STR_EQUIP_NAME_15; - descriptionShort = $STR_EQUIP_DESC_15; + displayName = $STR_EQUIP_NAME_MORPHINE; + descriptionShort = $STR_EQUIP_DESC_MORPHINE; class ItemActions { @@ -110,8 +110,8 @@ class ItemHeatPack : CA_Magazine type = 256; model = "\dayz_equip\models\Heat_pack.p3d"; picture = "\dayz_equip\textures\equip_heat_pack_ca.paa"; - displayName = $STR_EQUIP_NAME_42; - descriptionShort = $STR_EQUIP_DESC_42; + displayName = $STR_EQUIP_NAME_HEAT_PACK; + descriptionShort = $STR_EQUIP_DESC_HEAT_PACK; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp index f6fad62f4..478aba9f3 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Medical/Painkiller.hpp @@ -5,8 +5,8 @@ class ItemPainkiller : CA_Magazine type = 256; model = "\dayz_equip\models\med_painkiller_gear.p3d"; picture = "\dayz_equip\textures\equip_painkiller_ca.paa"; - displayName = $STR_EQUIP_NAME_18; - descriptionShort = $STR_EQUIP_DESC_18; + displayName = $STR_EQUIP_NAME_PAINKILLER; + descriptionShort = $STR_EQUIP_DESC_PAINKILLER; class medical { diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp index 94549e640..28437c455 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp @@ -3,8 +3,8 @@ class TrashJackDaniels : HandGrenade scope = 2; model = "\dayz_equip\models\bottle_jd.p3d"; picture = "\dayz_equip\textures\equip_bottle_jd_ca.paa"; - displayName = $STR_EQUIP_NAME_34; - descriptionShort = $STR_EQUIP_DESC_34; + displayName = $STR_EQUIP_NAME_EMPTY_WHISKEY_BOTTLE; + descriptionShort = $STR_EQUIP_DESC_EMPTY_WHISKEY_BOTTLE; ammo = "JackDaniels"; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp index 97f4e3fbe..fec23f0c7 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp @@ -3,8 +3,8 @@ class ItemSodaEmpty : HandGrenade scope = 2; model = "\dayz_equip\models\soda_coke_e.p3d"; picture = "\dayz_equip\textures\equip_soda_empty_ca.paa"; - displayName = $STR_EQUIP_NAME_35; - descriptionShort = $STR_EQUIP_DESC_35; + displayName = $STR_EQUIP_NAME_EMPTY_SODA_CAN; + descriptionShort = $STR_EQUIP_DESC_EMPTY_SODA_CAN; ammo = "SodaCan"; class ItemActions @@ -31,8 +31,8 @@ class TrashTinCan : HandGrenade scope = 2; model = "\dayz_equip\models\trash_tincan.p3d"; picture = "\dayz_equip\textures\equip_tincan_ca.paa"; - displayName = $STR_EQUIP_NAME_33; - descriptionShort = $STR_EQUIP_DESC_33; + displayName = $STR_EQUIP_NAME_EMPTY_TIN_CAN; + descriptionShort = $STR_EQUIP_DESC_EMPTY_TIN_CAN; ammo = "TinCan"; class ItemActions diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp index aceccf43c..387b068ce 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Bandit.hpp @@ -357,7 +357,6 @@ class Category_10 { class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; - class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp index 885cc9c71..c57070a71 100644 --- a/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTrader/Category/Hero.hpp @@ -354,7 +354,6 @@ class Category_5 { class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; - class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-2,"ItemGoldBar"};sell[] = {1,"ItemGoldBar"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp index cece3b8bb..e0333a9ac 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Bandit.hpp @@ -357,7 +357,6 @@ class Category_10 { class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; - class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp index f0cbbee50..c35f9da47 100644 --- a/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp +++ b/SQF/dayz_code/Configs/CfgServerTraderZSC/Category/Hero.hpp @@ -354,7 +354,6 @@ class Category_5 { class Skin_gsc_scientist2_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_scientist2W_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_scientist2_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; - class Skin_gsc_cloth_loner_head_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_eco_stalker_mask_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_eco_stalker_mask_neutralW_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; class Skin_gsc_eco_stalker_head_neutral_DZ {type = "trade_items";buy[] = {-1,"worth"};sell[] = {100,"worth"};}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildables/FencesGates.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildables/FencesGates.hpp index 796a41209..488548671 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Buildables/FencesGates.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Buildables/FencesGates.hpp @@ -78,6 +78,7 @@ class WoodenGate_1_DZ: DZE_Housebase }; lockable = 3; + removeoutput[] = {{"ItemComboLock",1}}; }; class WoodenGate_2_DZ: DZE_Housebase @@ -139,6 +140,7 @@ class WoodenGate_2_DZ: DZE_Housebase }; lockable = 3; + removeoutput[] = {{"ItemComboLock",1}}; }; class WoodenGate_3_DZ: DZE_Housebase @@ -200,6 +202,7 @@ class WoodenGate_3_DZ: DZE_Housebase }; lockable = 3; + removeoutput[] = {{"ItemComboLock",1}}; }; class WoodenGate_4_DZ: DZE_Housebase @@ -260,4 +263,5 @@ class WoodenGate_4_DZ: DZE_Housebase }; lockable = 3; + removeoutput[] = {{"ItemComboLock",1}}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp b/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp index 5662dc7bd..2da9d2b47 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Skins/Male.hpp @@ -1054,12 +1054,6 @@ class gsc_scientist2_head_DZ : gsc_scientist1_DZ { model = "\gsc_stalker\gsc_eco_suit2_head.p3d"; }; -class gsc_cloth_loner_head_DZ : Survivor_DZ { - scope = 2; - displayName = $STR_DZE_SKIN_STALKER_ROOKIE_NAME; - model = "\gsc_stalker\gsc_cloth_loner_head.p3d"; -}; - class gsc_eco_stalker_mask_neutral_DZ : SoldierLight_Base_DZ { scope = 2; displayName = $STR_DZE_SKIN_STALKER_LONER_MASK_NAME; diff --git a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp index 59f247961..e6a6050a1 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/WeaponHolder.hpp @@ -70,7 +70,7 @@ class WeaponHolder_MeleeMachete: WeaponHolderBase }; class WeaponHolder_ItemJerrycanEmpty : WeaponHolderBase { scope = 2; - displayName = "$STR_EQUIP_NAME_39"; + displayName = $STR_ITEM_NAME_JERRYCAN_EMPTY; model = "\dayz_equip\proxy\jerrycan_side.p3d"; destrType = "DestructNo"; @@ -221,7 +221,7 @@ class WeaponHolder_M4A1 : WeaponHolderBase { class WeaponHolder_ItemTent : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_20; + displayName = $STR_EQUIP_NAME_CAMPING_TENT; model = "\dayz_equip\proxy\tentbag.p3d"; destrType = "DestructNo"; @@ -232,7 +232,7 @@ class WeaponHolder_ItemTent : WeaponHolderBase { class WeaponHolder_ItemFlashlight : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_5; + displayName = $STR_EQUIP_NAME_FLASHLIGHT; model = "\dayz_equip\proxy\flashlight.p3d"; destrType = "DestructNo"; @@ -243,7 +243,7 @@ class WeaponHolder_ItemFlashlight : WeaponHolderBase { class WeaponHolder_ItemFlashlightRed : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_6; + displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY; model = "\dayz_equip\proxy\flashlight_mil.p3d"; destrType = "DestructNo"; @@ -254,7 +254,7 @@ class WeaponHolder_ItemFlashlightRed : WeaponHolderBase { class WeaponHolder_ItemWaterbottle : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_12; + displayName = $STR_EQUIP_NAME_WATER_BOTTLE; model = "\dayz_equip\proxy\waterbottle.p3d"; destrType = "DestructNo"; @@ -276,7 +276,7 @@ class WeaponHolder_ItemGenerator : WeaponHolderBase { class WeaponHolder_ItemToolbox : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_2; + displayName = $STR_EQUIP_NAME_TOOLBOX; model = "\dayz_equip\proxy\toolbox.p3d"; destrType = "DestructNo"; @@ -287,7 +287,7 @@ class WeaponHolder_ItemToolbox : WeaponHolderBase { class WeaponHolder_PartFueltank : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_8; + displayName = $STR_EQUIP_NAME_FUELTANK; model = "\dayz_equip\proxy\fueltank.p3d"; destrType = "DestructNo"; @@ -298,7 +298,7 @@ class WeaponHolder_PartFueltank : WeaponHolderBase { class WeaponHolder_PartWheel : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_9; + displayName = $STR_EQUIP_NAME_CAR_WHEEL; model = "\dayz_equip\proxy\wheel.p3d"; destrType = "DestructNo"; @@ -309,7 +309,7 @@ class WeaponHolder_PartWheel : WeaponHolderBase { class WeaponHolder_PartGeneric : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_10; + displayName = $STR_EQUIP_NAME_SCRAP_METAL; model = "\dayz_equip\proxy\genericparts.p3d"; destrType = "DestructNo"; @@ -320,7 +320,7 @@ class WeaponHolder_PartGeneric : WeaponHolderBase { class WeaponHolder_PartVRotor : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_32; + displayName = $STR_EQUIP_NAME_MAIN_ROTOR; model = "\dayz_equip\proxy\vrotor.p3d"; destrType = "DestructNo"; @@ -331,7 +331,7 @@ class WeaponHolder_PartVRotor : WeaponHolderBase { class WeaponHolder_PartEngine : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_11; + displayName = $STR_EQUIP_NAME_ENGINE; model = "\dayz_equip\proxy\engine.p3d"; destrType = "DestructNo"; @@ -342,7 +342,7 @@ class WeaponHolder_PartEngine : WeaponHolderBase { class WeaponHolder_PartGlass : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_30; + displayName = $STR_EQUIP_NAME_WINDSCREEN_GLASS; model = "\dayz_equip\proxy\carglass.p3d"; destrType = "DestructNo"; @@ -540,7 +540,7 @@ class WeaponHolder_ItemBucket : WeaponHolderBase { class WeaponHolder_ItemJerrycan : WeaponHolderBase { scope = 2; - displayName = $STR_EQUIP_NAME_19; + displayName = $STR_ITEM_NAME_JERRYCAN; model = "\dayz_equip\proxy\jerrycan.p3d"; destrType = "DestructNo"; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp index 3ce48e1e6..2ecd0dd8f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/AN94.hpp @@ -11,7 +11,12 @@ class AN94_DZ: AK_74 dexterity = 1.7; displayName = $STR_DZ_WPN_AN94_NAME; reloadMagazineSound[] = {"\RH_aks\sound\an94_reload.wss",0.056234,1,20}; - magazines[] = {"30Rnd_545x39_AK","75Rnd_545x39_RPK"}; + magazines[] = + { + 30Rnd_545x39_AK, + 60Rnd_545x39_AK_Taped, + 75Rnd_545x39_RPK + }; modes[] = {"Single","Burst","Fullauto"}; class Single: Mode_SemiAuto { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp index d2e5647d7..3786f6114 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/RK95.hpp @@ -17,23 +17,6 @@ class OpticsModes\ opticsPPEffects[] = {"OpticsCHAbera3","OpticsBlur3"};\ cameraDir = "";\ };\ - \ - class Iron\ - {\ - opticsID = 2;\ - useModelOptics = false;\ - opticsFlare = false;\ - opticsDisablePeripherialVision = false;\ - opticsZoomMin = 0.25;\ - opticsZoomMax = 1.1;\ - opticsZoomInit = 0.5;\ - distanceZoomMin = 100;\ - distanceZoomMax = 100;\ - memoryPointCamera = "eye";\ - visionMode[] = {};\ - opticsPPEffects[] = {};\ - cameraDir = "";\ - };\ } class RK95_DZ: AKM_DZ diff --git a/SQF/dayz_code/Configs/CfgWeapons/Throw.hpp b/SQF/dayz_code/Configs/CfgWeapons/Throw.hpp index fc939704e..23b043637 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Throw.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Throw.hpp @@ -60,7 +60,7 @@ class Throw : GrenadeLauncher class ChemLightMuzzle : ThrowMuzzle { - displayName = $STR_MAG_ACTION_5; + displayName = $STR_MAG_ACTION_CHEMLIGHT; magazines[] = {"HandChemGreen", "HandChemRed", "HandChemBlue"}; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp index 4a187e091..b044ff28d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp @@ -3,8 +3,8 @@ class ItemEtool : ItemCore scope = 2; model = "\dayz_equip\models\etool.p3d"; picture = "\dayz_equip\textures\equip_etool_ca.paa"; - displayName = $STR_EQUIP_NAME_1; - descriptionShort = $STR_EQUIP_DESC_1; + displayName = $STR_EQUIP_NAME_ETOOL; + descriptionShort = $STR_EQUIP_DESC_ETOOL; }; class ItemEtoolBroken : ItemCore @@ -12,8 +12,8 @@ class ItemEtoolBroken : ItemCore scope = 2; model = "\dayz_equip\models\etool.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemEtoolBroken.paa"; - displayName = $STR_EQUIP_NAME_1_BROKEN; - descriptionShort = $STR_EQUIP_DESC_1_BROKEN; + displayName = $STR_EQUIP_NAME_ETOOL_BROKEN; + descriptionShort = $STR_EQUIP_DESC_ETOOL_BROKEN; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp index 77ac9379a..13e754bc5 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp @@ -3,8 +3,8 @@ class ItemFlashlight : ItemCore scope = 2; model = "\dayz_equip\models\flashlight.p3d"; picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; - displayName = $STR_EQUIP_NAME_5; - descriptionShort = $STR_EQUIP_DESC_5; + displayName = $STR_EQUIP_NAME_FLASHLIGHT; + descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT; class ItemActions { @@ -23,8 +23,8 @@ class ItemFlashlightBroken : ItemCore scope = 2; model = "\dayz_equip\models\flashlight.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemFlashlightBroken.paa"; - displayName = $STR_EQUIP_NAME_5_BROKEN; - descriptionShort = $STR_EQUIP_DESC_5_BROKEN; + displayName = $STR_EQUIP_NAME_FLASHLIGHT_BROKEN; + descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_BROKEN; }; class MeleeFlashlight : Pistol @@ -32,8 +32,8 @@ class MeleeFlashlight : Pistol scope = 2; model = "\dayz_equip\models\flashlight.p3d"; picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; - displayName = $STR_EQUIP_NAME_5; - descriptionShort = $STR_EQUIP_DESC_5; + displayName = $STR_EQUIP_NAME_FLASHLIGHT; + descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT; modelOptics = "-"; magazines[] = {}; @@ -65,8 +65,8 @@ class ItemFlashlightRed : ItemFlashlight { model = "\dayz_equip\models\flashlight_mil.p3d"; picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; - displayName = $STR_EQUIP_NAME_6; - descriptionShort = $STR_EQUIP_DESC_6; + displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY; + descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY; class ItemActions { @@ -85,16 +85,16 @@ class ItemFlashlightRedBroken : ItemCore scope = 2; model = "\dayz_equip\models\flashlight_mil.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemMilitaryFlashlightBroken.paa"; - displayName = $STR_EQUIP_NAME_6_BROKEN; - descriptionShort = $STR_EQUIP_DESC_6_BROKEN; + displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY_BROKEN; + descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY_BROKEN; }; class MeleeFlashlightRed : MeleeFlashlight { model = "\dayz_equip\models\flashlight_mil.p3d"; picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; - displayName = $STR_EQUIP_NAME_6; - descriptionShort = $STR_EQUIP_DESC_6; + displayName = $STR_EQUIP_NAME_FLASHLIGHT_MILITARY; + descriptionShort = $STR_EQUIP_DESC_FLASHLIGHT_MILITARY; class FlashLight { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp index d18b4b61b..7d3fcf637 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp @@ -48,4 +48,22 @@ class ItemHatchetBroken : ItemCore inputweapons[] = {"ItemHatchetBroken"}; }; }; +}; + +class ItemHatchetBlunt : ItemCore +{ + scope = 2; + picture = "\dayz_epoch_c\icons\tools\ItemHatchetBroken.paa"; + model = "\dayz_equip\models\hatchet.p3d"; + displayName = $STR_EQUIP_NAME_HATCHET_DULL; + descriptionShort = $STR_EQUIP_DESC_HATCHET_DULL; + + class ItemActions + { + class SharpenHatchet + { + text = $STR_ACTIONS_SHARPEN_HATCHET; + script = "; ['ItemHatchetBlunt','ItemHatchet'] spawn player_sharpen;"; + }; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp index cfa83b38a..abd49f69d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Knife.hpp @@ -3,7 +3,7 @@ class ItemKnife_Base : ItemCore scope = 0; model = "\dayz_equip\models\knife_gear.p3d"; picture = "\dayz_equip\textures\equip_knife_ca.paa"; - displayName = $STR_EQUIP_NAME_4; + displayName = $STR_EQUIP_NAME_KNIFE; class ItemActions { @@ -20,55 +20,56 @@ class ItemKnife : ItemKnife_Base scope = 2; model = "\dayz_equip\models\knife_gear.p3d"; // Some mods override this. We leave this here just to be sure. picture = "\dayz_equip\textures\equip_knife_ca.paa"; - descriptionShort = $STR_EQUIP_DESC_4; + descriptionShort = $STR_EQUIP_DESC_KNIFE; sharpnessRemaining = "ItemKnife5"; }; class ItemKnife5 : ItemKnife_Base { scope = 2; - descriptionShort = $STR_EQUIP_DESC_4_A; + descriptionShort = $STR_EQUIP_DESC_KNIFE_5; sharpnessRemaining = "ItemKnife4"; }; class ItemKnife4 : ItemKnife_Base { scope = 2; - descriptionShort = $STR_EQUIP_DESC_4_B; + descriptionShort = $STR_EQUIP_DESC_KNIFE_4; sharpnessRemaining = "ItemKnife3"; }; class ItemKnife3 : ItemKnife_Base { scope = 2; - descriptionShort = $STR_EQUIP_DESC_4_C; + descriptionShort = $STR_EQUIP_DESC_KNIFE_3; sharpnessRemaining = "ItemKnife2"; }; class ItemKnife2 : ItemKnife_Base { scope = 2; - descriptionShort = $STR_EQUIP_DESC_4_D; + descriptionShort = $STR_EQUIP_DESC_KNIFE_2; sharpnessRemaining = "ItemKnife1"; }; class ItemKnife1 : ItemKnife_Base { scope = 2; - descriptionShort = $STR_EQUIP_DESC_4_E; + descriptionShort = $STR_EQUIP_DESC_KNIFE_1; sharpnessRemaining = "ItemKnifeBlunt"; }; class ItemKnifeBlunt : ItemKnife_Base { scope = 2; - descriptionShort = $STR_EQUIP_CODE_DESC_4; + displayName = $STR_EQUIP_NAME_KNIFE_DULL; + descriptionShort = $STR_EQUIP_DESC_KNIFE_DULL; sharpnessRemaining = "ItemKnifeBlunt"; class ItemActions { class FixKnife { - text = $STR_ACTIONS_FIX_KNIFE; + text = $STR_ACTIONS_SHARPEN_KNIFE; script = "; ['ItemKnifeBlunt','ItemKnife'] spawn player_sharpen;"; }; class Use diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp index fd11a14bf..1b949fd36 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp @@ -3,16 +3,24 @@ class ItemMatchbox_base : ItemCore scope = 0; model = "\dayz_equip\models\matchbox_gear.p3d"; picture = "\dayz_equip\textures\equip_matchbox_ca.paa"; - displayName = $STR_EQUIP_NAME_3; - descriptionShort = $STR_EQUIP_DESC_3; + displayName = $STR_EQUIP_NAME_MATCHES; + descriptionShort = $STR_EQUIP_DESC_MATCHES; +}; + +class ItemMatchboxWet : ItemMatchbox_base +{ + scope = 2; + picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa"; + displayName = $STR_EQUIP_NAME_MATCHES_WET; + descriptionShort = $STR_EQUIP_DESC_MATCHES_WET; }; class ItemMatchboxEmpty : ItemMatchbox_base { scope = 2; picture = "\dayz_epoch_c\icons\tools\ItemMatchesEmpty.paa"; - displayName = $STR_EQUIP_NAME_3_EMPTY; - descriptionShort = $STR_EQUIP_DESC_3_EMPTY; + displayName = $STR_EQUIP_NAME_MATCHES_EMPTY; + descriptionShort = $STR_EQUIP_DESC_MATCHES_EMPTY; }; //Loot Spawn Table. @@ -38,35 +46,35 @@ class ItemMatchbox : ItemMatchbox_base class Item5Matchbox : ItemMatchbox { displayName = $STR_EQUIP_NAME_MATCHES_5; - descriptionShort = $STR_EQUIP_DESC_3_A; + descriptionShort = $STR_EQUIP_DESC_MATCHES_5; matches = 5; qtyRemaining = "Item4Matchbox"; }; class Item4Matchbox : ItemMatchbox { displayName = $STR_EQUIP_NAME_MATCHES_4; - descriptionShort = $STR_EQUIP_DESC_3_B; + descriptionShort = $STR_EQUIP_DESC_MATCHES_4; qtyRemaining = "Item3Matchbox"; matches = 4; }; class Item3Matchbox : ItemMatchbox { displayName = $STR_EQUIP_NAME_MATCHES_3; - descriptionShort = $STR_EQUIP_DESC_3_C; + descriptionShort = $STR_EQUIP_DESC_MATCHES_3; qtyRemaining = "Item2Matchbox"; matches = 3; }; class Item2Matchbox : ItemMatchbox { displayName = $STR_EQUIP_NAME_MATCHES_2; - descriptionShort = $STR_EQUIP_DESC_3_D; + descriptionShort = $STR_EQUIP_DESC_MATCHES_2; qtyRemaining = "Item1Matchbox"; matches = 2; }; class Item1Matchbox : ItemMatchbox { displayName = $STR_EQUIP_NAME_MATCHES_1; - descriptionShort = $STR_EQUIP_DESC_3_E; + descriptionShort = $STR_EQUIP_DESC_MATCHES_1; qtyRemaining = "ItemMatchboxEmpty"; matches = 1; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp index 88694bfd8..e27613896 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Shovel.hpp @@ -3,8 +3,8 @@ class ItemShovel : ItemCore scope = 2; model = "\z\addons\dayz_communityassets\models\shovel.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemShovel.paa"; - displayName = $STR_EQUIP_NAME_1b; - descriptionShort = $STR_EQUIP_DESC_1b; + displayName = $STR_EQUIP_NAME_SHOVEL; + descriptionShort = $STR_EQUIP_DESC_SHOVEL; }; class ItemShovelBroken : ItemCore @@ -12,8 +12,8 @@ class ItemShovelBroken : ItemCore scope = 2; model = "\z\addons\dayz_communityassets\models\shovel.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemShovelBroken.paa"; - displayName = $STR_EQUIP_NAME_1b_BROKEN; - descriptionShort = $STR_EQUIP_DESC_1b_BROKEN; + displayName = $STR_EQUIP_NAME_SHOVEL_BROKEN; + descriptionShort = $STR_EQUIP_DESC_SHOVEL_BROKEN; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp index d30ef6ebb..201629e3b 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp @@ -3,8 +3,8 @@ class ItemToolbox : ItemCore scope = 2; model = "\dayz_equip\models\toolbox.p3d"; picture = "\dayz_equip\textures\equip_toolbox_ca.paa"; - displayName = $STR_EQUIP_NAME_2; - descriptionShort = $STR_EQUIP_DESC_2; + displayName = $STR_EQUIP_NAME_TOOLBOX; + descriptionShort = $STR_EQUIP_DESC_TOOLBOX; class ItemActions { @@ -21,6 +21,6 @@ class ItemToolboxBroken : ItemCore scope = 2; model = "\dayz_equip\models\toolbox.p3d"; picture = "\dayz_epoch_c\icons\tools\ItemToolboxBroken.paa"; - displayName = $STR_EQUIP_NAME_2_BROKEN; - descriptionShort = $STR_EQUIP_DESC_2_BROKEN; + displayName = $STR_EQUIP_NAME_TOOLBOX_BROKEN; + descriptionShort = $STR_EQUIP_DESC_TOOLBOX_BROKEN; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/cfgAmmo.hpp b/SQF/dayz_code/Configs/cfgAmmo.hpp index eac40c5e4..2e9207e9c 100644 --- a/SQF/dayz_code/Configs/cfgAmmo.hpp +++ b/SQF/dayz_code/Configs/cfgAmmo.hpp @@ -820,7 +820,7 @@ class CfgAmmo class ChemLight : LitObject { - displayName = $STR_MAG_ACTION_5; + displayName = $STR_MAG_ACTION_CHEMLIGHT; simulation = "shotShell"; simulationStep = 5; soundFly[] = {"", 0, 0}; diff --git a/SQF/dayz_code/actions/changeCode.sqf b/SQF/dayz_code/actions/changeCode.sqf index 4ec5e0cdf..d9d34329a 100644 --- a/SQF/dayz_code/actions/changeCode.sqf +++ b/SQF/dayz_code/actions/changeCode.sqf @@ -73,7 +73,7 @@ if (_isStorage) then { _vector = [vectorDir _cursorTarget,vectorUp _cursorTarget]; _object = createVehicle [_typeOf, [0,0,0], [], 0, "CAN_COLLIDE"]; - _object setDir _dir; + //_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _object setVectorDirAndUp _vector; _object setPosATL _location; _object setVariable ["memDir",_dir,true]; diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index a2929fed7..97c8298e4 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -362,7 +362,7 @@ if (_canBuild select 0) then { if (!_cancel) then { _classname = _classnametmp; _tmpbuilt = _classname createVehicle _location; - _tmpbuilt setdir _dir; + //_tmpbuilt setdir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _tmpbuilt setVariable["memDir",_dir,true]; _location = _position; diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index 61ac6be4a..467d40125 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -79,7 +79,7 @@ if ((count _upgrade) > 0) then { _classname = _newclassname; _object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; - _object setDir _dir; + //_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _object setVariable["memDir",_dir,true]; _object setVectorDirAndUp _vector; _object setPosATL _location; diff --git a/SQF/dayz_code/actions/player_emptyContainer.sqf b/SQF/dayz_code/actions/player_emptyContainer.sqf index bbfdd89b0..e14493a02 100644 --- a/SQF/dayz_code/actions/player_emptyContainer.sqf +++ b/SQF/dayz_code/actions/player_emptyContainer.sqf @@ -10,6 +10,7 @@ if (dayz_actionInProgress) exitWith {localize "str_epoch_player_56" call dayz_rollingMessages;}; dayz_actionInProgress = true; +closeDialog 0; private "_cfg"; @@ -19,28 +20,32 @@ _cfg = (ConfigFile >> "CfgMagazines" >> _this); if (!isClass(_cfg)) exitWith { diag_log format ["DAYZ ERROR: Invalid magazine classname given to player_emptyContainer: %1", _this]; + dayz_actionInProgress = false; }; //class isn't a consumable if (!isText(_cfg >> "containerEmpty")) exitWith { diag_log format ["DAYZ ERROR: Non-emptiable item classname given to player_emptyContainer: %1", _this]; + dayz_actionInProgress = false; }; //player is on a ladder if ((getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1) exitWith { (localize "str_player_21") call dayz_rollingMessages; + dayz_actionInProgress = false; }; //player doesn't have the consumable item -if (!(_this in magazines player)) exitWith { localize "str_misplaced_container" call dayz_rollingMessages; }; +if (!(_this in magazines player)) exitWith { dayz_actionInProgress = false;localize "str_misplaced_container" call dayz_rollingMessages; }; + +//Remove container +player removeMagazine _this; [player,(getPosATL player),5,"refuel"] spawn fnc_alertZombies; player playActionNow "PutDown"; -//Remove container -player removeMagazine _this; player addMagazine getText (_cfg >> "containerEmpty"); //update gear ui or close if the player is in a vehicle diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index bbfc082f7..6150ffb44 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -117,7 +117,7 @@ if ((count _upgrade) > 0) then { _objectCharacterID = _obj getVariable ["CharacterID","0"]; _classname = _newclassname; _object = createVehicle [_classname, [0,0,0], [], 0, "CAN_COLLIDE"]; - _object setDir _dir; + //_object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _object setVariable["memDir",_dir,true]; _object setVectorDirAndUp _vector; _object setPosATL _location; diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index 618319a31..bf35db7f3 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -33,7 +33,7 @@ _objectUID = _obj getVariable ["ObjectUID","0"]; _isOk = true; _proceed = false; _objType = typeOf _obj; -if (_objType in DZE_DoorsLocked) exitWith {dayz_actionInProgress = false; localize "STR_EPOCH_ACTIONS_20" call dayz_rollingMessages;}; +if (_objType in DZE_DoorsLocked && !(_objType in ["WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ"])) exitWith {dayz_actionInProgress = false; localize "STR_EPOCH_ACTIONS_20" call dayz_rollingMessages;}; // Chance to break tools _isDestructable = _obj isKindOf "BuiltItems"; @@ -77,7 +77,7 @@ _nameVehicle = getText(configFile >> "CfgVehicles" >> _objType >> "displayName") format[localize "str_epoch_player_162",_nameVehicle] call dayz_rollingMessages; if (_isModular && {_objType in _x} count DZE_modularConfig == 0) then { - localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages; + localize "STR_EPOCH_ACTIONS_21" call dayz_rollingMessages; }; // Alert zombies once. diff --git a/SQF/dayz_code/compile/fn_buildWeightedArray.sqf b/SQF/dayz_code/compile/fn_buildWeightedArray.sqf index d9e9d8d7c..6a190be82 100644 --- a/SQF/dayz_code/compile/fn_buildWeightedArray.sqf +++ b/SQF/dayz_code/compile/fn_buildWeightedArray.sqf @@ -18,9 +18,9 @@ scriptName "Functions\arrays\fn_selectRandomWeighted.sqf"; [*] Algorithm is inefficient? */ -private["_weighted"]; +private["_weights","_weighted","_weight"]; -_array = _this select 0; +// _array = _this select 0; _weights = _this select 1; /* @@ -34,7 +34,6 @@ if ((count _array) > (count _weights)) exitWith {debugLog "Log: [selectRandomWei _weighted = []; for "_i" from 0 to ((count _weights) - 1) do { - private ["_weight"]; _weight = _weights select _i; //Ensure the weight is a Number. @@ -53,4 +52,4 @@ for "_i" from 0 to ((count _weights) - 1) do _weighted set [(count _weighted), _i]; }; }; -_weighted \ No newline at end of file +_weighted diff --git a/SQF/dayz_code/compile/fn_inAngleSector.sqf b/SQF/dayz_code/compile/fn_inAngleSector.sqf index 8116b3b7a..242d75bba 100644 --- a/SQF/dayz_code/compile/fn_inAngleSector.sqf +++ b/SQF/dayz_code/compile/fn_inAngleSector.sqf @@ -15,7 +15,7 @@ // Revision History: // 09/01/08 0.1 - First cut VBS2 //------------------ -private["_r","_dir1"]; +private["_small","_large","_xpos","_ypos","_dir2","_dir3"]; _r = false; @@ -34,4 +34,4 @@ _dir3 = _dir1 + 360; if ((_dir1 >= _small && _dir1 <= _large) || (_dir2 >= _small && _dir2 <= _large) || (_dir3 >= _small && _dir3 <= _large)) then {_r = true}; -_r \ No newline at end of file +_r diff --git a/SQF/dayz_code/compile/fn_inString.sqf b/SQF/dayz_code/compile/fn_inString.sqf index 7870beea8..9a9a4c4cf 100644 --- a/SQF/dayz_code/compile/fn_inString.sqf +++ b/SQF/dayz_code/compile/fn_inString.sqf @@ -1,7 +1,7 @@ //Kilzone_Kid's megafast inString function //caseinsensitive //params [needle,haystack]; -private ["_found","_hayArr"]; +private["_needle","_haystack","_haystackArr","_haystackLen","_needleLen","_found","_hayArr"]; scopeName "main"; _needle = _this select 0; diff --git a/SQF/dayz_code/compile/fn_selectRandomLocation.sqf b/SQF/dayz_code/compile/fn_selectRandomLocation.sqf index f44976a8d..07d494a40 100644 --- a/SQF/dayz_code/compile/fn_selectRandomLocation.sqf +++ b/SQF/dayz_code/compile/fn_selectRandomLocation.sqf @@ -1,4 +1,5 @@ -private["_location","_minDistance","_maxDistance","_minobjectDistance","_X","_Y","_index"]; +private["_position","_minDistance","_maxDistance","_minobjectDistance","_X","_Y","_location","_index","_PosX","_PosY","_isFlat"]; + _position = _this select 0; _minDistance = _this select 1; @@ -35,4 +36,4 @@ while {_index < 50} do { //_location = [_location select 0,_location select 1,0]; //diag_log(str(_position)); //diag_log(str(_location)); -_location \ No newline at end of file +_location diff --git a/SQF/dayz_code/compile/fn_sunRise.sqf b/SQF/dayz_code/compile/fn_sunRise.sqf index d7b4614f8..35e119ed6 100644 --- a/SQF/dayz_code/compile/fn_sunRise.sqf +++ b/SQF/dayz_code/compile/fn_sunRise.sqf @@ -14,10 +14,10 @@ Reference: http://forums.bistudio.com/showthread.php?107476-How-do-I-detect-sundown-sunrise */ -private["_daytime"]; +private["_lat","_day","_hour","_daytime"]; _lat = -1 * getNumber(configFile >> "CfgWorlds" >> worldName >> "latitude"); _day = 360 * (dateToNumber date); _hour = acos ((24 * sin(_lat) * cos(_day)) / ((12 * cos(_day) - 78) * cos(_lat))); _daytime = _hour / 360 * 24; -_daytime \ No newline at end of file +_daytime diff --git a/SQF/dayz_code/compile/fnc_getSetPos.sqf b/SQF/dayz_code/compile/fnc_getSetPos.sqf index 30f6f7d03..37f23b0bb 100644 --- a/SQF/dayz_code/compile/fnc_getSetPos.sqf +++ b/SQF/dayz_code/compile/fnc_getSetPos.sqf @@ -1,5 +1,5 @@ //DO NOT USE IF YOU NEED ANGLE COMPENSATION!!!! -private "_pos"; +private["_params","_thingy","_isATL","_pos"]; _params = count _this; _thingy = _this select 0; @@ -28,4 +28,4 @@ if (surfaceIsWater _pos) then { }; }; -_pos; \ No newline at end of file +_pos; diff --git a/SQF/dayz_code/compile/player_attackfsmdelay.sqf b/SQF/dayz_code/compile/player_attackfsmdelay.sqf index 9112a43fb..6459d73f6 100644 --- a/SQF/dayz_code/compile/player_attackfsmdelay.sqf +++ b/SQF/dayz_code/compile/player_attackfsmdelay.sqf @@ -2,10 +2,10 @@ Created exclusively for ArmA2:OA - DayZMod. Please request permission to use/alter/distribute from project leader (R4Z0R49) AND the author (facoptere@gmail.com) */ -private []; +private ["_unit","_type"]; //_start = diag_tickTime; _unit = _this select 0; _type = _this select 1; -[_unit, _type] call player_zombieAttack; \ No newline at end of file +[_unit, _type] call player_zombieAttack; diff --git a/SQF/dayz_code/compile/player_checkStealth.sqf b/SQF/dayz_code/compile/player_checkStealth.sqf index d00e8d4c3..0b9cc3547 100644 --- a/SQF/dayz_code/compile/player_checkStealth.sqf +++ b/SQF/dayz_code/compile/player_checkStealth.sqf @@ -1,4 +1,4 @@ -private ["_scalePose","_scaleMvmt","_scaleLight","_initial"]; +private["_vel","_speed","_pos","_isPZombie","_anim","_anim4","_scaleSound","_nearFlare","_scaler","_nearLight","_nearFire","_building","_isPlayerInside","_audial"]; _vel = velocity (vehicle player); _speed = (_vel distance [0,0,0]); _pos = getPosATL player; diff --git a/SQF/dayz_code/compile/player_gearSet.sqf b/SQF/dayz_code/compile/player_gearSet.sqf index 89e4f9254..6c3386cd8 100644 --- a/SQF/dayz_code/compile/player_gearSet.sqf +++ b/SQF/dayz_code/compile/player_gearSet.sqf @@ -1,4 +1,4 @@ -private "_idc"; +private["_inventory","_wpns","_mags","_item","_val","_idc"]; _inventory = _this; if (count _inventory > 0) then { _wpns = _inventory select 0; diff --git a/SQF/dayz_code/compile/player_music.sqf b/SQF/dayz_code/compile/player_music.sqf index 1b9a0b682..28af024a9 100644 --- a/SQF/dayz_code/compile/player_music.sqf +++ b/SQF/dayz_code/compile/player_music.sqf @@ -1,3 +1,4 @@ +private["_num","_sound","_length","_pause"]; while {!r_player_dead} do { _num = round(random 37); _sound = "z_suspense_" + str(_num); @@ -7,4 +8,4 @@ while {!r_player_dead} do { playMusic _sound; }; uiSleep _pause; -}; \ No newline at end of file +}; diff --git a/SQF/dayz_code/compile/player_projectileNear.sqf b/SQF/dayz_code/compile/player_projectileNear.sqf index 0c19ecf47..c0b49ecb6 100644 --- a/SQF/dayz_code/compile/player_projectileNear.sqf +++ b/SQF/dayz_code/compile/player_projectileNear.sqf @@ -1,4 +1,4 @@ -private ["_currentNear","_listNear","_callCount"]; +private["_unit","_projectile","_isInComat","_listNear","_callCount","_projectilespeed","_projectflight","_currentNear","_nearVehicle","_isInCombat"]; _unit = _this select 0; _projectile = _this select 6; diff --git a/SQF/dayz_code/compile/veh_handleKilled.sqf b/SQF/dayz_code/compile/veh_handleKilled.sqf index d577ce24e..85e794f7b 100644 --- a/SQF/dayz_code/compile/veh_handleKilled.sqf +++ b/SQF/dayz_code/compile/veh_handleKilled.sqf @@ -1,4 +1,4 @@ -_unit = _this select 0; +local _unit = _this select 0; //_killer = _this select 1; // ask server to set global damage to 1, save to the hive @@ -15,4 +15,4 @@ if (local _unit) then { _unit removeAllEventHandlers "HandleDamage"; _unit removeAllEventHandlers "Killed"; _unit removeAllEventHandlers "GetIn"; -_unit removeAllEventHandlers "GetOut"; \ No newline at end of file +_unit removeAllEventHandlers "GetOut"; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp index 338dff669..82d44d7f7 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/Weapons/Tools.hpp @@ -162,6 +162,10 @@ class ItemHatchetBroken { weight = 1; }; +class ItemHatchetBlunt +{ + weight = 1; +}; class ItemCrowbar { weight = 1; @@ -198,6 +202,10 @@ class ItemMatchboxEmpty { weight = 0.001; }; +class ItemMatchboxWet +{ + weight = 0.009; +}; class ItemToolbox { weight = 1; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 4e7d05519..f10291c80 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -14,12 +14,12 @@ dayz_traps_trigger = []; USEC_typeOfWounds = ["Pelvis","aimpoint","lelbow","relbow","RightFoot","LeftFoot","neck","pilot"]; // Player classes -AllPlayers = ["SurvivorW2_DZ","Survivor2_DZ","Sniper1_DZ","Soldier1_DZ","Camo1_DZ","BanditW1_DZ","Bandit1_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorWwinter_DZ","SurvivorW3_DZ","Bandit2_DZ","Bandit3_DZ","Bandit4_DZ","Bandit5_DZ","BanditW2_DZ","Soldier_Crew_PMC","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Soldier_EP2_DZ","TK_INS_Soldier_EP3_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ","TK_Special_Forces_MG_EP1_DZ","TK_Soldier_Sniper_EP1_DZ","TK_Commander_EP1_DZ","RU_Soldier_Crew_DZ","INS_Lopotev_DZ","INS_Soldier_AR_DZ","INS_Soldier_CO_DZ","INS_Bardak_DZ","INS_Worker2_DZ","USMC_Soldier_Officer_DZ","USMC_Soldier_MG_DZ","USMC_Soldier_Pilot_DZ","FR_TL_DZ","FR_R_DZ","FR_Marksman_DZ","FR_Assault_R_DZ","RU_Soldier_DZ","RU_Soldier_Officer_DZ","RUS_Soldier1_DZ","RUS_Commander_DZ","MVD_Soldier_DZ","Ins_Soldier_2_DZ","Ins_Commander_DZ","Ins_Soldier_Crew_DZ","CDF_Soldier_DZ","Doctor_DZ","Assistant_DZ","Worker1_DZ","Worker3_DZ","Worker4_DZ","TK_CIV_Takistani01_EP1_DZ","TK_CIV_Takistani03_EP1_DZ","TK_CIV_Takistani04_EP1_DZ","TK_CIV_Takistani06_EP1_DZ","TK_INS_Soldier_AR_EP1_DZ","TK_GUE_Soldier_EP1_DZ","CZ_Soldier_SL_DES_EP1_DZ","US_Soldier_EP1_DZ","UN_CDF_Soldier_Guard_EP1_DZ","UN_CDF_Soldier_EP1_DZ","GER_Soldier_TL_EP1_DZ","BAF_Soldier_Officer_MTP_DZ","BAF_Soldier_N_MTP_DZ","FR_Sapper_DZ","CamoWinter1_DZ","CamoWinter2_DZ","SniperWinter_DZ","Nac_Soldier_DZ","Tamika_DZ","gsc_military_helmet_wdl_DZ","gsc_military_head_wdl_DZ","gsc_military_helmet_grey_DZ","gsc_military_head_grey_DZ","gsc_scientist1_DZ","gsc_scientist1_head_DZ","gsc_scientist2_DZ","gsc_scientist2_head_DZ","gsc_cloth_loner_head_DZ","gsc_eco_stalker_mask_neutral_DZ","gsc_eco_stalker_head_neutral_DZ","gsc_eco_stalker_mask_fred_DZ","gsc_eco_stalker_head_fred_DZ","gsc_eco_stalker_mask_duty_DZ","gsc_eco_stalker_head_duty_DZ","gsc_eco_stalker_mask_camo_DZ","gsc_eco_stalker_head_camo_DZ","GhillieFull_Desert01_DZ","GhillieFull_Desert02_DZ","GhillieFull_Desert03_DZ","GhillieFull_Desert04_DZ","GhillieFull_Desert05_DZ","GhillieFull_Desert06_DZ","GhillieFull_Desert07_DZ","GhillieFull_Desert08_DZ","GhillieFull_Snow01_DZ","GhillieFull_Snow02_DZ","GhillieFull_Snow03_DZ","GhillieFull_Snow04_DZ","GhillieFull_Snow05_DZ","GhillieFull_Urban01_DZ","GhillieFull_Wood01_DZ","GhillieFull_Wood02_DZ","GhillieFull_Wood03_DZ","GhillieFull_Wood04_DZ","GhillieFull_Wood05_DZ","GhillieFull_Wood06_DZ","GhillieFull_Wood07_DZ","GhillieFull_Wood08_DZ","GhillieFull_Wood09_DZ","GhillieFull_Wood10_DZ","GhillieFull_Wood11_DZ","GhillieFull_Wood12_DZ","GhillieFull_Wood13_DZ","GhillieFull_Wood14_DZ","GhillieFull_Wood15_DZ","GhillieFull_Wood16_DZ","GER_Soldier_EP1_des_DZ","GER_Soldier_TL_EP1_des_DZ","GER_Soldier_EP1_wdl_DZ","GER_Soldier_TL_EP1_wdl_DZ","Apo_Rifleman_01_DZ","Apo_Rifleman_02_DZ","Apo_Rifleman_03_DZ","Apo_Rifleman_04_DZ","Apo_Rifleman_05_DZ","Apo_Rifleman_06_DZ","SG_GRU_TL_DZ","SG_GRU_Scout_DZ","SG_GRU_Sniper_DZ","SG_GRU_Spotter_DZ","SG_GRU_TL_W_DZ","SG_GRU_Scout_W_DZ","SG_GRU_Assaultman_W_DZ","SG_GRU_Medic_W_DZ","SG_GRU_TL_D_DZ","SG_GRU_Scout_D_DZ","SG_GRU_Marksman_D_DZ","SG_GRU_Operator_D_DZ","SG_GRU_MG_D_DZ","CZ_Soldier805_DES_ACR_DZ","CZ_Soldier_805_Wdl_ACR_DZ","CZ_Soldier_Crew_Dst_ACR_DZ","CZ_Soldier_Officer_Wdl_ACR_DZ","CZ_Soldier_Recon_Wdl_ACR_DZ","CZ_Soldier_Spec1_Wdl_ACR_DZ","CZ_Soldier_Spec2_Wdl_ACR_DZ","CZ_Soldier_Spec3_Wdl_ACR_DZ","CZ_Soldier_Spec_Demo_Dst_ACR_DZ","CZ_Soldier_Sniper_ACR_DZ","CZ_Soldier_Light_Wdl_ACR_DZ","Firefighter1_DZ","Firefighter2_DZ","Firefighter3_DZ","Firefighter4_DZ","Firefighter5_DZ","Firefighter_Officer1_DZ","Firefighter_Officer2_DZ","Postman1_DZ","Postman2_DZ","Postman3_DZ","Postman4_DZ","SchoolTeacher_DZ","Gardener_DZ","RU_Policeman2_DZ","Hunter_DZ","Civilian1_DZ","Civilian2_DZ","Civilian3_DZ","Civilian4_DZ","Civilian5_DZ","Civilian6_DZ","Civilian7_DZ","Civilian8_DZ","Civilian9_DZ","Civilian10_DZ","Civilian11_DZ","Civilian12_DZ","Civilian13_DZ","Civilian14_DZ","Prisoner1_DZ","Prisoner2_DZ","Prisoner3_DZ","Reporter_DZ","MafiaBoss_DZ","Dealer_DZ","BusinessMan_DZ","CamoWinter1W_DZ","CamoWinter2W_DZ","OperatorW_DZ","GunnerW_DZ","DoctorW_DZ","WorkerW_DZ","PolicemanW_DZ","PriestW_DZ","HookerW1_DZ","HookerW2_DZ","HookerW3_DZ","HookerW4_DZ","HookerW5_DZ","SniperW_DZ","SniperBanditW_DZ","SniperWinterW_DZ","Sniper1W_DZ","TK_Soldier_Sniper_EP1W_DZ","CZ_Soldier_Sniper_EP1W_DZ","GhillieFull_Desert01W_DZ","GhillieFull_Desert02W_DZ","GhillieFull_Desert03W_DZ","GhillieFull_Desert04W_DZ","GhillieFull_Desert05W_DZ","GhillieFull_Desert06W_DZ","GhillieFull_Desert07W_DZ","GhillieFull_Desert08W_DZ","GhillieFull_Snow01W_DZ","GhillieFull_Snow02W_DZ","GhillieFull_Snow03W_DZ","GhillieFull_Snow04W_DZ","GhillieFull_Snow05W_DZ","GhillieFull_Urban01W_DZ","GhillieFull_Wood01W_DZ","GhillieFull_Wood02W_DZ","GhillieFull_Wood03W_DZ","GhillieFull_Wood04W_DZ","GhillieFull_Wood05W_DZ","GhillieFull_Wood06W_DZ","GhillieFull_Wood07W_DZ","GhillieFull_Wood08W_DZ","GhillieFull_Wood09W_DZ","GhillieFull_Wood10W_DZ","GhillieFull_Wood11W_DZ","GhillieFull_Wood12W_DZ","GhillieFull_Wood13W_DZ","GhillieFull_Wood14W_DZ","GhillieFull_Wood15W_DZ","GhillieFull_Wood16W_DZ","CZ_Soldier_Sniper_ACRW_DZ","Nac_SoldierW_DZ","gsc_military_helmet_wdlW_DZ","gsc_military_helmet_greyW_DZ","gsc_scientist1W_DZ","gsc_scientist2W_DZ","gsc_eco_stalker_mask_neutralW_DZ","gsc_eco_stalker_mask_fredW_DZ","gsc_eco_stalker_mask_dutyW_DZ","gsc_eco_stalker_mask_camoW_DZ"]; +AllPlayers = ["SurvivorW2_DZ","Survivor2_DZ","Sniper1_DZ","Soldier1_DZ","Camo1_DZ","BanditW1_DZ","Bandit1_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorWwinter_DZ","SurvivorW3_DZ","Bandit2_DZ","Bandit3_DZ","Bandit4_DZ","Bandit5_DZ","BanditW2_DZ","Soldier_Crew_PMC","Rocket_DZ","Rocker1_DZ","Rocker2_DZ","Rocker3_DZ","Rocker4_DZ","Priest_DZ","Functionary1_EP1_DZ","GUE_Commander_DZ","Ins_Soldier_GL_DZ","Haris_Press_EP1_DZ","Pilot_EP1_DZ","RU_Policeman_DZ","pz_policeman","pz_suit1","pz_suit2","pz_worker1","pz_worker2","pz_worker3","pz_doctor","pz_teacher","pz_hunter","pz_villager1","pz_villager2","pz_villager3","pz_priest","Soldier_TL_PMC_DZ","Soldier_Sniper_PMC_DZ","Soldier_Bodyguard_AA12_PMC_DZ","Drake_Light_DZ","CZ_Special_Forces_GL_DES_EP1_DZ","TK_INS_Soldier_EP1_DZ","TK_INS_Soldier_EP2_DZ","TK_INS_Soldier_EP3_DZ","TK_INS_Warlord_EP1_DZ","FR_OHara_DZ","FR_Rodriguez_DZ","CZ_Soldier_Sniper_EP1_DZ","Graves_Light_DZ","GUE_Soldier_MG_DZ","GUE_Soldier_Sniper_DZ","GUE_Soldier_Crew_DZ","GUE_Soldier_CO_DZ","GUE_Soldier_2_DZ","TK_Special_Forces_MG_EP1_DZ","TK_Soldier_Sniper_EP1_DZ","TK_Commander_EP1_DZ","RU_Soldier_Crew_DZ","INS_Lopotev_DZ","INS_Soldier_AR_DZ","INS_Soldier_CO_DZ","INS_Bardak_DZ","INS_Worker2_DZ","USMC_Soldier_Officer_DZ","USMC_Soldier_MG_DZ","USMC_Soldier_Pilot_DZ","FR_TL_DZ","FR_R_DZ","FR_Marksman_DZ","FR_Assault_R_DZ","RU_Soldier_DZ","RU_Soldier_Officer_DZ","RUS_Soldier1_DZ","RUS_Commander_DZ","MVD_Soldier_DZ","Ins_Soldier_2_DZ","Ins_Commander_DZ","Ins_Soldier_Crew_DZ","CDF_Soldier_DZ","Doctor_DZ","Assistant_DZ","Worker1_DZ","Worker3_DZ","Worker4_DZ","TK_CIV_Takistani01_EP1_DZ","TK_CIV_Takistani03_EP1_DZ","TK_CIV_Takistani04_EP1_DZ","TK_CIV_Takistani06_EP1_DZ","TK_INS_Soldier_AR_EP1_DZ","TK_GUE_Soldier_EP1_DZ","CZ_Soldier_SL_DES_EP1_DZ","US_Soldier_EP1_DZ","UN_CDF_Soldier_Guard_EP1_DZ","UN_CDF_Soldier_EP1_DZ","GER_Soldier_TL_EP1_DZ","BAF_Soldier_Officer_MTP_DZ","BAF_Soldier_N_MTP_DZ","FR_Sapper_DZ","CamoWinter1_DZ","CamoWinter2_DZ","SniperWinter_DZ","Nac_Soldier_DZ","Tamika_DZ","gsc_military_helmet_wdl_DZ","gsc_military_head_wdl_DZ","gsc_military_helmet_grey_DZ","gsc_military_head_grey_DZ","gsc_scientist1_DZ","gsc_scientist1_head_DZ","gsc_scientist2_DZ","gsc_scientist2_head_DZ","gsc_eco_stalker_mask_neutral_DZ","gsc_eco_stalker_head_neutral_DZ","gsc_eco_stalker_mask_fred_DZ","gsc_eco_stalker_head_fred_DZ","gsc_eco_stalker_mask_duty_DZ","gsc_eco_stalker_head_duty_DZ","gsc_eco_stalker_mask_camo_DZ","gsc_eco_stalker_head_camo_DZ","GhillieFull_Desert01_DZ","GhillieFull_Desert02_DZ","GhillieFull_Desert03_DZ","GhillieFull_Desert04_DZ","GhillieFull_Desert05_DZ","GhillieFull_Desert06_DZ","GhillieFull_Desert07_DZ","GhillieFull_Desert08_DZ","GhillieFull_Snow01_DZ","GhillieFull_Snow02_DZ","GhillieFull_Snow03_DZ","GhillieFull_Snow04_DZ","GhillieFull_Snow05_DZ","GhillieFull_Urban01_DZ","GhillieFull_Wood01_DZ","GhillieFull_Wood02_DZ","GhillieFull_Wood03_DZ","GhillieFull_Wood04_DZ","GhillieFull_Wood05_DZ","GhillieFull_Wood06_DZ","GhillieFull_Wood07_DZ","GhillieFull_Wood08_DZ","GhillieFull_Wood09_DZ","GhillieFull_Wood10_DZ","GhillieFull_Wood11_DZ","GhillieFull_Wood12_DZ","GhillieFull_Wood13_DZ","GhillieFull_Wood14_DZ","GhillieFull_Wood15_DZ","GhillieFull_Wood16_DZ","GER_Soldier_EP1_des_DZ","GER_Soldier_TL_EP1_des_DZ","GER_Soldier_EP1_wdl_DZ","GER_Soldier_TL_EP1_wdl_DZ","Apo_Rifleman_01_DZ","Apo_Rifleman_02_DZ","Apo_Rifleman_03_DZ","Apo_Rifleman_04_DZ","Apo_Rifleman_05_DZ","Apo_Rifleman_06_DZ","SG_GRU_TL_DZ","SG_GRU_Scout_DZ","SG_GRU_Sniper_DZ","SG_GRU_Spotter_DZ","SG_GRU_TL_W_DZ","SG_GRU_Scout_W_DZ","SG_GRU_Assaultman_W_DZ","SG_GRU_Medic_W_DZ","SG_GRU_TL_D_DZ","SG_GRU_Scout_D_DZ","SG_GRU_Marksman_D_DZ","SG_GRU_Operator_D_DZ","SG_GRU_MG_D_DZ","CZ_Soldier805_DES_ACR_DZ","CZ_Soldier_805_Wdl_ACR_DZ","CZ_Soldier_Crew_Dst_ACR_DZ","CZ_Soldier_Officer_Wdl_ACR_DZ","CZ_Soldier_Recon_Wdl_ACR_DZ","CZ_Soldier_Spec1_Wdl_ACR_DZ","CZ_Soldier_Spec2_Wdl_ACR_DZ","CZ_Soldier_Spec3_Wdl_ACR_DZ","CZ_Soldier_Spec_Demo_Dst_ACR_DZ","CZ_Soldier_Sniper_ACR_DZ","CZ_Soldier_Light_Wdl_ACR_DZ","Firefighter1_DZ","Firefighter2_DZ","Firefighter3_DZ","Firefighter4_DZ","Firefighter5_DZ","Firefighter_Officer1_DZ","Firefighter_Officer2_DZ","Postman1_DZ","Postman2_DZ","Postman3_DZ","Postman4_DZ","SchoolTeacher_DZ","Gardener_DZ","RU_Policeman2_DZ","Hunter_DZ","Civilian1_DZ","Civilian2_DZ","Civilian3_DZ","Civilian4_DZ","Civilian5_DZ","Civilian6_DZ","Civilian7_DZ","Civilian8_DZ","Civilian9_DZ","Civilian10_DZ","Civilian11_DZ","Civilian12_DZ","Civilian13_DZ","Civilian14_DZ","Prisoner1_DZ","Prisoner2_DZ","Prisoner3_DZ","Reporter_DZ","MafiaBoss_DZ","Dealer_DZ","BusinessMan_DZ","CamoWinter1W_DZ","CamoWinter2W_DZ","OperatorW_DZ","GunnerW_DZ","DoctorW_DZ","WorkerW_DZ","PolicemanW_DZ","PriestW_DZ","HookerW1_DZ","HookerW2_DZ","HookerW3_DZ","HookerW4_DZ","HookerW5_DZ","SniperW_DZ","SniperBanditW_DZ","SniperWinterW_DZ","Sniper1W_DZ","TK_Soldier_Sniper_EP1W_DZ","CZ_Soldier_Sniper_EP1W_DZ","GhillieFull_Desert01W_DZ","GhillieFull_Desert02W_DZ","GhillieFull_Desert03W_DZ","GhillieFull_Desert04W_DZ","GhillieFull_Desert05W_DZ","GhillieFull_Desert06W_DZ","GhillieFull_Desert07W_DZ","GhillieFull_Desert08W_DZ","GhillieFull_Snow01W_DZ","GhillieFull_Snow02W_DZ","GhillieFull_Snow03W_DZ","GhillieFull_Snow04W_DZ","GhillieFull_Snow05W_DZ","GhillieFull_Urban01W_DZ","GhillieFull_Wood01W_DZ","GhillieFull_Wood02W_DZ","GhillieFull_Wood03W_DZ","GhillieFull_Wood04W_DZ","GhillieFull_Wood05W_DZ","GhillieFull_Wood06W_DZ","GhillieFull_Wood07W_DZ","GhillieFull_Wood08W_DZ","GhillieFull_Wood09W_DZ","GhillieFull_Wood10W_DZ","GhillieFull_Wood11W_DZ","GhillieFull_Wood12W_DZ","GhillieFull_Wood13W_DZ","GhillieFull_Wood14W_DZ","GhillieFull_Wood15W_DZ","GhillieFull_Wood16W_DZ","CZ_Soldier_Sniper_ACRW_DZ","Nac_SoldierW_DZ","gsc_military_helmet_wdlW_DZ","gsc_military_helmet_greyW_DZ","gsc_scientist1W_DZ","gsc_scientist2W_DZ","gsc_eco_stalker_mask_neutralW_DZ","gsc_eco_stalker_mask_fredW_DZ","gsc_eco_stalker_mask_dutyW_DZ","gsc_eco_stalker_mask_camoW_DZ"]; // Epoch Additions dayz_activeInvites = []; DZE_DoorsLocked = ["Land_DZE_GarageWoodDoorLocked","Land_DZE_LargeWoodDoorLocked","Land_DZE_WoodDoorLocked","CinderWallDoorLocked_DZ","CinderWallDoorSmallLocked_DZ","WoodenGate_1_DZ","WoodenGate_2_DZ","WoodenGate_3_DZ","WoodenGate_4_DZ","Land_DZE_WoodGateLocked","CinderGateLocked_DZ","Metal_DrawbridgeLocked_DZ","Land_DZE_WoodOpenTopGarageLocked","CinderGarageOpenTopLocked_DZ","DoorLocked_DZ","CinderWallWindowLocked_DZ","CinderDoorHatchLocked_DZ","Concrete_Bunker_Locked_DZ"]; -DZE_isWreckBuilding = ["Land_wood_floor_2x2_wreck","Land_metal_floor_2x2_wreck","Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"]; +DZE_isWreckBuilding = ["Land_wreck_metal_floor","Land_wood_wreck_half","Land_wood_floor_2x2_wreck","Land_metal_floor_2x2_wreck","Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"]; DZE_LockedStorage = ["VaultStorageLocked","VaultStorage2Locked","LockboxStorageLocked","LockboxStorage2Locked","LockboxStorageWinterLocked","LockboxStorageWinter2Locked","TallSafeLocked"]; DZE_UnLockedStorage = ["VaultStorage","VaultStorage2","LockboxStorage","LockboxStorage2","LockboxStorageWinter","LockboxStorageWinter2","TallSafe"]; DZE_isNewStorage = ["OutHouse_DZ","Wooden_shed_DZ","Wooden_shed2_DZ","WoodShack_DZ","WoodShack2_DZ","StorageShed_DZ","StorageShed2_DZ","GunRack_DZ","GunRack2_DZ","WoodCrate_DZ","WoodCrate2_DZ","Advanced_WorkBench_DZ","CookTripod_DZ","Stoneoven_DZ","Commode_DZ","Wardrobe_DZ","Fridge_DZ","Washing_Machine_DZ","Server_Rack_DZ","ATM_DZ","Armchair_DZ","Sofa_DZ","Arcade_DZ","Vendmachine1_DZ","Vendmachine2_DZ","StorageCrate_DZ","CamoStorageCrate_DZ"]; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 3966d46fe..349218348 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -1032,11 +1032,15 @@ Починить топор Beil reparieren - + + Sharpen Hatchet + Beil schleifen + + Sharpen Knife Заточить нож Messer schleifen - + Fix Pickaxe Починить кирку @@ -1858,114 +1862,6 @@ Pro údržbu budovy schází %1. %1 fehlt, um das Objekt zu warten. - - Attach to M16A4 - Установить на M16A4 - Připevnit k M16A4 - An M16A4 anbringen - - - Attach to M16A2 - Установить на M16A2 - Připevnit k M16A2 - An M16A2 anbringen - - - Attach to Sa-58 - Установить на Sa-58 - Připevnit k Sa-58 - An Sa-58 anbringen - - - Attach to M4A1 - Установить на M4A1 - Připevnit k M4A1 - An M4A1 anbringen - - - Attach belt - Закрепить патронташ - Připevnit pás - Gurt anbringen - - - Attach CCO - Установить CCO - Připevnit CCO - CCO anbringen - - - Attach to Crossbow - Установить на арбалет - Připevnit ke kuši - An Armbrust anbringen - - - Attach flashlight - Установить фонарь - Připevnit baterku - Taschenlampe anbringen - - - Attach to AK-74 - Установить на AK-74 - Připevnit k AK-74 - An AK-74 anbringen - - - Attach to L85A2 - Установить на L85A2 - Připevnit k L85A2 - An L85A2 anbringen - - - Attach to M8 - Установить на M8 - Připevnit k M8 - An M8 anbringen - - - Attach to SCAR - Установить на SCAR - Připevnit k SCAR - An SCAR anbringen - - - Attach Scope - Установить прицел - Připevnit puškohled - Zielfernrohr anbringen - - - Attach to Makarov - Установить на Макаров - Připevnit k Makarov - An Makarov anbringen - - - Attach to M9 - Установить на M9 - Připevnit k M9 - An M9 anbringen - - - Attach to Bizon - Установить на Бизон - Připevnit k Bizon - An Bizon anbringen - - - Attach to MP5 - Установить на MP5 - Připevnit k MP5 - An MP5 anbringen - - - Attach to M14 - Установить на M14 - Připevnit k M14 - An M14 anbringen - Brace Leg Зафиксировать ногу @@ -2573,17 +2469,17 @@ Einige steril verpackte Mullbinden. - Empty Barrel - Leeres Fass - Ствол - Barril Vacío - Tonneau vide - Prázdný barel + Barrel (empty) + Fass (leer) + бочка (пустая) + Barril (vacío) + Tonneau (vide) + Barel (prázdný) A barrel that has been emptied of its content Ein Fass, welches bereits geleert wurde. - Ствол без обвеса. + бочка без обвеса. Un barril que su contenido fue descargado Un tonneau vidé de son contenu Sud, který někdo vyprázdnil. @@ -3011,155 +2907,11 @@ Du fil Kratší provázek - - [A] ACOG (M16) - [М] ACOG (M16) - ACG (Accesorio) - ACG (Fixation) - Příslušenství - ACOG pro M16 - ACOG-Zielfernrohr - - - ACOG attachment that can be attached to M16A4. - ACOG - стандартный оптический прицел для стрельбы на среднюю дальность. - Mira ACG (Accesorio) - ACG (Fixation) - Advanced Combat Optics Gunsight, používá se pro vylepšení M16A4. - Advanced Combat Optics Gunsight, ein Zielfernrohr amerikanischer Bauart. - - - [A] ACOG (Sa-58) - [М] ACOG (Sa-58) - ACG (Accesorio) - ACG (Fixation) - Příslušenství - ACOG pro Sa-58 - ACOG-Zielfernrohr - - - ACOG attachment that can be attached to Sa-58. - ACOG - стандартный оптический прицел для стрельбы на среднюю дальность. - Mira ACG (Accesorio) - ACG (Fixation) - Advanced Combat Optics Gunsight, používá se pro vylepšení Sa-58. - Advanced Combat Optics Gunsight, ein Zielfernrohr amerikanischer Bauart. - - - [A] Suppressor - [М] Глушитель - Silenciador (Accesorio) - Silencieux (Fixation) - Příslušenství - Tlumič - Schalldämpfer - - - Suppressor Attachment - Приспособление для бесшумной стрельбы. - Silenciador (Accesorio) - Silencieux (Fixation) - Tlumič pro střelné zbraně, používá se pro jejich vylepšení. - Ein Schalldämpfer für Schusswaffen. - Remove Suppressor Снять глушитель Schalldämpfer entfernen - - [A] PSO - [М] ПСО - PSO (Accesorio) - PSO (Fixation) - Příslušenství - PSO - PSO-Zielfernrohr - - - PSO ATTACHMENT - ПСО-1 (Прицел снайперский оптический) — один из основных прицелов советского и российского снайперского вооружения. - Mira PSO (Accesorio) - PSO (Fixation) - Ruský zaměřovač PSO-1, používá se pro vylepšení zbraní. - Ein russisches Zielfernrohr vom Typ PSO-1. - - - [A] KOBRA - [М] Кобра - KOBRA (Accesorio) - KOBRA (Fixation) - Příslušenství - KOBRA - KOBRA Rotpunktvisier - - - Can be mounted on the AK 74. - Электронно-коллиматорный прицел «Кобра». - Mira KOBRA (Accesorio) - KOBRA (Fixation) - Ruský zaměřovač KOBRA, používá se pro vylepšení AK-74. - Russisches Rotpunktvisier vom Typ KOBRA. - - - [A] GL - [М] Подствольник - GL (Accesorio) - GL (Fixation) - Příslušenství - granátomet - GL-Visier - - - A grenade launcher to upgrade your weapons. - Подствольный гранатомёт — гранатомёт, выполненный в виде дополнительного узла, устанавливаемого на ручное оружие, обычно — на автомат. - Lanzador de Granadas (Accesorio) - GL (Fixation) - Podvěsný granátomet, používá se pro vylepšení zbraní. - Russiches Grünpunktvisier. - - - [A] Camo (M4) - [М] Камуфляж (M4) - Camuflaje (Accesorio) - Camouflage (Fixation) - Příslušenství - kamufláž pro M4 - Tarnmaterial - - - Camo paint for M4A1 with AIM. - Камуфляж для M4A1 с ССО. - Camuflaje para armas (Accesorio) - Camouflage (Fixation) - Používá se pro vylepšení M4A1 s CCO. - Material zur Tarnung einer M4A1 mit AIM. - - - [A] AIM (M4) - [М] AIM (M4) - AIM (Accesorio) - AIM (Fixation) - Příslušenství - CCO pro M4 - CCO Rotpunktvisier - - - AIM attachment that can be attached to M4A1. - Прицел AIM для M4. - Mira AIM (Accesorio) - AIM (Fixation) - Kolimátor Close Combat Optics, používá se pro vylepšení M4A1. - Close Combat Optics (CCO), Rotpunktvisier amerikanischer Bauart für die M4. - - - [A] AIM (Sa-58) - [М] AIM (Sa-58) - AIM (Accesorio) - AIM (Fixation) - Příslušenství - CCO pro Sa-58 - CCO Rotpunktvisier - - - AIM attachment that can be attached to Sa-58. - Прицел AIM для Sa-58. - Mira AIM (Accesorio) - AIM (Fixation) - Kolimátor Close Combat Optics, používá se pro vylepšení Sa-58. - Close Combat Optics, Rotpunktvisier amerikanischer Bauart für die Sa-58. - [A] Ammo belt [М] Патронташ @@ -3172,42 +2924,6 @@ Nábojový pás, používá se pro vylepšení zbraní. Munitionsgürtel für schnelleres Nachladen. - - [A] CCO RedDot - [М] CCO - Příslušenství - CCO - [E] CCO Rotpunktvisier - - - CCO RedDot Attachment - Прицел CCO - оптический прицел для стрельбы на короткие дистанции. - Kolimátor Close Combat Optics, používá se pro vylepšení zbraní. - Close Combat Optics, Rotpunktvisier amerikanischer Bauart. - - - [A] Crossbow CCO - [М] CCO (арбалет) - Příslušenství - CCO pro kuši - [E] Armbrust CCO Rotpunktvisier - - - Fits a Compound Crossbow. - CCO прицел для арбалета. - Kolimátor Close Combat Optics, používá se pro vylepšení kuše. - CCO Rotpunktvisier für eine Armbrust. - - - [A] Flashlight - [М] Фонарик - Příslušenství - baterka - [E] Taschenlampen-Erweiterung - - - FlashLight Attachment. - Фонарик на оружие. - Baterka, používá se pro vylepšení zbraní. - Taschenlampen-Erweiterung für Schusswaffen. - [A] Scoped Sight [М] Прицел @@ -3220,68 +2936,6 @@ Puškohled, používá se pro vylepšení zbraní. Zielfernrohr-Erweiterung für Schusswaffen. - - - [A] Silencer (M9) - [М] 9мм глушитель (М9) - Příslušenství - tlumič pro M9 - [E] M9 Schalldämpfer - - - A silencer that can be attached to M9. - Прибор бесшумной стрельбы для М9. - Tlumič, používá se pro vylepšení pistole M9. - Ein Schalldämpfer, der an eine M9 angebracht werden kann. - - - [A] Silencer (M4A1) - [М] Глушитель (M4А1) - Příslušenství - tlumič pro M4A1 - [E] M4A1 Schalldämpfer - - - A silencer that can be attached to an M4A1 that already has AIM and camo. - Прибор бесшумной стрельбы для M4A1. - Tlumič, používá se pro vylepšení M4A1, jež již má CCO a kamufláž. - Ein Schalldämpfer, der an eine M4A1 angebracht werden kann. - - - - [A] Silencer (SCAR) - [М] Глушитель (SCAR) - Příslušenství - tlumič pro SCAR - [E] SCAR Schalldämpfer - - - A silencer that can be attached to SCAR CQC. - Прибор бесшумной стрельбы для SCAR CQC. - Tlumič, používá se pro vylepšení SCAR CQC. - Ein Schalldämpfer, der an eine SCAR CQC angebracht werden kann. - - - [A] Silencer (MP5) - [М] 9мм глушитель (MP5) - Příslušenství - tlumič pro MP5 - [E] MP5 Schalldämpfer - - - A silencer that can be attached to MP5A5. - Прибор бесшумной стрельбы для MP5A5. - Tlumič, používá se pro vylepšení samopalu MP5A5. - Ein Schalldämpfer, der an eine MP5A5 angebracht werden kann. - - - [A] Scope (M14) - [М] Прицел (M14) - Příslušenství - dalekohled pro M14 - [E] M14 Zielfernrohr - - - A sniper scope that can be attached to M14 AIM. - Прицел, который можно установить на M14. - Puškohled, používá se pro vylepšení pušky M14 AIM. - Ein Scharfschützen-Zielfernrohr für die M14 AIM. - Create Stash Lagergrube ausheben @@ -3290,7 +2944,7 @@ Créer une planque Postavit skrýš - + Entrenching Tool Klappspaten Сапёрная лопатка @@ -3298,12 +2952,12 @@ Outil de tranchée Polní lopatka - + Broken Entrenching Tool Kaputter Klappspaten Сломанная сапёрная лопатка - + Collapsible spade used together with the engineering backpack to create field defences. Ein Klappspaten, welcher beim Verschanzen und für viele Bautätigkeiten benötigt wird. Сапёрная лопатка используется вместе с инженерным ранцем для создания оборонительных сооружений. @@ -3311,12 +2965,12 @@ Une pelle démontable permettant de construire des éléments de défense. Polní lopatka se používá při stavbě obranných postavení. Pokud jste SpecNaz, umíte s ní zabít. - + Broken collapsible spade that must be repaired. Ein kaputter Klappspaten, welcher repariert werden muss. Сломанная сапёрная лопатка, которую необходимо починить. - + Shovel Schaufel Лопата @@ -3324,7 +2978,7 @@ Pelle Lopata - + A shovel is a tool for digging, lifting, and moving bulk materials. Eine Schaufel, mit welcher man Löcher graben kann. Лопата — ручной инструмент для работы (копание, расчистка, перенос) с грунтом. @@ -3332,17 +2986,17 @@ Oui une pelle c'est fait pour creuser. Lopata se používá hlavně pro kopání děr. - + Broken Shovel Kaputte Schaufel Сломанная лопата - + Too much force has broken this Shovel. Hopefully you find something to repair it. Rohe Kraft hat diese Schaufel zerstört. Hoffentlich findest du etwas zum Reparieren. Слишком много сил было приложено к этой лопате. Возможно вы найдёте что-нибудь, чтобы её починить. - + Toolbox Werkzeugkasten Набор инструментов @@ -3350,12 +3004,12 @@ Boîte à outils Sada nástrojů - + Broken Toolbox Kaputter Werkzeugkasten Сломанный набор инструментов - + Toolbox that can be used for repairing damaged vehicles and equipment. Eine Kiste mit Werkzeugen, welche zum Reparieren beschädigter Fahrzeuge und Ausrüstung verwendet werden können. Набор инструментов используется для ремонта повреждённой техники и снаряжения, а также установки укреплений. @@ -3363,7 +3017,7 @@ Boîte à outils servant à réparer le matériel et les véhicules. Sada nástrojů se používá pro opravy poškozených vozidel a vybavení. - + A broken toolbox that must be repaired. Ein kaputter Werkzeugkasten, welcher repariert werden muss. Сломанный набор инструментов, который необходимо починить. @@ -3392,7 +3046,7 @@ Il me semble qu'il manque un kit de transfusion. Zdá se, že chybí transfúzní souprava. - + Box of Matches Streichhölzer Коробок спичек @@ -3440,7 +3094,15 @@ Boîte d'allumettes (1 reste) Krabička zápalek (1 zbývající) - + + Box of safety matches for starting a fire under controlled conditions. + Eine Schachtel Streichhölzer. Von Kindern fernhalten. + Коробок спичек используется для разведения огня. + Una caja de fósforos de seguridad para iniciar fuego bajo condiciones controladas. + Boîte d'allumettes suédoises permettant d'allumer un feu. + Balíček bezpečnostních zápalek pro zapálení ohně. Udržujte z dosahu dětí. + + Box of safety matches for starting a fire under controlled conditions. 5 Matches left. Коробок с пятью спичками. 5 Partidos de Izquierda. Caja de seguridad de juegos compatibles para iniciar un incendio en condiciones controladas. @@ -3448,7 +3110,7 @@ Zbývá 5 zápalek. Udržujte z dosahu dětí. Eine Schachtel Streichhölzer mit 5 übrigen Streichhölzern. - + Box of safety matches for starting a fire under controlled conditions. 4 Matches left. Коробок с четырьмя спичками. 4 Partidos de Izquierda. Caja de seguridad de juegos compatibles para iniciar un incendio en condiciones controladas. @@ -3456,7 +3118,7 @@ Zbývají 4 zápalky. Udržujte z dosahu dětí. Eine Schachtel Streichhölzer mit 4 übrigen Streichhölzern. - + Box of safety matches for starting a fire under controlled conditions. 3 Matches left. Коробок с тремя спичками. 3 Partidos de Izquierda. Caja de seguridad de juegos compatibles para iniciar un incendio en condiciones controladas. @@ -3464,7 +3126,7 @@ Zbývají 3 zápalky. Udržujte z dosahu dětí. Eine Schachtel Streichhölzer mit 3 übrigen Streichhölzern. - + Box of safety matches for starting a fire under controlled conditions. 2 Matches left. Коробок с парой спичек. 2 Partidos de Izquierda. Caja de seguridad de juegos compatibles para iniciar un incendio en condiciones controladas. @@ -3472,7 +3134,7 @@ Zbývají 2 zápalky. Udržujte z dosahu dětí. Eine Schachtel Streichhölzer mit 2 übrigen Streichhölzern. - + Box of safety matches for starting a fire under controlled conditions. 1 Match left. Одна спичка в коробке. 1 Partidos de Izquierda. Caja de seguridad de juegos compatibles para iniciar un incendio en condiciones controladas. @@ -3480,15 +3142,15 @@ Zbývá 1 zápalka. Udržujte z dosahu dětí. Eine Schachtel Streichhölzer mit 1 übrigen Streichholz. - - Empty Box of Matches - Leere Schachtel Streichhölzer + + Box of Matches (empty) + Schachtel Streichhölzer (leer) Пустой коробок спичек Prázdná krabička zápalek Caja vacía de Resultados Boîte d'allumettes vide - + Empty Box of safety matches. Eine Schachtel Streichhölzer. Sie ist bereits leer. Абсолютно пустой коробок спичек. Выбрасывайте! @@ -3496,15 +3158,23 @@ Caja vacía de Resultados Boîte d'allumettes vide - - Box of safety matches for starting a fire under controlled conditions. - Eine Schachtel Streichhölzer. Von Kindern fernhalten. - Коробок спичек используется для разведения огня. - Una caja de fósforos de seguridad para iniciar fuego bajo condiciones controladas. - Boîte d'allumettes suédoises permettant d'allumer un feu. - Balíček bezpečnostních zápalek pro zapálení ohně. Udržujte z dosahu dětí. + + Box of Matches (wet) + Streichholzschachtel (nass) + Коробка промокших спичек + Caja de Fósforos Mojada + Boîte d'Allumettes mouillées + Krabička mokrých zápalek - + + Box of wet matches. + Eine Schachtel Sicherheitszündhölzer. Die Schachtel ist nass geworden und unbrauchbar. + Коробка промокших спичек. + Caja de fósforos mojada. + Boîte d'Allumettes mouillées. + Krabička plná mokrých zápalek. + + Hunting Knife Jagdmesser Охотничий нож @@ -3512,7 +3182,7 @@ Couteau de chasseur Lovecký nůž - + A knife used during hunting for preparing the game to be used as food by cutting up the meat. Ein Jadgmesser, welches zum Ausnehmen von erlegtem Wild verwendet werden kann. Нож можно использовать для разделки туш животных. @@ -3520,37 +3190,53 @@ Un couteau servant à dépecer le gibier. Nůž, který se používá pro kuchání zvířat. - + Your knife appears to be too blunt. (Maybe 5 uses left). Похоже, нож тупится. Осталось 5 использований. Tento nůž je tupý. Půjde ho použít ještě asi tak pětkrát. - Dein Messer scheint stumpf zu werden. (Vielleicht noch 5 Anwendungen möglich) + Dein Jagdmesser scheint stumpf zu werden. (Vielleicht noch 5 Anwendungen möglich) - + Your knife appears to be too blunt. (Maybe 4 uses Left). Похоже, нож тупится. Осталось 4 использования. Tento nůž je tupý. Půjde ho použít ještě asi tak čtyřikrát. - Dein Messer scheint stumpf zu werden. (Vielleicht noch 4 Anwendungen möglich) + Dein Jagdmesser scheint stumpf zu werden. (Vielleicht noch 4 Anwendungen möglich) - + Your knife appears to be too blunt. (Maybe 3 uses Left). Похоже, нож тупится. Осталось 3 использования. Tento nůž je tupý. Půjde ho použít ještě asi tak třikrát. - Dein Messer scheint stumpf zu werden. (Vielleicht noch 3 Anwendungen möglich) + Dein Jagdmesser scheint stumpf zu werden. (Vielleicht noch 3 Anwendungen möglich) - + Your knife appears to be too blunt. (Maybe 2 uses Left). Похоже, нож тупится. Осталось пара использований. Tento nůž je tupý. Půjde ho použít ještě asi tak dvakrát. - Dein Messer ist fast stumpf. (Vielleicht noch 2 Anwendungen möglich) + Dein Jagdmesser ist fast stumpf. (Vielleicht noch 2 Anwendungen möglich) - + Your Knife appears to be too blunt. (Maybe 1 uses Left). Похоже, нож тупится. Можно воспользоваться ещё разок. Tento nůž je tupý. Půjde ho použít ještě asi tak jednou. - Dein Messer ist so gut wie stumpf. (Vielleicht noch 1 Anwendung möglich) + Dein Jagdmesser ist so gut wie stumpf. (Vielleicht noch 1 Anwendung möglich) - + + Hunting Knife (dull) + Jagdmesser (stumpf) + Затупившийся нож + Cuchillo Desafilado + Couteau émoussé + Tupý nůž + + + Your Knife appears to be too dull. + Dein Jagdmesser ist durch häufigen Gebrauch stumpf geworden. + Ваш нож слишком туп, чтобы его использовать. + Tu cuchillo parece estar muy desafilado. + Votre couteau semble trop émoussé + Vypadá to, že tento nůž je příliš tupý. + + Flashlight Taschenlampe Фонарик @@ -3558,12 +3244,12 @@ Lampe torche Baterka - + Broken Flashlight Kaputte Taschenlampe Сломанный фонарик - + Battery-powered Flashlight<br/>Batteries: 2 x D-size Batteriebetriebene Taschenlampe, benötigte Batterien: 2x R20/D Фонарик питается двумя батарейками типа D. @@ -3571,12 +3257,12 @@ Lampe torche à piles.<br/>Piles: 2 x Type D Klasická baterka na baterie<br/>Baterie: 2xD - + A broken Battery-powered Flashlight that must be repaired. Eine kaputte batteriebetriebene Taschenlampe, welche repariert werden muss. Сломанный фонарик на батарейках, который необходимо починить. - + Flashlight (Military) Militärtaschenlampe Армейский фонарик @@ -3584,12 +3270,12 @@ Lampe torche (Mil.) Baterka (Vojenská) - + Broken Flashlight (Military) Kaputte Militärtaschenlampe Сломанный армейский фонарик - + Military Red-light Battery-powered Flashlight<br/>Batteries: 2 x D-size Militärische, batteriebetriebene Rotlichtlampe, benötigte Batterien: 2x R20/D Армейский фонарик светит красным светом и питается двумя батарейками типа D. @@ -3597,12 +3283,12 @@ Lampe torche militaire à piles, lumière rouge.<br/>Piles: 2 x Type D Vojenská baterka s červeným světlem na baterie<br/>Baterie: 2xD - + A broken military Red-light that must be repaired. Eine kaputte militärische, batteriebetriebene Rotlichtlampe, welche repariert werden muss. Сломанный армейский фонарик на батарейках, который необходимо починить. - + Bandage Verbandszeug Бинт @@ -3610,7 +3296,7 @@ Pansement Obvaz - + Joint Services standard first aid dressing. Used to stop bleeding of wounds. Militärisches Verbandszeug, NATO-Standard. Wird zum Stillen von blutenden Wunden verwendet. Упаковка армейских бинтов. Используются для перевязки ран. @@ -3618,7 +3304,7 @@ Pansement de premier secours, norme OTAN. Utilisé pour stopper une hémorragie. Obvaz podle standartů NATO. Slouží pro zastavení krvácení. - + Fueltank Parts Treibstofftankteile Бензобак @@ -3626,7 +3312,7 @@ Réservoir Palivová nádrž - + An old fueltank that could be used to repair a vehicle with a broken one. Ein alter Treibstofftank, mit dem eventuell der kaputte Tank eines Fahrzeugs repariert werden könnte. Бензобак, запчасти из которого можно использовать для ремонта техники. @@ -3634,7 +3320,7 @@ Un réservoir d'occasion pouvant servir de pièce de rechange pour un réparer un véhicule. Náhradní díly pro opravu palivové nádrže u vašeho vozidla. - + Car Wheel Reifen Колесо @@ -3642,7 +3328,7 @@ Roue Kolo auta - + An old Car Wheel that could be used to repair a vehicle with a broken one. Ein alter Reifen, welcher eventuell den kaputten Reifen eines Fahrzeugs ersetzen könnte. Колесо, которое можно использовать для починки одного колеса на автомобиле. @@ -3650,7 +3336,7 @@ Une roue d'occasion pouvant servir de pièce de rechange pour un réparer un véhicule. Staré kolo, které se hodí, pokud jste zrovna píchli. - + Scrap Metal Metallteile Металлолом @@ -3658,7 +3344,7 @@ Bouts de métal Kovový šrot - + Scrap metal and assorted mechanical spares. Useful for repairing vehicles and equipment. Metallteile und verschiedene mechanische Ersatzteile. Sie können nützlich beim Reparieren von Fahrzeugen und Ausrüstung sein. Металлолом, используемый для починки оборудования или корпуса техники. @@ -3666,7 +3352,7 @@ Divers bouts de métal pouvant servir de pièce de rechange pour un réparer un véhicule. Různé kovové a mechanické díly. Užitečné pro opravu libovolného vozidla. - + Engine Parts Motorteile Двигатель @@ -3674,7 +3360,7 @@ Bloc moteur Díly motoru - + Engine components with oil and lubricant. Everything you would need to repair an engine. Motorteile mit Öl und Schmiere. Alles, was man zum Reparieren eines Motors braucht ist dabei. Двигатель, запчасти из которого используются для ремонта двигателей в технике. @@ -3682,7 +3368,7 @@ Un moteur ainsi que de l'huile et du lubrifiant. Tout le nécessaire pour changer un moteur. Náhraní díly motoru včetně oleje. Vše, co je potřeba k tomu, aby váš motor zase běžel jako hodinky. - + Windscreen Glass Autoglas Автомобильное стекло @@ -3690,7 +3376,7 @@ Vitre Autosklo - + Brand new auto glass. Could be used to repair glass on a vehicle. Gut erhaltenes Autoglas, welches zum Reparieren von Fahrzeugscheiben verwendet werden kann. Новое автомобильное стекло в упаковке. Его можно установить на технику. @@ -3698,7 +3384,7 @@ Vitre neuve. Permet de réparer un véhicule. Zcela nové autosklo. Lze použít pro opravu vozidla. - + Main Rotor Assembly Hauptrotorteile Ротор несущего винта @@ -3706,7 +3392,7 @@ Rotor d'hélico Hlavní rotor - + Rotor Shaft Hydraulics for a helicopter. Can be used to replace broken rotor shafts in helicopters. Hydrauliksysteme für einen Helikopter, welche zum Reparieren kaputter Rotorwellen in Helikoptern verwendet werden können. Набор запчастей для починки лопастей винтов и вала главного ротора для вертолёта. @@ -3714,7 +3400,7 @@ Colonne de rotor d'hélicoptère. Permet de réparer un hélicoptère qui a un de ses rotors cassé. Hlavní rotor pro vrtulníky. Lze použít při opravě rotoru libovolného vrtulníku. - + Water Bottle Wasserflasche Бутылка (вода) @@ -3722,7 +3408,7 @@ Bouteille Láhev s vodou - + A bottle of water that has been filled and can be consumed. Eine Flasche gefüllt mit Trinkwasser. Наполненная водой пластиковая бутылка. Вода сомнительного качества. @@ -3730,7 +3416,7 @@ Bouteille (pleine) Plná láhev vody, kterou lze vypít. - + Water Bottle (Empty) Wasserflasche (Leer) Бутылка (пустая) @@ -3743,7 +3429,7 @@ Опустошить Ausleeren - + A bottle of water that is empty. It might be useful to fill it with water again. Eine leere Wasserflasche. Sie könnte nützlich sein, um sie wieder mit Wasser zu füllen. Пустая бутылка, которую можно наполнить водой. @@ -3751,7 +3437,7 @@ Une Bouteille vide. Il serait bien de la remplir à nouveau. Prázdná láhev na vodu. Může být znovu naplněna. - + Epi-Pen Epinephrin-Autoinjektor Адреналин @@ -3759,7 +3445,7 @@ Adrénaline Adrenalin - + Epinephrine Autoinjector. Used for intramuscular injection to revive unconscious casualties. Epinephrin-Autoinjektor zur intramuskulären Injektion bei Bewusstlosigkeit. Инъекция адреналина для приведения в чувство людей без сознания. @@ -3767,7 +3453,7 @@ Adrénaline en auto-injection intra-musculaire "Epipen". Permet de se remettre d'une perte de conscience. Injekce adrenalinu (epinefrinu). Používá se pro probrání osoby z bezvědomí. - + Morphine Auto-Injector Morphin-Autoinjektor Морфий @@ -3775,7 +3461,7 @@ Morphine Morfium - + Morphine Autoinjector. Used for intramuscular injection to manage severe pain such as those from fractures. Morphin-Autoinjektor zur intramuskulären Injektion bei extremen Schmerzen, etwa von Knochenbrüchen. Морфий используется для местного обезболивания при переломах. @@ -3783,7 +3469,7 @@ Morphine en auto-injection intra-musculaire. Permet de traiter les douleurs aiguees, comme les fractures. Injekce morfia, kterou lze použít proti silné bolesti jako jsou např. zlomené kosti. Pozor na závislost. - + Blood Bag Blutkonserve Пакет крови @@ -3791,7 +3477,7 @@ Poche de sang Krevní vak - + Bag of blood used for administering a Blood transfusion. Eine Blutkonserve für eine Bluttransfusion. Пакет крови используется для переливания при кровопотерях. @@ -3799,7 +3485,7 @@ Sang permettant de transfuser un co-équipier. Krevní vak, který se používá pro krevní transfúzi. - + Antibiotics Antibiotikum Антибиотики @@ -3807,6 +3493,14 @@ Antibiotiques Antibiotika + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. + Antibiotics (6 left) Antibiotikum (6 übrig) @@ -3815,6 +3509,14 @@ Antibiotiques (6 reste) Antibiotika (6 zbývající) + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 6 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 6 таблеток. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (6 übrig) + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (6 restante) + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (6 reste) + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (6 zbývající) + Antibiotics (5 left) Antibiotikum (5 übrig) @@ -3823,6 +3525,14 @@ Antibiotiques (5 reste) Antibiotika (5 zbývající) + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 5 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 5 таблеток. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (5 übrig) + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (5 restante) + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (5 reste) + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (5 zbývající) + Antibiotics (4 left) Antibiotikum (4 übrig) @@ -3831,6 +3541,14 @@ Antibiotiques (4 reste) Antibiotika (4 zbývající) + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 4 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 4 таблетки. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (4 übrig) + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (4 restante) + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (4 reste) + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (4 zbývající) + Antibiotics (3 left) Antibiotikum (3 übrig) @@ -3839,6 +3557,14 @@ Antibiotiques (3 reste) Antibiotika (3 zbývající) + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 3 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 3 таблетки. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (3 übrig) + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (3 restante) + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (3 reste) + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (3 zbývající) + Antibiotics (2 left) Antibiotikum (2 übrig) @@ -3847,6 +3573,14 @@ Antibiotiques (2 reste) Antibiotika (2 zbývající) + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 2 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 2 таблетки. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (2 übrig) + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (2 restante) + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (2 reste) + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (2 zbývající) + Antibiotics (1 left) Antibiotikum (1 übrig) @@ -3855,6 +3589,14 @@ Antibiotiques (1 reste) Antibiotika (1 zbývající) + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 1 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталась 1 таблетка. + Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (1 übrig) + La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (1 restante) + L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (1 reste) + Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (1 zbývající) + Antibiotics (empty) Antibiotikum (leer) @@ -3863,68 +3605,12 @@ Antibiotiques (vide) Antibiotika (prázdný) - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. - - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 6 Remaining. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 6 таблеток. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (6 übrig) - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (6 restante) - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (6 reste) - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (6 zbývající) - - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 5 Remaining. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 5 таблеток. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (5 übrig) - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (5 restante) - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (5 reste) - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (5 zbývající) - - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 4 Remaining. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 4 таблетки. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (4 übrig) - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (4 restante) - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (4 reste) - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (4 zbývající) - - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 3 Remaining. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 3 таблетки. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (3 übrig) - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (3 restante) - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (3 reste) - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (3 zbývající) - - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 2 Remaining. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 2 таблетки. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (2 übrig) - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (2 restante) - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (2 reste) - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (2 zbývající) - - - Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 1 Remaining. - Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталась 1 таблетка. - Azithromycin ist ein Breitbandantibiotikum, das zur Behandlung verschiedener bakterieller Infektionen verwendet wird. (1 übrig) - La azitromicina es un antibiótico de amplio espectro usado para tratar o prevenir ciertas infecciones bacteriales. (1 restante) - L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. (1 reste) - Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. (1 zbývající) - - + Empty box of Azithromycin. Пустая коробка азитромицина. Leere Schachtel Azithromycin - + Painkillers Schmerzmittel Болеутоляющее @@ -3993,7 +3679,7 @@ Пустая коробка болеутоляющего. Leere Schachtel Schmerzmittel. - + A moderate painkiller suitable for regular use of relief of pain and inflammation caused by moderate wounds. Ein Schmerzmittel zum Stillen von Schmerzen und Entzündungen durch mittelschwere Wunden. Слабое болеутоляющее отлично подходит для подавления боли от небольших ранений. @@ -4078,55 +3764,7 @@ Krabice plná nejrůznějších léčivých rostlin. Sen každé babky kořenářky. Eine Schachtel mit medizinischen Kräutern. Es wird Tage gedauert haben sie zu sammeln. - - Jerry Can - Kanister - Канистра - Bidón - Jerrican - Kanystr - - - 20 litre Jerry Can that can be used for refueling vehicles and powering generators. - Ein 20-Liter-Kanister, welcher zum Betanken von Fahrzeugen und Generatoren verwendet werden kann. - 20-ти литровая канистра для заправки техники и генераторов. - Bidón de 20 litros que puede ser usado para recargar combustible en los vehículos. - Jerrican de 20 litres pour faire le plein des véhicules. - Kanystr o objemu 20 litrů. Může být použit pro tankování vozidel a jako palivo pro generátory. - - - Raw Meat - Rohes Fleisch - Сырое мясо - Carne Cruda - Viande crue - Syrové maso - - - Meat Steak cut from an animal to be used for sustenance, must be cooked prior to eating. - Ein Stück rohes Fleisch, welches vor dem Verzehr gebraten werden sollte. - Вырезка сырого мяса, снятого с разделанного животного. Приготовление на огне обязательно. - Currasco de carne cortado de un animal para ser usado para sobrevivir, debería ser cocinado antes de comer. - Viande crue pouvant servir de repas, qui cependant devrait être cuite préalablement. - Syrové maso vykuchané ze zvířete. Před konzumací by mělo být upečeno. - - - Cooked Meat - Gebratenes Fleisch - Жареное мясо - Carne Cocinada - Viande cuite - Upečené maso - - - Meat Steak that has been cooked at a fireplace and can be consumed for sustenance. - Ein Stück Fleisch, welches über Feuer gut durchgebraten wurde. - Кусок жареного на огне мяса. - Currasco de carne que fue cocinado en una fogata y puede ser consumido. - Viande cuite au feu de bois. En manger vous fera reprendre des forces. - Toto maso bylo upečeno a může být konzumováno. - - + Can (Baked Beans) Dose (Gebackene Bohnen) Банка (Бобы) @@ -4134,7 +3772,7 @@ Conserve (Haricots) Plechovka (Baked Beans) - + Canned baked beans used for sustainment. Lasts well over five years if stored correctly. Eine Dose gebackener Bohnen, welche bei richtiger Lagerung weit über fünf Jahre haltbar sind. Банка варёных бобов в соусе. Срок хранения до 5 лет. @@ -4142,7 +3780,7 @@ Boîte d'haricots pour un repas. Peut se conserver 5 ans stocké dans un endroit approprié. Baked Beans v rajčatové omáčce jsou nejoblíbenější variantou této značky. Při správném skladování vydrží i 5 let. - + Can (Sardines) Dose (Sardinen) Банка (Сардины) @@ -4150,7 +3788,7 @@ Conserve (Sardines) Plechovka (Sardinky) - + Canned sardines used for sustenance. Lasts well over five years if stored correctly. Eine Dose Sardinen, welche bei richtiger Lagerung weit über fünf Jahre haltbar sind. Банка консервированных сардин. Срок хранения до 5 лет. @@ -4158,7 +3796,7 @@ Boîte de sardines, pour un repas. Peut se conserver 5 ans stocké dans un endroit approprié. Konzervované sardinky. Při správném skladování vydrží i pět let. - + Can (Frank and Beans) Dose (Bohnen und Würste) Банка (Фасоль с мясом) @@ -4166,7 +3804,7 @@ Conserve (William Saurien) Plechovka (Frank and Beans) - + Canned Beans and Sausages used for sustenance. Lasts well over five years if stored correctly. Eine Dose Bohnen mit Würstchen, welche bei richtiger Lagerung weit über fünf Jahre haltbar sind. Банка консервированной фасоли с мясом. Срок хранения до 5 лет. @@ -4174,7 +3812,7 @@ Une boîte d'haricots et saussisses en sauce. Peut se conserver 5 ans stocké dans un endroit approprié. Fazole s párky v plechovce. Při správném skladování vydrží i pět let. - + Can (Pasta) Dose (Nudeln) Банка (Лапша) @@ -4182,7 +3820,7 @@ Conserve (Pâtes) Plechovka (Těstoviny) - + Canned Macaroni used for sustenance. Lasts well over five years if stored correctly. Eine Dose Nudeln, welche bei richtiger Lagerung weit über fünf Jahre haltbar sind. Банка лапши в соусе. Срок хранения до 5 лет. @@ -4190,7 +3828,7 @@ Macaroni en boîte, pour un repas. Peut se conserver 5 ans stocké dans un endroit approprié. Konzerva plná makarónů. Při správném skladování vydrží i pět let. - + Empty Tin Can Leere Blechdose Пустая консервная банка @@ -4198,7 +3836,7 @@ Boîte vide Prázdná plechovka na jídlo - + An empty tin can that no longer contains any food, or anything usable. Eine leere Blechdose. Leider ist nichts Essbares mehr drin, ist aber vielleicht anderweitig nützlich. Пустая консервная банка. Совершенно пуста и бесполезна. @@ -4206,7 +3844,7 @@ Boîte de conserve vide, dont la seule utilité est de faire éventuellement diversion. Kdysi tato plechovka obsahovala jídlo, teď je prázdná. - + Empty Whiskey Bottle Leere Whiskeyflasche Пустая бутылка (Виски) @@ -4214,7 +3852,7 @@ Bouteille de Whisky vide Prádná flaška od whiskey - + A cracked empty whiskey bottle that no longer contains anything. Eine leere Whiskeyflasche. Sie ist leider undicht. Разбитая бутылка виски, в которой ничего не осталось. @@ -4222,7 +3860,7 @@ Une bouteille fêlée, sans son précieux brevage. Popraskaná láhev od whisky, která už neobsahuje ani kapku. - + Empty Soda Can Leere Getränkedose Пустая банка газировки @@ -4230,7 +3868,7 @@ Canette vide Prázdná plechovka na pití - + A aluminum can that once contained a tasty carbonated beverage, and now contains nothing. Eine Aluminiumdose, in der einmal ein köstliches kohlensäurehaltiges Getränk war. Алюминиевая банка, которая когда-то содержала вкусный газированный напиток, но теперь пуста. @@ -4238,7 +3876,7 @@ Une canette en alu, qui jadis a contenu du soda. Kdysi tato hliníková plechovka obsahovala chutný sycený nápoj. Teď v ní nic není. - + Soda Can (Coke) Dose (Coke) Газировка (Кола) @@ -4246,7 +3884,7 @@ Canette (Coca) Plechovka (Kola) - + Soda Can (Pepsi) Dose (Pepsi) Газировка (Пепси) @@ -4254,7 +3892,7 @@ Canette (Pepsi) Plechovka (Pepsi) - + An aluminum can containing a tasty carbonated beverage full of sugar, artificial flavors, and preservatives. Eine Alumniumdose, voll mit einem köstlichen kohlensäurehaltigen Getränk voller Zucker, künstlicher Aromen und Konservierungsmitteln. Алюминиевая банка с вкусным газированным напитком с сахаром, искусственными ароматизаторами и консервантами. @@ -4262,7 +3900,7 @@ Une canette en alu, contenant un breuvage goutu composé de sucre, d'arômes artificiels et de conservateurs. Hliníková plechovka, která obsahuje chutný sycený nápoj plný cukru, umělých příchutí a konzervačních látek. - + Soda Can (Mountain Dew) Dose (Mountain Dew) Газировка (Маунтин Дью) @@ -4270,23 +3908,11 @@ Canette (Mountain Dew) Plechovka (Mountain Dew) - - Jerry Can (Empty) - Leerer Kanister - Канистра (пустая) - Bidón (Vacío) - Jerrican (vide) - Kanystr (Prázdný) - - - An empty 20 litre Jerry Can that can be filled from cars or petrol stations. - Ein leerer 20-Liter-Kanister, der an Fahrzeugen oder Tankstellen aufgefüllt werden kann. - Пустая 20-ти литровая канистра, которая может быть наполнена топливом, слитым из машины или заправочной станции. - Un bidón de 20 litros vacío que puede ser llenado en estaciones de servicio. - Un Jerrican de 20 litres, vide. Peut être rempli en siphonnant les cuves à fioul de stations-service. - Prázdný dvacetilitrový kanystr, který může být naplněn u benzínových stanic nebo aut. - - + + A Mountain Dew soda can. It is pretty rare these days. Better to keep it for later. + Eine Mountain Dew Dose. Sehr selten in diesen Tagen. Besser für später aufheben. + + Wood Pile Holzstapel Поленья @@ -4294,7 +3920,7 @@ Tas de bois Hromádka dřeva - + A small pile of freshly chopped wood that can be used for making a fireplace and various other things. Ein kleiner Stapel frisch gehacktes Holz, welches unter anderem dazu verwendet werden kann, ein Feuer zu machen. Кучка дров, идеально подойдёт, чтобы развести костёр. @@ -4302,7 +3928,7 @@ Un peu de bois qui permet de préparer du feu, entre autre. Hromádka čerstvě nasekaného dřeva, které může být použito pro vyrobení ohniště a další různé věci. - + Heatpack Wärmekissen Хим-грелка @@ -4310,7 +3936,7 @@ Chaufferette Zahřívací sáček - + A heating pad that heats when you start the crystallisation process. Used to provide warmth to your body. Ein Wärmekissen. Wird das Metallplättchen im Gel geknickt, kristallisiert der Inhalt und erzeugt Wärme. Nützlich in kalten Umgebungen. Химическая грелка. Используется для согревания вашего тела. @@ -4425,7 +4051,7 @@ Разделить на 4 по 2п. In 4x2 Schuss aufteilen - + Road Flare Bengalische Fackel Сигнальный фаер @@ -4433,7 +4059,7 @@ Fusée éclairante Světlice - + Hand operated flare commonly found in roadside emergency kits. Will burn for approximately five minutes. Eine Bengalische Fackel, welche häufig in Erste-Hilfe-Kästen von Fahrzeugen zu finden ist. Die Leuchdauer beträgt etwa 5 Minuten. Гражданский сигнальный фаер, который обычно используют спасатели. Горит около пяти минут. @@ -4441,7 +4067,7 @@ Fusée de détresse que l'on trouve dans les trousses de secours. Eclaire pendant 5 minutes environs. Ruční světlice, kterou lze často najít v pohotovostních balíčcích. Hoří přibližně pět minut. - + Chemlight (Green) Knicklicht (Grün) Химсвет (Зеленый) @@ -4449,14 +4075,14 @@ Bâton lumineux (vert) Chemické světlo (zelené) - + Chemlight Knicklicht Химсвет Bâton lumineux Chemické světlo - + Chemical Lightstick providing 60 minutes illumination within a small area when activated and thrown. Available in assorted colors. Ein chemisches Knicklicht, welches für etwa 60 Minuten Licht spendet, nachdem es geknickt und geworfen wurde. In verschiedenen Farben verfügbar. Химический источник света, освещающий небольшую область на период до 60 минут после броска. Бывает разных цветов. @@ -4464,7 +4090,7 @@ Un bâton produisant une lumière fluorescente pendant 60 minutes sur un périmètre restreint. Existe de plusieurs couleurs. Chemické světlo, které poskytuje po aktivaci 60 minutové osvětlení v malém prostoru. K dispozici v různých barvách. - + Chemlight (Red) Knicklicht (Rot) Химсвет (Красный) @@ -4472,7 +4098,7 @@ Bâton lumineux (rouge) Chemické světlo (červené) - + Chemlight (Blue) Knicklicht (Blau) Химсвет (Синий) @@ -4488,7 +4114,7 @@ Survivant Přeživší - + Camping Tent Zelt Палатка-домик @@ -4496,7 +4122,7 @@ Stan Tente de camping - + A camping tent that can be pitched, allowing you extended storage safe from others. Ein kleines Zelt aus Militärbeständen, welches aufgeschlagen werden kann und sicheren Lagerplatz bietet. Палатку можно развернуть и использовать как безопасное хранилище ваших вещей. @@ -4504,7 +4130,7 @@ Stan může být postaven a poskytnout uložný prostor. Une tente de camping qui peut être montée, permettant un espace de stockage étendu à l'abri des autres. - + Sandbags Sandsäcke Мешки с песком @@ -4512,7 +4138,7 @@ Pytle na písek Sacs de sable - + Sacks made of hessian that can be filled with sand or soil and used for military fortification. Jutesäcke, die mit Sand oder Erde gefüllt für Befestigungen verwendet werden können. Мешки с песком для создания оборонительных сооружений. @@ -4520,7 +4146,7 @@ Jutové pytle, lze naplnit pískem nebo zeminou a použít je pro postavení opevnění. Des sacs de jute qui peuvent être remplis de sable et utilisés pour des fortifications militaires. - + Tank Trap Kit Panzersperre Противотанковый ёж @@ -4528,7 +4154,7 @@ Tankový zátaras Obstacle anti Tank - + Metal materials that can be used by an engineer to construct a Tank Trap. Schwere Metallteile, die zu einer wirksamen Panzersperre verbunden wurden, um schwere Fahrzeuge, wie zum Beispiel Panzer aufzuhalten. Металлические детали, из которых собирается противотанковый ёж. @@ -4536,7 +4162,7 @@ Kovový materiál, který může být použit pro postavení zátarasu. Des pièces de métal utilisées par le génie militaire pour construire un obstacle anti-tank. - + Wire Fencing Kit Stacheldraht Колючая проволока @@ -4544,7 +4170,7 @@ Ostnatý drát Kit de barbelés - + Razor wire in large coils which can be expanded like a concertina with steel pickets to form military wire obstacles. Eine Rolle gewickelter Stacheldraht, aus der ein wirkungsvolles Stacheldrahthindernis errichtet werden kann. Катушка острой колючей проволоки для сооружения заграждений. @@ -4552,22 +4178,6 @@ Lze postavit kdekoliv na rovné ploše. Slouží jako plot, přes který nelze přeskočit. Du fil de fer tranchant comme un rasoir et bardé de pointes métalliques, utilisé comme obstacle barbelé militaire. - - Camping Tent - Zelt - Палатка-домик - Carpa - Stan - Tente de camping - - - A camping tent that can be pitched, allowing you extended storage safe from others. - Ein kleines Zelt aus Militärbeständen, welches aufgeschlagen werden kann und sicheren Lagerplatz bietet. - Палатку можно развернуть и использовать как безопасное хранилище ваших вещей. - Una carpa que puede ser asentada permitiendo almacenar objetos. - Stan může být postaven a poskytnout uložný prostor. - Une tente de camping qui peut être montée, permettant un espace de stockage étendu à l'abri des autres. - Bear Trap Trampa de Osos @@ -4763,171 +4373,6 @@ Objet destiné à un fameux sport US, ce club de bois est bardé de barbelés Dieser Baseballschläger wurde mit Stacheldraht umwickelt. Baseball lässt sich damit nicht mehr spielen. - - M16A2 - - - Assault rifle <br/>Caliber: 5.56x45mm NATO - Штурмовая винтовка <br/>Калибр: 5.56x45мм НАТО - Rifle de asalto <br/>Calibre: 5.56x45mm NATO - Útočná puška <br/>Kalibr: 5.56x45mm NATO - Fusil d'assault américain <br/>Calibre: 5.56x45mm OTAN - Amerikanisches Sturmgewehr<br/>Kaliber: 5.56 x 45 mm NATO (STANAG 4172) - - - M16A2 M203 - - - Assault rifle with grenade launcher <br/>Caliber: 5.56x45mm NATO - Штурмовая винтовка с гранатомётом <br/>Калибр: 5.56x45мм НАТО - Rifle de asalto con lanzador de granadas <br/>Calibre: 5.56x45mm NATO - Fusil d'assault américain avec lance-grenades <br/>Calibre: 5.56x45mm OTAN, Grenade 40mm - Útočná puška s podvěsným granátometem <br/>Kalibr: 5.56x45mm NATO, granát 40mm - Amerikanisches Sturmgewehr mit Unterlaufgranatwerfer<br/>Kaliber: 5.56 x 45 mm NATO (STANAG 4172), Granaten: 40 mm - - - M16A4 - - - Assault rifle <br/>Caliber: 5.56x45mm NATO - Штурмовая винтовка <br/>Калибр: 5.56x45мм НАТО - Rifle de asalto <br/>Calibre: 5.56x45mm NATO - Fusil d'assault américain <br/>Calibre: 5.56x45mm OTAN - Útočná puška <br/>Kalibr: 5.56x45mm NATO - Amerikanisches Sturmgewehr<br/>Kaliber: 5.56 x 45 mm NATO (STANAG 4172) - - - M16A4 ACOG - - - Assault rifle <br/>Caliber: 5.56x45mm NATO - Штурмовая винтовка <br/>Калибр: 5.56x45мм НАТО - Rifle de asalto <br/>Calibre: 5.56x45mm NATO - Fusil d'assault américain à viseur optique avancé <br/>Calibre: 5.56x45mm OTAN - Útočná puška s ACOG zaměřovačem <br/>Kalibr: 5.56x45mm NATO - Amerikanisches Sturmgewehr mit ACOG-Zielfernrohr<br/>Kaliber: 5.56 x 45 mm NATO (STANAG 4172) - - - M16A4 M203 ACOG - - - Assault rifle with grenade luncher <br/>Caliber: 5.56x45mm NATO - Штурмовая винтовка с гранатомётом <br/>Калибр: 5.56x45мм НАТО - Rifle de asalto con lanzador de granadas <br/>Calibre: 5.56x45mm NATO - Fusil d'assault à viseur optique avancé et lance-grenades <br/>Calibre: 5.56x45mm OTAN, grenade 40mm - Útočná puška s podvěsným granátometem a zaměřovačem ACOG <br/>Kalibr: 5.56x45mm NATO, granát 40mm - Amerikanisches Sturmgewehr mit Unterlaufgranatwerfer und ACOG-Zielfernrohr<br/>Kaliber: 5.56 x 45 mm NATO (STANAG 4172), Granaten: 40 mm - - - M16A4 M203 - - - Assault rifle with grenade luncher <br/>Caliber: 5.56x45mm NATO - Штурмовая винтовка с гранатомётом <br/>Калибр: 5.56x45мм НАТО - Rifle de asalto con lanzador de granadas <br/>Calibre: 5.56x45mm NATO - Fusil d'assault américain avec lance-grenades <br/>Calibre: 5.56x45mm OTAN, grenade 40mm - Útočná puška s podvěsným granátometem <br/>Kalibr: 5.56x45mm NATO, granát 40mm - Amerikanisches Sturmgewehr mit Unterlaufgranatwerfer<br/>Kaliber: 5.56 x 45 mm NATO (STANAG 4172), Granaten: 40 mm - - - M9 - - - Semi-automatic pistol <br/>Caliber: 9x19mm - Полуавтоматический пистолет <br/>Калибр: 9x19мм - Pistola semi-automática <br/>Calibre: 9x19mm - Pistolet semi-automatique italien <br/>Calibre: 9x19mm - Poloautomatická pistole <br/>Kalibr: 9x19mm - Halbautomatische Pistole vom Typ Beretta 92, Militärversion<br/>Kaliber: 9 x 19 mm - - - M9 SD - M9 с глушителем - M9 Silenciada - M9 Silenciada - M9 s tlumičem - - - Suppressed semi-automatic pistol <br/>Caliber: 9x19mm SD - Полуавтоматический пистолет с глушителем<br/>Калибр: 9x19мм дозвук. - Pistola silenciada semi-automática<br/>Calibre: 9x19mm SD - Pistolet semi-automatique italien avec silencieux <br/>Calibre: 9x19mm SD - Poloautomatická pistole s tlumičem <br/>Kalibr: 9x19mm SD - Halbautomatische Pistole vom Typ Beretta 92, Militärversion mit Schalldämpfer<br/>Kaliber: 9x19mm SD - - - Colt M1911 - - - Semi-automatic pistol <br/>Caliber: .45 ACP - Полуавтоматический пистолет <br/>Калибр: .45 ACP - Pistola semi-automática <br/>Calibre: .45 ACP - Pistolet semi-automatique américain <br/>Calibre: .45 ACP - Poloautomatická pistole <br/>Kalibr: .45 ACP - Halbautomatische Pistole vom Typ Colt M1911<br/>Kaliber: .45 ACP - - - Makarov - ПМ - Makarow - - - Semi-automatic pistol <br/>Caliber: 9x18mm - Полуавтоматический пистолет <br/>Калибр: 9x18мм - Pistola semi-automática <br/>Calibre: 9x18mm - Pistolet semi-automatique russe <br/>Calibre: 9x18mm - Ruská poloautomatická pistole <br/>Kalibr: 9x18mm - Halbautomatische Pistole vom Typ Makarow<br/>Kaliber: 9 x 18 mm Makarow - - - Makarov SD - ПМ с глушителем - Makarov s tlumičem - Makarow SD - - - Suppressed semi-automatic pistol <br/>Caliber: 9x18mm SD - Полуавтоматический пистолет с глушителем<br/>Калибр: 9x18мм дозвук. - Pistola silenciada semi-automática <br/>Calibre: 9x18mm SD - Pistolet semi-automatique russe avec silencieux <br/>Calibre: 9x18mm SD - Ruská poloautomatická pistole s tlumičem <br/>Kalibr: 9x18mm - Halbautomatische Pistole vom Typ Makarow mit Schalldämpfer (Typ PB)<br/>Kaliber: 9x18mm SD - - - PDW - - - Submachine gun <br/>Caliber: 9x19mm - Пистолет-пулемет <br/>Калибр: 9x19мм - Ametralladora <br/>Calibre: 9x19mm - Mitrailleuse<br/>Calibre: 9x19mm - Personal Defense Weapon, samopal <br/>Kalibr: 9x19mm - Leichte Maschinenpistole (Personal Defense Weapon)<br/>Kaliber 9 x 19 mm - - - Revolver - Револьвер - Revólver - - - Revolver <br/>Caliber: .45 ACP - Шестизарядный револьвер <br/>Калибр: .45 ACP - Revólver <br/>Calibre: .45 ACP - Revolver à 6 coups<br/>Calibre: .45 ACP - Revolver <br/>Kalibr: .45 ACP - Trommelrevolver mit sechs Schuss<br/>Kaliber .45 ACP - - - G17 - - - Semi-automatic pistol<br/>Caliber: 9x19mm - Полуавтоматический пистолет <br/>Калибр: 9x19мм - Pistola semi-automática <br/>Calibre: 9x19mm - Pistolet semi-automatique autrichien <br/>Calibre: 9x19mm - Poloautomatická pistole Glock 17 <br/>Kalibr: 9x19mm - Halbautomatische Pistole vom Typ Glock 17<br/>Kaliber: 9 x 19 mm - Clothes Одежда @@ -5024,23 +4469,7 @@ Un uniforme de soldat de l'Armée Britannique. Peut être porté. Ein Feldanzug der British Armed Forces mit Splitterschutzhelm und Koppelgeschirr. - - Box of Wet Matches - Feuchte Streichholzschachtel - Коробка промокших спичек - Caja de Fósforos Mojada - Boîte d'Allumettes mouillées - Krabička mokrých zápalek - - - Box of wet matches. - Eine Schachtel Sicherheitszündhölzer. Die Schachtel ist nass geworden und unbrauchbar. - Коробка промокших спичек. - Caja de fósforos mojada. - Boîte d'Allumettes mouillées. - Krabička plná mokrých zápalek. - - + Dull Hatchet Stumpfes Beil Затупившийся топор @@ -5048,7 +4477,7 @@ Hache émoussée Tupá sekera - + Your Hatchet appears to be too dull to be used. Dein Beil ist durch häufigen Gebrauch stumpf geworden. Ваш топор слишком туп, чтобы его использовать. @@ -5072,111 +4501,15 @@ Votre couteau semble trop émoussé Vypadá to, že tento nůž je příliš tupý. - - Raw Meat - Rohes Fleisch - Сырое мясо - Carne Cruda - Viande crue - Syrové maso - - - Raw Meat to be used for sustenance, should be cooked prior to safe eating. - Ein Stück rohes Fleisch, welches vor dem Verzehr gebraten werden sollte. - Сырое мясо. Будет вкуснее и безопаснее, если его приготовить. - Carne Cruda que se utilizará para sobrevivir, debería cocinarse primero. - La Viande Crue peut être consommée mais devrait être cuite pour la manger en toute sécurité. - Bezpečnější bude syrové maso nejprve opéct. - - - Mutton Raw - Rohes Hammelfleisch - Баранина - Cordero Crudo - Agneau Cru - Syrové jehněčí - - - Lamb Meat to be used for sustenance, should be cooked prior to safe eating. - Ein Stück rohes Hammelfleisch, welches vor dem Verzehr gebraten werden sollte. - Баранина. Будет вкуснее и безопаснее, если её приготовить. - Carne de Cordero que se utilizará para sobrevivir, debería cocinarse primero. - La Viande d'agneau peut être consommée mais doit être cuite avant de pouvoir la manger. - Tento kus jehněčího byl měl být nejprve opečen. - - - Raw Chicken Leg - Rohe Hühnchenkeule - Куриный окорочок - Pata de Pollo Cruda - Poulet cru - Syrové kuřecí - - - Chicken Leg to be used for sustenance, should be cooked prior to safe eating. - Eine rohe Hühnchenkeule, welche vor dem Verzehr gebraten werden sollte. - Сырой куриный окорочок. Будет вкуснее и безопаснее, если его приготовить. - Pata de Pollo que se utilizará para sobrevivir, debería cocinarse primero. - La Cuisse de Poulet crue peut être consommée mais devrait être cuite avant de pouvoir la manger. - Toto kuřecí stehno byl mělo být nejprve opečeno. - - - Rabbit Raw - Rohes Kaninchen - Кролик - Conejo Crudo - Lapin cru - Syrové králičí - - - Rabbit to be used for sustenance, should be cooked prior to safe eating. - Ein Stück rohes Kaninchenfleisch, welches vor dem Verzehr gebraten werden sollte. - Кролик. Будет вкуснее и безопаснее, если его приготовить. - Conejo que se utilizará para sobrevivir, debería cocinarse primero. - Le Lapin cru peut être consommé mais devrait être cuit avant de le manger. - Tento kus králičího byl měl být nejprve opečen. - - - Raw Bacon - Roher Speck - Бекон - Panceta Cruda - Bacon cru - Syrová slanina - - - Bacon to be used for sustenance, should be cooked prior to safe eating. - Roher Speck, welcher vor dem Verzehr gebraten werden sollte. - Бекон. Будет вкуснее и безопаснее, если его приготовить. - Panceta que se utilizará para sobrevivir, debería cocinarse primero. - Le Bacon cru peut être consommé mais devrait être cuit avant de le manger. - Tento kus slaniny byl měl být nejprve opečen. - - - Raw Beef - Rohes Rindfleisch - Говядина - Churrasco Crudo - Boeuf Cru - Syrové hovězí - - - Beef to be used for sustenance, should be cooked prior to safe eating. - Ein Stück rohes Rindfleisch, welches vor dem Verzehr gebraten werden sollte. - Говядина. Будет вкуснее и безопаснее, если её приготовить. - Currasco que se utilizará para sobrevivir, debería cocinarse primero. - Le Boeuf Cru peut être consommé mais devrait être cuit avant de le manger. - Tento hovězí steak byl měl být nejprve opečen. - - - Raw Goat - Rohes Ziegenfleisch + + Goat Meat (raw) + Ziegenfleisch (roh) Ягнятина Cabra Cruda Viande de chèvre crue Syrové kozí - + Goat Meat to be used for sustenance, should be cooked prior to safe eating. Ein Stück rohes Ziegenfleisch, welches vor dem Verzehr gebraten werden sollte. Ягнятина. Будет вкуснее и безопаснее, если её приготовить. @@ -5184,110 +4517,174 @@ La viande de chèvre crue peut être consommée mais devrait être cuite avant de le manger. Tento kus kozího masa byl měl být nejprve opečen. - - Cooked Meat - Gebratenes Fleisch - Жареное мясо - Carne Cocinada - Viande cuite - Opečené maso + + Goat Meat (cooked) + Ziegenfleisch (gebraten) + Жареная ягнятина + Cabra a la Parrilla + Chèvre grillée + Opečené kozí - - Cooked Meat to be used for sustenance. - Ein Stück Fleisch, welches über Feuer gut durchgebraten wurde. - Жареное мясо, готовое к употреблению. - Carne Cocinada que se utilizará para sobrevivir. - La Viande Cuite peut être consommée. - Opečené maso může být snězeno, abyste přežili. + + Goat Meat to be used for sustenance. + Ein Stück Ziegenfleisch, welches über Feuer gut durchgebraten wurde. + Жареная ягнятина, готовая к употреблению. + Cabra a la Parrilla que se utilizará para sobrevivir. + La Chèvre grillée peut être consommée. + Kozí maso, které lze sníst, aby jste přežili. + + + Mutton Meat (raw) + Hammelfleisch (roh) + Баранина + Cordero Crudo + Agneau Cru + Syrové jehněčí - - Cooked Mutton - Gebratenes Lammfleisch + + Lamb Meat to be used for sustenance, should be cooked prior to safe eating. + Ein Stück rohes Hammelfleisch, welches vor dem Verzehr gebraten werden sollte. + Баранина. Будет вкуснее и безопаснее, если её приготовить. + Carne de Cordero que se utilizará para sobrevivir, debería cocinarse primero. + La Viande d'agneau peut être consommée mais doit être cuite avant de pouvoir la manger. + Tento kus jehněčího byl měl být nejprve opečen. + + + Mutton Meat (cooked) + Hammelfleisch (gebraten) Жареная баранина Cordero Cocinado Agneau Cuit Opečené jehněčí - + Lamb Meat to be used for sustenance. - Ein Stück Lammfleisch, welches über Feuer gut durchgebraten wurde. + Ein Stück Hammelfleisch, welches über Feuer gut durchgebraten wurde. Жареная баранина, готовая к употреблению. Carne de Cordero que se utilizará para sobrevivir. La Viande d'agneau peut être consommée. Opečené jehněčí může být snězeno, abyste přežili. + + + Chicken Leg (raw) + Hühnchenkeule (roh) + Куриный окорочок + Pata de Pollo Cruda + Poulet cru + Syrové kuřecí - - Chicken Leg - Gebratene Hühnchenkeule + + Chicken Leg to be used for sustenance, should be cooked prior to safe eating. + Eine rohe Hühnchenkeule, welche vor dem Verzehr gebraten werden sollte. + Сырой куриный окорочок. Будет вкуснее и безопаснее, если его приготовить. + Pata de Pollo que se utilizará para sobrevivir, debería cocinarse primero. + La Cuisse de Poulet crue peut être consommée mais devrait être cuite avant de pouvoir la manger. + Toto kuřecí stehno byl mělo být nejprve opečeno. + + + Chicken Leg (cooked) + Hühnchenkeule (gebraten) Жареный куриный окорочок Pata de Pollo Poulet grillé Opečené kuřecí - + Chicken Leg to be used for sustenance. Eine Hühnchenkeule, welche über Feuer gut durchgebraten wurde. Жареный куриный окорочок, готовый к употреблению. Pata de Pollo que se utilizará para sobrevivir. La cuisse de poulet peut être consommée. Kuřecí stehno může být snědeno, abyste přežili. + + + Bacon (raw) + Speck (roh) + Бекон + Panceta Cruda + Bacon cru + Syrová slanina - - Rabbit - Gebratenes Kaninchen - Жареный кролик - Conejo - Lapin cuit - Opečené králičí - - - Rabbit to be used for sustenance. - Ein Stück Kaninchenfleisch, welches über Feuer gut durchgebraten wurde. - Жареный кролик, готовый к употреблению. - Conejo que se utilizará para sobrevivir. - Le Lapin peut être consommé. - Králík může být sněden, abyste přežili. - - - Bacon - Gebratener Speck + + Bacon to be used for sustenance, should be cooked prior to safe eating. + Roher Speck, welcher vor dem Verzehr gebraten werden sollte. + Бекон. Будет вкуснее и безопаснее, если его приготовить. + Panceta que se utilizará para sobrevivir, debería cocinarse primero. + Le Bacon cru peut être consommé mais devrait être cuit avant de le manger. + Tento kus slaniny byl měl být nejprve opečen. + + + Bacon (cooked) + Speck (gebraten) Готовый бекон Panceta Opečená slanina - + Bacon to be used for sustenance. Über Feuer knusprig gebratener Speck. Passt hervorragend zu gebackenen Bohnen. Бекон, готовый к употреблению. Panceta que se utilizará para sobrevivir. Le Bacon peut être consommé. Slanina může být snědena, abyste přežili. + + + Rabbit Leg (raw) + Kaninchenkeule (roh) + Кролик + Conejo Crudo + Lapin cru + Syrové králičí - - Angel Cookies - Engelskekse - Печеньки! - Galletitas de Ángel - Cookies d'Ange - Sušenky Angel + + Rabbit leg to be used for sustenance, should be cooked prior to safe eating. + Eine rohe Kaninchenkeule, welche vor dem Verzehr gebraten werden sollte. + Кролик. Будет вкуснее и безопаснее, если его приготовить. + Conejo que se utilizará para sobrevivir, debería cocinarse primero. + Le Lapin cru peut être consommé mais devrait être cuit avant de le manger. + Tento kus králičího byl měl být nejprve opečen. - - Angel Cookies to boost your moral up! - Engelskekse, um die Moral zu heben! - Печенюшки для поднятия настроения! - Galletitas de Ángel que levantan tu moral - Cookies d'Ange pour remonter votre moral! - Sušenky Angel vylepší vaši náladu! + + Rabbit Leg (cooked) + Kaninchenkeule (gebraten) + Жареный кролик + Conejo + Lapin cuit + Opečené králičí - - Beefsteak - Gebratenes Rindersteak + + Rabbit to be used for sustenance. + Eine Kaninchenkeule, welche über Feuer gut durchgebraten wurde. + Жареный кролик, готовый к употреблению. + Conejo que se utilizará para sobrevivir. + Le Lapin peut être consommé. + Králík může být sněden, abyste přežili. + + + Beefsteak (raw) + Rindersteak (roh) + Говядина + Churrasco Crudo + Boeuf Cru + Syrové hovězí + + + Beefsteak to be used for sustenance, should be cooked prior to safe eating. + Ein Stück rohes Rindersteak, welches vor dem Verzehr gebraten werden sollte. + Говядина. Будет вкуснее и безопаснее, если её приготовить. + Currasco que se utilizará para sobrevivir, debería cocinarse primero. + Le Boeuf Cru peut être consommé mais devrait être cuit avant de le manger. + Tento hovězí steak byl měl být nejprve opečen. + + + Beefsteak (cooked) + Rindersteak (gebraten) Бифштекс Churrasco Bifteck Opečené hovězí - + Beefsteak to be used for sustenance. Ein Rindersteak, welches über Feuer gebraten wurde. Бифштекс, готовый к употреблению. @@ -5295,45 +4692,52 @@ Le Bifteck peut être consommé. Biftek může být sněden, abyste přežili. - - Grilled Goat - Gegrilltes Ziegenfleisch - Жареная ягнятина - Cabra a la Parrilla - Chèvre grillée - Opečené kozí + + Dog Meat (raw) + Hundefleisch (roh) + Сырое мясо собаки + La carne de perro en bruto + Nourriture pour chien - - Goat Meat to be used for sustenance. - Ein Stück Ziegenfleisch, welches über Feuer gut durchgebraten wurde. - Жареная ягнятина, готовая к употреблению. - Cabra a la Parrilla que se utilizará para sobrevivir. - La Chèvre grillée peut être consommée. - Kozí maso, které lze sníst, aby jste přežili. + + Dog Meat to be used for sustenance, should be cooked prior to safe eating. + Ein Stück Hundefleisch, welches vor dem Verzehr gebraten werden sollte. + + + Dog Meat (cooked) + Hundefleisch (gebraten) + Приготовленное мясо собаки + Carne cocinada perro + Cuit viande de chien + Vařené maso Dog + + + Dog Meat to be used for sustenance. + Ein Stück Hundefleisch, welches über Feuer gebraten wurde. - Steelhead + Steelhead (raw) Форель Trucha Pstruh Brochet - Stahlkopfforelle + Stahlkopfforelle (roh) - Tuna + Tuna (raw) Тунец Atún Tuňák Thon - Thunfisch + Thunfisch (roh) - Seabass + Seabass (raw) Окунь Lubina Mořčák Bar - Wolfsbarsch + Wolfsbarsch (roh) Raw Steelhead worth 200 Blood Regen. @@ -5365,7 +4769,7 @@ Trucha (cocinada) Pstruh (opečený) Brochet (cuit) - Gebratene Stahlkopfforelle + Stahlkopfforelle (gebraten) Tuna (cooked) @@ -5373,7 +4777,7 @@ Atún (cocinado) Tuňák (opečený) Thon (cuit) - Gebratener Thunfisch + Thunfisch (gebraten) Seabass (cooked) @@ -5381,7 +4785,7 @@ Lubina (cocinada) Mořčák (opečený) Bar (cuit) - Gebratener Wolfsbarsch + Wolfsbarsch (gebraten) Cooked Steelhead worth 1000 Blood Regen. @@ -5575,11 +4979,11 @@ Čistá a ještě neotevřená plechovka limonády Mikhail Made. Vytvořeno Mikhailem. - Soda (Cola) + Soda (Lirikola) Dose (Lirikola) - Газировка (Кола) - Fernet con Coca - Nápoj (Kola) + Газировка (Lirikola) + Fernet Lirikola + Nápoj (Lirikola) A clean, unopened can of Lirikola. An o7 brand. @@ -5621,11 +5025,11 @@ Čistá a ještě neotevřená plechovka sody mZLY yZLY. - Soda (Cola) + Soda (Peppsy Cola) Dose (Peppsy Cola) - Газировка (Кола) - Gaseosa (Cola) - Nápoj (Kola) + Газировка (Peppsy Кола) + Gaseosa (Peppsy Cola) + Nápoj (Peppsy Kola) A clean, unopened can of Peppsy soda. @@ -6325,12 +5729,12 @@ Eine offene Packung Kosmos Zigaretten. - Fuelcan (5L) - Benzinkanister (5L) - Канистра (5л) - Bidón Chico (5L) - Bidon de carburant (5L) - Kanystr (5L) + Fuelcan 5L + Benzinkanister 5L + Канистра 5л + Bidón Chico 5L + Bidon de carburant 5L + Kanystr 5L A small 5-liter can for gasoline. @@ -6340,13 +5744,13 @@ Un petit bidon de carburant. Menší kanystr s palivem. - - Empty Fuelcan (5L) - Leerer Benzinkanister (5L) - Пустая канистра (5л) - Bidón Chico Vacío (5L) - Bidon vide (5L) - Kanystr (5L) (Prázdný) + + Fuelcan 5L (empty) + Benzinkanister 5L (leer) + Канистра 5л (пустая) + Bidón Chico 5L (vacío) + Bidon 5L (vide) + Kanystr 5L (prázdný) A small can for gasoline. @@ -6357,33 +5761,33 @@ Menší kanystr na palivo, momentálně prázdný. - Jerry Can (20L) - Bidón (20L) - Benzinkanister (20L) - Канистра (20л) - Jerrican (20L) - Kanystr (20L) + Jerry Can 20L + Bidón 20L + Benzinkanister 20L + Канистра 20л + Jerrican 20L + Kanystr 20L 20 litre Jerry Can that can be used for refueling vehicles and powering generators. Un bidón de combustible de 20 litros para recargar vehículos y generadores. - Ein 20-Liter-Kanister, welcher zum Betanken von Fahrzeugen und Generatoren verwendet werden kann. + Ein 20-Liter-Benzinkanister, welcher zum Betanken von Fahrzeugen und Generatoren verwendet werden kann. 20-ти литровая канистра для заправки техники и генераторов. Un jerrican de 20 litres qui peut être utilisé pour réaprovisionner les véhicules et générateurs de courant. Dvacetilitrový kanistr, který se dá použít k dotankování vozidel a generátorů. - + - Empty Jerry Can (20L) - Bidón Vacío (20L) - Leerer Benzinkanister (20L) - Пустая канистра (20л) - Jerrican vide (20L) - Prázdný kanystr (20L) - + Jerry Can 20L (empty) + Benzinkanister 20L (leer) + Канистра 20л (пустая) + Bidón 20L (vacío) + Jerrican 20L (vide) + Kanystr 20L (prázdný) + An empty 20 litre Jerry Can that can be filled from cars or petrol stations. Un bidón de combustible vacío de 20 litros que puede ser recargado estaciones de servicio. - Ein leerer 20-Liter-Kanister, der an Fahrzeugen oder Tankstellen aufgefüllt werden kann. + Ein leerer 20-Liter-Benzinkanister, der an Fahrzeugen oder Tankstellen aufgefüllt werden kann. Пустая 20-ти литровая канистра, которая может быть наполнена топливом, слитым из машины или заправочной станции. Un jerrican vide de 20L qui peut être rempli à partir de véhicules ou de staions servives. Prázdný dvacetilitrový kanystr, který může být naplněn u benzínek nebo odstavených aut. @@ -27203,21 +26607,7 @@ Stan (iglú) Poušť +++++ Wüsten-Igluzelt +++++ - - Raw Dog Meat - Rohes Hundefleisch - Сырое мясо собаки - La carne de perro en bruto - Nourriture pour chien - - - Cooked Dog Meat - Gekochtes Hundefleisch - Приготовленное мясо собаки - Carne cocinada perro - Cuit viande de chien - Vařené maso Dog - + Bio Meat Biofleisch @@ -27966,12 +27356,12 @@ 210 литров нефти в бочке. - Oil Barrel (Empty) - Leeres Ölfass - Пустая бочка нефти + Oil Barrel (empty) + Ölfass (leer) + бочка нефти (пустая) - 210 litres of oil per barrel. (Empty) + Empty 210 litre oil barrel. Leeres 210 Liter Ölfass. 210-литровая пустая бочка нефти. @@ -27986,12 +27376,12 @@ 210 литров топлива в бочке. - Fuel Barrel (Empty) - Leeres Fass (210L) - Пустая бочка + Fuel Barrel (empty) + Kraftstofffass (leer) + бочка (пустая) - 210 litres of fuel per barrel. (Empty) + Empty 210 litre fuel barrel. Leeres 210 Liter Kraftstofffass. 210-литровая пустая бочка для топлива. @@ -30739,11 +30129,6 @@ Wissenschaftler (Gelber Rad-Anzug) Учёный (Жёлт. рад. костюм) - - Stalker (Rookie) - Stalker (Anfänger) - Сталкер (Новичок) - Stalker (Loner) Сталкер (Одиночка) @@ -30836,16 +30221,6 @@ Wissenschaftler (Gelber Rad-Anzug) Учёный (Жёлт. рад. костюм) - - Stalker (Rookie) - Stalker (Anfänger) - Сталкер (Новичок) - - - A pack of wornout clothings that fits an apocalyptic environment. - Heruntergekommene Klamotten, die gut in eine apokalyptische Umgebung passen würden. - Комплект поношенной одежды, подходящей для апокалиптического окружения. - Stalker (Loner) Сталкер (Одиночка) @@ -32122,9 +31497,9 @@ Бочка метиламина - Methylamine Barrel (Empty) - Leeres Methylaminfass - Пустая бочка метиламина + Methylamine Barrel (empty) + Methylaminfass (leer) + бочка метиламина (пустая) 210 litres of Methylamine per barrel. @@ -32132,7 +31507,7 @@ 210-литровая бочка метиламина. - 210 litres of Methylamine per barrel. (Empty) + Empty 210 litre Methylamine barrel. Leeres 210 Liter Methylaminfass. 210-литровая пустая бочка метиламина. diff --git a/SQF/dayz_server/compile/server_changeCode.sqf b/SQF/dayz_server/compile/server_changeCode.sqf index 37ac06af4..561348c1c 100644 --- a/SQF/dayz_server/compile/server_changeCode.sqf +++ b/SQF/dayz_server/compile/server_changeCode.sqf @@ -40,7 +40,7 @@ if (Z_singleCurrency) then {_coins = _object getVariable ["cashMoney",0];}; [_objectID,_objectUID,_object] call server_deleteObjDirect; _holder = _lockedClass createVehicle [0,0,0]; -_holder setDir _dir; +//_holder setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _holder setVariable ["memDir",_dir,true]; _holder setVectorDirAndUp _vector; _holder setPosATL _pos; diff --git a/SQF/dayz_server/compile/server_handleSafeGear.sqf b/SQF/dayz_server/compile/server_handleSafeGear.sqf index 8426c41f0..524166bdc 100644 --- a/SQF/dayz_server/compile/server_handleSafeGear.sqf +++ b/SQF/dayz_server/compile/server_handleSafeGear.sqf @@ -61,7 +61,7 @@ call { // Create new unlocked safe, then delete old locked safe _holder = _unlockedClass createVehicle [0,0,0]; - _holder setDir _dir; + //_holder setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _holder setVariable ["memDir",_dir,true]; _holder setVectorDirAndUp _vector; _holder setPosATL _pos; @@ -89,7 +89,7 @@ call { // Create new locked safe, then delete old unlocked safe _holder = _lockedClass createVehicle [0,0,0]; - _holder setDir _dir; + //_holder setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp _holder setVariable ["memDir",_dir,true]; _holder setVectorDirAndUp _vector; _holder setPosATL _pos; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index fcf651f0c..2fa703139 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -183,14 +183,16 @@ if ((playersNumber west + playersNumber civilian) == 0) exitWith { }; }; - _object = _type createVehicle [0,0,0]; //more than 2x faster than createvehicle array - _object setDir _dir; - _object setPosATL _pos; + _object = _type createVehicle [0,0,0]; //more than 2x faster than createvehicle array _object setDamage _damage; + if (_vecExists) then { _object setVectorDirAndUp _vector; + } else { + _object setDir _dir; // setdir is incompatible with setVectorDirAndUp and should not be used together on the same object https://community.bistudio.com/wiki/setVectorDirAndUp }; _object enableSimulation false; + _object setPosATL _pos; _doorLocked = _type in DZE_DoorsLocked; _isPlot = _type == "Plastic_Pole_EP1_DZ"; diff --git a/Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql b/Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql new file mode 100644 index 000000000..c21c3ee04 --- /dev/null +++ b/Server Files/SQL/update epoch 1.0.7 to 1.0.7.1.sql @@ -0,0 +1,4 @@ +UPDATE character_data SET Backpack = REPLACE(Backpack, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Backpack, '"Skin_gsc_cloth_loner_head_DZ"') > 0; +UPDATE character_data SET Inventory = REPLACE(Inventory, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Inventory, '"Skin_gsc_cloth_loner_head_DZ"') > 0; +UPDATE object_data SET Inventory = REPLACE(Inventory, '"Skin_gsc_cloth_loner_head_DZ"', '"Skin_Survivor2_DZ"') WHERE INSTR(Inventory, '"Skin_gsc_cloth_loner_head_DZ"') > 0; +UPDATE character_data SET Model = "Survivor2_DZ" WHERE Model = "gsc_cloth_loner_head_DZ";