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

Add disposals damage (#21489)

Browse Source 
* system naming conventions

* remove obsolete warnings

* use EntityQueries

* tube comp clean up

* damage on turns

* remove OnRelayMovement because it didn't work

* reduce volume

* reduce damage to 1.0
This commit is contained in:
Slava0135
2023-11-15 03:52:43 +03:00
committed by GitHub
parent 62e1e3cab6
commit e62d8ff8e1
3 changed files with 76 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Disposal/Tube/DisposalTubeSystem.cs
View File

@@ -44,7 +44,6 @@ namespace Content.Server.Disposal.Tube
SubscribeLocalEvent<DisposalTubeComponent, ComponentRemove>(OnComponentRemove);
SubscribeLocalEvent<DisposalTubeComponent, AnchorStateChangedEvent>(OnAnchorChange);
SubscribeLocalEvent<DisposalTubeComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
SubscribeLocalEvent<DisposalTubeComponent, BreakageEventArgs>(OnBreak);
SubscribeLocalEvent<DisposalTubeComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<DisposalTubeComponent, ConstructionBeforeDeleteEvent>(OnDeconstruct);
@@ -278,17 +277,6 @@ namespace Content.Server.Disposal.Tube
UpdateAnchored(uid, component, Transform(uid).Anchored);
}
private void OnRelayMovement(EntityUid uid, DisposalTubeComponent component, ref ContainerRelayMovementEntityEvent args)
{
if (_gameTiming.CurTime < component.LastClang + DisposalTubeComponent.ClangDelay)
{
return;
}
component.LastClang = _gameTiming.CurTime;
_audioSystem.PlayPvs(component.ClangSound, uid);
}
private void OnBreak(EntityUid uid, DisposalTubeComponent component, BreakageEventArgs args)
{
DisconnectTube(uid, component);