diff --git a/Subsurface/Source/Characters/AI/AIController.cs b/Subsurface/Source/Characters/AI/AIController.cs
index e3fc2e544..77fff925b 100644
--- a/Subsurface/Source/Characters/AI/AIController.cs
+++ b/Subsurface/Source/Characters/AI/AIController.cs
@@ -58,7 +58,7 @@ namespace Barotrauma
 
         //protected Structure lastStructurePicked;
 
-        public virtual void FillNetworkData(NetOutgoingMessage message) { }
+        public virtual void FillNetworkData(NetBuffer message) { }
         public virtual void ReadNetworkData(NetIncomingMessage message) { }
         
     }
diff --git a/Subsurface/Source/Characters/AI/EnemyAIController.cs b/Subsurface/Source/Characters/AI/EnemyAIController.cs
index e1b237122..9206871df 100644
--- a/Subsurface/Source/Characters/AI/EnemyAIController.cs
+++ b/Subsurface/Source/Characters/AI/EnemyAIController.cs
@@ -508,7 +508,7 @@ namespace Barotrauma
             spriteBatch.DrawString(GUI.Font, "cooldown: " + coolDownTimer, pos - Vector2.UnitY * 120.0f, Color.Red);
         }
 
-        public override void FillNetworkData(NetOutgoingMessage message)
+        public override void FillNetworkData(NetBuffer message)
         {
             message.Write((byte)state);
 
diff --git a/Subsurface/Source/Characters/AICharacter.cs b/Subsurface/Source/Characters/AICharacter.cs
index e059b7ab8..367740635 100644
--- a/Subsurface/Source/Characters/AICharacter.cs
+++ b/Subsurface/Source/Characters/AICharacter.cs
@@ -83,7 +83,7 @@ namespace Barotrauma
             return result;
         }
 
-        public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
         {
             switch (type)
             {
diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 75d9a9575..142a33cdd 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -1186,7 +1186,7 @@ namespace Barotrauma
             }
         }
 
-        public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
         {
             switch (type)
             {
diff --git a/Subsurface/Source/Items/CharacterInventory.cs b/Subsurface/Source/Items/CharacterInventory.cs
index 396aec3ed..e7a2e91d7 100644
--- a/Subsurface/Source/Items/CharacterInventory.cs
+++ b/Subsurface/Source/Items/CharacterInventory.cs
@@ -355,7 +355,7 @@ namespace Barotrauma
             }                       
         }
 
