Merge branch 'master' into 2020-05-18-midi

2020-05-21 19:50:09 +02:00
parent bb31fcb227 b270c69512
commit cb391ec3d8
46 changed files with 928 additions and 30 deletions
--- a/Content.Shared/GameObjects/Components/Mobs/SharedSpeciesComponent.cs
+++ b/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
--- a/Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs
+++ b/Content.Shared/GameObjects/Components/Mobs/SharedStatusEffectsComponent.cs
@@ -32,5 +32,6 @@ namespace Content.Shared.GameObjects.Components.Mobs
        Health,
        Hunger,
        Thirst,
+        Stun,
    }
 }