Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove some obsolete AppearanceComponent method usages (#13726)

Browse Source
This commit is contained in:
Visne
2023-02-02 17:34:53 +01:00
committed by GitHub
parent 23b90de34d
commit 5a5a3afbb1
111 changed files with 428 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Atmos/EntitySystems/AtmosPlaqueSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Atmos.Components;
using Content.Shared.Atmos.Visuals;
using Robust.Server.GameObjects;
using Robust.Shared.Random;
namespace Content.Server.Atmos.EntitySystems;
@@ -7,6 +8,7 @@ namespace Content.Server.Atmos.EntitySystems;
public sealed class AtmosPlaqueSystem : EntitySystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
public override void Initialize()
{
@@ -27,10 +29,10 @@ public sealed class AtmosPlaqueSystem : EntitySystem
// 45% LINDA
else component.Type = PlaqueType.Linda;
UpdateSign(component);
UpdateSign(uid, component);
}
public void UpdateSign(AtmosPlaqueComponent component)
public void UpdateSign(EntityUid uid, AtmosPlaqueComponent component)
{
var metaData = MetaData(component.Owner);
@@ -70,7 +72,7 @@ public sealed class AtmosPlaqueSystem : EntitySystem
{
var state = component.Type == PlaqueType.Zumos ? "zumosplaque" : "atmosplaque";
appearance.SetData(AtmosPlaqueVisuals.State, state);
_appearance.SetData(uid, AtmosPlaqueVisuals.State, state, appearance);
}
}
}

5
Content.Server/Atmos/EntitySystems/FlammableSystem.cs
View File

@@ -35,6 +35,7 @@ namespace Content.Server.Atmos.EntitySystems
[Dependency] private readonly FixtureSystem _fixture = default!;
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
public const float MinimumFireStacks = -10f;
public const float MaximumFireStacks = 20f;
@@ -176,8 +177,8 @@ namespace Content.Server.Atmos.EntitySystems
if (!Resolve(uid, ref flammable, ref appearance))
return;
appearance.SetData(FireVisuals.OnFire, flammable.OnFire);
appearance.SetData(FireVisuals.FireStacks, flammable.FireStacks);
_appearance.SetData(uid, FireVisuals.OnFire, flammable.OnFire, appearance);
_appearance.SetData(uid, FireVisuals.FireStacks, flammable.FireStacks, appearance);
}
public void AdjustFireStacks(EntityUid uid, float relativeFireStacks, FlammableComponent? flammable = null)