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

Fix Merge Conflict 1

Browse Source
This commit is contained in:
icomrade
2016-03-03 22:09:38 -05:00
parent bad0a2e461 479097e7a8
commit 61c64cb14a
175 changed files with 9333 additions and 7650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/compile/player_death.sqf
View File

@@ -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 {