Fix Merge Conflict 1

SQF/dayz_code/compile/fn_selfActions.sqf

@@ -38,6 +38,27 @@ if (_canPickLight && !dayz_hasLight && !_isPZombie) then {
 	s_player_removeflare = -1;
 };
 
+if (s_player_equip_carry < 0) then
+{
+	if (dayz_onBack != "" && { !_inVehicle && { !_onLadder && { !r_player_unconscious } } }) then
+	{
+		dz_plr_carryActionItem = dayz_onBack;
+		_text = getText (configFile >> "CfgWeapons" >> dz_plr_carryActionItem >> "displayName");
+		s_player_equip_carry = player addAction [
+			format [localize "STR_ACTIONS_WEAPON", _text],
+			"\z\addons\dayz_code\actions\player_switchWeapon_action.sqf",
+			nil, 0.5, false, true];
+	};
+}
+else
+{
+	if (dayz_onBack != dz_plr_carryActionItem || { _inVehicle || { _onLadder || { r_player_unconscious } } } ) then
+	{
+		player removeAction s_player_equip_carry;
+		s_player_equip_carry = -1;
+	};
+};
+
 if (_inVehicle && {_vehicleOwnerID != "0"} && {!(_vehicle isKindOf "Bicycle")}) then {
 	if (s_player_lockUnlockInside_ctrl < 0) then {
 		DZE_myVehicle = _vehicle;

SQF/dayz_code/compile/fn_unconscious.sqf

@@ -14,6 +14,7 @@ r_player_unconsciousInProgress = true;
 			default { 0 }; // bare hands / flare
 		}
 	};