-        public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
         {
             for (int i = 0; i < 5; i++ )
             {
@@ -371,7 +371,7 @@ namespace Barotrauma
             return true;
         }
 
-        public override void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
+        public override void ReadNetworkData(NetworkEventType type, NetBuffer message)
         {
             for (int i = 0; i<5; i++)
             {
diff --git a/Subsurface/Source/Items/Components/Holdable/Holdable.cs b/Subsurface/Source/Items/Components/Holdable/Holdable.cs
index 881487f5e..6b2087ac9 100644
--- a/Subsurface/Source/Items/Components/Holdable/Holdable.cs
+++ b/Subsurface/Source/Items/Components/Holdable/Holdable.cs
@@ -263,13 +263,13 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             message.Write(item.SimPosition.X);
             message.Write(item.SimPosition.Y);
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             Vector2 newPos = Vector2.Zero;
 
diff --git a/Subsurface/Source/Items/Components/ItemComponent.cs b/Subsurface/Source/Items/Components/ItemComponent.cs
index 618cee02b..15d47344d 100644
--- a/Subsurface/Source/Items/Components/ItemComponent.cs
+++ b/Subsurface/Source/Items/Components/ItemComponent.cs
@@ -701,11 +701,11 @@ namespace Barotrauma.Items.Components
             return ic;
         }
 
-        public virtual void FillNetworkData(NetworkEventType type, NetOutgoingMessage message)
+        public virtual void FillNetworkData(NetworkEventType type, NetBuffer message)
         {
         }
 
-        public virtual void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
+        public virtual void ReadNetworkData(NetworkEventType type, NetBuffer message)
         {
         }
     }
diff --git a/Subsurface/Source/Items/Components/Machines/Pump.cs b/Subsurface/Source/Items/Components/Machines/Pump.cs
index eb786fe56..c78ca9006 100644
--- a/Subsurface/Source/Items/Components/Machines/Pump.cs
+++ b/Subsurface/Source/Items/Components/Machines/Pump.cs
@@ -166,14 +166,14 @@ namespace Barotrauma.Items.Components
             if (!IsActive) currPowerConsumption = 0.0f;
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             message.WriteRangedInteger(-10,10,(int)(flowPercentage/10.0f));
             message.Write(IsActive);
             message.WritePadBits();
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             float newFlow = 0.0f;
             bool newActive;
diff --git a/Subsurface/Source/Items/Components/Machines/Radar.cs b/Subsurface/Source/Items/Components/Machines/Radar.cs
index f1e4067e6..a0ac2f6cf 100644
--- a/Subsurface/Source/Items/Components/Machines/Radar.cs
+++ b/Subsurface/Source/Items/Components/Machines/Radar.cs
@@ -296,12 +296,12 @@ namespace Barotrauma.Items.Components
             spriteBatch.DrawString(GUI.SmallFont, (int)(dist / 80.0f) + " m", new Vector2(markerPos.X + 10, markerPos.Y + 15), Color.LightGreen);                
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             message.Write(IsActive);
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             try
             {
diff --git a/Subsurface/Source/Items/Components/Machines/Reactor.cs b/Subsurface/Source/Items/Components/Machines/Reactor.cs
index 8e2754a90..a3d0ce692 100644
--- a/Subsurface/Source/Items/Components/Machines/Reactor.cs
+++ b/Subsurface/Source/Items/Components/Machines/Reactor.cs
@@ -423,7 +423,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void FillNetworkData(NetworkEventType type, NetOutgoingMessage message)
+        public override void FillNetworkData(NetworkEventType type, NetBuffer message)
         {
             message.Write(autoTemp);
             message.WriteRangedSingle(temperature, 0.0f, 10000.0f, 16);
@@ -433,7 +433,7 @@ namespace Barotrauma.Items.Components
             message.WriteRangedSingle(fissionRate, 0.0f, 100.0f, 8);
         }
 
-        public override void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
+        public override void ReadNetworkData(NetworkEventType type, NetBuffer message)
         {
             bool newAutoTemp;
             float newTemperature, newShutDownTemp;
diff --git a/Subsurface/Source/Items/Components/Machines/Steering.cs b/Subsurface/Source/Items/Components/Machines/Steering.cs
index 9fb7936bc..807b27ce4 100644
--- a/Subsurface/Source/Items/Components/Machines/Steering.cs
+++ b/Subsurface/Source/Items/Components/Machines/Steering.cs
@@ -209,7 +209,7 @@ namespace Barotrauma.Items.Components
             }  
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             message.Write(targetVelocity.X);
             message.Write(targetVelocity.Y);
@@ -217,7 +217,7 @@ namespace Barotrauma.Items.Components
             message.Write(autoPilot);
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             Vector2 newTargetVelocity   = Vector2.Zero;
             bool newAutoPilot           = false;
diff --git a/Subsurface/Source/Items/Components/Power/PowerContainer.cs b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
index 393f3e60a..a18909012 100644
--- a/Subsurface/Source/Items/Components/Power/PowerContainer.cs
+++ b/Subsurface/Source/Items/Components/Power/PowerContainer.cs
@@ -196,13 +196,13 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             message.WriteRangedSingle(MathHelper.Clamp(rechargeSpeed/MaxRechargeSpeed, 0.0f, 1.0f), 0.0f, 1.0f, 8);
             message.WriteRangedSingle(MathHelper.Clamp(charge/capacity,0.0f, 1.0f), 0.0f, 1.0f, 8);
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             float newRechargeSpeed = 0f;
             float newCharge = 0.0f;
diff --git a/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
index 1fd38a981..f762079f4 100644
--- a/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
+++ b/Subsurface/Source/Items/Components/Signal/ConnectionPanel.cs
@@ -124,7 +124,7 @@ namespace Barotrauma.Items.Components
             base.Remove();
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             foreach (Connection c in connections)
             {
@@ -137,7 +137,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             System.Diagnostics.Debug.WriteLine("connectionpanel update");
             foreach (Connection c in connections)
diff --git a/Subsurface/Source/Items/Components/Signal/Wire.cs b/Subsurface/Source/Items/Components/Signal/Wire.cs
index f312e35b8..12b5b14b1 100644
--- a/Subsurface/Source/Items/Components/Signal/Wire.cs
+++ b/Subsurface/Source/Items/Components/Signal/Wire.cs
@@ -428,7 +428,7 @@ namespace Barotrauma.Items.Components
             base.Remove();
         }
 
-        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
+        public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             message.Write((byte)Math.Min(Nodes.Count, 10));
             for (int i = 0; i < Math.Min(Nodes.Count,10); i++)
@@ -438,7 +438,7 @@ namespace Barotrauma.Items.Components
             }
         }
 
-        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetIncomingMessage message)
+        public override void ReadNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetBuffer message)
         {
             Nodes.Clear();
 
diff --git a/Subsurface/Source/Items/Inventory.cs b/Subsurface/Source/Items/Inventory.cs
index 382400e62..5e26e60f9 100644
--- a/Subsurface/Source/Items/Inventory.cs
+++ b/Subsurface/Source/Items/Inventory.cs
@@ -295,7 +295,7 @@ namespace Barotrauma
                 spriteBatch.DrawString(GUI.Font, (int)item.Condition + " %", new Vector2(rect.X + rect.Width / 2, rect.Y + rect.Height / 2), Color.Red);
         }
 
