Merge branch 'master' into replace-sounds-with-sound-specifier

# Conflicts: # Content.Server/Kitchen/Components/ReagentGrinderComponent.cs # Content.Server/Storage/Components/SecureEntityStorageComponent.cs
2021-07-30 20:26:22 +02:00
parent f531c65a0b 898bdc9491
commit 5363f59a90
117 changed files with 1807 additions and 1851 deletions
--- a/Content.Server/Light/Components/ExpendableLightComponent.cs
+++ b/Content.Server/Light/Components/ExpendableLightComponent.cs
@@ -56,7 +56,7 @@ namespace Content.Server.Light.Components
        /// </summary>
        private bool TryActivate()
        {
-            if (!Activated)
+            if (!Activated && CurrentState == ExpendableLightState.BrandNew)
            {
                if (Owner.TryGetComponent<ItemComponent>(out var item))
                {