(3b137aa1a) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:36:05 +03:00
parent 5ba3c802ea
commit 8280ed9c1a
24 changed files with 415 additions and 187 deletions
@@ -241,5 +241,12 @@ namespace Barotrauma.Items.Components
        {
            character.AnimController.UpdateUseItem(false, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((item.Condition / item.MaxCondition) % 0.1f));
        }
+
+        public override void ReceiveSignal(int stepsTaken, string signal, Connection connection, Item source, Character sender, float power = 0, float signalStrength = 1)
+        {
+            //do nothing
+            //Repairables should always stay active, so we don't want to use the default behavior 
+            //where set_active/set_state signals can disable the component
+        }
    }
 }