-        public virtual bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        public virtual bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
         {
             for (int i = 0; i<capacity; i++)
             {
@@ -306,7 +306,7 @@ namespace Barotrauma
             return true;
         }
 
-        public virtual void ReadNetworkData(NetworkEventType type, NetIncomingMessage message)
+        public virtual void ReadNetworkData(NetworkEventType type, NetBuffer message)
         {
             List<ushort> newItemIDs = new List<ushort>();
                         
diff --git a/Subsurface/Source/Items/Item.cs b/Subsurface/Source/Items/Item.cs
index 2c1d5fcfb..0295aae88 100644
--- a/Subsurface/Source/Items/Item.cs
+++ b/Subsurface/Source/Items/Item.cs
@@ -1223,7 +1223,7 @@ namespace Barotrauma
                 NetworkEventType.ImportantComponentUpdate : NetworkEventType.ComponentUpdate, ID, isClient, index);
         }
 
-        public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
         {
             message.Write((byte)MathHelper.Clamp(condition*2.55f,0.0f,255.0f));
 
diff --git a/Subsurface/Source/Map/Entity.cs b/Subsurface/Source/Map/Entity.cs
index 1449ad68e..4377ef8a9 100644
--- a/Subsurface/Source/Map/Entity.cs
+++ b/Subsurface/Source/Map/Entity.cs
@@ -65,7 +65,7 @@ namespace Barotrauma
             dictionary.Add(id, this);
         }
 
-        public virtual bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data) 
+        public virtual bool FillNetworkData(NetworkEventType type, NetBuffer message, object data) 
         {
             return false;
         }
diff --git a/Subsurface/Source/Map/Hull.cs b/Subsurface/Source/Map/Hull.cs
index 7da365d7f..0f509df31 100644
--- a/Subsurface/Source/Map/Hull.cs
+++ b/Subsurface/Source/Map/Hull.cs
@@ -6,6 +6,7 @@ using System.Xml.Linq;
 using FarseerPhysics;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Lidgren.Network;
 
 namespace Barotrauma
 {
@@ -471,7 +472,7 @@ namespace Barotrauma
             h.ID = (ushort)int.Parse(element.Attribute("ID").Value);
         }
 
-        public override bool FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(Networking.NetworkEventType type, NetBuffer message, object data)
         {            
             message.WriteRangedSingle(MathHelper.Clamp(volume/FullVolume, 0.0f, 1.5f), 0.0f, 1.5f, 6);
 
diff --git a/Subsurface/Source/Map/Structure.cs b/Subsurface/Source/Map/Structure.cs
index ed2477da5..0584d5541 100644
--- a/Subsurface/Source/Map/Structure.cs
+++ b/Subsurface/Source/Map/Structure.cs
@@ -636,7 +636,7 @@ namespace Barotrauma
 
         }
 
-        public override bool FillNetworkData(NetworkEventType type, NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(NetworkEventType type, NetBuffer message, object data)
         {
             message.Write((float)NetTime.Now);
 
diff --git a/Subsurface/Source/Map/Submarine.cs b/Subsurface/Source/Map/Submarine.cs
index 3cb4469f8..094a301b6 100644
--- a/Subsurface/Source/Map/Submarine.cs
+++ b/Subsurface/Source/Map/Submarine.cs
@@ -383,7 +383,7 @@ namespace Barotrauma
             Level.Loaded.Move(-amount);
         }
 
-        public override bool FillNetworkData(Networking.NetworkEventType type, NetOutgoingMessage message, object data)
+        public override bool FillNetworkData(Networking.NetworkEventType type, NetBuffer message, object data)
         {
             if (subBody == null) return false;
 
diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs
index b0a17d05c..771cbc109 100644
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -645,14 +645,12 @@ namespace Barotrauma.Networking
 
                 NetOutgoingMessage message = server.CreateMessage();
                 message.Write((byte)PacketTypes.NetworkEvent);
-
-
-
+                
                 List<byte[]> msgBytes = new List<byte[]>();
 
                 foreach (NetworkEvent unreliableEvent in unreliableEvents)
                 {
-                    NetOutgoingMessage tempMessage = server.CreateMessage();
+                    NetBuffer tempMessage = new NetBuffer();// server.CreateMessage();
                     if (!unreliableEvent.FillData(tempMessage)) continue;
                     tempMessage.WritePadBits();
 
diff --git a/Subsurface/Source/Networking/NetworkEvent.cs b/Subsurface/Source/Networking/NetworkEvent.cs
index f7039dfa5..26350fa8a 100644
--- a/Subsurface/Source/Networking/NetworkEvent.cs
+++ b/Subsurface/Source/Networking/NetworkEvent.cs
@@ -21,9 +21,7 @@ namespace Barotrauma.Networking
         ItemFixed = 9,
         
         UpdateProperty = 10,
-        WallDamage = 11,
-
-
+        WallDamage = 11
     }
 
     class NetworkEvent
@@ -123,7 +121,7 @@ namespace Barotrauma.Networking
             events.Add(this);
         }
 
-        public bool FillData(NetOutgoingMessage message)
+        public bool FillData(NetBuffer message)
         {
             message.Write((byte)eventType);
 
diff --git a/Subsurface_Solution.v12.suo b/Subsurface_Solution.v12.suo
index db4184715..728c5959b 100644
Binary files a/Subsurface_Solution.v12.suo and b/Subsurface_Solution.v12.suo differ