(4ca668169) Fixed: Conflict

2019-05-16 05:58:48 +03:00
parent 0a67590572
commit cb83984e80
80 changed files with 2036 additions and 1859 deletions
@@ -152,7 +152,8 @@ namespace Barotrauma.Items.Components
                ParentSub = item.CurrentHull?.Submarine,
                Position = item.Position,
                CastShadows = castShadows,
-                IsBackground = drawBehindSubs
+                IsBackground = drawBehindSubs,
+                SpriteScale = Vector2.One * item.Scale
            };
 #endif