Merge remote-tracking branch 'origin/master'

# Conflicts:
#	CHANGE LOG 1.0.6.1.txt
This commit is contained in:
ebaydayz
2017-01-21 21:46:58 -05:00
26 changed files with 31 additions and 27 deletions

View File

@@ -29,7 +29,7 @@ if (dayz_presets == "Custom") then {
dayz_spawncarepkgs_clutterCutter = 0; //0 = loot hidden in grass, 1 = loot lifted, 2 = no grass
dayz_spawnCrashSite_clutterCutter = 0; // heli crash options 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass
dayz_spawnInfectedSite_clutterCutter = 0; // infected base spawn 0 = loot hidden in grass, 1 = loot lifted, 2 = no grass
dayz_bleedingeffect = 3; //1 = blood on the ground, 2 = partical effect, 3 = both
dayz_bleedingeffect = 2; //1 = blood on the ground, 2 = partical effect, 3 = both
dayz_OpenTarget_TimerTicks = 60 * 10; //how long can a player be freely attacked for after attacking someone unprovoked
dayz_nutritionValuesSystem = true; //true, Enables nutrition system, false, disables nutrition system.
dayz_classicBloodBagSystem = true; // disable blood types system and use the single classic ItemBloodbag