+<<<<<<< HEAD
 	_sprint = if (count _anim <= 10) then { false } else { _anim select 10 in [112, 118] };
 	_stance = if (count _anim <= 5) then { 2 } else {
 		switch (_anim select 5) do {
@@ -21,6 +22,42 @@ r_player_unconsciousInProgress = true;
 			case 112 : { 0 }; // prone
 			default { 2 }; // erected
 		}
+=======
+	"dynamicBlur" ppEffectEnable true;"dynamicBlur" ppEffectAdjust [2]; "dynamicBlur" ppEffectCommit 0;
+	"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectEnable true;"colorCorrections" ppEffectAdjust [1, 1, 0, [1, 1, 1, 0.0], [1, 1, 1, 0.1],  [1, 1, 1, 0.0]];"colorCorrections" ppEffectCommit 0;
+	0 fadeSound 0.05;
+	disableUserInput true;
+	_disableHdlr = [] spawn { uiSleep 2; disableUserInput true; r_player_unconsciousInputDisabled = true; };
+	autoRunActive = 0;
+	while {r_player_unconscious} do {
+		_ctrl1 ctrlSetPosition [(_ctrl1Pos select 0),(_ctrl1Pos select 1),(_ctrl1Pos select 2),((0.136829 * safezoneH) * (1 -(r_player_timeout / _totalTimeout)))];
+		_ctrl1 ctrlCommit 1;
+		playSound "heartbeat_1";
+		uiSleep 1;
+		_bloodLow = ((r_player_blood/r_player_bloodTotal) < 0.5);
+		
+		if(_timeout == 0) then {
+			if (!r_player_dead && !_bloodLow && r_player_injured) then {
+				_timeout = 10;
+			};
+		} else {
+			_timeout = _timeout - 1;
+		};
+		
+		if (r_player_timeout > 0) then {
+			r_player_timeout = r_player_timeout - 1;
+		} else {
+			if (!r_player_dead) then {
+				_nul = [] spawn fnc_usec_recoverUncons;
+			};
+		};
+		if (!(player getVariable ["NORRN_unconscious", true])) then {
+			_nul = [] spawn fnc_usec_recoverUncons;
+		};
+		if(animationState player == "AmovPpneMstpSnonWnonDnon_healed") then {
+			_nul = [] spawn fnc_usec_recoverUncons;
+		};
+>>>>>>> upstream/master
 	};
 
 	_transmove = (switch true do {

SQF/dayz_code/compile/keyboard.sqf

@@ -26,10 +26,6 @@ if (isNil "keyboard_keys") then {
 		call dayz_EjectPlayer;
 		_handled = false;
 		if (r_player_dead) then {_handled = true;}; // Disable ESC after death
-    };
-	_playerStats = {
-		DZE_Q_alt = true;
-		execVM "\z\addons\dayz_code\actions\playerstats.sqf";
     };
 	_dze_f = {
 		 if (!_ctrlState && !_altState) then {DZE_F = true;};
@@ -44,6 +40,21 @@ if (isNil "keyboard_keys") then {
 		 if (!_ctrlState && _altState) then {DZE_Z_alt = true;};
 		 if (_ctrlState && !_altState) then {DZE_Z_ctrl = true;};
 	};
+	_autoRun = {
+		if (autoRunActive == 0) then {
+			autoRunActive = 1;
+			autoRunThread = [] spawn {
+				while {autoRunActive == 1} do {
+					if ((player != vehicle player) or (surfaceIsWater (getPosASL player)) or r_fracture_legs) exitWith {call autoRunOff;};
+					player playAction "FastF";
+					uiSleep 0.5;
+				};
+			};
+		} else {
+			call autoRunOff;
+		};
+		_handled = true;
+	};
     _rifle = {
 		2 call dz_fn_switchWeapon;
         _handled = true;
@@ -75,7 +86,7 @@ if (isNil "keyboard_keys") then {
                         };                      
                     } forEach getArray(configFile >> "cfgWeapons" >> _weapon >> _muzz >> "magazines");
                 } forEach _muzzles;
-            } forEach [ "Flare", "Throw" ];
+            } forEach [ "Throw"];
 
             _magCount = count _ammo_throwable;
             if (_magCount > 0) then {
@@ -174,6 +185,7 @@ if (isNil "keyboard_keys") then {
     _interrupt = {
         r_interrupt = true;
 		if (DZE_Surrender) then {call dze_surrender_off};
+		if (autoRunActive == 1) then {call autoRunOff;};
     };
     // TODO: left/right, when gear open: onKeyDown = "[_this,'onKeyDown',0,107,0,107] execVM '\z\addons\dayz_code\system\handleGear.sqf'";
     _noise = {
@@ -275,17 +287,18 @@ if (isNil "keyboard_keys") then {
     keyboard_keys = [];
     keyboard_keys resize 256;
     [[DIK_ESCAPE], _cancelBuild] call _addArray;
-	[[DIK_INSERT], _playerStats] call _addArray;
+	[[DIK_INSERT], {DZE_Q_alt = true;}] call _addArray;
 	[[DIK_F], _dze_f] call _addArray;
 	[[DIK_PRIOR], _dze_q] call _addArray;
 	[[DIK_NEXT], _dze_z] call _addArray;
 	[[DIK_Q], {DZE_4 = true;}] call _addArray;
 	[[DIK_E], {DZE_6 = true;}] call _addArray;
+	[[DIK_0], _autoRun] call _addArray;
 	[[DIK_SPACE], {DZE_5 = true;}] call _addArray;
 	[actionKeys "User6", {DZE_F = true;}] call _addArray;
 	[actionKeys "User7", {DZE_Q_ctrl = true;}] call _addArray;
 	[actionKeys "User8", {DZE_Z_ctrl = true;}] call _addArray;
-	[actionKeys "User13", _playerStats] call _addArray;
+	[actionKeys "User13", {DZE_Q_alt = true;}] call _addArray;
 	[actionKeys "User14", {DZE_Z_alt = true;}] call _addArray;
 	[actionKeys "User15", {DZE_Q = true;}] call _addArray;
 	[actionKeys "User16", {DZE_Z = true;}] call _addArray;
@@ -324,7 +337,7 @@ if (isNil "keyboard_keys") then {
     [actionKeys "ForceCommandingMode", {DZE_5 = true;_handled = true;}] call _addArray;
     [[  DIK_F9, DIK_F10, DIK_F11, 
         DIK_F8,DIK_F7,DIK_F6,DIK_F5,DIK_F4,
-        DIK_F3,DIK_F2,DIK_F1,DIK_0,DIK_9,
+        DIK_F3,DIK_F2,DIK_F1,DIK_9,
         DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray;
     if (serverCommandAvailable "#kick") then {
         [[DIK_F12], gcam_onoff] call _addArray; // GCAM: F12 to start (for admins only)

SQF/dayz_code/compile/player_death.sqf

@@ -50,7 +50,11 @@ player setVariable ["bloodTaken", false, true];
 player setVariable ["startcombattimer", 0];
 r_player_unconscious = false;
 r_player_cardiac = false;
+<<<<<<< HEAD
 _model = typeOf player;
+=======
+autoRunActive = 0;
+>>>>>>> upstream/master
 
 _array = _this;
 if (count _array > 0) then {