(875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-27 20:56:29 +02:00
parent 3b786d7ded
commit 7c8f19ee14
13 changed files with 748 additions and 149 deletions
@@ -68,6 +68,14 @@ namespace Barotrauma

        private float dropItemAnimDuration = 0.5f;
        private float dropItemAnimTimer;
+
+        public Item DroppedItem
+        {
+            get
+            {
+                return droppedItem;
+            }
+        }
        private Item droppedItem;

        private GUIComponent draggingMed;