Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

9
Content.Server/Morgue/CrematoriumSystem.cs
View File

@@ -41,12 +41,17 @@ public sealed class CrematoriumSystem : EntitySystem
if (!TryComp<AppearanceComponent>(uid, out var appearance))
return;
if (appearance.TryGetData(CrematoriumVisuals.Burning, out bool isBurning) && isBurning)
if (_appearance.TryGetData<bool>(uid, CrematoriumVisuals.Burning, out var isBurning, appearance) && isBurning)
args.PushMarkup(Loc.GetString("crematorium-entity-storage-component-on-examine-details-is-burning", ("owner", uid)));
if (appearance.TryGetData(StorageVisuals.HasContents, out bool hasContents) && hasContents)
if (_appearance.TryGetData<bool>(uid, StorageVisuals.HasContents, out var hasContents, appearance) && hasContents)
{
args.PushMarkup(Loc.GetString("crematorium-entity-storage-component-on-examine-details-has-contents"));
}
else
{
args.PushMarkup(Loc.GetString("crematorium-entity-storage-component-on-examine-details-empty"));
}
}
private void OnAttemptOpen(EntityUid uid, ActiveCrematoriumComponent component, StorageOpenAttemptEvent args)

7
Content.Server/Morgue/MorgueSystem.cs
View File

@@ -24,13 +24,10 @@ public sealed class MorgueSystem : EntitySystem
/// </summary>
private void OnExamine(EntityUid uid, MorgueComponent component, ExaminedEvent args)
{
if (!TryComp<AppearanceComponent>(uid, out var appearance))
return;
if (!args.IsInDetailsRange)
return;
appearance.TryGetData(MorgueVisuals.Contents, out MorgueContents contents);
_appearance.TryGetData<MorgueContents>(uid, MorgueVisuals.Contents, out var contents);
var text = contents switch
{
@@ -92,7 +89,7 @@ public sealed class MorgueSystem : EntitySystem
comp.AccumulatedFrameTime -= comp.BeepTime;
if (comp.DoSoulBeep && appearance.TryGetData(MorgueVisuals.Contents, out MorgueContents contents) && contents == MorgueContents.HasSoul)
if (comp.DoSoulBeep && _appearance.TryGetData<MorgueContents>(appearance.Owner, MorgueVisuals.Contents, out var contents, appearance) && contents == MorgueContents.HasSoul)
{
_audio.PlayPvs(comp.OccupantHasSoulAlarmSound, comp.Owner);
}