Unstable 0.1500.2.0 (Rokvach's dog edition)

2021-09-10 04:52:34 +09:00
parent e7b7c1a748
commit 1231170fce
126 changed files with 2424 additions and 1083 deletions
@@ -77,6 +77,13 @@ namespace Barotrauma
            protected set;
        }

+        [Serialize(true, false)]
+        public bool ShowInStatusMonitor
+        {
+            get;
+            private set;
+        }
+

        [Serialize("", false)]
        public string ImpactSoundTag { get; private set; }
@@ -84,13 +91,13 @@ namespace Barotrauma
        public override void UpdatePlacing(Camera cam)
        {
            Vector2 position = Submarine.MouseToWorldGrid(cam, Submarine.MainSub);
-            
+
            if (PlayerInput.SecondaryMouseButtonClicked())
            {
                selected = null;
                return;
            }
-            
+
            var potentialContainer = MapEntity.GetPotentialContainer(position);

            if (!ResizeHorizontal && !ResizeVertical)
@@ -155,7 +162,7 @@ namespace Barotrauma
            {
                potentialContainer.IsHighlighted = true;
            }
-            
+

            //if (PlayerInput.GetMouseState.RightButton == ButtonState.Pressed) selected = null;