W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 09:10:27 +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

2
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -50,7 +50,7 @@ if (_characterID != "?") exitwith {
if ((_timeout - time) > 0) then {
_playerObj setVariable["NORRN_unconscious",true, true];
_playerObj setVariable["unconsciousTime",300,true];
_playerObj setVariable["unconsciousTime",150,true];
diag_log format["COMBAT LOGGED: %1 (%2) at location %3", _playerName,_timeout,(getPosATL _playerObj)];
//diag_log format["SET UNCONCIOUSNESS: %1", _playerName];