Unstable 0.1500.1.0 (BaroDev edition)

This commit is contained in:
Markus Isberg
2021-09-03 21:56:31 +09:00
parent 501e02c026
commit e7b7c1a748
143 changed files with 2928 additions and 1356 deletions
@@ -41,7 +41,7 @@ namespace Barotrauma.Items.Components
set
{
if (string.IsNullOrEmpty(value)) { return; }
ShowOnDisplay(value);
ShowOnDisplay(value, addToHistory: true);
}
}
@@ -59,7 +59,7 @@ namespace Barotrauma.Items.Components
partial void InitProjSpecific(XElement element);
partial void ShowOnDisplay(string input, bool addToHistory = true);
partial void ShowOnDisplay(string input, bool addToHistory);
public override void ReceiveSignal(Signal signal, Connection connection)
{
@@ -70,14 +70,14 @@ namespace Barotrauma.Items.Components
}
string inputSignal = signal.value.Replace("\\n", "\n");
ShowOnDisplay(inputSignal);
ShowOnDisplay(inputSignal, addToHistory: true);
}
public override void OnItemLoaded()
{
bool isSubEditor = false;
#if CLIENT
isSubEditor = Screen.Selected != GameMain.SubEditorScreen || GameMain.GameSession?.GameMode is TestGameMode;
isSubEditor = Screen.Selected == GameMain.SubEditorScreen || GameMain.GameSession?.GameMode is TestGameMode;
#endif
base.OnItemLoaded();
@@ -110,7 +110,7 @@ namespace Barotrauma.Items.Components
{
string msg = componentElement.GetAttributeString("msg" + i, null);
if (msg == null) { break; }
ShowOnDisplay(msg);
ShowOnDisplay(msg, addToHistory: true);
}
}
}