Merge https://github.com/Regalis11/Barotrauma into develop

2023-06-15 12:13:50 -03:00
parent 6b461e1026 f95be0511c
commit 15daa64f66
210 changed files with 4491 additions and 2580 deletions
@@ -185,7 +185,7 @@ namespace Barotrauma.Items.Components
                    //already connected, no need to do anything
                    if (Connections[i].Wires.Contains(newWire)) { continue; }

-                    newWire.Connect(Connections[i], true, true);
+                    newWire.TryConnect(Connections[i], true, true);
                    Connections[i].TryAddLink(newWire);

                    var otherConnection = newWire.OtherConnection(Connections[i]);