1.0.1.2 RC1

+ [FIXED] Prevent player zombies from getting any default loadouts. + [FIXED] Bad vehicle type message when using default loadout override and no backpack. + [FIXED] dayz_zedsAttackVehicles logic was reversed fixed now so that true = attack vehicles. + [ADDED] Safes now have a keypad GUI. Simply click on the numbers to enter your combo and then press #. https://www.dropbox.com/s/b00fgdpo13wokg9/Untitled-1.jpg + [ADDED] Tons of awesome cars by vilas from http://www.armaholic.com/page.php?id=17447 + [FIXED] Models needed extra variable to prevent being sunk into the ground. + [CHANGED] Bleeding duration reduced to minimum of 30 sec and max of 330 seconds. Before it was min 100 max 500. + [ADDED] When kneeling bleeding per second is reduced by 50%. + [ADDED] When crawling bleeding per second is reduced by 75%. + [ADDED] When changing locations the locations name will display in the bottom right. + [CHANGED] Replaced m107 with BAF_LRR_scoped. + [CHANGED] Replaced as50 with AK_107_PSO. TODO + [FIXED] Lock vehicle no longer shows on killed vehicles. + [ADDED] Disabled purchased vehicle parachute spawning by default added variable DZE_TRADER_SPAWNMODE = true; to enable. (Default: false) + [CHANGED] Plot pole has changed to another model a "no entry" sign and can be removed by anyone. When done building take your plot pole with you, if it isn't yours remove it and put it back down again. + [ADDED] Loot positions on top of some tables. + [ADDED] Briefcase that can hold up to 10 x 10oz Gold Bars or 100oz. + [ADDED] Full moon nights as option with dayz_fullMoonNights = true; + [CHANGED] Can no longer Salvage vehicle parts with 0 damage. Fixes bugged hitpoints and duping. + [REMOVED] Remove all crates of toolbelt items. This was just to add stock to traders and since most servers are now auto stocking them at the traders its not needed and cumbersome to use. + [CHANGED] Generator can only be built within 30m of gas stations that say "Needs Power". + [CHANGED] Moved light bulb to farm loot table as it was to common on trash loots. + [ADDED] Fuel pump can be built near standard fuel source (i.e. rusty tanks) then powered with a generator to make a refuel station. + [CHANGED] R3f realism no more fade to black, changed to use dayz shaking and knockouts. + [ADDED] Reset tiredness when you take painkillers. + [ADDED] Reset tiredness when you sleep at a tent. + [ADDED] added back fixed rbull soda and added new can orange sherbet
2025-12-20 02:16:29 +03:00 · 2013-06-20 09:03:48 -05:00
parent bbfb71062f
commit 95c8bc5205
360 changed files with 6788 additions and 1637 deletions
--- a/dayz_code/CfgWeapons.hpp
+++ b/dayz_code/CfgWeapons.hpp
@@ -13,9 +13,9 @@ class CfgWeapons {
 	class ItemKeyKit: ItemCore {
 		scope = 2;
 		displayname = "Keymakers kit";
-		model="\dayz_equip\models\keykit.p3d";
+		model="\z\addons\dayz_epoch\models\keykit.p3d";
 		descriptionShort="Kit including the tools required to smelt, mold and shape keys.";
-		picture="\dayz_equip\textures\equip_keykit_ca.paa";
+		picture="\z\addons\dayz_epoch\pictures\equip_keykit_ca.paa";
 	};
 	class ItemAnvil: ItemCore {
 		displayname = "Anvil";
@@ -140,8 +140,8 @@ class CfgWeapons {
 		scope=2;
 		autoreload=1;
 		magazineReloadTime=0;
-		model="\dayz_equip\models\fishing_rod_weaponized.p3d";
-		picture="\dayz_equip\textures\equip_fishingpole_CA.paa";
+		model="\z\addons\dayz_epoch\models\fishing_rod_weaponized.p3d";
+		picture="\z\addons\dayz_epoch\pictures\equip_fishingpole_CA.paa";
 		displayName="Fishing Pole";
 		magazines[]=
 		{
@@ -178,8 +178,8 @@ class CfgWeapons {
 	{
 		scope=2;
 		displayName="Fishing Pole";
-		model="\dayz_equip\models\fishing_rod_loot_item.p3d";
-		picture="\dayz_equip\textures\equip_fishingpole_CA.paa";
+		model="\z\addons\dayz_epoch\models\fishing_rod_loot_item.p3d";
+		picture="\z\addons\dayz_epoch\pictures\equip_fishingpole_CA.paa";
 		descriptionShort="Fishing Pole: This carbon fiber rod may be old but, she still works like a charm.";
 		class ItemActions
 		{
@@ -297,8 +297,8 @@ class CfgWeapons {
 	
 	// Experimental keys
 	class ItemKey: ItemCore {
-		model = "\dayz_equip\models\key.p3d";
-		picture = "\dayz_equip\textures\equip_key_CA.paa";
+		model = "\z\addons\dayz_epoch\models\key.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_key_CA.paa";
 		displayname = "Black Key";
 		keyid = 0;
 		scope = 2;
@@ -317,26 +317,26 @@ class CfgWeapons {
 	};
 	class ItemKeyGreen: ItemKey {
 		displayname = "Green Key";
-		model = "\dayz_equip\models\key_green.p3d";
-		picture = "\dayz_equip\textures\equip_key_CA_green.paa";
+		model = "\z\addons\dayz_epoch\models\key_green.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_green.paa";
 		scope = 2;
 	};
 	class ItemKeyBlue: ItemKey {
 		displayname = "Blue Key";
-		model = "\dayz_equip\models\key_blue.p3d";
-		picture = "\dayz_equip\textures\equip_key_CA_blue.paa";
+		model = "\z\addons\dayz_epoch\models\key_blue.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_blue.paa";
 		scope = 2;
 	};
 	class ItemKeyYellow: ItemKey {
 		displayname = "Yellow Key";
-		model = "\dayz_equip\models\key_yellow.p3d";
-		picture = "\dayz_equip\textures\equip_key_CA_yellow.paa";
+		model = "\z\addons\dayz_epoch\models\key_yellow.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_yellow.paa";
 		scope = 2;
 	};
 	class ItemKeyRed: ItemKey {
 		displayname = "Red Key";
-		model = "\dayz_equip\models\key_red.p3d";
-		picture = "\dayz_equip\textures\equip_key_CA_red.paa";
+		model = "\z\addons\dayz_epoch\models\key_red.p3d";
+		picture = "\z\addons\dayz_epoch\pictures\equip_key_CA_red.paa";
 		scope = 2;
 	};

--- a/dayz_code/actions/player_build.sqf
+++ b/dayz_code/actions/player_build.sqf
@@ -19,21 +19,38 @@ _item =			_this;
 _classname = 	getText (configFile >> "CfgMagazines" >> _item >> "ItemActions" >> "Build" >> "create");
 _require =  getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Build" >> "require");

+_needNearby =  getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Build" >> "needNearby");
+
 _text = 		getText (configFile >> "CfgVehicles" >> _classname >> "displayName");
 _offset = 	getArray (configFile >> "CfgVehicles" >> _classname >> "offset");

 _isPole = (_classname == "Plastic_Pole_EP1_DZ");

 _distance = 30;
+_needText = "Plot Pole";
+
 if(_isPole) then {
 	_distance = 45;
 };

-// check for near plot
-_findNearestPoles = nearestObjects [(vehicle player), ["Plastic_Pole_EP1_DZ"], _distance];
-_findNearestPole = [];
-{if (alive _x) then {_findNearestPole set [(count _findNearestPole),_x];};} foreach _findNearestPoles;
+if((count _needNearby) == 0) then {
+	_needNearby = ["Plastic_Pole_EP1_DZ"];
+} else {
+	if("dayz_fuelpumparray" in _needNearby) then {
+		_needNearby = dayz_fuelpumparray;
+		_needText = "Fuel Pump";
+	};
+	if("dayz_fuelsources" in _needNearby) then {
+		_needNearby = dayz_fuelsources;
+		_needText = "Fuel Tanks";
+	};
+};

+// check for near plot
+_findNearestPoles = nearestObjects [(vehicle player), _needNearby, _distance];
+_findNearestPole = [];
+
+{if (alive _x) then {_findNearestPole set [(count _findNearestPole),_x];};} foreach _findNearestPoles;
 _IsNearPlot = count (_findNearestPole);

 // If item is plot pole and another one exists within 45m
@@ -43,41 +60,44 @@ if(_IsNearPlot == 0) then {

 	// Allow building of plot
 	if(_isPole) then {
-		_canBuildOnPlot = true;	
+		_canBuildOnPlot = true;
 	};
 	
 } else {
 	// Since there are plots nearby we check for ownership and then for friend status

-	_nearestPole = _findNearestPole select 0;
+	if("Plastic_Pole_EP1_DZ" in _needNearby) then {
+		_nearestPole = _findNearestPole select 0;

-	// Find owner 
-	_ownerID = _nearestPole getVariable["CharacterID","0"];
+		// Find owner 
+		_ownerID = _nearestPole getVariable["CharacterID","0"];

-	// diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID];
+		// diag_log format["DEBUG BUILDING: %1 = %2", dayz_characterID, _ownerID];

-	// check if friendly to owner
-	if(dayz_characterID == _ownerID) then {
-		// owner can build anything within his plot except other plots
-		if(!_isPole) then {
-			_canBuildOnPlot = true;
-		};
-		
-	} else {
-		// disallow building plot
-		if(!_isPole) then {
-			_friendlies		= player getVariable ["friendlyTo",[]];
-			// check if friendly to owner
-			if(_ownerID in _friendlies) then {
+		// check if friendly to owner
+		if(dayz_characterID == _ownerID) then {
+			// owner can build anything within his plot except other plots
+			if(!_isPole) then {
 				_canBuildOnPlot = true;
 			};
+		
+		} else {
+			// disallow building plot
+			if(!_isPole) then {
+				_friendlies		= player getVariable ["friendlyTo",[]];
+				// check if friendly to owner
+				if(_ownerID in _friendlies) then {
+					_canBuildOnPlot = true;
+				};
+			};
 		};
+	} else {
+		_canBuildOnPlot = true;
 	};
-	
 };

 // _message
-if(!_canBuildOnPlot) exitWith {  TradeInprogress = false; cutText ["Building requires plot pole within 30m." , "PLAIN DOWN"]; };
+if(!_canBuildOnPlot) exitWith {  TradeInprogress = false; cutText [format["Building requires %1 within %2m.",_needText,_distance] , "PLAIN DOWN"]; };

 _missing = "";
 _hasrequireditem = true;
@@ -268,8 +288,10 @@ if (_hasrequireditem) then {

 		} else {
 			r_interrupt = false;
-			[objNull, player, rSwitchMove,""] call RE;
-			player playActionNow "stop";
+			if (vehicle player == player) then {
+				[objNull, player, rSwitchMove,""] call RE;
+				player playActionNow "stop";
+			};

 			deleteVehicle _tmpbuilt;

--- a/dayz_code/actions/player_chopWood.sqf
+++ b/dayz_code/actions/player_chopWood.sqf
@@ -1,3 +1,8 @@
+/*
+	DayZ Enhanced ChopWood
+	Usage: spawn player_chopWood;
+	Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com.
+*/
 private ["_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_animState","_isMedic","_proceed","_counter","_itemOut","_countOut","_tree","_distance2d","_distance3d","_trees","_findNearestTree"];

 if(TradeInprogress) exitWith { cutText ["Harvest wood already in progress." , "PLAIN DOWN"]; };
@@ -124,8 +129,10 @@ if (count(_findNearestTree) >= 1) then {

 		} else {
 			r_interrupt = false;
-			[objNull, player, rSwitchMove,""] call RE;
-			player playActionNow "stop";
+			if (vehicle player == player) then {
+				[objNull, player, rSwitchMove,""] call RE;
+				player playActionNow "stop";
+			};
 			cutText ["Canceled Harvesting Wood.", "PLAIN DOWN"];
 		};

--- a/dayz_code/actions/salvage.sqf
+++ b/dayz_code/actions/salvage.sqf
@@ -73,8 +73,6 @@ if (_hasToolbox) then {
 		
 			if (_isOK) then {	

-				
-			
 				//break the part
 				_selection = getText(configFile >> "cfgVehicles" >> _type >> "HitPoints" >> _hitpoint >> "name");
 			
@@ -105,8 +103,10 @@ if (_hasToolbox) then {
 	
 	} else {
 		r_interrupt = false;
-		[objNull, player, rSwitchMove,""] call RE;
-		player playActionNow "stop";
+		if (vehicle player == player) then {
+			[objNull, player, rSwitchMove,""] call RE;
+			player playActionNow "stop";
+		};
 		cutText ["Canceled Salvage.", "PLAIN DOWN"];
 	};
 			
--- a/dayz_code/actions/salvage_vehicle.sqf
+++ b/dayz_code/actions/salvage_vehicle.sqf
@@ -10,7 +10,7 @@ _vehicle = _this select 3;

 // _allFixed = true;
 _hitpoints = _vehicle call vehicle_getHitpoints;
-
+// diag_log format["DEBUG SALVAGE: %1", _hitpoints];
 {			
 	_damage = [_vehicle,_x] call object_getHit;
 	_part = "PartGeneric";
@@ -43,7 +43,7 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
 	};

 	// allow removal of any lightly damaged parts
-	if (_damage < 1) then {
+	if (_damage < 1 and _damage > 0) then {
 		
 		// Do not allow removal of engine or fueltanks
 		if( _part == "PartGlass" or _part == "PartWheel" ) then {
@@ -56,6 +56,7 @@ _hitpoints = _vehicle call vehicle_getHitpoints;
 			_string = format["<t %2>Remove%1 (%3 %4)</t>",_cmpt,_color,_percent,"%"]; //Remove - Part
 			_handle = dayz_myCursorTarget addAction [_string, "\z\addons\dayz_code\actions\salvage.sqf",[_vehicle,_part,_x], 0, false, true, "",""];
 			s_player_repairActions set [count s_player_repairActions,_handle];
+			
 		};
 	};

--- a/dayz_code/actions/tame_dog.sqf
+++ b/dayz_code/actions/tame_dog.sqf
@@ -1,7 +1,7 @@
 /*
 	File: tame_dog.sqf 1.1
 	Author: Kane "Alby" Stone
-	Edited by: [VB]AWOL
+	Expanded to allow all meats as input by: [VB]AWOL - DayZ Epoch

 	Description:
 	Allows a player to tame/domesticate a dog.
@@ -20,7 +20,6 @@ _caller = 	_this select 1;
 _id =		_this select 2;
 _dog =		_this select 3;

-// expanded to allow all meats as input
 _removed = 0;
 _itemIn = "FoodmeatRaw";
 _countIn = 1;
--- a/dayz_code/actions/trade_any_boat.sqf
+++ b/dayz_code/actions/trade_any_boat.sqf
@@ -62,8 +62,10 @@ if (_qty >= _qty_in) then {

 	if (!_finished) exitWith { 
 		r_interrupt = false;
-		[objNull, player, rSwitchMove,""] call RE;
-		player playActionNow "stop";
+		if (vehicle player == player) then {
+			[objNull, player, rSwitchMove,""] call RE;
+			player playActionNow "stop";
+		};
 		cutText ["Canceled Trade." , "PLAIN DOWN"];
 	};

@@ -73,7 +75,7 @@ if (_qty >= _qty_in) then {
 		if(_buy_o_sell == "buy") then {
 			_qty = {_x == _part_in} count magazines player;
 		} else {
-			_obj = nearestObjects [(getPosATL player), [_part_in], 20];
+			_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance];
 			_qty = count _obj;
 		};

@@ -106,6 +108,7 @@ if (_qty >= _qty_in) then {
 					
 					_config = _keySelected;
 					_isOk = [player,_config] call BIS_fnc_invAdd;
+					waitUntil {!isNil "_isOk"};
 					if (_isOk and _isKeyOK) then {
 					
 						_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
--- a/dayz_code/actions/trade_any_vehicle.sqf
+++ b/dayz_code/actions/trade_any_vehicle.sqf
@@ -24,7 +24,7 @@ _bos = 0;
 if(_buy_o_sell == "buy") then {
 	_qty = {_x == _part_in} count magazines player;
 } else {
-	_obj = nearestObjects [(getPosATL player), [_part_in], 20];
+	_obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance];
 	_qty = count _obj;
 	_bos = 1;
 };
@@ -61,8 +61,10 @@ if (_qty >= _qty_in) then {

 	if (!_finished) exitWith { 
 		r_interrupt = false;
-		[objNull, player, rSwitchMove,""] call RE;
-		player playActionNow "stop";
+		if (vehicle player == player) then {
+			[objNull, player, rSwitchMove,""] call RE;
+			player playActionNow "stop";
+		};
 		cutText ["Canceled Trade." , "PLAIN DOWN"];
 	};

@@ -105,6 +107,7 @@ if (_qty >= _qty_in) then {
 					
 					_config = _keySelected;
 					_isOk = [player,_config] call BIS_fnc_invAdd;
+					waitUntil {!isNil "_isOk"};
 					if (_isOk and _isKeyOK) then {
 					
 						_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
@@ -186,7 +189,7 @@ if (_qty >= _qty_in) then {
 							cutText [format[("Sold %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];
 						};
 					} else {
-						cutText [format[("Cannot sell %1, tires are too damaged."),_textPartOut] , "PLAIN DOWN"];
+						cutText [format[("Cannot sell %1, tires are too damaged."),_textPartIn] , "PLAIN DOWN"];
 					};
 				};
 	
--- a/dayz_code/actions/vault_combination_1.sqf
+++ b/dayz_code/actions/vault_combination_1.sqf
@@ -1,12 +1,11 @@
 private ["_buy","_number"];
 dayz_selectedVault = _this select 3;
 dayz_combination = "";
-_number = 0;

 {player removeAction _x} forEach s_player_combi;s_player_combi = [];
-
-for "_x" from 1 to 10 do {
-	_buy = player addAction [str(_number), "\z\addons\dayz_code\actions\vault_combination_2.sqf",str(_number), 99, true, false, "",""];
-	s_player_combi set [count s_player_combi,_buy];
-	_number = _number + 1;
+		
+if(!isNull dayz_selectedVault) then {
+	_ok = createdialog "SafeKeyPad";
 };
+
+s_player_unlockvault = -1;
--- a/dayz_code/actions/vault_pitch.sqf
+++ b/dayz_code/actions/vault_pitch.sqf
@@ -48,7 +48,7 @@ _counter = 0;
 while {_isOk} do {
 	
 	if(_counter == 0) then {
-		cutText ["Planning consruction stand still 5 seconds to build.", "PLAIN DOWN"];
+		cutText ["Planning construction stand still 5 seconds to build.", "PLAIN DOWN"];
 		sleep 5; 
 		_location1 = getPosATL player;
 		sleep 5;
@@ -56,7 +56,7 @@ while {_isOk} do {
 	
 		if(_location1 distance _location2 < 0.1) exitWith {
 			
-			cutText ["Started consruction move within 5 seconds to cancel.", "PLAIN DOWN"];
+			cutText ["Started construction move within 5 seconds to cancel.", "PLAIN DOWN"];
 			_location3 = getPosATL player;
 			sleep 5;
 			_location4 = getPosATL player;
@@ -85,7 +85,7 @@ _vault_location = (getPosATL _tmpvault);
 // Make sure vault is not placed on road. 
 if (isOnRoad _vault_location) then { _isOk = true; diag_log ("surface is road"); };
 // Make sure vault is not placed in trader citys
-if(!placevault) then { _isOk = true; diag_log ("is trader city"); };
+if(!canbuild) then { _isOk = true; diag_log ("is trader city"); };

 //Block Tents in pounds
 _objectsPond = 		nearestObjects [_playerPos, [], 10];
--- a/dayz_code/compile/fn_selfActions.sqf
+++ b/dayz_code/compile/fn_selfActions.sqf
@@ -40,7 +40,12 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then {
 if(DZEdebug) then {
 	hint str(typeOf cursorTarget);
 	if (s_player_debuglootpos < 0) then {
-		s_player_debuglootpos = player addAction ["Save to arma2.rpt", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["save"], 99, false, true, "",""];
+		s_player_debuglootpos = player addAction ["Save to arma2.rpt", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["start"], 99, false, true, "",""];
+		s_player_debuglootpos1 = player addAction ["Raise Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["up"], 99, false, true, "",""];
+		s_player_debuglootpos2 = player addAction ["Lower Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["down"], 99, false, true, "",""];
+		s_player_debuglootpos3 = player addAction ["Raise Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["up_small"], 99, false, true, "",""];
+		s_player_debuglootpos4 = player addAction ["Lower Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["down_small"], 99, false, true, "",""];
+		Base_Z_height = 0.5;
 	};
 };

@@ -130,7 +135,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	_isZombie = _cursorTarget isKindOf "zZombie_base";
 	_isDestructable = _cursorTarget isKindOf "BuiltItems";
 	_isWreck = _typeOfCursorTarget in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
-	_isRemovable = _typeOfCursorTarget in ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","SandNest_DZ"];
+	_isRemovable = _typeOfCursorTarget in ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","SandNest_DZ","Plastic_Pole_EP1_DZ"];
 	_isDisallowRepair = _typeOfCursorTarget in ["M240Nest_DZ"];

 	_isTent = _cursorTarget isKindOf "TentStorage";
@@ -157,7 +162,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	// diag_log ("OWNERID = " + _ownerID + " CHARID = " + dayz_characterID + " " + str(_ownerID == dayz_characterID));
 	
 	//Allow player to delete objects
-	if((_isDestructable or _isWreck or (_isRemovable and ("ItemCrowbar" in _itemsPlayer))) and _hasToolbox) then {
+	if((_isDestructable or _isWreck or (_isRemovable and ("ItemCrowbar" in _itemsPlayer))) and _hasToolbox and _isAlive) then {
 		if (s_player_deleteBuild < 0) then {
 			s_player_deleteBuild = player addAction [format[localize "str_actions_delete",_text], "\z\addons\dayz_code\actions\remove.sqf",_cursorTarget, 1, true, true, "", ""];
 		};
@@ -167,7 +172,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	};
 	
 	// Allow Owner to lock and unlock vehicle  
-	if(_isVehicle and !_isMan and _ownerID != "0") then {
+	if(_isVehicle and _isAlive and !_isMan and _ownerID != "0") then {
 		if (s_player_lockUnlock_crtl < 0) then {
 			_hasKey = _ownerID in _temp_keys;
 			_oldOwner = (_ownerID == dayz_playerUID);
@@ -205,7 +210,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 		player removeAction s_player_forceSave;
 		s_player_forceSave = -1;
 	};
-	*/
+	

 	if((_isVehicle or _isTent or _isnewstorage) and _isAlive and !_isMan) then {
 		if (s_player_checkGear < 0) then {
@@ -215,6 +220,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 		player removeAction s_player_checkGear;
 		s_player_checkGear = -1;
 	};
+	*/

 	//flip vehicle small vehicles by your self and all other vehicles with help nearby
 	if (_isVehicle and !_canmove and _isAlive and (player distance _cursorTarget >= 2) and (count (crew _cursorTarget))== 0 and ((vectorUp _cursorTarget) select 2) < 0.5) then {
--- a/dayz_code/compile/player_friendliesCheck.sqf
+++ b/dayz_code/compile/player_friendliesCheck.sqf
@@ -1,26 +1,33 @@
-private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList"];
+private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList","_statusNew","_tagColor","_humanity","_status","_everyone"];
 _charID = player getVariable ["characterID", "0"];
 _friendlies = player getVariable ["friendlies", []];
+_everyone = player getVariable ["everyone", []];
 _tagList = player getVariable ["tagList", []];

 // create tags
 { 
-	if (isPlayer _x) then { 
+	if (isPlayer _x and player != _x) then { 
 		_rcharID = _x getVariable ["characterID", "0"];
-		_rfriendlies = _x getVariable ["friendlies", []];
-		_rfriendlyTo = _x getVariable ["friendlyTo", []];
-		if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then {
-			if (!(_charID in _rfriendlyTo)) then {
-				_position = [0,0,0];
-				_tag = "Sign_sphere10cm_EP1" createVehicleLocal _position;
-				_tag attachTo [_x,[0,0,0],"lwrist"];
-				_tag setVariable ["belongsTo", _rcharID];
-				_rfriendlyTo set [count _rfriendlyTo, _charID];
-				_x setVariable ["friendlyTo", _rfriendlyTo, true];
-				_tagList set [count _tagList, [_x, _tag]];
-				player setVariable ["tagList", _tagList];
-				titleText [format["You and %1 are now tagged as friendlies.", (name _x)], "PLAIN DOWN"];
-			};
+		if(!(_rcharID in _everyone)) then {
+			
+			// Track who has tags
+			_everyone set [count _everyone, _rcharID];
+			player setVariable ["everyone", _everyone];
+			
+			// Add sphere to everyone
+			_position = [0,0,0];
+			_tag = "Sign_sphere10cm_EP1" createVehicleLocal _position;
+			_tag attachTo [_x,[0,0,0],"lwrist"];
+			_tag setVariable ["belongsTo", _rcharID];	
+
+			// Force white
+			_tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"];
+			
+			diag_log format["SETUP ORB FOR: %1", _x];
+			
+			// Maintenance array
+			_tagList set [count _tagList, [_x, _tag,"white"]];
+			player setVariable ["tagList", _tagList];
 		};
 	};
 } forEach playableUnits;
@@ -30,13 +37,68 @@ _newTagList = [];
 {
 	_player = _x select 0;
 	_tag = _x select 1;
+	_status = _x select 2;
+	_statusNew = "white";
+	//_tagColor = "";
+	_tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)";
+	
 	
 	// friendly player disconnected
 	if (!(isPlayer _player)) then {
 		deleteVehicle _tag;
 	} else {
-		_newTagList set [count _newTagList, [_player, _tag]];
+		
+		if (_status != "green") then {	
+			diag_log format["CHECK IF FRIENDLY: %1", _player];
+			_rcharID = _player getVariable ["characterID", "0"];
+			_rfriendlies = _player getVariable ["friendlies", []];
+			_rfriendlyTo = _player getVariable ["friendlyTo", []];
+		
+			if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then {
+				if (!(_charID in _rfriendlyTo)) then {
+
+					diag_log format["IS FRIENDLY: %1", _player];
+				
+					_rfriendlyTo set [count _rfriendlyTo, _charID];
+					_player setVariable ["friendlyTo", _rfriendlyTo, true];
+					titleText [format["You and %1 are now tagged as friendlies.", (name _player)], "PLAIN DOWN"];
+				
+					_statusNew = "green";
+					_tagColor = "#(argb,8,8,3)color(0,1,0,0.5,ca)";
+					// light green #(argb,8,8,3)color(0.04,0.86,0.1,0.5,ca)
+				};
+
+			} else {
+		
+				// Get humanity 
+				_humanity = _player getVariable ["humanity",0];  
+				
+				if(_humanity < -2000) then {
+					_statusNew = "red";
+					_tagColor = "#(argb,8,8,3)color(1,0,0,0.5,ca)";
+				} else {
+					if(_humanity > 5000) then {
+						_statusNew = "blue";
+						_tagColor = "#(argb,8,8,3)color(0,0,1,0.5,ca)";
+					};
+				};
+
+				diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity];
+			};
+
+			
+			if(_statusNew != _status) then {
+				diag_log format["STATUS CHANGED: %1 != %2", _statusNew, _status];
+				// Set texture based on humanity or friendship status
+				_tag setobjecttexture [0,_tagColor];
+				_status = _statusNew;
+			}; 
+
+		};
+		diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status];
+		_newTagList set [count _newTagList, [_player, _tag, _status]];
 	};
 } forEach _tagList;

-player setVariable ["tagList", _newTagList];
+player setVariable ["tagList", _newTagList];
+
--- a/dayz_code/compile/player_onPause.sqf
+++ b/dayz_code/compile/player_onPause.sqf
@@ -31,7 +31,7 @@ private ["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax"];
 					cutText [format ["Can Abort in %1", (_timeMax - _timeOut)], "PLAIN DOWN"];
 					//cutText [format[localize "str_abort_zedsclose",_text, "PLAIN DOWN"];
 				};
-				case (!placevault) : {
+				case (!canbuild) : {
 					_btnAbort ctrlEnable false;
 					cutText ["Cannot Abort while in a trader city!", "PLAIN DOWN"];
 				};
--- a/dayz_code/compile/player_zombieAttack.sqf
+++ b/dayz_code/compile/player_zombieAttack.sqf
@@ -5,7 +5,7 @@ _vehicle = (vehicle player);

 _targets = _unit getVariable ["targets",[]];

-if (dayz_zedsAttackVehicles and !(_vehicle in _targets)) exitWith {};
+// if (!dayz_zedsAttackVehicles and !(_vehicle in _targets)) exitWith {};

 //Do the attack
 if (r_player_unconscious && _vehicle == player && _type == "zombie") then {
--- a/dayz_code/compile/spawn_loot.sqf
+++ b/dayz_code/compile/spawn_loot.sqf
@@ -4,8 +4,8 @@ _iClass = 	_this select 1;
 _iPos =		_this select 2;
 _radius =	_this select 3;

-_iPosZ = _iPos select 2;
-if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; };
+//_iPosZ = _iPos select 2;
+//if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; };

 switch (_iClass) do {
 	default {
--- a/dayz_code/config.cpp
+++ b/dayz_code/config.cpp
@@ -14,13 +14,14 @@
 #define EAST 0 // (Russian)

 #include "basicdefines.hpp"
+#include "safegui.hpp"

 class CfgPatches {
 	class dayz_code {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights"};
+		requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT","asc_eu_lights","vilas_pl_cars"};
 	};
 	class DZ_DebriefingRemoved
 	{
@@ -40,7 +41,7 @@ class CfgMods
 		hidePicture = 0;
 		hideName = 0;
 		action = "http://www.dayzepoch.com";
-		version = "1.0.1.1";
+		version = "1.0.1.2";
 		hiveVersion = 0.96; //0.93
 	};
 };
@@ -78,6 +79,19 @@ class CfgAddons
 	};
 };

+class CfgActions {
+	class None; // External class reference
+
+	class Rearm : None {
+		show = 0;
+	};
+	/*
+	class TakeBag : None {
+		show = 0;
+	};
+	*/
+	
+};
 class CfgAISkill {
 	aimingaccuracy[] = {0, 0, 1, 1};
 	aimingshake[] = {0, 0, 1, 1};
@@ -96,6 +110,8 @@ class CfgInGameUI
    class PeripheralVision
    {
        cueColor[] = {0,0,0,0};
+        cueFriendlyColor[] = {0,0,0,0};
+        cueEnemyColor[] = {0,0,0,0};
    };

 	
@@ -381,6 +397,14 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWpink_DZ";
 		};
+		class Skin_SurvivorWsequisha_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWsequisha_DZ";
+		};
+		class Skin_SurvivorWsequishaD_DZ: Default {
+			sex = "female";
+			playerModel = "SurvivorWsequishaD_DZ";
+		};
 		class Skin_SurvivorWcombat_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWcombat_DZ";
@@ -487,7 +511,7 @@ class CfgBuildingLoot {
 		lootPos[] = {};
 		itemType[] = {
 			{ "ItemSodaMdew","magazine" },
-			{ "ItemSodaR4z0r","magazine" },
+			{ "ItemSodaRbull","magazine" },
 			{ "ItemWatch","generic" },
 			{ "ItemCompass","generic" },
 			{ "ItemMap","weapon" },
@@ -568,7 +592,7 @@ class CfgBuildingLoot {
 		lootPos[] = {};
 		itemType[] = {
 			{ "WeaponHolder_ItemGenerator","object" },
-			{ "WeaponHolder_ItemFuelBarrel","object" },
+			{"ItemFuelBarrel","magazine"},
 			{ "","generic" },
 			{ "","trash" },
 			{ "","military" },
@@ -624,9 +648,10 @@ class CfgBuildingLoot {
 			{ "PartWoodPile","magazine" },
 			{ "WeaponHolder_ItemHatchet","object" },
 			{ "MR43","weapon" },
-			{ "WeaponHolder_ItemFuelBarrel","object" },
+			{"ItemFuelBarrel","magazine"},
 			{ "WeaponHolder_ItemMachete", "object"},
-			{ "ItemFishingPole","weapon" }
+			{ "ItemFishingPole","weapon" },
+			{ "ItemLightBulb","magazine"}
 	};
 		itemChance[] =	{
 			0.05,
@@ -634,14 +659,15 @@ class CfgBuildingLoot {
 			0.01,
 			0.04,
 			0.03,
-			0.22,
+			0.21,
 			0.03,
-			0.095,
+			0.085,
 			0.15,
 			0.06,
 			0.005,
 			0.03,
-			0.01
+			0.01,
+			0.02
 		};
 	};
 	class Supermarket: Default {
@@ -651,6 +677,7 @@ class CfgBuildingLoot {
 		zombieChance = 0.3;
 		zombieClass[] = {"zZombie_Base","zZombie_Base","z_teacher","z_suit1","z_suit2"};
 		itemType[] = {
+			{ "ItemSodaOrageSherbet","magazine" },
 			{ "ItemWatch","generic" },
 			{ "ItemCompass","generic" },
 			{ "ItemMap","weapon" },
@@ -685,7 +712,8 @@ class CfgBuildingLoot {
 			{"ItemKeyKit","weapon"}
 	};
 		itemChance[] =	{
-			0.11,
+			0.01,
+			0.10,
 			0.02,
 			0.04,
 			0.02,
@@ -727,8 +755,8 @@ class CfgBuildingLoot {
 			{ "bizon_silenced","weapon" },
 			{ "M14_EP1","weapon" },
 			{ "FN_FAL_ANPVS4","weapon" },
-			{ "M107_DZ","weapon" },
-			{ "BAF_AS50_scoped","weapon" },
+			{ "BAF_LRR_scoped","weapon" },
+			{ "AK_107_PSO","weapon" },
 			{ "Mk_48_DZ","weapon" },
 			{ "M249_DZ","weapon" },
 			{"BAF_L85A2_RIS_SUSAT","weapon"},
@@ -961,7 +989,7 @@ class HeliCrash_No50s: Default {
 			{ "M24","weapon" },
 			{ "SVD_CAMO","weapon" },
 			{ "M1014","weapon" },
-			{ "M107_DZ","weapon" },
+			{ "BAF_LRR_scoped","weapon" },
 			{ "DMR","weapon" },
 			{ "M4A1","weapon" },
 			{ "M14_EP1","weapon" },
@@ -1094,13 +1122,13 @@ class HeliCrash_No50s: Default {
 		zombieClass[] = {"z_priest","z_priest","z_priest"};
 	};
 	class Land_HouseV_1I4: Residential {
-		lootPos[] = {{-0.400146,-3.87695,-2.76879},{-3.67749,-2.52002,-2.76551},{-0.472168,3.19702,-2.72021}};
+		lootPos[] = {{-1.77002,-2.64941,-2.05628},{-0.400146,-3.87695,-2.76879},{-3.67749,-2.52002,-2.76551},{-0.472168,3.19702,-2.72021}};
 	};
 	class Land_kulna: Residential {
 		lootPos[] = {{0.504395,0.218262,-1.11643},{-0.496582,1.93262,-1.12826}};
 	};
 	class Land_Ind_Workshop01_01: Industrial {
-		lootPos[] = {{0.595215,-2.43115,-1.29412},{1.24365,0.463867,-1.295},{-0.663574,-0.50293,-1.29837}};
+		lootPos[] = {{-0.796875,1.24707,-0.836596},{0.595215,-2.43115,-1.29412},{1.24365,0.463867,-1.295},{-0.663574,-0.50293,-1.29837}};
 	};
 	class Land_Ind_Garage01: Industrial {
 		lootPos[] = {{-0.580078,-1.49707,-1.23483},{-0.834473,2.75781,-1.22563},{2.47754,-1.12891,-1.23714},{1.31934,1.63086,-1.23228}};
@@ -1134,7 +1162,7 @@ class HeliCrash_No50s: Default {
 		lootPos[] = {{-6.93213,1.0708,-1.20155},{-7.2959,-2.68213,-1.20155},{-3.41406,-4.39307,-1.20155},{-1.28809,-2.57861,-1.20155},{0.903809,-4.35986,-1.20155},{3.1377,-3.40771,-1.20155},{7.53418,-2.69971,-1.20154},{13.9653,-4.50342,-1.20155},{10.2617,0.109863,-1.20155},{10.5869,-3.84375,-1.20155},{7.84521,-0.137207,-1.20154},{3.57471,0.0356445,-1.20154},{-0.370605,5.17676,-1.20155},{4.77783,5.57617,-1.20155},{13.0874,4.35645,-1.20155},{12.9932,6.31689,-1.20155},{7.36328,3.00928,-1.20155},{1.93091,2.17236,-1.20154},{-3.82715,5.3335,-1.20155},{-7.55029,8.54199,-1.20154},{-4.42407,8.96631,-1.20154},{3.72705,8.36084,-1.20155},{9.84033,8.3374,-1.20155},{-2.90918,1.32031,-1.20155}};
 	};
 	class Land_A_GeneralStore_01: Supermarket {
-		lootPos[] = {{-9.38965,-3.30371,-1.20155},{-3.77539,-3.86865,-1.20155},{1.31836,1.46631,-1.20155},{9.01367,3.8457,-1.20155},{13.3008,-1.77832,-1.20155},{9.81055,1.43213,-1.20155},{1.65039,5.14355,-1.20155},{0.753906,-3.69531,-1.20155},{13.3125,-7.65137,-1.20155},{11.168,-3.73682,-1.20155},{8.89453,-8.37402,-1.20155},{-2.04492,-7.58105,-1.20155},{-7.84766,-5.73633,-1.20155},{-8.22461,-7.32422,-1.20155},{3.79004,-5.69336,-1.20155},{-9.38379,4.46191,-1.20155},{-3.5752,4.46533,-1.20155},{-3.33789,0.612793,-1.20155},{10.5918,-9.9458,-1.21082},{0.105469,-9.6084,-1.21082},{-4.86035,-10.4209,-1.21082},{-6.80859,-1.23975,-1.20155},{1.12207,-1.58887,-1.20155}};
+		lootPos[] = {{-1.32861,-2.72534,-0.621548},{4.4751,-2.69824,-0.621548},{-5.29688,0.796387,-0.691548},{-4.85498,2.95166,-0.201549},{-9.38965,-3.30371,-1.20155},{-3.77539,-3.86865,-1.20155},{1.31836,1.46631,-1.20155},{9.01367,3.8457,-1.20155},{13.3008,-1.77832,-1.20155},{9.81055,1.43213,-1.20155},{1.65039,5.14355,-1.20155},{0.753906,-3.69531,-1.20155},{13.3125,-7.65137,-1.20155},{11.168,-3.73682,-1.20155},{8.89453,-8.37402,-1.20155},{-2.04492,-7.58105,-1.20155},{-7.84766,-5.73633,-1.20155},{-8.22461,-7.32422,-1.20155},{3.79004,-5.69336,-1.20155},{-9.38379,4.46191,-1.20155},{-3.5752,4.46533,-1.20155},{-3.33789,0.612793,-1.20155},{10.5918,-9.9458,-1.21082},{0.105469,-9.6084,-1.21082},{-4.86035,-10.4209,-1.21082},{-6.80859,-1.23975,-1.20155},{1.12207,-1.58887,-1.20155}};
 	};
 	class Land_Farm_Cowshed_a: Farm {
 		lootPos[] = {{-1.06836,-5.92163,-3.08763},{1.69043,-4.91089,-3.08763},{5.8833,-6.15381,-3.08763},{8.83984,-5.60278,-3.08763},{9.74023,-2.48657,-3.08763},{2.88428,-2.34546,-3.08763},{7.88037,2.94214,-3.08763}};
@@ -1147,40 +1175,41 @@ class HeliCrash_No50s: Default {
 		lootPos[] = {{4.93188,-17.0444,-2.63063},{-3.82813,-18.6699,-2.63036},{-4.46387,16.6665,-2.63651},{5.78711,18.9473,-2.6369},{3.9541,4.88428,-2.63446},{-2.99072,-4.16748,-2.63287}};
 	};
 	class Land_Hlidac_budka: Residential {
-		lootPos[] = {{-2.3186,1.5127,-0.78363},{2.02075,0.444336,-0.78363},{-0.460938,1.75879,-0.78363}};
+		lootPos[] = {{1.27002,2.29736,-0.113617},{-2.3186,1.5127,-0.78363},{2.02075,0.444336,-0.78363},{-0.460938,1.75879,-0.78363}};
 	};
 	class Land_HouseV2_02_Interier: Residential {
-		lootPos[] = {{7.23096,5.37207,-5.53067},{8.55005,0.754883,-5.53067},{5.20166,-1.54004,-5.53067},{3.34912,1.9707,-5.53067},{-3.62598,3.05371,-5.53067},{-5.4812,-0.0292969,-5.53067},{-5.83325,3.26563,-5.53067},{-5.71045,5.49414,-5.53067}};
+		lootPos[] = {{6.46094,1.48608,-4.60568},{7.23096,5.37207,-5.53067},{8.55005,0.754883,-5.53067},{5.20166,-1.54004,-5.53067},{3.34912,1.9707,-5.53067},{-3.62598,3.05371,-5.53067},{-5.4812,-0.0292969,-5.53067},{-5.83325,3.26563,-5.53067},{-5.71045,5.49414,-5.53067}};
 	};
 	class Land_a_stationhouse: Military {
 		lootChance = 0.3;
-		lootPos[] = {{-2.69922,-7.57422,-9.47058},{-0.892578,-5.7168,-9.47058},{-3.2417,-6.61914,-4.6489},{-1.35645,-8.3623,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39502,-7.88281,-0.0437927},{-1.396,-7.79883,4.41141},{-1.37939,-5.79102,4.41141},{1.5127,1.96484,-9.47058},{18.9058,-4.06738,-9.47058}};
+		lootPos[] = {{9.93115,3.34375,-9.40037},{-2.69922,-7.57422,-9.47058},{-0.892578,-5.7168,-9.47058},{-3.2417,-6.61914,-4.6489},{-1.35645,-8.3623,-4.6489},{-1.70801,-7.85449,-0.0437927},{-3.39502,-7.88281,-0.0437927},{-1.396,-7.79883,4.41141},{-1.37939,-5.79102,4.41141},{1.5127,1.96484,-9.47058},{18.9058,-4.06738,-9.47058}};
 	};
 	class Land_Mil_ControlTower: Military {
 		lootChance = 0.4;
-		lootPos[] = {{10.0703,3.76367,-9.62869},{3.89844,3.43457,-5.46368},{1.75195,5.68164,-5.46368},{6.66113,-0.625488,-1.0687},{2.63965,-0.191406,-1.0687},{6.72266,3.23389,-1.0687}};
+		lootPos[] = {{5.51807,-1.72363,-0.378696},{7.55103,1.85889,-0.378696},{10.0703,3.76367,-9.62869},{3.89844,3.43457,-5.46368},{1.75195,5.68164,-5.46368},{6.66113,-0.625488,-1.0687},{2.63965,-0.191406,-1.0687},{6.72266,3.23389,-1.0687}};
 	};

 	class Land_SS_hangar: Military {
 		maxRoaming = 3;
-		lootPos[] = {{11.7344,-17.165,-5.87253},{-11.7158,-18.9541,-5.87253},{-14.2461,23.0439,-5.87253}};
+		lootPos[] = {{-0.18457,5.26465,-5.87254},{11.7344,-17.165,-5.87253},{-11.7158,-18.9541,-5.87253},{-14.2461,23.0439,-5.87253}};
 	};
 	class Land_A_Pub_01: Residential {
 		zombieChance = 0.2;
-		lootPos[] = {{1.83398,0.393799,-5.7462},{-1.76514,0.334473,-5.74622},{-6.62207,-6.55371,-5.74622},{-4.63623,-0.100586,-5.74622},{-5.75928,-3.05029,-5.74622},{-2.08203,0.922852,-1.76122},{-4.76514,-5.89087,-1.76122},{-6.94385,-1.9375,-1.76122},{-4.05225,-0.779785,-1.76122},{1.39795,-1.73779,-1.76122},{3.13867,-2.78564,-1.76122},{3.58301,-0.591309,-1.76122},{3.03027,-4.04346,-1.76122},{1.94092,3.18799,-1.76122},{-0.0961914,6.22437,-1.76122},{5.30469,7.55957,-1.76122},{6.72559,-2.72705,-1.76122},{2.56885,-4.6001,-5.74621},{4.06738,5.41406,-5.74622},{0.753418,2.2998,-5.74622}};
+		lootPos[] = {{1.25684,5.34863,-5.01622},{1.2041,-1.88574,-4.7562},{-7.50195,-1.42871,-5.28622},{-3.51318,-2.60645,-3.66622},{2.09375,1.03027,-0.101221},{1.85889,6.45996,-1.31122]},
+		{1.83398,0.393799,-5.7462},{-1.76514,0.334473,-5.74622},{-6.62207,-6.55371,-5.74622},{-4.63623,-0.100586,-5.74622},{-5.75928,-3.05029,-5.74622},{-2.08203,0.922852,-1.76122},{-4.76514,-5.89087,-1.76122},{-6.94385,-1.9375,-1.76122},{-4.05225,-0.779785,-1.76122},{1.39795,-1.73779,-1.76122},{3.13867,-2.78564,-1.76122},{3.58301,-0.591309,-1.76122},{3.03027,-4.04346,-1.76122},{1.94092,3.18799,-1.76122},{-0.0961914,6.22437,-1.76122},{5.30469,7.55957,-1.76122},{6.72559,-2.72705,-1.76122},{2.56885,-4.6001,-5.74621},{4.06738,5.41406,-5.74622},{0.753418,2.2998,-5.74622}};
 	};
 	class Land_HouseB_Tenement: Office {
-		lootPos[] = {{5.40576,9.89551,-20.7845},{5.99023,14.1689,-20.7845},{12.9609,14.0718,-20.7845},{14.6069,8.92383,-20.7845},{-2.75635,-2.08594,-20.7845}};
+		lootPos[] = {{4.02954,12.0869,-18.7345},{7.12988,11.7734,-20.3445},{2.4187,4.88037,-19.8245},{-1.08154,4.7002,-19.8245},{-4.54492,4.87012,-19.8245},{-10.4272,-0.536621,-20.3445},{5.40576,9.89551,-20.7845},{5.99023,14.1689,-20.7845},{12.9609,14.0718,-20.7845},{14.6069,8.92383,-20.7845},{-2.75635,-2.08594,-20.7845}};
 	};
 	class Land_A_Hospital: hospital {
 		lootChance = 0.9;
-		lootPos[] = {{0.807129,-1.16333,-7.33966},{-7.23389,-2.63647,-7.33966},{-16.3687,-2.40381,-7.33966},{-12.2847,-3.19604,-7.33966},{4.40674,-3.50513,-7.33966},{-3.2666,-0.925293,-7.33966},{6.85693,-2.75146,-7.33966},{11.0151,-3.95435,-7.33966},{16.8198,-4.71118,-7.33966},{-1.12793,3.78418,-7.44939},{12.7476,0.142822,3.29184},{10.2661,-1.21558,3.29184}};
+		lootPos[] = {{8.30273,-0.921875,-6.89966},{2.32813,-3.57422,-6.36466},{-1.40234,-4.0293,-6.36466},{0.807129,-1.16333,-7.33966},{-7.23389,-2.63647,-7.33966},{-16.3687,-2.40381,-7.33966},{-12.2847,-3.19604,-7.33966},{4.40674,-3.50513,-7.33966},{-3.2666,-0.925293,-7.33966},{6.85693,-2.75146,-7.33966},{11.0151,-3.95435,-7.33966},{16.8198,-4.71118,-7.33966},{-1.12793,3.78418,-7.44939},{12.7476,0.142822,3.29184},{10.2661,-1.21558,3.29184}};
 	};
 	class Land_Panelak: Office {
 		lootPos[] = {{-2.76904,-6.26563,0.0714226},{-2.93896,-1.3916,0.0714226},{-5.42065,-3.13184,0.0714226},{-6.81128,-6.15527,0.0714221},{-4.00879,2.53027,0.0714226},{-0.730957,-3.20117,2.77144},{3.979,-7.08936,2.77144},{2.49609,2.93701,2.77144},{6.7373,1.63281,2.77144},{6.38525,-2.3916,2.77144},{6.80615,-5.77295,2.77144},{3.75122,-0.803711,2.77144},{-0.824219,1.86914,1.32865}};
 	};
 	class Land_Panelak2: Office {
-		lootPos[] = {{-0.729492,-3.00635,-2.62859},{-0.764648,1.36279,-1.37137},{-0.30127,3.65039,1.32864},{0.73584,-3.22217,2.71097},{-0.630859,1.84766,4.05244},{3.68921,-7.33545,5.43665},{2.26807,2.94092,5.43665},{6.7002,2.68994,5.43665},{6.87842,-1.45947,5.43665},{6.09619,-5.94824,5.43665},{4.45508,-1.64893,5.43665},{2.76367,0.445801,5.43665}};
+		lootPos[] = {{4.90283,1.53857,6.24665},{-0.729492,-3.00635,-2.62859},{-0.764648,1.36279,-1.37137},{-0.30127,3.65039,1.32864},{0.73584,-3.22217,2.71097},{-0.630859,1.84766,4.05244},{3.68921,-7.33545,5.43665},{2.26807,2.94092,5.43665},{6.7002,2.68994,5.43665},{6.87842,-1.45947,5.43665},{6.09619,-5.94824,5.43665},{4.45508,-1.64893,5.43665},{2.76367,0.445801,5.43665}};
 	};
 	class Land_Shed_Ind02: Industrial {
 		lootPos[] = {{-2.28174,-5.67236,-4.62599},{4.54529,9.6665,-4.62599},{4.41223,2.64941,-1.27954},{-0.437866,11.6943,-1.27641},{-3.44482,12.2119,-1.27704}};
@@ -1204,7 +1233,7 @@ class HeliCrash_No50s: Default {
 		lootPos[] = {{-11.6309,7.2052,-5.55933},{-12.0674,2.56909,-5.55933},{-4.89355,6.6394,-5.55933},{-3.74121,2.90393,-3.89665},{-12.8672,1.44519,-2.23135},{-12.415,8.1311,-2.23135},{-12.7236,4.11255,-2.23135},{-3.99805,8.9801,-2.23156},{-7.33105,8.44214,-2.23156},{-4.55371,5.22644,-2.23156},{-11.4746,2.92114,1.66661},{-11.0703,8.13818,1.66661},{-4.67578,7.32678,1.62174},{-2.68262,3.44763,3.4243},{-13.1953,-8.95862,3.4243},{-8.80859,-0.443481,0.401226},{-12.1328,-0.149414,0.424298},{-2.03418,6.61414,-5.55933},{0.239258,1.72278,-5.59793},{6.22461,-3.948,-4.61825},{-6.39355,-8.24353,-5.59541},{-10.8496,-6.91211,-5.56572},{-6.77637,-1.73083,-5.56019}};
 	};
 	class Land_rail_station_big: Office {
-		lootPos[] = {{-4.97266,4.55737,-5.04438},{0.458496,4.85229,-5.04438},{2.4624,2.21851,-5.04438},{-1.32373,-2.60571,-5.04438},{-3.29443,-0.121826,-5.04438},{-1.07764,2.36646,-5.04438},{7.46045,-3.41528,-5.04438},{8.93408,3.1189,-5.04438},{-8.16357,-5.12842,-5.04438}};
+		lootPos[] = {{1.78076,0.811768,-4.05438},{-4.97266,4.55737,-5.04438},{0.458496,4.85229,-5.04438},{2.4624,2.21851,-5.04438},{-1.32373,-2.60571,-5.04438},{-3.29443,-0.121826,-5.04438},{-1.07764,2.36646,-5.04438},{7.46045,-3.41528,-5.04438},{8.93408,3.1189,-5.04438},{-8.16357,-5.12842,-5.04438}};
 	};
 	class Land_Ind_Vysypka: Industrial {
 		lootPos[] = {{0.486084,4.95459,-4.96861},{1.08032,-0.406738,-4.96801},{-0.0354004,-10.8208,-4.96686},{-5.07788,-16.4624,-4.96759},{-6.30298,2.92969,-4.96838},{-6.26685,26.7349,-4.9772},{1.64697,23.4038,-4.97097},{7.14575,3.92529,-4.96972},{4.63599,-12.1621,-4.96971}};
@@ -1218,7 +1247,7 @@ class HeliCrash_No50s: Default {
 		lootPos[] = {{-4.66113,-6.27173,-18.429},{3.31641,-5.77417,-18.429},{-0.20752,-6.48682,-18.429},{-9.72412,-4.88745,-3.78903},{-9.57813,3.55615,-3.78903},{-7.16797,11.0737,-3.78903},{5.07422,11.1838,-3.78903},{9.3208,5.38623,-3.78903},{9.65332,-4.82056,-3.78903},{3.23535,-0.105957,-0.169027},{4.85205,-3.69019,-0.169027},{-0.80127,-7.89087,-0.169027},{-4.4082,-4.91772,-0.169027},{-4.90771,-2.23169,-0.169027}};
 	};
 	class Land_A_Office01: Office {
-		lootPos[] = {{-2.50391,-2.46948,-4.528},{4.23535,-0.336914,-4.528},{4.11133,6.1123,-4.528},{0.242188,6.06299,-4.528},{4.31641,3.74023,-4.528},{5.08887,0.219727,-4.528},{11.6504,-1.5647,-4.528},{14.5811,-4.1123,-4.528},{13.8545,-0.749023,-4.528},{-7.7627,5.59082,-4.528},{1.81152,0.993408,-2.028},{4.93164,4.31982,-2.028},{1.18945,6.07031,-2.028},{2.23145,3.76563,-2.028},{-4.76367,-2.51221,-2.028},{-14.5596,-3.40723,-2.028},{-15.2705,5.92773,-2.028},{-10.9063,6.04175,0.472008},{-6.30762,3.30078,0.472006},{7.6416,6.38696,0.472001},{13.6729,6.5957,0.471999},{13.1924,-2.58691,0.471998},{3.0918,2.4375,6.20491},{-1.45703,-2.28369,6.20491},{-2.12988,4.51587,0.472005},{4.74414,-4.60156,-2.01486},{8.3457,-1.10718,-2.028},{9.94727,-3.74146,-2.028},{7.13867,-2.50732,-2.028},{12.8701,4.70923,-2.028},{15.3721,3.42383,-2.028}};
+		lootPos[] = {{0.951172,5.1814,-3.668},{6.68164,5.77954,-3.828},{-4.54492,4.97656,-1.348},{-2.50391,-2.46948,-4.528},{4.23535,-0.336914,-4.528},{4.11133,6.1123,-4.528},{0.242188,6.06299,-4.528},{4.31641,3.74023,-4.528},{5.08887,0.219727,-4.528},{11.6504,-1.5647,-4.528},{14.5811,-4.1123,-4.528},{13.8545,-0.749023,-4.528},{-7.7627,5.59082,-4.528},{1.81152,0.993408,-2.028},{4.93164,4.31982,-2.028},{1.18945,6.07031,-2.028},{2.23145,3.76563,-2.028},{-4.76367,-2.51221,-2.028},{-14.5596,-3.40723,-2.028},{-15.2705,5.92773,-2.028},{-10.9063,6.04175,0.472008},{-6.30762,3.30078,0.472006},{7.6416,6.38696,0.472001},{13.6729,6.5957,0.471999},{13.1924,-2.58691,0.471998},{3.0918,2.4375,6.20491},{-1.45703,-2.28369,6.20491},{-2.12988,4.51587,0.472005},{4.74414,-4.60156,-2.01486},{8.3457,-1.10718,-2.028},{9.94727,-3.74146,-2.028},{7.13867,-2.50732,-2.028},{12.8701,4.70923,-2.028},{15.3721,3.42383,-2.028}};
 	};
 	class Land_A_Office02: Office {
 		lootPos[] = {{4.72266,-5.74121,-8.15108},{0.961426,-5.16943,-8.15076}};
@@ -1272,7 +1301,7 @@ class HeliCrash_No50s: Default {
 		lootPos[] = {{0.542969,-3.89453,-0.776679},{0.47998,-0.608398,-0.776638},{0.515381,3.03857,-0.776592}};
 	};
 	class Land_HouseV2_04_interier: Residential {
-		lootPos[] = {{7.49463,5.8374,-5.73902},{7.50989,-0.930176,-5.74176},{1.95532,4.16406,-5.73938},{2.10876,6.60645,-5.7386},{-2.30017,4.22461,-5.73936},{-5.13306,6.74365,-5.73856},{-4.74658,2.68457,-5.73985}};
+		lootPos[] = {{-3.65234,6.87573,-5.00152},{4.78516,2.62744,-5.07818},{1.59375,2.69629,-5.06737},{7.49463,5.8374,-5.73902},{7.50989,-0.930176,-5.74176},{1.95532,4.16406,-5.73938},{2.10876,6.60645,-5.7386},{-2.30017,4.22461,-5.73936},{-5.13306,6.74365,-5.73856},{-4.74658,2.68457,-5.73985}};
 	};
 	class Land_HouseV2_01A: Residential {
 		lootPos[] = {{-3.52881,-3.16895,-5.60346},{-1.62988,-3.25439,-5.66887}};
@@ -1495,7 +1524,9 @@ class HeliCrash_No50s: Default {
 			{ 7.53271,-1.70068,-1.0687 },
 			{ 4.55225,1.64111,2.92148 },
 			{ 10.1292,3.6958,-9.62869 },
-			{ 0.491943,6.1543,-9.62869}};
+			{ 0.491943,6.1543,-9.62869},
+			{ 7.54956,1.74512,-0.378696},
+			{5.40234,-1.71289,-0.378696}};
 	};
 	class Land_Mil_hangar_EP1: Military
 	{
@@ -1808,7 +1839,7 @@ class HeliCrash_No50s: Default {
 			{ "M24","weapon" },
 			{ "SVD_CAMO","weapon" },
 			{ "M1014","weapon" },
-			{ "M107_DZ","weapon" },
+			{ "BAF_LRR_scoped","weapon" },
 			{ "DMR","weapon" },
 			{ "M4A1","weapon" },
 			{ "M14_EP1","weapon" },
--- a/dayz_code/init/compiles.sqf
+++ b/dayz_code/init/compiles.sqf
@@ -56,6 +56,7 @@ if (!isDedicated) then {
 	//Objects
 	object_roadFlare = 			compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_roadFlare.sqf";
 	object_setpitchbank	=		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_setpitchbank.sqf";
+	object_monitorGear =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_monitorGear.sqf";
 	
 	//Zombies
 	zombie_findTargetAgent = 	compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_findTargetAgent.sqf";
@@ -122,8 +123,9 @@ if (!isDedicated) then {
 		_display = uiNameSpace getVariable "BIS_loadingScreen";
 		_control1 = _display displayctrl 8400;
 		_control2 = _display displayctrl 102;
-		// 40 sec timeout
-		while { _timeOut < 400 && !dayz_clientPreload } do {
+		// 120 sec timeout
+		while { _timeOut < 3000 && !dayz_clientPreload && !dayz_authed } do {
+
 			if ( isNull _display ) then {
 				waitUntil { !dialog; };
 				startLoadingScreen ["","RscDisplayLoadCustom"];
@@ -140,13 +142,14 @@ if (!isDedicated) then {
 			sleep 0.1;
 		};
 			endLoadingScreen;
-		if ( !dayz_clientPreload ) then {
-
+		/*
+		if ( !dayz_clientPreload && !dayz_authed ) then {
 			diag_log "DEBUG: loadscreen guard ended with timeout.";
 			disableUserInput false;
-			1 cutText ["Something went wrong! disconnect and try again!", "PLAIN"];
+			1 cutText ["Disconnected!", "PLAIN"];
 			player enableSimulation false;
 		} else { diag_log "DEBUG: loadscreen guard ended."; };
+		*/
 	}; 
 	dayz_losChance = {
 		private["_agent","_maxDis","_dis","_val","_maxExp","_myExp"];
@@ -434,6 +437,7 @@ if (!isDedicated) then {
 	fnc_vehicleEventHandler = 	compile preprocessFileLineNumbers "\z\addons\dayz_code\init\vehicle_init.sqf";			//Initialize vehicle
 	fnc_inString = 				compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_inString.sqf";	
 	fnc_isInsideBuilding = 		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding.sqf";	//_isInside = [_unit,_building] call fnc_isInsideBuilding;
+	fnc_isInsideBuilding2 = 		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_isInsideBuilding2.sqf";	//_isInside = [_unit,_building] call fnc_isInsideBuilding;
 	dayz_zombieSpeak = 			compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_speak.sqf";			//Used to generate random speech for a unit
 	vehicle_getHitpoints =		compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_getHitpoints.sqf";
 	local_gutObject =			compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_gutObject.sqf";		//Generated on the server (or local to unit) when gutting an object
--- a/dayz_code/init/variables.sqf
+++ b/dayz_code/init/variables.sqf
@@ -14,7 +14,7 @@ Camo1_DZ = 		"Camo1_DZ";
 Soldier1_DZ = 	"Soldier1_DZ";
 Rocket_DZ = 	"Rocket_DZ";

-AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","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_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"];
+AllPlayers = ["Survivor2_DZ","SurvivorWcombat_DZ","SurvivorWdesert_DZ","SurvivorWurban_DZ","SurvivorWsequishaD_DZ","SurvivorWsequisha_DZ","SurvivorWpink_DZ","SurvivorW3_DZ","SurvivorW2_DZ","Bandit1_DZ","Bandit2_DZ","BanditW1_DZ","BanditW2_DZ","Soldier_Crew_PMC","Sniper1_DZ","Camo1_DZ","Soldier1_DZ","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_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"];
 // AllPlayersVehicles = ["AllVehicles"]+AllPlayers;

 //Cooking
@@ -90,6 +90,8 @@ food_output = [
 no_output_drink = ["ItemWaterbottle", "ItemWaterbottleBoiled"];
 drink_with_output = [
    "ItemSoda",  //just to define item for ItemSodaEmpty
+	"ItemSodaRbull",
+	"ItemSodaOrageSherbet",
    "ItemSodaCoke",
    "ItemSodaPepsi",
    "ItemSodaMdew",
@@ -105,6 +107,8 @@ drink_with_output = [
 ];
 drink_output = [
    "ItemSodaEmpty", 
+	"ItemSodaEmpty", 
+	"ItemSodaEmpty", 
    "ItemSodaCokeEmpty",
    "ItemSodaPepsiEmpty",
    "ItemSodaMdewEmpty",
@@ -151,7 +155,7 @@ dayz_combination = "";
 dayz_combatLog = "";
 canRoll = true;

-placevault = true;
+canbuild = true;

 //Hunting Variables
 dayZ_partClasses = [
@@ -370,10 +374,10 @@ dayz_animalDistance = 800;
 dayz_zSpawnDistance = 1000;

 if(isNil "dayz_maxLocalZombies") then {
-	dayz_maxLocalZombies = 40;
+	dayz_maxLocalZombies = 30;
 };
 if(isNil "dayz_maxGlobalZombiesInit") then {
-	dayz_maxGlobalZombiesInit = 40;
+	dayz_maxGlobalZombiesInit = 30;
 };
 if(isNil "dayz_maxGlobalZombiesIncrease") then {
 	dayz_maxGlobalZombiesIncrease = 10;
@@ -384,6 +388,9 @@ if(isNil "dayz_maxZeds") then {
 if(isNil "DZEdebug") then {
 	DZEdebug = false;
 };
+if(isNil "DZE_TRADER_SPAWNMODE") then {
+	DZE_TRADER_SPAWNMODE = false;
+};
 if(isNil "dayz_tameDogs") then {
 	dayz_tameDogs = false;
 };
@@ -399,12 +406,15 @@ if(isNil "dayz_minpos") then {
 if(isNil "dayz_maxpos") then {
 	dayz_maxpos = 20000;
 };
+if(isNil "dayz_canBuildInCity") then {
+	dayz_canBuildInCity = false;
+};

 if(isNil "dayz_zedSpawnVehCount") then {
 	dayz_zedSpawnVehCount = dayz_maxLocalZombies / 2;
 };
 if(isNil "dayz_spawnAirCount") then {
-	dayz_spawnAirCount = 5;
+	dayz_spawnAirCount = 0;
 };
 if(isNil "dayz_zedsAttackVehicles") then {
 	dayz_zedsAttackVehicles = true;
@@ -431,6 +441,15 @@ if(isServer) then {
 	dayz_players = [];
 	dead_bodyCleanup = [];
 	needUpdate_objects = [];
+
+	if(isNil "dayz_fullMoonNights") then {
+		dayz_fullMoonNights = false;
+	};
+	if(isNil "EpochEvents") then {
+		EpochEvents = [];
+	};
+	
+	
 };

 if(!isDedicated) then {
@@ -485,6 +504,9 @@ if(!isDedicated) then {
 	dayz_damageCounter =	time;
 	dayz_lastSave =			time;
 	dayz_isSwimming	=		true;
+	dayz_isKneeling	=		false;
+	dayz_isCrawling	=		false;
+	dayz_PreviousTown =		"Wilderness";
 	dayz_currentDay = 		0;
 	dayz_hasLight = 		false;
 	dayz_surfaceNoise =		0;
@@ -499,6 +521,7 @@ if(!isDedicated) then {
 	dayz_playerName =		"Unknown";
 	dayz_sourceBleeding =	objNull;
 	dayz_clientPreload = 	false;
+	dayz_authed = 			false;
 	dayz_panicCooldown = 	0;
 	dayz_areaAffect =		2;
 	dayz_heartBeat = 		false;
--- a/dayz_code/rscTitles.hpp
+++ b/dayz_code/rscTitles.hpp
@@ -1,6 +1,7 @@
-class RscPicture;
-class RscButton;
+//class RscPicture;
+//class RscButton;
 class CA_IGUI_Title;
+class CA_Title;
 class RscText;
 class RscControlsGroup;
 class RscLineBreak;
@@ -148,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay
 		class DAYZ_Version : CA_Version
 		{
 			idc = -1;
-			text = "DayZ Epoch 1.0.1.1 (1.7.6.1)";
+			text = "DayZ Epoch 1.0.1.2 (1.7.6.1)";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;
@@ -763,6 +764,113 @@ class RscDisplayGenderSelect
 	};
 };

+class RscDisplayMPInterrupt : RscStandardDisplay {
+	movingEnable = 0;
+	enableSimulation = 1;
+	//onLoad = "_dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf'; [(_this select 0)] execVM '\z\addons\dayz_code\compile\player_onPause.sqf';"; _respawn = (_this select 0) displayCtrl 1010); _respawn ctrlEnable false; _abort = (_this select 0) displayCtrl 104); _abort ctrlEnable false;						
+	onLoad = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; _dummy = ['Init', _this] execVM '\ca\ui\scripts\pauseLoadinit.sqf';";
+	onUnload = "private ['_dummy']; _dummy = ['Unload', _this] execVM '\ca\ui\scripts\pauseOnUnload.sqf';";
+	
+	class controlsBackground {
+		class Mainback : RscPicture {
+			idc = 1104;
+			x = 0.045;
+			y = 0.17;
+			w = 0.627451;
+			h = 0.836601;
+			text = "\ca\ui\data\ui_background_mp_pause_ca.paa";
+		};
+	};
+	
+	class controls {
+	/*
+		class Title {};
+		class B_Players {};
+		class B_Options {};
+		class B_Abort {};
+		class B_Retry {};
+		class B_Load {};
+		class B_Save {};
+		class B_Continue {};
+		class B_Diary {};
+	*/	
+		
+		class MissionTitle : RscText {
+			idc = 120;
+			x = 0.05;
+			y = 0.818;
+			text = "";
+		};
+		
+		class DifficultyTitle : RscText {
+			idc = 121;
+			x = 0.05;
+			y = 0.772;
+			text = "";
+		};
+		
+		class Paused_Title : CA_Title {
+			idc = 523;
+			x = 0.087;
+			y = 0.192;
+			text = $STR_DISP_MAIN_MULTI;
+		};
+		
+		class CA_B_SAVE : RscShortcutButtonMain {
+			idc = 103;
+			y = 0.2537 + 0.101903 * 0;
+			x = 0.051;
+			text = $STR_DISP_INT_SAVE;
+			default = 0;
+		};
+		
+		class CA_B_Skip : CA_B_SAVE {
+			idc = 1002;
+			text = $STR_DISP_INT_SKIP;
+		};
+		
+		class CA_B_REVERT : CA_B_SAVE {
+			idc = 119;
+			y = 0.2537 + 0.101903 * 1;
+			text = "$str_disp_revert";
+			default = 0;
+		};
+		
+		class CA_B_Respawn : CA_B_SAVE {
+			idc = 1010;
+			//onButtonClick = "hint str (_this select 0);";
+			onButtonClick = "if ((alive player) && (r_fracture_legs)) then { player SetDamage 1;};";
+			y = 0.2537 + 0.101903 * 2;
+			text = $STR_DISP_INT_RESPAWN;
+			default = 0;
+		};
+		
+		class CA_B_Options : CA_B_SAVE {
+			idc = 101;
+			y = 0.2537 + 0.101903 * 3;
+			text = $STR_DISP_INT_OPTIONS;
+			default = 0;
+		};
+		
+		class CA_B_Abort : CA_B_SAVE {
+			idc = 104;
+			y = 0.2537 + 0.101903 * 4;
+			onButtonClick = "[] execVM '\z\addons\dayz_code\compile\player_onPause.sqf'; call dayz_forceSave;";
+			text = $STR_DISP_INT_ABORT;
+			default = 0;
+		};
+		
+		class ButtonCancel : RscShortcutButton {
+			idc = 2;
+			shortcuts[] = {0x00050000 + 1, 0x00050000 + 8};
+			default = 1;
+			x = 0.1605;
+			y = 0.8617;
+			text = $STR_DISP_INT_CONTINUE;
+		};
+	};
+};
+
 class RscDisplayGear
 {
 	idd = 106;
@@ -1491,7 +1599,7 @@ class RscDisplayGear
 	emptyMag2 = "\ca\ui\data\ui_gear_mag2_gs.paa";
 	emptyHGun = "\ca\ui\data\ui_gear_hgun_gs.paa";
 	emptyHGunMag = "\ca\ui\data\ui_gear_hgunmag_gs.paa";
-	onLoad = "call gear_ui_init;if (isNil('IGUI_GEAR_activeFilter')) then { IGUI_GEAR_activeFilter = 0;}; private ['_dummy']; _dummy = [_this,'initDialog'] call compile preprocessFile	'\ca\ui\scripts\handleGear.sqf'; _dummy = [_this,'onLoad'] execVM	'\ca\ui\scripts\handleGear.sqf'; _dummy;";
+	onLoad = "[] spawn object_monitorGear; call gear_ui_init;if (isNil('IGUI_GEAR_activeFilter')) then { IGUI_GEAR_activeFilter = 0;}; private ['_dummy']; _dummy = [_this,'initDialog'] call compile preprocessFile	'\ca\ui\scripts\handleGear.sqf'; _dummy = [_this,'onLoad'] execVM	'\ca\ui\scripts\handleGear.sqf'; _dummy;";
 	class ControlsBackground
 	{
 		class Mainback: RscPicture
--- a/dayz_code/safegui.hpp
+++ b/dayz_code/safegui.hpp
@@ -0,0 +1,363 @@
+///////////////////////////////////////////////////////////////////////////
+/// Styles
+///////////////////////////////////////////////////////////////////////////
+
+// Control types
+#define CT_STATIC           0
+#define CT_BUTTON           1
+#define CT_EDIT             2
+#define CT_SLIDER           3
+#define CT_COMBO            4
+#define CT_LISTBOX          5
+#define CT_TOOLBOX          6
+#define CT_CHECKBOXES       7
+#define CT_PROGRESS         8
+#define CT_HTML             9
+#define CT_STATIC_SKEW      10
+#define CT_ACTIVETEXT       11
+#define CT_TREE             12
+#define CT_STRUCTURED_TEXT  13
+#define CT_CONTEXT_MENU     14
+#define CT_CONTROLS_GROUP   15
+#define CT_SHORTCUTBUTTON   16
+#define CT_XKEYDESC         40
+#define CT_XBUTTON          41
+#define CT_XLISTBOX         42
+#define CT_XSLIDER          43
+#define CT_XCOMBO           44
+#define CT_ANIMATED_TEXTURE 45
+#define CT_OBJECT           80
+#define CT_OBJECT_ZOOM      81
+#define CT_OBJECT_CONTAINER 82
+#define CT_OBJECT_CONT_ANIM 83
+#define CT_LINEBREAK        98
+#define CT_USER             99
+#define CT_MAP              100
+#define CT_MAP_MAIN         101
+#define CT_LISTNBOX         102
+
+// Static styles
+#define ST_POS            0x0F
+#define ST_HPOS           0x03
+#define ST_VPOS           0x0C
+#define ST_LEFT           0x00
+#define ST_RIGHT          0x01
+#define ST_CENTER         0x02
+#define ST_DOWN           0x04
+#define ST_UP             0x08
+#define ST_VCENTER        0x0C
+
+#define ST_TYPE           0xF0
+#define ST_SINGLE         0x00
+#define ST_MULTI          0x10
+#define ST_TITLE_BAR      0x20
+#define ST_PICTURE        0x30
+#define ST_FRAME          0x40
+#define ST_BACKGROUND     0x50
+#define ST_GROUP_BOX      0x60
+#define ST_GROUP_BOX2     0x70
+#define ST_HUD_BACKGROUND 0x80
+#define ST_TILE_PICTURE   0x90
+#define ST_WITH_RECT      0xA0
+#define ST_LINE           0xB0
+
+#define ST_SHADOW         0x100
+#define ST_NO_RECT        0x200
+#define ST_KEEP_ASPECT_RATIO  0x800
+
+#define ST_TITLE          ST_TITLE_BAR + ST_CENTER
+
+// Slider styles
+#define SL_DIR            0x400
+#define SL_VERT           0
+#define SL_HORZ           0x400
+
+#define SL_TEXTURES       0x10
+
+// progress bar 
+#define ST_VERTICAL       0x01
+#define ST_HORIZONTAL     0
+
+// Listbox styles
+#define LB_TEXTURES       0x10
+#define LB_MULTI          0x20
+
+// Tree styles
+#define TR_SHOWROOT       1
+#define TR_AUTOCOLLAPSE   2
+
+// MessageBox styles
+#define MB_BUTTON_OK      1
+#define MB_BUTTON_CANCEL  2
+#define MB_BUTTON_USER    4
+
+
+///////////////////////////////////////////////////////////////////////////
+/// Base Classes
+///////////////////////////////////////////////////////////////////////////
+/*
+class RscPicture
+{
+	access = 0;
+	type = 0;
+	idc = -1;
+	style = 48;
+	colorBackground[] = {0,0,0,0};
+	colorText[] = {1,1,1,1};
+	font = "TahomaB";
+	sizeEx = 0;
+	lineSpacing = 0;
+	text = "";
+	fixedWidth = 0;
+	shadow = 0;
+	x = 0;
+	y = 0;
+	w = 0.2;
+	h = 0.15;
+};
+class RscButton
+{
+	access = 0;
+	type = 1;
+	text = "";
+	colorText[] = {0.8784,0.8471,0.651,1};
+	colorDisabled[] = {0.4,0.4,0.4,1};
+	colorBackground[] = {1,0.537,0,0.5};
+	colorBackgroundDisabled[] = {0.95,0.95,0.95,1};
+	colorBackgroundActive[] = {1,0.537,0,1};
+	colorFocused[] = {1,0.537,0,1};
+	colorShadow[] = {0.023529,0,0.0313725,1};
+	colorBorder[] = {0.023529,0,0.0313725,1};
+	soundEnter[] = {"\ca\ui\data\sound\onover",0.09,1};
+	soundPush[] = {"\ca\ui\data\sound\new1",0,0};
+	soundClick[] = {"\ca\ui\data\sound\onclick",0.07,1};
+	soundEscape[] = {"\ca\ui\data\sound\onescape",0.09,1};
+	style = 2;
+	x = 0;
+	y = 0;
+	w = 0.095589;
+	h = 0.039216;
+	shadow = 2;
+	font = "Zeppelin33";
+	sizeEx = 0.03921;
+	offsetX = 0.003;
+	offsetY = 0.003;
+	offsetPressedX = 0.002;
+	offsetPressedY = 0.002;
+	borderSize = 0;
+};
+*/
+class RscPicture;
+class RscButton;
+
+class SafeKeyPad
+{
+	idd = -1;
+	movingenable = 0;
+
+	class Controls
+	{
+		class SafeKeyPadPic: RscPicture
+		{
+			idc = -1;
+			text = "\z\addons\dayz_epoch\pictures\SafeKeyPad.paa";
+			x = 0.361701 * safezoneW + safezoneX;
+			y = 0.255985 * safezoneH + safezoneY;
+			w = 0.281637 * safezoneW;
+			h = 0.470087 * safezoneH;
+		};
+		class b1: RscButton
+		{
+			idc = -1;
+			x = 0.444897 * safezoneW + safezoneX;
+			y = 0.39423 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="1";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(1);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_1.ogg",0.5,1};
+		};
+		class b4: RscButton
+		{
+			idc = -1;
+			x = 0.444897 * safezoneW + safezoneX;
+			y = 0.441239 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="4";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(4);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_4.ogg",0.5,1}; 
+		};
+		class b7: RscButton
+		{
+			idc = -1;
+			x = 0.444897 * safezoneW + safezoneX;
+			y = 0.488248 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="7";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(7);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_7.ogg",0.5,1}; 
+		};
+		class b2: RscButton
+		{
+			idc = -1;
+			x = 0.487755 * safezoneW + safezoneX;
+			y = 0.39423 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="2";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(2);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_2.ogg",0.5,1}; 
+		};
+		class b8: RscButton
+		{
+			idc = -1;
+			x = 0.487755 * safezoneW + safezoneX;
+			y = 0.488248 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="8";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(8);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_8.ogg",0.5,1}; 
+		};
+		class b5: RscButton
+		{
+			idc = -1;
+			x = 0.487755 * safezoneW + safezoneX;
+			y = 0.441239 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="5";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(5);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_5.ogg",0.5,1}; 
+		};
+		class b3: RscButton
+		{
+			idc = -1;
+			x = 0.530613 * safezoneW + safezoneX;
+			y = 0.39423 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="3";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(3);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_3.ogg",0.5,1}; 
+		};
+		class b6: RscButton
+		{
+			idc = -1;
+			x = 0.530613 * safezoneW + safezoneX;
+			y = 0.441239 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="6";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(6);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_6.ogg",0.5,1};
+		};
+		class b9: RscButton
+		{
+			idc = -1;
+			x = 0.530613 * safezoneW + safezoneX;
+			y = 0.488248 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;
+			text="9";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(9);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_9.ogg",0.5,1}; 
+		};
+		class b0: RscButton
+		{
+			idc = -1;
+			x = 0.487755 * safezoneW + safezoneX;
+			y = 0.535257 * safezoneH + safezoneY;
+			w = 0.0283751 * safezoneW;
+			h = 0.0490667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.05;			
+			text="0";
+			colorText[] = {0,0.6,1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			action = "dayz_combination = dayz_combination + str(0);";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_9.ogg",0.5,1}; 
+		};
+		
+		class bcancel: RscButton
+		{
+			idc = -1;
+			x = 0.444897 * safezoneW + safezoneX;
+			y = 0.545257 * safezoneH + safezoneY;
+			w = 0.0263751 * safezoneW;
+			h = 0.0440667 * safezoneH;
+			font = "Zeppelin33";
+			sizeEx=0.1;
+			text="*";
+			colorText[] = {1,0.1,0.1,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_star.ogg",0.6,1};
+			onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 3000);";
+		};
+		class benter: RscButton
+		{
+			idc = -1;
+			x = 0.530613 * safezoneW + safezoneX;
+			y = 0.535257 * safezoneH + safezoneY;
+			w = 0.0263751 * safezoneW;
+			h = 0.0440667 * safezoneH;
+			font = "Zeppelin33Italic";
+			sizeEx=0.1;
+			text="#";
+			colorText[] = {0,1,0,1};
+			colorBackground[] = {0,0,0,0};
+			colorBackgroundActive[] = {0,0,0,0};
+			onButtonClick = "((ctrlParent (_this select 0)) closeDisplay 3000); if(!isNull dayz_selectedVault and (typeOf dayz_selectedVault) == ""VaultStorageLocked"") then {dayz_selectedVault spawn player_unlockVault;};";
+			soundClick[] = {"\dayz_sfx\action\cell\dtmf_hash.ogg",0.6,1};
+		};
+	};
+};
--- a/dayz_code/stringtable.xml
+++ b/dayz_code/stringtable.xml
@@ -2472,5 +2472,45 @@
 			<French>An old-fashioned cut-throat razor with a rounded French point.</French>
 			<Czech>An old-fashioned cut-throat razor with a rounded French point.</Czech>
 		</Key>
+    <Key ID="STR_FOOD_NAME_RBULL">
+      <Original>Red Bull</Original>
+      <English>Red Bull</English>
+      <German>Red Bull</German>
+      <Russian>Red Bull</Russian>
+      <Spanish>Red Bull</Spanish>
+      <Dutch>Red Bull</Dutch>
+      <French>Red Bull</French>
+      <Czech>Red Bull</Czech>
+    </Key>
+    <Key ID="STR_FOOD_DESC_RBULL">
+      <Original>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Original>
+      <English>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</English>
+      <German>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</German>
+      <Russian>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Russian>
+      <Spanish>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Spanish>
+      <Dutch>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Dutch>
+      <French>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</French>
+      <Czech>Red Bull is an energy drink sold by Austrian company Red Bull GmbH,</Czech>
+    </Key>
+    <Key ID="STR_FOOD_NAME_OSHERBET">
+      <Original>Orange Sherbet/Original>
+      <English>Orange Sherbet</English>
+      <German>Orange Sherbet</German>
+      <Russian>Orange Sherbet</Russian>
+      <Spanish>Orange Sherbet</Spanish>
+      <Dutch>Orange Sherbet</Dutch>
+      <French>Orange Sherbet</French>
+      <Czech>Orange Sherbet</Czech>
+    </Key>
+    <Key ID="STR_FOOD_DESC_OSHERBET">
+      <Original>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</Original>
+      <English>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</English>
+      <German>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</German>
+      <Russian>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</Russian>
+      <Spanish>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</Spanish>
+      <Dutch>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</Dutch>
+      <French>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</French>
+      <Czech>Orange Sherbet is a tangy orange carbonated soft drink with plenty of fizz.</Czech>
+    </Key>
 	</Package>
 </Project>
--- a/dayz_code/system/player_monitor.fsm
+++ b/dayz_code/system/player_monitor.fsm
@@ -119,8 +119,8 @@ link59[] = {51,52};
 link60[] = {52,29};
 link61[] = {53,54};
 link62[] = {54,20};
-globals[] = {25.000000,1,0,0,0,640,480,1,85,6316128,1,-452.194977,340.078094,1506.747437,277.117401,566,880,1};
-window[] = {2,-1,-1,-1,-1,760,28,999,0,3,584};
+globals[] = {25.000000,1,0,0,0,640,480,1,85,6316128,1,-452.194977,340.078094,1506.747437,277.117401,565,880,1};
+window[] = {2,-1,-1,-1,-1,806,2041,3012,46,3,583};
 *//*%FSM</HEAD>*/
 class FSM
 {
@@ -444,7 +444,7 @@ class FSM
          priority = 0.000000;
          to="Parse_Login";
          precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
-          condition=/*%FSM<CONDITION""">*/"count (dayzPlayerLogin) > 0"/*%FSM</CONDITION""">*/;
+          condition=/*%FSM<CONDITION""">*/"count (dayzPlayerLogin) > 1"/*%FSM</CONDITION""">*/;
          action=/*%FSM<ACTION""">*/"_msg = 		dayzPlayerLogin;"/*%FSM</ACTION""">*/;
        };
        /*%FSM</LINK>*/
@@ -455,7 +455,9 @@ class FSM
    class Parse_Login
    {
      name = "Parse_Login";
-      init = /*%FSM<STATEINIT""">*/"progressLoadingScreen 0.6;" \n
+      init = /*%FSM<STATEINIT""">*/"dayz_authed = true;" \n
+       "" \n
+       "progressLoadingScreen 0.6;" \n
       "_charID		= _msg select 0;" \n
       "_inventory	= _msg select 1;" \n
       "_backpack	= _msg select 2;" \n
@@ -720,43 +722,46 @@ class FSM
       "dayz_playerUID = _playerUID;" \n
       "" \n
       "if ((_isNew) OR (count _inventory == 0)) then {" \n
-       "	//player is new, add initial loadout" \n
-       "	_config = (configFile >> ""CfgSurvival"" >> ""Inventory"" >> ""Default"");" \n
-       "	_mags = getArray (_config >> ""magazines"");" \n
-       "	_wpns = getArray (_config >> ""weapons"");		" \n
-       "	_bcpk = getText (_config >> ""backpack"");" \n
-       "	_bcpkWpn = getText (_config >> ""backpackWeapon"");" \n
-       "	if(!isNil ""DefaultMagazines"") then {" \n
-       "		_mags = DefaultMagazines;" \n
-       "	};" \n
-       "	if(!isNil ""DefaultWeapons"") then {" \n
-       "		_wpns = DefaultWeapons;" \n
-       "	};" \n
-       "	if(!isNil ""DefaultBackpack"") then {" \n
-       "		_bcpk = DefaultBackpack;" \n
-       "	};" \n
-       "	if(!isNil ""DefaultBackpackWeapon"") then {" \n
-       "		_bcpkWpn = DefaultBackpackWeapon;" \n
-       "	};" \n
-       "	//Add inventory" \n
-       "	{" \n
-       "		_isOK = 	isClass(configFile >> ""CfgMagazines"" >> _x);" \n
-       "		if (_isOK) then {" \n
-       "			player addMagazine _x;" \n
+       "	//player is new, add initial loadout only if player is not pzombie" \n
+       "	if(!(player isKindOf ""PZombie_VB"")) then {" \n
+       "		_config = (configFile >> ""CfgSurvival"" >> ""Inventory"" >> ""Default"");" \n
+       "		_mags = getArray (_config >> ""magazines"");" \n
+       "		_wpns = getArray (_config >> ""weapons"");		" \n
+       "		_bcpk = getText (_config >> ""backpack"");" \n
+       "		_bcpkWpn = getText (_config >> ""backpackWeapon"");" \n
+       "		if(!isNil ""DefaultMagazines"") then {" \n
+       "			_mags = DefaultMagazines;" \n
       "		};" \n
-       "	} forEach _mags;" \n
-       "	{" \n
-       "		_isOK = 	isClass(configFile >> ""CfgWeapons"" >> _x);" \n
-       "		if (_isOK) then {" \n
-       "			player addWeapon _x;" \n
+       "		if(!isNil ""DefaultWeapons"") then {" \n
+       "			_wpns = DefaultWeapons;" \n
+       "		};" \n
+       "		if(!isNil ""DefaultBackpack"") then {" \n
+       "			_bcpk = DefaultBackpack;" \n
+       "		};" \n
+       "		if(!isNil ""DefaultBackpackWeapon"") then {" \n
+       "			_bcpkWpn = DefaultBackpackWeapon;" \n
+       "		};" \n
+       "		//Add inventory" \n
+       "		{" \n
+       "			_isOK = 	isClass(configFile >> ""CfgMagazines"" >> _x);" \n
+       "			if (_isOK) then {" \n
+       "				player addMagazine _x;" \n
+       "			};" \n
+       "		} forEach _mags;" \n
+       "		{" \n
+       "			_isOK = 	isClass(configFile >> ""CfgWeapons"" >> _x);" \n
+       "			if (_isOK) then {" \n
+       "				player addWeapon _x;" \n
+       "			};" \n
+       "		} forEach _wpns;" \n
+       "		" \n
+       "		if (_bcpk != """") then {" \n
+       "			player addBackpack _bcpk; " \n
+       "			dayz_myBackpack =	unitBackpack player;" \n
+       "		};" \n
+       "		if (_bcpkWpn != """") then {" \n
+       "			dayz_myBackpack addWeaponCargoGlobal [_bcpkWpn,1];" \n
       "		};" \n
-       "	} forEach _wpns;" \n
-       "	" \n
-       "	player addBackpack _bcpk; " \n
-       "	dayz_myBackpack =	unitBackpack player;" \n
-       "" \n
-       "	if (_bcpkWpn != """") then {" \n
-       "		dayz_myBackpack addWeaponCargoGlobal [_bcpkWpn,1];" \n
       "	};" \n
       "};" \n
       "" \n
--- a/dayz_code/system/player_spawn_1.sqf
+++ b/dayz_code/system/player_spawn_1.sqf
@@ -56,6 +56,20 @@ while {true} do {
 		dayz_currentDay = _day;
 	};

+	_world = toUpper(worldName); //toUpper(getText (configFile >> "CfgWorlds" >> (worldName) >> "description"));
+	_nearestCity = nearestLocations [getPos player, ["NameCityCapital","NameCity","NameVillage","NameLocal"],300];
+	
+	if (count _nearestCity > 0) then {
+		_town = text (_nearestCity select 0); 
+		if(dayz_PreviousTown == "Wilderness") then {
+			dayz_PreviousTown = _town;
+		};
+		if(_town != dayz_PreviousTown) then {
+			_first = [_world,_town,""] spawn BIS_fnc_infoText;
+		};
+		dayz_PreviousTown = _town;
+	};
+
 	//wait
 	sleep 5;
 };