Merge pull request #911 from Zumorica/2020-05-13-stuns

Adds StunnableComponent, Stunbaton...
2020-05-21 19:48:19 +02:00
parent 629ff929c5 d3102dbf96
commit b270c69512
41 changed files with 919 additions and 22 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,
    }
 }