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

This commit is contained in:
DrSmugleaf
2020-07-07 20:36:43 +02:00
5598 changed files with 6598 additions and 6497 deletions

View File

@@ -31,7 +31,7 @@ namespace Content.Server.GameObjects.Components.Explosion
serializer.DataField(ref _range, "range", 7.0f);
serializer.DataField(ref _duration, "duration", 8.0);
serializer.DataField(ref _sound, "sound", "/Audio/effects/flash_bang.ogg");
serializer.DataField(ref _sound, "sound", "/Audio/Effects/flash_bang.ogg");
serializer.DataField(ref _deleteOnFlash, "deleteOnFlash", true);
}