Merge remote-tracking branch 'upstream/master' into weapon_anims

# Conflicts:
#	Resources/Prototypes/MeleeWeaponAnimations/default.yml

Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs

@@ -108,6 +108,9 @@ namespace Content.Shared.GameObjects.Components.Sound
 
         public void ExposeData(ObjectSerializer serializer)
         {
+            if (!serializer.Reading)
+                return;
+
             Filename = serializer.ReadDataField("filename", "");
             Delay = serializer.ReadDataField("delay", 0u);
             RandomDelay = serializer.ReadDataField("randomdelay", 0u);

Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs

@@ -0,0 +1,12 @@
+using System;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.GameObjects.Components.Weapons.Ranged
+{
+    /// <summary>
+    /// This is sent if the MagazineBarrel AutoEjects the magazine
+    /// </summary>
+    [Serializable, NetSerializable]
+    public sealed class MagazineAutoEjectMessage : ComponentMessage {}
+}

Content.Shared/SharedGameTicker.cs

@@ -66,6 +66,7 @@ namespace Content.Shared
             public bool YouAreReady { get; set; }
             // UTC.
             public DateTime StartTime { get; set; }
+            public bool Paused { get; set; }
 
             public override void ReadFromBuffer(NetIncomingMessage buffer)
             {
@@ -78,6 +79,7 @@ namespace Content.Shared
 
                 YouAreReady = buffer.ReadBoolean();
                 StartTime = new DateTime(buffer.ReadInt64(), DateTimeKind.Utc);
+                Paused = buffer.ReadBoolean();
             }
 
             public override void WriteToBuffer(NetOutgoingMessage buffer)
@@ -91,6 +93,7 @@ namespace Content.Shared
 
                 buffer.Write(YouAreReady);
                 buffer.Write(StartTime.Ticks);
+                buffer.Write(Paused);
             }
         }