Merge commit 'a19579088ffa87bb873bf6baf6cdc9a1ef60dbb1' into antagonists

Barotrauma/BarotraumaShared/Source/DebugConsole.cs

@@ -732,12 +732,30 @@ namespace Barotrauma
                 }
             }));
 
+            commands.Add(new Command("kill", "kill [character]: Immediately kills the specified character.", (string[] args) =>
+            {
+                Character killedCharacter = null;
+                if (args.Length == 0)
+                {
+                    killedCharacter = Character.Controlled;
+                }
+                else
+                {
+                    killedCharacter = FindMatchingCharacter(args);
+                }
+
+                if (killedCharacter != null)
+                {
+                    killedCharacter.AddDamage(CauseOfDeath.Damage, killedCharacter.MaxHealth * 2, null);
+                }
+            }));
+
             commands.Add(new Command("killmonsters", "killmonsters: Immediately kills all AI-controlled enemies in the level.", (string[] args) =>
             {
                 foreach (Character c in Character.CharacterList)
                 {
                     if (!(c.AIController is EnemyAIController)) continue;
-                    c.AddDamage(CauseOfDeath.Damage, 10000.0f, null);
+                    c.AddDamage(CauseOfDeath.Damage, c.MaxHealth * 2, null);
                 }
             }));
 

Barotrauma/BarotraumaShared/Source/Events/MonsterEvent.cs

@@ -73,14 +73,14 @@ namespace Barotrauma
         {
             base.Init();
 
-            monsters = SpawnMonsters(Rand.Range(minAmount, maxAmount, Rand.RandSync.Server));
+            monsters = SpawnMonsters(Rand.Range(minAmount, maxAmount, Rand.RandSync.Server), false);
             if (GameSettings.VerboseLogging)
             {
                 DebugConsole.NewMessage("Initialized MonsterEvent (" + monsters[0]?.SpeciesName + " x" + monsters.Length + ")", Color.White);
             }
         }
 
-        private Character[] SpawnMonsters(int amount)
+        private Character[] SpawnMonsters(int amount, bool createNetworkEvent)
         {
             if (disallowed) return null;
             
@@ -101,7 +101,7 @@ namespace Barotrauma
             {
                 spawnPos.X += Rand.Range(-0.5f, 0.5f, Rand.RandSync.Server);
                 spawnPos.Y += Rand.Range(-0.5f, 0.5f, Rand.RandSync.Server);
-                monsters[i] = Character.Create(characterFile, spawnPos, null, GameMain.Client != null, true, false);
+                monsters[i] = Character.Create(characterFile, spawnPos, null, GameMain.Client != null, true, createNetworkEvent);
             }
 
             return monsters;
@@ -127,7 +127,7 @@ namespace Barotrauma
                 {
                     if (monsters[i] == null || monsters[i].Removed || monsters[i].IsDead)
                     {
-                        monsters[i] = SpawnMonsters(1)[0];
+                        monsters[i] = SpawnMonsters(1, true)[0];
                     }
                 }
             }

Barotrauma/BarotraumaShared/Source/Items/Components/Signal/ConnectionPanel.cs

@@ -120,6 +120,11 @@ namespace Barotrauma.Items.Components
             return componentElement;
         }
 
+        protected override void ShallowRemoveComponentSpecific()
+        {
+            //do nothing
+        }
+
         protected override void RemoveComponentSpecific()
         {
             foreach (Connection c in Connections)

Barotrauma/BarotraumaShared/Source/Map/MapEntity.cs

@@ -223,9 +223,8 @@ namespace Barotrauma
                     //index of the connection in the connectionpanel of the target item
                     int connectionIndex = connectedItem.Connections.IndexOf(originalWire.Connections[n]);
                     
-                    (clones[itemIndex] as Item).GetComponent<ConnectionPanel>().Connections[connectionIndex].TryAddLink(cloneWire);
+                    (clones[itemIndex] as Item).Connections[connectionIndex].TryAddLink(cloneWire);
                     cloneWire.Connect((clones[itemIndex] as Item).Connections[connectionIndex], false);
-
                 }
             }