tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-08 15:35:20 +02:00
parent f5a9f91de4 e815de7563
commit e1f9033a69
121 changed files with 1116 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs
View File

@@ -21,7 +21,7 @@ namespace Content.Server.GameObjects.Components.Explosion
public override string Name => "FlashExplosive";
private float _range;
private double _duration;
private float _duration;
private string _sound;
private bool _deleteOnFlash;
@@ -30,7 +30,7 @@ namespace Content.Server.GameObjects.Components.Explosion
base.ExposeData(serializer);
serializer.DataField(ref _range, "range", 7.0f);
serializer.DataField(ref _duration, "duration", 8.0);
serializer.DataField(ref _duration, "duration", 8.0f);
serializer.DataField(ref _sound, "sound", "/Audio/Effects/flash_bang.ogg");
serializer.DataField(ref _deleteOnFlash, "deleteOnFlash", true);
}
@@ -41,7 +41,7 @@ namespace Content.Server.GameObjects.Components.Explosion
ContainerHelpers.TryGetContainer(Owner, out var container);
if (container == null || !container.Owner.HasComponent<EntityStorageComponent>())
{
ServerFlashableComponent.FlashAreaHelper(Owner, _range, _duration);
FlashableComponent.FlashAreaHelper(Owner, _range, _duration);
}
if (_sound != null)