(d9829ac) v0.9.4.0

This commit is contained in:
Regalis
2019-10-24 18:05:42 +02:00
parent 9aa12bcac2
commit b39922a074
319 changed files with 12516 additions and 6815 deletions
@@ -21,7 +21,7 @@ namespace Barotrauma.Items.Components
private List<ushort> disconnectedWireIds;
[Serialize(false, true), Editable(ToolTip = "Locked connection panels cannot be rewired in-game.")]
[Editable, Serialize(false, true, description: "Locked connection panels cannot be rewired in-game.")]
public bool Locked
{
get;
@@ -171,9 +171,9 @@ namespace Barotrauma.Items.Components
return true;
}
public override void Load(XElement element)
public override void Load(XElement element, bool usePrefabValues)
{
base.Load(element);
base.Load(element, usePrefabValues);
List<Connection> loadedConnections = new List<Connection>();