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

Move CfgServerTrader to dayz_code\configs folder

Browse Source 
Also moved the dayz_epoch_b stringtable into a dayz_epoch package in the
dayz_code stringtable.

This makes it easier to maintain and search for code strings. Epoch_b
only holds extra models and textures now.
This commit is contained in:
ebaydayz
2016-04-04 13:10:01 -04:00
parent 37277613c1
commit eda82156be
96 changed files with 3805 additions and 3825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/system/player_spawn_2.sqf
View File

@@ -370,12 +370,10 @@ while {1 == 1} do {
if (_startcombattimer == 1 || _PlayerNearby) then {
player setVariable["combattimeout", diag_tickTime + 30, false];
player setVariable["startcombattimer", 0, false];
dayz_combat = 1;
} else {
if (_ZedsNearby) then {
player setVariable["combattimeout", diag_tickTime + 10, false];
player setVariable["startcombattimer", 0, false];
dayz_combat = 1;
};
};