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

Cleanup flashbangs. Fixes #1305

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-07-08 00:51:08 +02:00
parent 1616b0d867
commit 271945e1a5
5 changed files with 63 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,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;
@@ -29,7 +29,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);
}
@@ -40,7 +40,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)