0
0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-13 09:50:43 -05:00

Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev

This commit is contained in:
Dev 2024-07-06 15:01:57 +01:00
commit 47edbbcd98
47 changed files with 2451 additions and 2657 deletions

View File

@ -161,6 +161,13 @@
"season": "None", "season": "None",
"startTimestamp": 1341615600000, "startTimestamp": 1341615600000,
"endTimestamp": "", "endTimestamp": "",
"yearly": false
},
"6658a15615cbb1b2c6014d5b": {
"name": "Hustle2",
"season": "None",
"startTimestamp": 1341615600000,
"endTimestamp": "",
"yearly": false "yearly": false
} }
}, },

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -183,7 +183,7 @@
"DisabledScavExits": "", "DisabledScavExits": "",
"EnableCoop": true, "EnableCoop": true,
"Enabled": true, "Enabled": true,
"EscapeTimeLimit": 34, "EscapeTimeLimit": 40,
"EscapeTimeLimitCoop": 30, "EscapeTimeLimitCoop": 30,
"EscapeTimeLimitPVE": 34, "EscapeTimeLimitPVE": 34,
"ExitZones": { "ExitZones": {

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff