Merge branch 'master' of http://github.com/juanjp600/Barotrauma

Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml

@@ -36,11 +36,12 @@
     category="Machine"
     type="Controller"
     linkable="true"
+    disableitemusagewhenselected="true"
     >
 
     <Sprite texture ="railgunetc.png" depth="0.8" sourcerect="182,0,61,97"/>
     
-    <Controller UserPos="-35.0, -50.0" direction ="Right" canbeselected = "true">
+    <Controller UserPos="-35.0, -50.0" direction ="Right" canbeselected="true">
       <limbposition limb="Head" position="-5,-62"/>
       <limbposition limb="Torso" position="-5,-108"/>
       <limbposition limb="LeftHand" position="43,-85"/>

Barotrauma/BarotraumaShared/Source/Characters/Character.cs

@@ -926,6 +926,8 @@ namespace Barotrauma
                 }
             }
 
+            if (SelectedConstruction == null || !SelectedConstruction.Prefab.DisableItemUsageWhenSelected)
+            {
                 for (int i = 0; i < selectedItems.Length; i++ )
                 {
                     if (selectedItems[i] == null) continue;
@@ -934,6 +936,7 @@ namespace Barotrauma
                     if (IsKeyDown(InputType.Use)) selectedItems[i].Use(deltaTime, this);
                     if (IsKeyDown(InputType.Aim) && selectedItems[i] != null) selectedItems[i].SecondaryUse(deltaTime, this);                
                 }
+            }
 
             if (selectedConstruction != null)
             {

Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs

@@ -134,6 +134,13 @@ namespace Barotrauma
             private set;
         }
 
+        [Serialize(false, false)]
+        public bool DisableItemUsageWhenSelected
+        {
+            get;
+            private set;
+        }
+
         public bool CanSpriteFlipX
         {
             get { return canSpriteFlipX; }