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

# Conflicts:
#	project/assets/database/globals.json

project/assets/configs/quest.json

@@ -168,6 +168,13 @@
 			"season": "None",
 			"startTimestamp": 1341615600000,
             "endTimestamp": "",
+            "yearly": false
+		},
+		"6672ec2a2b6f3b71be794cc5": {
+			"name": "Key to salvation",
+			"season": "None",
+			"startTimestamp": 1341615600000,
+            "endTimestamp": "",
             "yearly": false
 		}
     },

project/assets/database/templates/profiles.json

@@ -27560,7 +27560,7 @@
                     "LastTimePlayedAsSavage": 0,
                     "Level": 1,
                     "LowerNickname": "__REPLACEME__",
-                    "MemberCategory": 1024,
+                    "MemberCategory": 1026,
 					"isMigratedSkills": false,
 					"SelectedMemberCategory": 1024,
                     "NeedWipeOptions": [],
@@ -31900,7 +31900,7 @@
                     "LastTimePlayedAsSavage": 0,
                     "Level": 1,
                     "LowerNickname": "__REPLACEME__",
-                    "MemberCategory": 1024,
+                    "MemberCategory": 1026,
 					"isMigratedSkills": false,
 					"SelectedMemberCategory": 1024,
                     "NeedWipeOptions": [],

project/src/callbacks/ProfileCallbacks.ts

@@ -167,10 +167,10 @@ export class ProfileCallbacks
         url: string,
         info: IGetProfileSettingsRequest,
         sessionId: string,
-    ): IGetBodyResponseData<string>
+    ): IGetBodyResponseData<boolean>
     {
-        this.profileController.setChosenProfileIcon(sessionId, info);
-        return this.httpResponse.emptyResponse();
+        
+        return this.httpResponse.getBody(this.profileController.setChosenProfileIcon(sessionId, info));
     }
 
     /**

project/src/controllers/ProfileController.ts

@@ -489,14 +489,15 @@ export class ProfileController
     /**
      * Handle client/profile/settings
      */
-    public setChosenProfileIcon(sessionId: string, request: IGetProfileSettingsRequest): void
+    public setChosenProfileIcon(sessionId: string, request: IGetProfileSettingsRequest): boolean
     {
         const profileToUpdate = this.profileHelper.getPmcProfile(sessionId);
         if (!profileToUpdate)
         {
-            return;
+            return false;
         }
 
         profileToUpdate.Info.SelectedMemberCategory = request.memberCategory;
+        return true;
     }
 }

project/src/models/eft/common/tables/ITemplateItem.ts

@@ -483,6 +483,7 @@ export interface Slot
 export interface SlotProps
 {
     filters: SlotFilter[]
+    MaxStackCount?: number
 }
 
 export interface SlotFilter
@@ -505,7 +506,7 @@ export interface StackSlot
     _max_count: number
     _props: StackSlotProps
     _proto: string
-    upd: any
+    upd?: any
 }
 
 export interface StackSlotProps

project/src/routers/static/ProfileStaticRouter.ts

@@ -126,7 +126,7 @@ export class ProfileStaticRouter extends StaticRouter
                     info: any,
                     sessionID: string,
                     output: string,
-                ): Promise<IGetBodyResponseData<string>> =>
+                ): Promise<IGetBodyResponseData<boolean>> =>
                 {
                     return this.profileCallbacks.getProfileSettings(url, info, sessionID);
                 },