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

# Conflicts: # SpaceStation14.sln.DotSettings
2020-05-22 11:31:18 +02:00
parent 1e91b9f075 958c101e52
commit d2d6c2cecd
56 changed files with 1128 additions and 43 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,
    }
 }