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

cargo system cleanup (#13396)

Browse Source
This commit is contained in:
Checkraze
2023-01-10 04:55:59 -05:00
committed by GitHub
parent 394107742c
commit 66a01ccbf2
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
View File

@@ -1,3 +1,4 @@
using Content.Server.Cargo.Systems;
using Content.Server.Cargo.Components;
using Content.Server.Labels.Components;
using Content.Server.Paper;
@@ -13,6 +14,7 @@ namespace Content.Server.Cargo.Systems;
public sealed partial class CargoSystem
{
[Dependency] private readonly PaperSystem _paperSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
private void InitializeTelepad()
{
@@ -32,7 +34,7 @@ public sealed partial class CargoSystem
if (comp.CurrentState == CargoTelepadState.Unpowered)
{
comp.CurrentState = CargoTelepadState.Idle;
appearance?.SetData(CargoTelepadVisuals.State, CargoTelepadState.Idle);
_appearance.SetData(comp.Owner, CargoTelepadVisuals.State, CargoTelepadState.Idle, appearance);
comp.Accumulator = comp.Delay;
continue;
}
@@ -43,7 +45,7 @@ public sealed partial class CargoSystem
if (comp.Accumulator > 0f)
{
comp.CurrentState = CargoTelepadState.Idle;
appearance?.SetData(CargoTelepadVisuals.State, CargoTelepadState.Idle);
_appearance.SetData(comp.Owner, CargoTelepadVisuals.State, CargoTelepadState.Idle, appearance);
continue;
}
@@ -78,12 +80,12 @@ public sealed partial class CargoSystem
if (order.Amount <= 0)
orderDatabase.Orders.Remove(index);
SoundSystem.Play(comp.TeleportSound.GetSound(), Filter.Pvs(comp.Owner), comp.Owner, AudioParams.Default.WithVolume(-8f));
_audio.PlayPvs(_audio.GetSound(comp.TeleportSound), comp.Owner, AudioParams.Default.WithVolume(-8f));
SpawnProduct(comp, order);
UpdateOrders(orderDatabase);
comp.CurrentState = CargoTelepadState.Teleporting;
appearance?.SetData(CargoTelepadVisuals.State, CargoTelepadState.Teleporting);
_appearance.SetData(comp.Owner, CargoTelepadVisuals.State, CargoTelepadState.Teleporting, appearance);
comp.Accumulator += comp.Delay;
}
}
@@ -106,7 +108,7 @@ public sealed partial class CargoSystem
TryComp<AppearanceComponent>(component.Owner, out var appearance);
component.CurrentState = CargoTelepadState.Unpowered;
appearance?.SetData(CargoTelepadVisuals.State, CargoTelepadState.Unpowered);
_appearance.SetData(component.Owner, CargoTelepadVisuals.State, CargoTelepadState.Unpowered, appearance);
}
private void OnTelepadPowerChange(EntityUid uid, CargoTelepadComponent component, ref PowerChangedEvent args)