Merge branch 'master' into buckle-locker-fix-1262

2020-07-07 20:36:43 +02:00
parent e0f888344e ae41d03ec6
commit 8f685f0541
5598 changed files with 6598 additions and 6497 deletions
--- a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs
+++ b/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs
@@ -88,7 +88,7 @@ namespace Content.Server.GameObjects.Components
        private void Rustle()
        {
            EntitySystem.Get<AudioSystem>()
-                .PlayFromEntity("/Audio/effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f));
+                .PlayFromEntity("/Audio/Effects/plant_rustle.ogg", Owner, AudioHelpers.WithVariation(0.25f));
        }
    }
 }