Merge remote-tracking branch 'refs/remotes/origin/master' into development

This commit is contained in:
second_coming 2016-04-27 15:17:17 +01:00
commit f7eb16d376

View File

@ -16,11 +16,6 @@ if (SC_fastNights) then
[60, fnc_checkMultiplier, [], true] call ExileServer_system_thread_addTask; [60, fnc_checkMultiplier, [], true] call ExileServer_system_thread_addTask;
}; };
if() then
{
};
if(SC_occupyTraders) then if(SC_occupyTraders) then
{ {
uiSleep 15; // delay the start uiSleep 15; // delay the start