Unstable 0.1500.1.0 (BaroDev edition)

2021-09-03 21:56:31 +09:00
parent 501e02c026
commit e7b7c1a748
143 changed files with 2928 additions and 1356 deletions
@@ -0,0 +1,20 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma.Items.Components
+{
+    partial class GeneticMaterial : ItemComponent
+    {
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        {
+            msg.Write(tainted);
+            if (tainted)
+            {
+                msg.Write(selectedTaintedEffect?.UIntIdentifier ?? 0);
+            }
+            else
+            {
+                msg.Write(selectedEffect?.UIntIdentifier ?? 0);
+            }
+        }
+    }
+}
@@ -19,13 +19,13 @@ namespace Barotrauma.Items.Components
                GameServer.Log(GameServer.CharacterLogName(c.Character) + " entered \"" + newOutputValue + "\" on " + item.Name,
                    ServerLog.MessageType.ItemInteraction);
                OutputValue = newOutputValue;
-                ShowOnDisplay(newOutputValue);
+                ShowOnDisplay(newOutputValue, addToHistory: true);
                item.SendSignal(newOutputValue, "signal_out");
                item.CreateServerEvent(this);
            }
        }

-        partial void ShowOnDisplay(string input, bool addToHistory = true)
+        partial void ShowOnDisplay(string input, bool addToHistory)
        {
            if (addToHistory)
            {