v1.2.6.0 (Winter Update)

2023-12-14 16:11:27 +02:00
parent af8cc89fce
commit b91e85559d
375 changed files with 7771 additions and 2874 deletions
@@ -277,12 +277,21 @@ namespace Barotrauma
            Rectangle drawRect =
                Submarine == null ? rect : new Rectangle((int)(Submarine.DrawPosition.X + rect.X), (int)(Submarine.DrawPosition.Y + rect.Y), rect.Width, rect.Height);

-            if ((IsSelected || IsHighlighted) && editing)
+            if (editing)
            {
+                if (IsSelected || IsHighlighted)
+                {
+                    GUI.DrawRectangle(spriteBatch,
+                        new Vector2(drawRect.X, -drawRect.Y),
+                        new Vector2(rect.Width, rect.Height),
+                        (IsHighlighted ? Color.LightBlue * 0.8f : GUIStyle.Red * 0.5f) * alpha, false, 0, (int)Math.Max(5.0f / Screen.Selected.Cam.Zoom, 1.0f));
+                }
+
+                float waterHeight = WaterVolume / rect.Width;
                GUI.DrawRectangle(spriteBatch,
-                    new Vector2(drawRect.X, -drawRect.Y),
-                    new Vector2(rect.Width, rect.Height),
-                    (IsHighlighted ? Color.LightBlue * 0.8f : GUIStyle.Red * 0.5f) * alpha, false, 0, (int)Math.Max(5.0f / Screen.Selected.Cam.Zoom, 1.0f));
+                    new Vector2(drawRect.X, -drawRect.Y + drawRect.Height - waterHeight),
+                    new Vector2(drawRect.Width, waterHeight),
+                    Color.Blue * 0.25f, isFilled: true);
            }

            GUI.DrawRectangle(spriteBatch,
@@ -746,7 +755,7 @@ namespace Barotrauma

                var newFire = i < FireSources.Count ?
                    FireSources[i] :
-                    new FireSource(Submarine == null ? pos : pos + Submarine.Position, null, true);
+                    new FireSource(Submarine == null ? pos : pos + Submarine.Position, sourceCharacter: null, isNetworkMessage: true);
                newFire.Position = pos;
                newFire.Size = new Vector2(size, newFire.Size.Y);

@@ -86,7 +86,7 @@ namespace Barotrauma
                MathUtils.RoundTowardsClosest(center.Y, Submarine.GridSize.Y) - center.Y - Submarine.GridSize.Y / 2);

            MapEntity.SelectedList.Clear();
-            assemblyEntities.ForEach(e => MapEntity.AddSelection(e));
+            entities.ForEach(e => MapEntity.AddSelection(e));

            foreach (MapEntity mapEntity in assemblyEntities)
            {
@@ -43,7 +43,7 @@ namespace Barotrauma
                {
                    mainElement = mainElement.FirstElement();
                    prefabs.Clear();
-                    DebugConsole.NewMessage($"Overriding all background creatures with '{configPath}'", Color.Yellow);
+                    DebugConsole.NewMessage($"Overriding all background creatures with '{configPath}'", Color.MediumPurple);
                }
                else if (prefabs.Any())
                {
@@ -1,10 +1,9 @@
 using Barotrauma.Networking;
+using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System;
-using System.Linq;
 using System.Collections.Generic;
-using FarseerPhysics;

 namespace Barotrauma
 {
@@ -53,7 +52,7 @@ namespace Barotrauma
                foreach (InterestingPosition pos in PositionsOfInterest)
                {
                    Color color = Color.Yellow;
-                    if (pos.PositionType == PositionType.Cave)
+                    if (pos.PositionType == PositionType.Cave || pos.PositionType == PositionType.AbyssCave)
                    {
                        color = Color.DarkOrange;
                    }
@@ -61,6 +60,10 @@ namespace Barotrauma
                    {
                        color = Color.LightGray;
                    }
+                    if (!pos.IsValid)
+                    {
+                        color = Color.Red;
+                    }
                    
                    GUI.DrawRectangle(spriteBatch, new Vector2(pos.Position.X - 15.0f, -pos.Position.Y - 15.0f), new Vector2(30.0f, 30.0f), color, true);
                }
@@ -162,6 +162,8 @@ namespace Barotrauma
            CanBeVisible =
                Sprite != null ||
                Prefab.DeformableSprite != null ||
+                ParticleEmitters is { Length: > 0 } ||
+                (GameMain.DebugDraw && Triggers is { Count: > 0 }) ||
                Prefab.OverrideProperties.Any(p => p != null && (p.Sprites.Any() || p.DeformableSprite != null));
        }

@@ -23,7 +23,14 @@ namespace Barotrauma
        private Rectangle currentGridIndices;

        public bool ForceRefreshVisibleObjects;
-        
+
+        partial void RemoveProjSpecific()
+        {
+            visibleObjectsBack.Clear();
+            visibleObjectsMid.Clear();
+            visibleObjectsFront.Clear();
+        }
+
        partial void UpdateProjSpecific(float deltaTime)
        {
            foreach (LevelObject obj in visibleObjectsBack)
@@ -133,6 +133,8 @@ namespace Barotrauma.Lights

        public Rectangle BoundingBox { get; private set; }

+        public bool IsInvalid { get; private set; }
+
        public ConvexHull(Rectangle rect, bool isHorizontal, MapEntity parent)
        {
            shadowEffect ??= new BasicEffect(GameMain.Instance.GraphicsDevice)
@@ -481,15 +483,34 @@ namespace Barotrauma.Lights
            for (int i = 0; i < 4; i++)
            {
                vertices[i].WorldPos = vertices[i].Pos;
+                ValidateVertex(vertices[i].WorldPos, "vertices[i].Pos");
                segments[i].Start.WorldPos = segments[i].Start.Pos;
+                ValidateVertex(segments[i].Start.WorldPos, "segments[i].Start.Pos");
                segments[i].End.WorldPos = segments[i].End.Pos;
+                ValidateVertex(segments[i].End.WorldPos, "segments[i].End.Pos");
            }
            if (ParentEntity == null || ParentEntity.Submarine == null) { return; }
            for (int i = 0; i < 4; i++)
            {
                vertices[i].WorldPos += ParentEntity.Submarine.DrawPosition;
+                ValidateVertex(vertices[i].WorldPos, "vertices[i].WorldPos");
                segments[i].Start.WorldPos += ParentEntity.Submarine.DrawPosition;
+                ValidateVertex(segments[i].Start.WorldPos, "segments[i].Start.WorldPos");
                segments[i].End.WorldPos += ParentEntity.Submarine.DrawPosition;
+                ValidateVertex(segments[i].End.WorldPos, "segments[i].End.WorldPos");
+            }
+
+            void ValidateVertex(Vector2 vertex, string debugName)
+            {
+                if (!MathUtils.IsValid(vertex))
+                {
+                    IsInvalid = true;
+                    string errorMsg = $"Invalid vertex on convex hull ({debugName}: {vertex}, parent entity: {ParentEntity?.ToString() ?? "null"}).";
+#if DEBUG
+                    DebugConsole.ThrowError(errorMsg);
+#endif
+                    GameAnalyticsManager.AddErrorEventOnce("ConvexHull.RefreshWorldPositions:InvalidVertex", GameAnalyticsManager.ErrorSeverity.Error, errorMsg);
+                }
            }
        }

@@ -234,6 +234,15 @@ namespace Barotrauma.Lights
            }
        }

+        public void DebugDrawVertices(SpriteBatch spriteBatch)
+        {
+            foreach (LightSource light in lights)
+            {
+                if (!light.Enabled) { continue; }
+                light.DebugDrawVertices(spriteBatch);
+            }
+        }
+
        public void RenderLightMap(GraphicsDevice graphics, SpriteBatch spriteBatch, Camera cam, RenderTarget2D backgroundObstructor = null)
        {
            if (!LightingEnabled) { return; }
@@ -269,6 +278,9 @@ namespace Barotrauma.Lights
                    light.Position = pos;
                }

+                //above the top boundary of the level (in an inactive respawn shuttle?)
+                if (Level.Loaded != null && light.WorldPosition.Y > Level.Loaded.Size.Y) { continue; }
+
                float range = light.LightSourceParams.TextureRange;
                if (light.LightSprite != null)
                {
@@ -801,6 +813,8 @@ namespace Barotrauma.Lights

        public void ClearLights()
        {
+            activeLights.Clear();
+            activeLightsWithLightVolume.Clear();
            lights.Clear();
        }
    }
@@ -37,9 +37,9 @@ namespace Barotrauma.Lights
                TextureRange = range;
                if (OverrideLightTexture != null)
                {
-                    TextureRange += Math.Max(
-                        Math.Abs(OverrideLightTexture.RelativeOrigin.X - 0.5f) * OverrideLightTexture.size.X,
-                        Math.Abs(OverrideLightTexture.RelativeOrigin.Y - 0.5f) * OverrideLightTexture.size.Y);
+                    TextureRange *= 1.0f + Math.Max(
+                        Math.Abs(OverrideLightTexture.RelativeOrigin.X - 0.5f),
+                        Math.Abs(OverrideLightTexture.RelativeOrigin.Y - 0.5f));
                }
            }
        }
