Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jabak
2024-07-17 15:32:05 +03:00
parent 84bc7a9df6
commit 020ad2f834
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
View File

@@ -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,
new (), new() //AMOUR
Color.Beige,
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>()
);
}

4
Content.Server/Database/ServerDbBase.cs
View File

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

7
Content.Shared/Preferences/HumanoidCharacterProfile.cs
View File

@@ -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))
{
}