W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-20 23:20:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup some merge conflicts

Browse Source
This commit is contained in:
ebaydayz
2016-03-04 14:29:49 -05:00
parent 61c64cb14a
commit 732c2fe5a0
8 changed files with 10 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,11 +50,8 @@ 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 {