(683b11c00) High-res shuttle preview images + merge fix

2019-05-16 07:05:08 +03:00
parent 5438a65852
commit f605651966
43 changed files with 34 additions and 3476 deletions
@@ -41,33 +41,6 @@ namespace Barotrauma
        {
            get { return activeSprite; }
        }
-              
-        public float SpriteRotation;
-
-        private GUITextBlock itemInUseWarning;
-        private GUITextBlock ItemInUseWarning
-        {
-            get
-            {
-                if (itemInUseWarning == null)
-                {
-                    itemInUseWarning = new GUITextBlock(new RectTransform(new Point(10), GUI.Canvas), "", 
-                        textColor: Color.Orange, color: Color.Black, 
-                        textAlignment:Alignment.Center, style: "OuterGlow");
-                }
-                return itemInUseWarning;
-            }
-        }
-
-        public override bool SelectableInEditor
-        {
-            get
-            {
-                return parentInventory == null && (body == null || body.Enabled) && ShowItems;
-            }
-        }
-              
-        public float SpriteRotation;

        private GUITextBlock itemInUseWarning;
        private GUITextBlock ItemInUseWarning