Merge remote-tracking branch 'upstream/master' into fucking-upstream

2024-08-24 13:13:56 +03:00
parent 3c0bf9751e dba9565865
commit b460eb54ba
2222 changed files with 247186 additions and 50848 deletions
--- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
+++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs
@@ -111,9 +111,12 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem
    /// </remarks>
    public override void LoadProfile(
        EntityUid uid,
-        HumanoidCharacterProfile profile,
+        HumanoidCharacterProfile? profile,
        HumanoidAppearanceComponent? humanoid = null)
    {
+        if (profile == null)
+            return;
+
        if (!Resolve(uid, ref humanoid))
        {
            return;