Merge branch 'master' into 2020-04-28-tool-component

# Conflicts:
#	SpaceStation14.sln.DotSettings

Content.Shared/Audio/AudioHelpers.cs

@@ -2,9 +2,12 @@ using System;
 using Content.Shared.GameObjects.Components.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
+using Robust.Shared.Map;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
 namespace Content.Shared.Audio
@@ -18,5 +21,11 @@ namespace Content.Shared.Audio
             var scale = (float)(IoCManager.Resolve<IRobustRandom>().NextGaussian(1, amplitude));
             return AudioParams.Default.WithPitchScale(scale);
         }
+
+        public static string GetRandomFileFromSoundCollection(string name)
+        {
+            var soundCollection = IoCManager.Resolve<IPrototypeManager>().Index<SoundCollectionPrototype>(name);
+            return IoCManager.Resolve<IRobustRandom>().Pick(soundCollection.PickFiles);
+        }
     }
 }

Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs

@@ -20,7 +20,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
             /// <summary>
             ///     Mob is standing up
             /// </summary>
-            Stand,
+            Standing,
 
             /// <summary>
             ///     Mob is laying down

Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs

@@ -32,5 +32,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
         Health,
         Hunger,
         Thirst,
+        Stun,
     }
 }