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

Merge branch '4.0.0-DEV' into feat-rewardrefactor

This commit is contained in:
Chomp 2025-01-20 09:20:26 +00:00 committed by GitHub
commit 67887e7d66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1300,24 +1300,25 @@
"collectionTimeHours": 48, "collectionTimeHours": 48,
"maxToSendPlayer": 5 "maxToSendPlayer": 5
}, },
"MechanicGiftDay1": { "MechanicGiftDay1": {
"items": [ "items": [
{ {
"_id": "678d4d81189b5f2a7538f14d", "_id": "678d4d81189b5f2a7538f14d",
"_tpl": "590c2c9c86f774245b1f03f2", "_tpl": "590c2c9c86f774245b1f03f2",
"slotId": "main", "slotId": "main",
"upd": { "upd": {
"StackObjectsCount": 1 "StackObjectsCount": 1,
}, "SpawnedInSession": true
"parentId": "678d4d90fc70718b8c4067ad" },
} "parentId": "678d4d90fc70718b8c4067ad"
], }
"sender": "Trader", ],
"sender": "Trader",
"trader": "MECHANIC", "trader": "MECHANIC",
"localeTextId": "6776e324810eb26b880fb4a5 0", "localeTextId": "6776e324810eb26b880fb4a5 0",
"collectionTimeHours": 72, "collectionTimeHours": 72,
"maxToSendPlayer": 1 "maxToSendPlayer": 1
}, },
"KAPPA4U": { "KAPPA4U": {
"items": [ "items": [
{ {