Merge remote-tracking branch 'upstream/dev' into develop

2022-12-09 17:33:44 -03:00
parent 83c9c25164 6f788fb8b4
commit 90c3cef977
416 changed files with 12674 additions and 5862 deletions
@@ -289,7 +289,7 @@ namespace Barotrauma.Items.Components
 #if CLIENT
            Light.ParentSub = item.Submarine;
 #endif
-            if (item.Container != null)
+            if (item.Container != null && !(item.GetRootInventoryOwner() is Character))
            {
                SetLightSourceState(false, 0.0f);
                return;
@@ -301,7 +301,7 @@ namespace Barotrauma.Items.Components
            if (body != null && !body.Enabled)
            {
                SetLightSourceState(false, 0.0f);
-                return;                
+                return;
            }

            //currPowerConsumption = powerConsumption;