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

Explosion refactor TEST MERG (#6995)

Browse Source 
* Explosions

* fix yaml typo

and prevent silly UI inputs

* oop

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
This commit is contained in:
Moony
2022-03-04 13:48:01 -06:00
committed by GitHub
parent 4e203f49d2
commit 4a466f4927
71 changed files with 3958 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
View File

@@ -5,7 +5,6 @@ using Content.Shared.MobState.Components;
using Content.Shared.Pointing.Components;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -19,8 +18,7 @@ namespace Content.Server.Pointing.EntitySystems
internal sealed class RoguePointingSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly ExplosionSystem _explosions = default!;
[Dependency] private readonly ExplosionSystem _explosion = default!;
public override void Initialize()
{
@@ -103,10 +101,7 @@ namespace Content.Server.Pointing.EntitySystems
{
return;
}
_explosions.SpawnExplosion(uid, 0, 2, 1, 1);
SoundSystem.Play(Filter.Pvs(uid, entityManager: EntityManager), component.ExplosionSound.GetSound(), uid);
_explosion.QueueExplosion(uid, "Default", 50, 3, 10);
EntityManager.QueueDeleteEntity(uid);
}
}