Как же я заебался

Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs

@@ -4,6 +4,7 @@ using Content.Server.Database;
 using Content.Shared._Amour.RoleplayInfo;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid;
+using Content.Shared.Humanoid.Markings;
 using Content.Shared.Preferences;
 using Content.Shared.Preferences.Loadouts;
 using Content.Shared.Preferences.Loadouts.Effects;
@@ -59,8 +60,10 @@ namespace Content.IntegrationTests.Tests.Preferences
                     "Shaved",
                     Color.Aquamarine,
                     Color.Azure,
-                    Color.Beige,128,
+                    Color.Beige,
-                    new (), new() //AMOUR
+                    128,
+                    new (),
+                    new() //AMOUR
                 ),
                 SpawnPriorityPreference.None,
                 new Dictionary<string, JobPriority>
@@ -70,8 +73,8 @@ namespace Content.IntegrationTests.Tests.Preferences
                 PreferenceUnavailableMode.StayInLobby,
                 new List<string> (),
                 new List<string>(),
-                new Dictionary<string, RoleLoadout>(),
+                new Dictionary<string, RoleplayInfo>(), //AMOUR
-                new Dictionary<string, RoleplayInfo>() //AMOUR
+                new Dictionary<string, RoleLoadout>()
             );
         }
 

Content.Server/Database/ServerDbBase.cs

@@ -282,8 +282,8 @@ namespace Content.Server.Database
                 (PreferenceUnavailableMode) profile.PreferenceUnavailable,
                 antags.ToList(),
                 traits.ToList(),
-                loadouts,
+                roleplayInfo,
-                roleplayInfo
+                loadouts
             );
         }
 

Content.Shared/Preferences/HumanoidCharacterProfile.cs

@@ -139,7 +139,8 @@ namespace Content.Shared.Preferences
             PreferenceUnavailableMode preferenceUnavailable,
             IReadOnlyList<string> antagPreferences,
             IReadOnlyList<string> traitPreferences,
-            Dictionary<string, RoleLoadout> loadouts, IReadOnlyDictionary<string, RoleplayInfo> roleplayInfoData)
+            IReadOnlyDictionary<string, RoleplayInfo> roleplayInfoData,
+            Dictionary<string, RoleLoadout> loadouts)
             : this(name,
                 clownName,
                 mimeName,
@@ -157,8 +158,8 @@ namespace Content.Shared.Preferences
                 preferenceUnavailable,
                 new List<string>(antagPreferences),
                 new List<string>(traitPreferences),
-                new Dictionary<string, RoleLoadout>(loadouts),
+                new Dictionary<string, RoleplayInfo>(roleplayInfoData),
-                new Dictionary<string, RoleplayInfo>(roleplayInfoData))
+                new Dictionary<string, RoleLoadout>(loadouts))
         {
         }