@@ -238,7 +238,11 @@ namespace Barotrauma.Lights
        private bool needsRecalculationWhenUpToDate;
        public bool NeedsRecalculation
        {
-            get { return needsRecalculation; }
+            get
+            {
+                if (ParentBody?.UserData is Item it && it.Prefab.Identifier == "flashlight") { return true; }
+                return needsRecalculation; 
+            }
            set
            {
                if (!needsRecalculation && value)
@@ -708,6 +712,7 @@ namespace Barotrauma.Lights
            {
                foreach (ConvexHull hull in chList.List)
                {
+                    if (hull.IsInvalid) { continue; }
                    if (!chList.IsHidden.Contains(hull)) 
                    {
                        //find convexhull segments that are close enough and facing towards the light source
@@ -735,6 +740,7 @@ namespace Barotrauma.Lights
            GameMain.LightManager.AddRayCastTask(this, drawPos, rotation);
        }

+        const float MinPointDistance = 6;

        public void RayCastTask(Vector2 drawPos, float rotation)
        {
@@ -877,12 +883,11 @@ namespace Barotrauma.Lights
                    }
                }

-                const float MinPointDistance = 6;
-
                //remove points that are very close to each other
-                for (int i = 0; i < points.Count; i++)
+                //+= 2 because the points are added in pairs above, i.e. 0 and 1 belong to the same segment
+                for (int i = 0; i < points.Count; i += 2)
                {
-                    for (int j = Math.Min(i + 4, points.Count - 1); j > i; j--)
+                    for (int j = Math.Min(i + 2, points.Count - 1); j > i; j--)
                    {
                        if (Math.Abs(points[i].WorldPos.X - points[j].WorldPos.X) < MinPointDistance &&
                            Math.Abs(points[i].WorldPos.Y - points[j].WorldPos.Y) < MinPointDistance)
@@ -892,14 +897,14 @@ namespace Barotrauma.Lights
                    }
                }

-                var compareCCW = new CompareSegmentPointCW(drawPos);
                try
                {
-                    points.Sort(compareCCW);
+                    var compareCW = new CompareSegmentPointCW(drawPos);
+                    points.Sort(compareCW);
                }
                catch (Exception e)
                {
-                    StringBuilder sb = new StringBuilder("Constructing light volumes failed! Light pos: " + drawPos + ", Hull verts:\n");
+                    StringBuilder sb = new StringBuilder($"Constructing light volumes failed ({nameof(CompareSegmentPointCW)})! Light pos: {drawPos}, Hull verts:\n");
                    foreach (SegmentPoint sp in points)
                    {
                        sb.AppendLine(sp.Pos.ToString());
@@ -914,7 +919,11 @@ namespace Barotrauma.Lights
                verts.Clear();
                foreach (SegmentPoint p in points)
                {
-                    Vector2 dir = Vector2.Normalize(p.WorldPos - drawPos);
+                    Vector2 diff = p.WorldPos - drawPos;
+                    float dist = diff.Length();
+                    //light source exactly at the segment point, don't cast a shadow (normalizing the vector would lead to NaN)
+                    if (dist <= 0.0001f) { continue; }
+                    Vector2 dir = diff / dist;
                    Vector2 dirNormal = new Vector2(-dir.Y, dir.X) * MinPointDistance;

                    //do two slightly offset raycasts to hit the segment itself and whatever's behind it
@@ -940,9 +949,36 @@ namespace Barotrauma.Lights
                    {
                        //the raycasts landed on different segments
                        //we definitely want to generate new geometry here
-                        verts.Add(isPoint1 ? p.WorldPos : intersection1.pos);
-                        verts.Add(isPoint2 ? p.WorldPos : intersection2.pos);
-                        markAsVisible = true;
+                        if (isPoint1)
+                        {
+                            TryAddPoints(intersection2.pos, p.WorldPos, drawPos, verts);
+                            markAsVisible = true;
+                        }
+                        else if (isPoint2)
+                        {
+                            TryAddPoints(intersection1.pos, p.WorldPos, drawPos, verts);
+                            markAsVisible = true;
+                        }
+                        else
+                        {
+                            //didn't hit either point, completely obstructed
+                            verts.Add(intersection1.pos);
+                            verts.Add(intersection2.pos);
+                        }
+                        static void TryAddPoints(Vector2 intersection, Vector2 point, Vector2 refPos, List<Vector2> verts)
+                        {
+                            //* 0.8f because we don't care about obstacles that are very close (intersecting walls),
+                            //only about obstacles that are clearly between the point and the refPos
+                            bool intersectionCloserThanPoint = Vector2.DistanceSquared(intersection, refPos) < Vector2.DistanceSquared(point, refPos) * 0.8f;
+                            //if the raycast hit a segment that's closer than the point we're aiming towards,
+                            //it means we didn't hit a segment behind the point, but something that's obstructing it
+                            //= we don't want to add vertex at that obstructed point, it could make the light go through obstacles
+                            if (!intersectionCloserThanPoint)
+                            {
+                                verts.Add(point);
+                            }
+                            verts.Add(intersection);
+                        }
                    }
                    if (markAsVisible)
                    {
@@ -959,15 +995,32 @@ namespace Barotrauma.Lights
            //remove points that are very close to each other
            for (int i = 0; i < verts.Count - 1; i++)
            {
-                for (int j = Math.Min(i + 4, verts.Count - 1); j > i; j--)
+                for (int j = verts.Count - 1; j > i; j--)
                {
-                    if (Math.Abs(verts[i].X - verts[j].X) < 6 &&
-                       Math.Abs(verts[i].Y - verts[j].Y) < 6)
+                    if (Math.Abs(verts[i].X - verts[j].X) < MinPointDistance &&
+                       Math.Abs(verts[i].Y - verts[j].Y) < MinPointDistance)
                    {
                        verts.RemoveAt(j);
                    }
                }
            }
+
+            try
+            {
+                var compareCW = new CompareCW(drawPos);
+                verts.Sort(compareCW);
+            }
+            catch (Exception e)
+            {
+                StringBuilder sb = new StringBuilder($"Constructing light volumes failed ({nameof(CompareSegmentPointCW)})! Light pos: {drawPos}, verts:\n");
+                foreach (Vector2 v in verts)
+                {
+                    sb.AppendLine(v.ToString());
+                }
+                DebugConsole.ThrowError(sb.ToString(), e);
+            }
+
+
            calculatedDrawPos = drawPos;
            state = LightVertexState.PendingVertexRecalculation;
        }
@@ -1114,7 +1167,7 @@ namespace Barotrauma.Lights

                //add the normals together and use some magic numbers to create
                //a somewhat useful/good-looking blur
-                float blurDistance = 40.0f;
+                float blurDistance = 25.0f;
                Vector2 nDiff = nDiff1 * blurDistance;
                if (MathUtils.GetLineIntersection(vertex + (nDiff1 * blurDistance), nextVertex + (nDiff1 * blurDistance), vertex + (nDiff2 * blurDistance), prevVertex + (nDiff2 * blurDistance), true, out Vector2 intersection))
                {
@@ -1230,7 +1283,8 @@ namespace Barotrauma.Lights
        /// <param name="spriteBatch"></param>
        public void DrawSprite(SpriteBatch spriteBatch, Camera cam)
        {
-            if (GameMain.DebugDraw)
+            //uncomment if you want to visualize the bounds of the light volume
+            /*if (GameMain.DebugDraw)
            {
                Vector2 drawPos = position;
                if (ParentSub != null)
@@ -1269,7 +1323,7 @@ namespace Barotrauma.Lights
                {
                    GUI.DrawLine(spriteBatch, boundaryCorners[i].Pos, boundaryCorners[(i + 1) % 4].Pos, Color.White, 0, 3);
                }
-            }
+            }*/

            if (DeformableLightSprite != null)
            {
@@ -1318,7 +1372,7 @@ namespace Barotrauma.Lights

                if (LightTextureTargetSize != Vector2.Zero)
                {
-                    LightSprite.DrawTiled(spriteBatch, drawPos, LightTextureTargetSize, color, startOffset: LightTextureOffset, textureScale: LightTextureScale);
+                    LightSprite.DrawTiled(spriteBatch, drawPos, LightTextureTargetSize, color: color, startOffset: LightTextureOffset, textureScale: LightTextureScale);
                }
                else
                {
@@ -1367,6 +1421,38 @@ namespace Barotrauma.Lights
            }
        }

+        public void DebugDrawVertices(SpriteBatch spriteBatch)
+        {
+            if (Range < 1.0f || Color.A < 1 || CurrentBrightness <= 0.0f) { return; }
+
+            //commented out because this is mostly just useful in very specific situations, otherwise it just makes debugdraw very messy
+            //(you may also need to add a condition here that only draws this for the specific light you're interested in)
+            if (GameMain.DebugDraw && vertices != null)
+            {
+                if (ParentBody?.UserData is Item it && it.Prefab.Identifier == "flashlight")
+
+                    for (int i = 1; i < vertices.Length - 1; i += 2)
+                    {
+                        Vector2 vert1 = new Vector2(vertices[i].Position.X, vertices[i].Position.Y);
+                        int nextIndex = (i + 2) % vertices.Length;
+                        //the first vertex is the one at the position of the light source, skip that one
+                        //(we just want to draw lines between the vertices at the circumference of the light volume)
+                        if (nextIndex == 0) { nextIndex++; }
+                        Vector2 vert2 = new Vector2(vertices[nextIndex].Position.X, vertices[nextIndex].Position.Y);
+                        if (ParentSub != null)
+                        {
+                            vert1 += ParentSub.DrawPosition;
+                            vert2 += ParentSub.DrawPosition;
+                        }
+                        vert1.Y = -vert1.Y;
+                        vert2.Y = -vert2.Y;
+
+                        var randomColor = ToolBox.GradientLerp(i / (float)vertices.Length, Color.Magenta, Color.Blue, Color.Yellow, Color.Green, Color.Cyan, Color.Red, Color.Purple, Color.Yellow);
+                        GUI.DrawLine(spriteBatch, vert1, vert2, randomColor * 0.8f, width: 2);
+                    }
+            }
+        }
+
        public void DrawLightVolume(SpriteBatch spriteBatch, BasicEffect lightEffect, Matrix transform, bool allowRecalculation, ref int recalculationCount)
        {
            if (Range < 1.0f || Color.A < 1 || CurrentBrightness <= 0.0f) { return; }
@@ -291,14 +291,14 @@ namespace Barotrauma

        private readonly List<MapNotification> mapNotifications = new List<MapNotification>();

-        partial void ChangeLocationTypeProjSpecific(Location location, string prevName, LocationTypeChange change)
+        partial void ChangeLocationTypeProjSpecific(Location location, LocalizedString prevName, LocationTypeChange change)
        {
            var messages = change.GetMessages(location.Faction);
            if (!messages.Any()) { return; }

            string msg = messages.GetRandom(Rand.RandSync.Unsynced)
                .Replace("[previousname]", $"‖color:gui.yellow‖{prevName}‖end‖")
-                .Replace("[name]", $"‖color:gui.yellow‖{location.Name}‖end‖");
+                .Replace("[name]", $"‖color:gui.yellow‖{location.DisplayName}‖end‖");
            location.LastTypeChangeMessage = msg;

            mapNotifications.Add(new MapNotification(msg, GUIStyle.SubHeadingFont, mapNotifications, location));           
@@ -377,7 +377,7 @@ namespace Barotrauma

            bool showReputation = hudVisibility > 0.0f && location.Type.HasOutpost && location.Reputation != null;

-            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), location.Name, font: GUIStyle.LargeFont) { Padding = Vector4.Zero };
+            new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), location.DisplayName, font: GUIStyle.LargeFont) { Padding = Vector4.Zero };
            if (!location.Type.Name.IsNullOrEmpty())
            {
                new GUITextBlock(new RectTransform(new Vector2(1.0f, 0.0f), content.RectTransform), location.Type.Name, font: GUIStyle.SubHeadingFont) { Padding = Vector4.Zero };
@@ -1080,6 +1080,7 @@ namespace Barotrauma
                }
                float dist = Vector2.Distance(start, end);
                var connectionSprite = connection.Passed ? generationParams.PassedConnectionSprite : generationParams.ConnectionSprite;
+                if (connectionSprite?.Texture == null) { continue; }

                Color segmentColor = connectionColor;
                int segmentWidth = width;
@@ -1092,9 +1093,6 @@ namespace Barotrauma
                        segmentWidth /= 2; 
                        segmentColor = connection.Passed ? generationParams.ConnectionColor : generationParams.UnvisitedConnectionColor; 
                    }
-                    else 
-                    { 
-                    }
                }

                spriteBatch.Draw(connectionSprite.Texture,
@@ -29,7 +29,7 @@ namespace Barotrauma

            Vector2 spriteScale = new Vector2(zoom);

-            uiSprite.Sprite.DrawTiled(spriteBatch, topLeft, size, Params.RadiationAreaColor, Vector2.Zero, textureScale: spriteScale);
+            uiSprite.Sprite.DrawTiled(spriteBatch, topLeft, size, color: Params.RadiationAreaColor, startOffset: Vector2.Zero, textureScale: spriteScale);

            Vector2 topRight = topLeft + Vector2.UnitX * size.X;

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using Barotrauma.Lights;
+using Microsoft.Xna.Framework;

 namespace Barotrauma
 {
@@ -65,9 +66,7 @@ namespace Barotrauma
                disableSelect = value;
                if (disableSelect)
                {
-                    startMovingPos = Vector2.Zero;
-                    selectionSize = Vector2.Zero;
-                    selectionPos = Vector2.Zero;
+                    StopSelection();
                }
            }
        }
@@ -163,21 +162,9 @@ namespace Barotrauma
                {
                    if (SelectedAny)
                    {
-                        if (SelectedList.Any(static t => t is Item it && it.GetComponent<CircuitBox>() is not null))
-                        {
-                            GUI.AskForConfirmation(SubEditorScreen.CircuitBoxDeletionWarningHeader, SubEditorScreen.CircuitBoxDeletionWarningBody, onConfirm: Delete);
-                        }
-                        else
-                        {
-                            Delete();
-                        }
-
-                        void Delete()
-                        {
-                            SubEditorScreen.StoreCommand(new AddOrDeleteCommand(new List<MapEntity>(SelectedList), true));
-                            SelectedList.ForEach(static e => { if (!e.Removed) { e.Remove(); } });
-                            SelectedList.Clear();
-                        }
+                        SubEditorScreen.StoreCommand(new AddOrDeleteCommand(new List<MapEntity>(SelectedList), true));
+                        SelectedList.ForEachMod(static e => { if (!e.Removed) { e.Remove(); } });
+                        SelectedList.Clear();
                    }
                }

@@ -494,6 +481,13 @@ namespace Barotrauma
            }
        }

+        public static void StopSelection()
+        {
+            startMovingPos = Vector2.Zero;
+            selectionSize = Vector2.Zero;
+            selectionPos = Vector2.Zero;
+        }
+
        public static Vector2 GetNudgeAmount(bool doHold = true)
        {
            Vector2 nudgeAmount = Vector2.Zero;
@@ -792,12 +786,16 @@ namespace Barotrauma
                    foreach (MapEntity e in SelectedList)
                    {
                        SpriteEffects spriteEffects = SpriteEffects.None;
+                        float spriteRotation = 0.0f;
+                        float rectangleRotation = 0.0f;
                        switch (e)
                        {
                            case Item item:
                                {
                                    if (item.FlippedX && item.Prefab.CanSpriteFlipX) { spriteEffects ^= SpriteEffects.FlipHorizontally; }
-                                    if (item.flippedY && item.Prefab.CanSpriteFlipY) { spriteEffects ^= SpriteEffects.FlipVertically; }
+                                    if (item.FlippedY && item.Prefab.CanSpriteFlipY) { spriteEffects ^= SpriteEffects.FlipVertically; }
+                                    spriteRotation = MathHelper.ToRadians(item.Rotation);
+                                    rectangleRotation = spriteRotation;
                                    var wire = item.GetComponent<Wire>();
                                    if (wire != null && wire.Item.body != null && !wire.Item.body.Enabled)
                                    {
@@ -809,7 +807,10 @@ namespace Barotrauma
                            case Structure structure:
                                {
                                    if (structure.FlippedX && structure.Prefab.CanSpriteFlipX) { spriteEffects ^= SpriteEffects.FlipHorizontally; }
-                                    if (structure.flippedY && structure.Prefab.CanSpriteFlipY) { spriteEffects ^= SpriteEffects.FlipVertically; }
+                                    if (structure.FlippedY && structure.Prefab.CanSpriteFlipY) { spriteEffects ^= SpriteEffects.FlipVertically; }
+                                    spriteRotation = MathHelper.ToRadians(structure.Rotation);
+                                    rectangleRotation = spriteRotation;
+                                    if (structure.FlippedX != structure.FlippedY) { rectangleRotation = -rectangleRotation; }
                                    break;
                                }
                            case WayPoint wayPoint:
@@ -831,11 +832,12 @@ namespace Barotrauma
                                }
                        }
                        e.Prefab?.DrawPlacing(spriteBatch,
-                            new Rectangle(e.WorldRect.Location + new Point((int)moveAmount.X, (int)-moveAmount.Y), e.WorldRect.Size), e.Scale, spriteEffects);
+                            new Rectangle(e.WorldRect.Location + new Point((int)moveAmount.X, (int)-moveAmount.Y), e.WorldRect.Size), e.Scale, spriteRotation, spriteEffects: spriteEffects);
                        GUI.DrawRectangle(spriteBatch,
-                            new Vector2(e.WorldRect.X, -e.WorldRect.Y) + moveAmount,
-                            new Vector2(e.rect.Width, e.rect.Height),
-                            Color.White, false, 0, (int)Math.Max(3.0f / GameScreen.Selected.Cam.Zoom, 2.0f));
+                            center: e.WorldRect.Center.ToVector2().FlipY() + moveAmount + new Vector2(0f, e.WorldRect.Height),
+                            width: e.WorldRect.Width, height: e.WorldRect.Height,
+                            rotation: rectangleRotation, clr: Color.White,
+                            depth: 0f, thickness: Math.Max(3.0f / GameScreen.Selected.Cam.Zoom, 2.0f));
                    }

                    //stop dragging the "selection rectangle"
@@ -877,6 +879,23 @@ namespace Barotrauma
            spriteBatch.DrawLine(corners[3] + offset, corners[0] - offset, color, thickness);
        }

+        protected static void ColorFlipButton(GUIButton btn, bool flip)
+        {
+            var color = flip ? GUIStyle.Green : Color.White;
+            var hsv = ToolBox.RGBToHSV(color);
+
+            // Boost saturation and reduce value a bit because our default colors are too muted for this button's style
+            var hsvBase = hsv;
+            hsvBase.Y *= 4f;
+            hsvBase.Z *= 0.8f;
+            btn.Color = ToolBox.HSVToRGB(hsvBase.X, hsvBase.Y, hsvBase.Z); 
+            btn.SelectedColor = ToolBox.HSVToRGB(hsvBase.X, hsvBase.Y, hsvBase.Z); 
+
+            var hsvHover = hsv;
+            hsvHover.Z *= 1.2f;
+            btn.HoverColor = ToolBox.HSVToRGB(hsvHover.X, hsvHover.Y, hsvHover.Z); 
+        }
+
        public static List<MapEntity> FilteredSelectedList { get; private set; } = new List<MapEntity>();

        public static void UpdateEditor(Camera cam, float deltaTime)
@@ -1105,6 +1124,25 @@ namespace Barotrauma

        public virtual void DrawEditing(SpriteBatch spriteBatch, Camera cam) { }

+        private float RotationRad
+            => MathHelper.ToRadians(
+                this switch
+                {
+                    Structure s => s.Rotation,
+                    Item it => it.Rotation,
+                    _ => 0.0f
+                });
+
+        private Vector2 GetEditingHandlePos(int x, int y, Camera cam)
+        {
+            Vector2 handleDiff = new Vector2(x * (rect.Width * 0.5f), y * (rect.Height * 0.5f));
+            var rotation = -RotationRad;
+            handleDiff = MathUtils.RotatePoint(handleDiff, rotation);
+            if (FlippedX) { handleDiff = handleDiff.FlipX(); }
+            if (FlippedY) { handleDiff = handleDiff.FlipY(); }
+            return cam.WorldToScreen(Position + handleDiff);
+        }
+
        float ResizeHandleSize => 10 * GUI.Scale;
        float ResizeHandleHighlightDistance => 8 * GUI.Scale;

@@ -1119,9 +1157,10 @@ namespace Barotrauma
            {
                for (int y = startY; y < 2; y += 2)
                {
-                    Vector2 handlePos = cam.WorldToScreen(Position + new Vector2(x * (rect.Width * 0.5f), y * (rect.Height * 0.5f)));
+                    Vector2 handlePos = GetEditingHandlePos(x, y, cam);

                    bool highlighted = Vector2.DistanceSquared(PlayerInput.MousePosition, handlePos) < ResizeHandleHighlightDistance * ResizeHandleHighlightDistance;
+
                    if (highlighted && PlayerInput.PrimaryMouseButtonDown())
                    {
                        selectionPos = Vector2.Zero;
@@ -1138,44 +1177,83 @@ namespace Barotrauma
            {
                if (prevRect == null)
                {
-                    prevRect = new Rectangle(Rect.Location, Rect.Size);
+                    prevRect = Rect;
                }

-                Vector2 placePosition = new Vector2(rect.X, rect.Y);
-                Vector2 placeSize = new Vector2(rect.Width, rect.Height);
+                Vector2 placePosition = prevRect.Value.Location.ToVector2();
+                Vector2 placeSize = prevRect.Value.Size.ToVector2();

-                Vector2 mousePos = Submarine.MouseToWorldGrid(cam, Submarine.MainSub, round: true);
-
-                if (PlayerInput.IsShiftDown())
+                static Vector2 flipThenRotate(Vector2 point, Vector2 center, float angle, bool flipX, bool flipY)
                {
-                    mousePos = cam.ScreenToWorld(PlayerInput.MousePosition);
+                    if (flipX) { point = (point - center).FlipX() + center; }
+                    if (flipY) { point = (point - center).FlipY() + center; }
+
+                    point = MathUtils.RotatePointAroundTarget(point, center, angle);
+
+                    return point;
+                }
+                
+                static Vector2 rotateThenFlip(Vector2 point, Vector2 center, float angle, bool flipX, bool flipY)
+                {
+                    point = MathUtils.RotatePointAroundTarget(point, center, angle);
+
+                    if (flipX) { point = (point - center).FlipX() + center; }
+                    if (flipY) { point = (point - center).FlipY() + center; }
+
+                    return point;
+                }
+                
+                Vector2 mousePos = cam.ScreenToWorld(PlayerInput.MousePosition);
+                Vector2 prevPos = placePosition;
+                Vector2 prevOppositeCorner = prevPos + placeSize.FlipY();
+                Vector2 prevCenter = placePosition + placeSize.FlipY() * 0.5f;
+                mousePos = flipThenRotate(mousePos, prevCenter, RotationRad, FlippedX, FlippedY);
+
+                if (!PlayerInput.IsShiftDown())
+                {
+                    mousePos = Submarine.VectorToWorldGrid(mousePos, Submarine.MainSub, round: true);
                }

                if (resizeDirX > 0)
                {
-                    mousePos.X = Math.Max(mousePos.X, rect.X + Submarine.GridSize.X);
+                    mousePos.X = Math.Max(mousePos.X, prevRect.Value.X + Submarine.GridSize.X);
                    placeSize.X = mousePos.X - placePosition.X;
                }
                else if (resizeDirX < 0)
                {
-                    mousePos.X = Math.Min(mousePos.X, rect.Right - Submarine.GridSize.X);
+                    mousePos.X = Math.Min(mousePos.X, prevRect.Value.Right - Submarine.GridSize.X);

                    placeSize.X = MathF.Round((placePosition.X + placeSize.X) - mousePos.X);
                    placePosition.X = MathF.Round(mousePos.X);
                }
                if (resizeDirY < 0)
                {
-                    mousePos.Y = Math.Min(mousePos.Y, rect.Y - Submarine.GridSize.Y);
+                    mousePos.Y = Math.Min(mousePos.Y, prevRect.Value.Y - Submarine.GridSize.Y);
                    placeSize.Y = placePosition.Y - mousePos.Y;
                }
                else if (resizeDirY > 0)
                {
-                    mousePos.Y = Math.Max(mousePos.Y, rect.Y - rect.Height + Submarine.GridSize.X);
+                    mousePos.Y = Math.Max(mousePos.Y, prevRect.Value.Y - prevRect.Value.Height + Submarine.GridSize.Y);

-                    placeSize.Y = mousePos.Y - (rect.Y - rect.Height);
+                    placeSize.Y = mousePos.Y - (prevRect.Value.Y - prevRect.Value.Height);
                    placePosition.Y = mousePos.Y;
                }

+                Vector2 newPos = placePosition;
+                Vector2 newOppositeCorner = placePosition + placeSize.FlipY();
+
+                Vector2 transformedCornerDiff = rotateThenFlip(newPos-prevPos, Vector2.Zero, -RotationRad, FlippedX, FlippedY);
+                Vector2 transformedOppositeCornerDiff = rotateThenFlip(newOppositeCorner-prevOppositeCorner, Vector2.Zero, -RotationRad, FlippedX, FlippedY);
+
+                Vector2 newPosTransformed = rotateThenFlip(prevPos, prevCenter, -RotationRad, FlippedX, FlippedY)
+                                            + transformedCornerDiff;
+                Vector2 newOppositeTransformed = rotateThenFlip(prevOppositeCorner, prevCenter, -RotationRad, FlippedX, FlippedY)
+                                                 + transformedOppositeCornerDiff;
+                Vector2 newTransformedCenter = (newPosTransformed + newOppositeTransformed) * 0.5f;
+
+                var newDiff = (newOppositeCorner - newPos) * 0.5f;
+                placePosition = newTransformedCenter - newDiff;
+
                if ((int)placePosition.X != rect.X || (int)placePosition.Y != rect.Y || (int)placeSize.X != rect.Width || (int)placeSize.Y != rect.Height)
                {
                    Rect = new Rectangle((int)placePosition.X, (int)placePosition.Y, (int)placeSize.X, (int)placeSize.Y);
@@ -1210,15 +1288,16 @@ namespace Barotrauma
            IsHighlighted = true;

            int startX = ResizeHorizontal ? -1 : 0;
-            int StartY = ResizeVertical ? -1 : 0;
+            int startY = ResizeVertical ? -1 : 0;

            for (int x = startX; x < 2; x += 2)
            {
-                for (int y = StartY; y < 2; y += 2)
+                for (int y = startY; y < 2; y += 2)
                {
-                    Vector2 handlePos = cam.WorldToScreen(Position + new Vector2(x * (rect.Width * 0.5f), y * (rect.Height * 0.5f)));
+                    Vector2 handlePos = GetEditingHandlePos(x, y, cam);

                    bool highlighted = Vector2.DistanceSquared(PlayerInput.MousePosition, handlePos) < ResizeHandleHighlightDistance * ResizeHandleHighlightDistance;
+                    var color = Color.White * (highlighted ? 1.0f : 0.6f);
                    if (highlighted && !PlayerInput.PrimaryMouseButtonHeld())
                    {
                        GUI.MouseCursor = CursorState.Hand;
@@ -1226,7 +1305,7 @@ namespace Barotrauma
                    GUI.DrawRectangle(spriteBatch,
                        handlePos - new Vector2(ResizeHandleSize / 2),
                        new Vector2(ResizeHandleSize),
-                        Color.White * (highlighted ? 1.0f : 0.6f),
+                        color,
                        true, 0,
                        (int)Math.Max(1.5f / GameScreen.Selected.Cam.Zoom, 1.0f));
                }
@@ -1241,12 +1320,15 @@ namespace Barotrauma
            HashSet<MapEntity> foundEntities = new HashSet<MapEntity>();

            Rectangle selectionRect = Submarine.AbsRect(pos, size);
+            Quad2D selectionQuad = Quad2D.FromSubmarineRectangle(selectionRect);

            foreach (MapEntity entity in MapEntityList)
            {
                if (!entity.SelectableInEditor) { continue; }

-                if (Submarine.RectsOverlap(selectionRect, entity.rect))
+                Quad2D entityQuad = entity.GetTransformedQuad();
+
+                if (selectionQuad.Intersects(entityQuad))
                {
                    foundEntities.Add(entity);
                    entity.IsIncludedInSelection = true;
@@ -84,7 +84,7 @@ namespace Barotrauma
            }
        }

-        public virtual void DrawPlacing(SpriteBatch spriteBatch, Rectangle drawRect, float scale = 1.0f, SpriteEffects spriteEffects = SpriteEffects.None)
+        public virtual void DrawPlacing(SpriteBatch spriteBatch, Rectangle drawRect, float scale = 1.0f, float rotation = 0.0f, SpriteEffects spriteEffects = SpriteEffects.None)
        {
            if (Submarine.MainSub != null)
            {
@@ -1,10 +1,9 @@
 #nullable enable
+using Barotrauma.Sounds;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Xml.Linq;
-using Barotrauma.Sounds;
-using Microsoft.Xna.Framework;

 namespace Barotrauma
 {
@@ -45,7 +44,8 @@ namespace Barotrauma
            }
            if (FrequencyMultiplierRange.Y > 4.0f)
            {
-                DebugConsole.ThrowError($"Loaded frequency range exceeds max value: {FrequencyMultiplierRange} (original string was \"{freqMultAttr}\")");
+                DebugConsole.ThrowError($"Loaded frequency range exceeds max value: {FrequencyMultiplierRange} (original string was \"{freqMultAttr}\")",
+                    contentPackage: element.ContentPackage);
            }
            IgnoreMuffling = element.GetAttributeBool("dontmuffle", false);
        }
@@ -65,7 +65,8 @@ namespace Barotrauma
            if (filename is null)
            {
                string errorMsg = "Error when loading round sound (" + element + ") - file path not set";
-                DebugConsole.ThrowError(errorMsg);
+                DebugConsole.ThrowError(errorMsg,
+                    contentPackage: element.ContentPackage);
                GameAnalyticsManager.AddErrorEventOnce("RoundSound.LoadRoundSound:FilePathEmpty" + element.ToString(), GameAnalyticsManager.ErrorSeverity.Error, errorMsg + "\n" + Environment.StackTrace.CleanupStackTrace());
                return null;
            }
@@ -86,7 +87,8 @@ namespace Barotrauma
                catch (System.IO.FileNotFoundException e)
                {
                    string errorMsg = "Failed to load sound file \"" + filename + "\" (file not found).";
-                    DebugConsole.ThrowError(errorMsg, e);
+                    DebugConsole.ThrowError(errorMsg, e,
+                        contentPackage: element.ContentPackage);
                    if (!ContentPackageManager.ModsEnabled)
                    {
                        GameAnalyticsManager.AddErrorEventOnce("RoundSound.LoadRoundSound:FileNotFound" + filename, GameAnalyticsManager.ErrorSeverity.Error, errorMsg + "\n" + Environment.StackTrace.CleanupStackTrace());
@@ -96,7 +98,8 @@ namespace Barotrauma
                catch (System.IO.InvalidDataException e)
                {
                    string errorMsg = "Failed to load sound file \"" + filename + "\" (invalid data).";
-                    DebugConsole.ThrowError(errorMsg, e);
+                    DebugConsole.ThrowError(errorMsg, e,
+                        contentPackage: element.ContentPackage);
                    GameAnalyticsManager.AddErrorEventOnce("RoundSound.LoadRoundSound:InvalidData" + filename, GameAnalyticsManager.ErrorSeverity.Error, errorMsg + "\n" + Environment.StackTrace.CleanupStackTrace());
                    return null;
                }
@@ -123,7 +126,8 @@ namespace Barotrauma
                catch (System.IO.FileNotFoundException e)
                {
                    string errorMsg = "Failed to load sound file \"" + roundSound.Filename + "\".";
-                    DebugConsole.ThrowError(errorMsg, e);
+                    DebugConsole.ThrowError(errorMsg, e,
+                        contentPackage: roundSound.Sound?.XElement?.ContentPackage);
                    GameAnalyticsManager.AddErrorEventOnce("RoundSound.LoadRoundSound:FileNotFound" + roundSound.Filename, GameAnalyticsManager.ErrorSeverity.Error, errorMsg + "\n" + Environment.StackTrace.CleanupStackTrace());
                    return;
                }
@@ -150,7 +150,8 @@ namespace Barotrauma
                Stretch = true,
                RelativeSpacing = 0.01f
            };
-            new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityX"), style: "GUIButtonSmall")
+
+            var mirrorX = new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityX"), style: "GUIButtonSmall")
            {
                ToolTip = TextManager.Get("MirrorEntityXToolTip"),
                OnClicked = (button, data) =>
@@ -160,10 +161,12 @@ namespace Barotrauma
                        me.FlipX(relativeToSub: false);
                    }
                    if (!SelectedList.Contains(this)) { FlipX(relativeToSub: false); }
+                    ColorFlipButton(button, FlippedX);
                    return true;
                }
            };
-            new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"), style: "GUIButtonSmall")
+            ColorFlipButton(mirrorX, FlippedX);
+            var mirrorY = new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("MirrorEntityY"), style: "GUIButtonSmall")
            {
                ToolTip = TextManager.Get("MirrorEntityYToolTip"),
                OnClicked = (button, data) =>
@@ -173,9 +176,11 @@ namespace Barotrauma
                        me.FlipY(relativeToSub: false);
                    }
                    if (!SelectedList.Contains(this)) { FlipY(relativeToSub: false); }
+                    ColorFlipButton(button, FlippedY);
                    return true;
                }
            };
+            ColorFlipButton(mirrorY, FlippedY);
            new GUIButton(new RectTransform(new Vector2(0.23f, 1.0f), buttonContainer.RectTransform), TextManager.Get("ReloadSprite"), style: "GUIButtonSmall")
            {
                OnClicked = (button, data) =>
@@ -231,11 +236,14 @@ namespace Barotrauma

        public override bool IsVisible(Rectangle worldView)
        {
-            Rectangle worldRect = WorldRect;
+            RectangleF worldRect = Quad2D.FromSubmarineRectangle(WorldRect).Rotated(
+                FlippedX != FlippedY
+                    ? rotationRad
+                    : -rotationRad).BoundingAxisAlignedRectangle;
            Vector2 worldPos = WorldPosition;

-            Vector2 min = new Vector2(worldRect.X, worldRect.Y - worldRect.Height);
-            Vector2 max = new Vector2(worldRect.Right, worldRect.Y);
+            Vector2 min = new Vector2(worldRect.X, worldRect.Y);
+            Vector2 max = new Vector2(worldRect.Right, worldRect.Y + worldRect.Height);
            foreach (DecorativeSprite decorativeSprite in Prefab.DecorativeSprites)
            {
                float scale = decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale;
@@ -307,7 +315,12 @@ namespace Barotrauma

                Vector2 bodyPos = WorldPosition + BodyOffset * Scale;

-                GUI.DrawRectangle(spriteBatch, new Vector2(bodyPos.X, -bodyPos.Y), rectSize.X, rectSize.Y, BodyRotation, Color.White,
+                GUI.DrawRectangle(sb: spriteBatch,
+                    center: new Vector2(bodyPos.X, -bodyPos.Y),
+                    width: rectSize.X,
+                    height: rectSize.Y,
+                    rotation: BodyRotation,
+                    clr: Color.White,
                    thickness: Math.Max(1, (int)(2 / Screen.Selected.Cam.Zoom)));
            }

@@ -357,8 +370,10 @@ namespace Barotrauma

                    Prefab.BackgroundSprite.DrawTiled(
                        spriteBatch,
-                        new Vector2(rect.X + drawOffset.X, -(rect.Y + drawOffset.Y)),
+                        new Vector2(rect.X + rect.Width / 2 + drawOffset.X, -(rect.Y - rect.Height / 2 + drawOffset.Y)),
                        new Vector2(rect.Width, rect.Height),
+                        rotation: rotationRad,
+                        origin: rect.Size.ToVector2() * new Vector2(0.5f, 0.5f),
                        color: Prefab.BackgroundSpriteColor,
                        textureScale: TextureScale * Scale,
                        startOffset: backGroundOffset,
@@ -368,8 +383,10 @@ namespace Barotrauma
                    {
                        Prefab.BackgroundSprite.DrawTiled(
                            spriteBatch,
-                            new Vector2(rect.X + drawOffset.X, -(rect.Y + drawOffset.Y)) + dropShadowOffset,
+                            new Vector2(rect.X + rect.Width / 2 + drawOffset.X, -(rect.Y - rect.Height / 2 + drawOffset.Y)) + dropShadowOffset,
                            new Vector2(rect.Width, rect.Height),
+                            rotation: rotationRad,
+                            origin: rect.Size.ToVector2() * new Vector2(0.5f, 0.5f),
                            color: Color.Black * 0.5f,
                            textureScale: TextureScale * Scale,
                            startOffset: backGroundOffset,
@@ -385,6 +402,13 @@ namespace Barotrauma
                SpriteEffects oldEffects = Prefab.Sprite.effects;
                Prefab.Sprite.effects ^= SpriteEffects;

+                Vector2 advanceX = MathUtils.RotatedUnitXRadians(this.rotationRad).FlipY();
+                Vector2 advanceY = advanceX.YX().FlipX();
+                if (FlippedX != FlippedY)
+                {
+                    advanceX = advanceX.FlipY();
+                    advanceY = advanceY.FlipX();
+                }
                for (int i = 0; i < Sections.Length; i++)
                {
                    Rectangle drawSection = Sections[i].rect;
@@ -409,7 +433,7 @@ namespace Barotrauma
                        drawSection = new Rectangle(
                            drawSection.X,
                            drawSection.Y,
-                            Sections[Sections.Length -1 ].rect.Right - drawSection.X,
+                            Sections[Sections.Length - 1].rect.Right - drawSection.X,
                            drawSection.Y - (Sections[Sections.Length - 1].rect.Y - Sections[Sections.Length - 1].rect.Height));
                        i = Sections.Length;
                    }
@@ -424,10 +448,18 @@ namespace Barotrauma
                    sectionOffset.X += MathUtils.PositiveModulo((int)-textureOffset.X, Prefab.Sprite.SourceRect.Width);
                    sectionOffset.Y += MathUtils.PositiveModulo((int)-textureOffset.Y, Prefab.Sprite.SourceRect.Height);

+                    Vector2 pos = new Vector2(drawSection.X, drawSection.Y);
+                    pos -= rect.Location.ToVector2();
+                    pos = advanceX * pos.X + advanceY * pos.Y;
+                    pos += rect.Location.ToVector2();
+                    pos = new Vector2(pos.X + rect.Width / 2 + drawOffset.X, -(pos.Y - rect.Height / 2 + drawOffset.Y));
+
                    Prefab.Sprite.DrawTiled(
                        spriteBatch,
-                        new Vector2(drawSection.X + drawOffset.X, -(drawSection.Y + drawOffset.Y)),
+                        pos,
                        new Vector2(drawSection.Width, drawSection.Height),
+                        rotation: rotationRad,
+                        origin: rect.Size.ToVector2() * new Vector2(0.5f, 0.5f),
                        color: color,
                        startOffset: sectionOffset,
                        depth: depth,
@@ -437,7 +469,7 @@ namespace Barotrauma
                foreach (var decorativeSprite in Prefab.DecorativeSprites)
                {
                    if (!spriteAnimState[decorativeSprite].IsActive) { continue; }
-                    float rotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor);
+                    float rotation = decorativeSprite.GetRotation(ref spriteAnimState[decorativeSprite].RotationState, spriteAnimState[decorativeSprite].RandomRotationFactor) + this.rotationRad;
                    Vector2 offset = decorativeSprite.GetOffset(ref spriteAnimState[decorativeSprite].OffsetState, spriteAnimState[decorativeSprite].RandomOffsetMultiplier) * Scale;
                    decorativeSprite.Sprite.Draw(spriteBatch, new Vector2(DrawPosition.X + offset.X, -(DrawPosition.Y + offset.Y)), color,
                        rotation, decorativeSprite.GetScale(spriteAnimState[decorativeSprite].RandomScaleFactor) * Scale, Prefab.Sprite.effects,
@@ -94,19 +94,20 @@ namespace Barotrauma
            GUI.DrawRectangle(spriteBatch, new Rectangle(newRect.X, -newRect.Y - GameMain.GraphicsHeight, newRect.Width, newRect.Height + GameMain.GraphicsHeight * 2), Color.White);
        }

-        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f, SpriteEffects spriteEffects = SpriteEffects.None)
+        public override void DrawPlacing(SpriteBatch spriteBatch, Rectangle placeRect, float scale = 1.0f, float rotation = 0.0f, SpriteEffects spriteEffects = SpriteEffects.None)
        {
-            SpriteEffects oldEffects = Sprite.effects;
-            Sprite.effects ^= spriteEffects;
-
+            var position = placeRect.Location.ToVector2().FlipY();
+            position += placeRect.Size.ToVector2() * 0.5f;
+            
            Sprite.DrawTiled(
                spriteBatch, 
-                new Vector2(placeRect.X, -placeRect.Y), 
-                new Vector2(placeRect.Width, placeRect.Height), 
-                color: Color.White * 0.8f, 
-                textureScale: TextureScale * scale);
-
-            Sprite.effects = oldEffects;
+                position, 
+                placeRect.Size.ToVector2(), 
+                color: Color.White * 0.8f,
+                origin: placeRect.Size.ToVector2() * 0.5f,
+                rotation: rotation,
+                textureScale: TextureScale * scale,
+                spriteEffects: spriteEffects ^ Sprite.effects);
        }
    }
 }
@@ -25,7 +25,7 @@ namespace Barotrauma
        /// <summary>
        /// Margin applied around the view area when culling entities (i.e. entities that are this far outside the view are still considered visible)
        /// </summary>
-        private const int CullMargin = 500;
+        private const int CullMargin = 50;
        /// <summary>
        /// Update entity culling when any corner of the view has moved more than this
        /// </summary>
@@ -713,18 +713,12 @@ namespace Barotrauma
            return GameMain.LightManager.Lights.Count(l => l.CastShadows && !l.IsBackground) - disabledItemLightCount;
        }

-        public static Vector2 MouseToWorldGrid(Camera cam, Submarine sub, bool round = false)
+        public static Vector2 MouseToWorldGrid(Camera cam, Submarine sub, Vector2? mousePos = null, bool round = false)
        {
-            Vector2 position = PlayerInput.MousePosition;
+            Vector2 position = mousePos ?? PlayerInput.MousePosition;
            position = cam.ScreenToWorld(position);

-            Vector2 worldGridPos = VectorToWorldGrid(position, round);
-
-            if (sub != null)
-            {
-                worldGridPos.X += sub.Position.X % GridSize.X;
-                worldGridPos.Y += sub.Position.Y % GridSize.Y;
-            }
+            Vector2 worldGridPos = VectorToWorldGrid(position, sub, round);

            return worldGridPos;
        }
@@ -421,7 +421,7 @@ namespace Barotrauma
            float scale = element.GetAttributeFloat("scale", 1f);
            Color color = element.GetAttributeColor("spritecolor", Color.White);

-            float rotation = element.GetAttributeFloat("rotation", 0f);
+            float rotationRad = MathHelper.ToRadians(element.GetAttributeFloat("rotation", 0f));

            MapEntityPrefab prefab;
            if (element.NameAsIdentifier() == "item"
@@ -455,7 +455,7 @@ namespace Barotrauma
            ItemPrefab itemPrefab = prefab as ItemPrefab;
            if (itemPrefab != null)
            {
-                BakeItemComponents(itemPrefab, rect, color, scale, rotation, depth, out overrideSprite);
+                BakeItemComponents(itemPrefab, rect, color, scale, rotationRad, depth, out overrideSprite);
            }

            if (!overrideSprite)
@@ -485,13 +485,15 @@ namespace Barotrauma
                                MathUtils.PositiveModulo((int)-textureOffset.Y, prefab.Sprite.SourceRect.Height));

                    prefab.Sprite.DrawTiled(
-                        spriteRecorder,
-                        rect.Location.ToVector2() * new Vector2(1f, -1f),
-                        rect.Size.ToVector2(),
+                        spriteBatch: spriteRecorder,
+                        position: new Vector2(rect.X + rect.Width / 2, -(rect.Y - rect.Height / 2)),
+                        targetSize: rect.Size.ToVector2(),
+                        origin: rect.Size.ToVector2() * new Vector2(0.5f, 0.5f),
                        color: color,
                        startOffset: backGroundOffset,
                        textureScale: textureScale * scale,
-                        depth: depth);
+                        depth: depth,
+                        rotation: rotationRad);
                }
                else if (itemPrefab != null)
                {
@@ -552,7 +554,7 @@ namespace Barotrauma
                            spritePos * new Vector2(1f, -1f),
                            color,
                            prefab.Sprite.Origin,
-                            rotation,
+                            rotationRad,
                            scale,
                            prefab.Sprite.effects, depth);

@@ -564,7 +566,7 @@ namespace Barotrauma
                            if (flippedX) { offset.X = -offset.X; }
                            if (flippedY) { offset.Y = -offset.Y; }
                            decorativeSprite.Sprite.Draw(spriteRecorder, new Vector2(spritePos.X + offset.X, -(spritePos.Y + offset.Y)), color,
-                                MathHelper.ToRadians(rotation) + rot, decorativeSprite.GetScale(0f) * scale, prefab.Sprite.effects,
+                                rotationRad + rot, decorativeSprite.GetScale(0f) * scale, prefab.Sprite.effects,
                                depth: Math.Min(depth + (decorativeSprite.Sprite.Depth - prefab.Sprite.Depth), 0.999f));
                        }
                    }
@@ -577,7 +579,7 @@ namespace Barotrauma
        private void BakeItemComponents(
            ItemPrefab prefab,
            Rectangle rect, Color color,
-            float scale, float rotation, float depth,
+            float scale, float rotationRad, float depth,
            out bool overrideSprite)
        {
            overrideSprite = false;
@@ -607,7 +609,7 @@ namespace Barotrauma
                        Vector2 relativeBarrelPos = barrelPos * prefab.Scale - new Vector2(rect.Width / 2, rect.Height / 2);
                        var transformedBarrelPos = MathUtils.RotatePoint(
                            relativeBarrelPos,                            
-                            MathHelper.ToRadians(rotation));
+                            rotationRad);

                        Vector2 drawPos = new Vector2(rect.X + rect.Width * relativeScale / 2 + transformedBarrelPos.X * relativeScale, rect.Y - rect.Height * relativeScale / 2 - transformedBarrelPos.Y * relativeScale);
                        drawPos.Y = -drawPos.Y;
@@ -615,13 +617,13 @@ namespace Barotrauma
                        railSprite?.Draw(spriteRecorder,
                            drawPos,
                            color,
-                            rotation + MathHelper.PiOver2, scale,
+                            rotationRad, scale,
                            SpriteEffects.None, depth + (railSprite.Depth - prefab.Sprite.Depth));

                        barrelSprite?.Draw(spriteRecorder,
                            drawPos,
                            color,
-                            rotation + MathHelper.PiOver2, scale,
+                            rotationRad, scale,
                            SpriteEffects.None, depth + (barrelSprite.Depth - prefab.Sprite.Depth));

                        break;
@@ -781,7 +783,7 @@ namespace Barotrauma
                previewFrame = null;
            }
            spriteRecorder?.Dispose(); spriteRecorder = null;
-            camera?.Dispose(); camera = null;
+            camera = null;
            isDisposed = true;
        }
    }