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

Weldable cleanup (#19809)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-05 00:07:01 +10:00
committed by GitHub
parent 88454b046a
commit db1ff07821
24 changed files with 159 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Construction/Conditions/StorageWelded.cs
View File

@@ -1,6 +1,7 @@
using Content.Server.Storage.Components;
using Content.Shared.Construction;
using Content.Shared.Examine;
using Content.Shared.Tools.Systems;
using JetBrains.Annotations;
namespace Content.Server.Construction.Conditions
@@ -14,10 +15,7 @@ namespace Content.Server.Construction.Conditions
public bool Condition(EntityUid uid, IEntityManager entityManager)
{
if (!entityManager.TryGetComponent(uid, out EntityStorageComponent? entityStorageComponent))
return false;
return entityStorageComponent.IsWeldedShut == Welded;
return entityManager.System<WeldableSystem>().IsWelded(uid);
}
public bool DoExamine(ExaminedEvent args)
@@ -25,11 +23,12 @@ namespace Content.Server.Construction.Conditions
var entMan = IoCManager.Resolve<IEntityManager>();
var entity = args.Examined;
if (!entMan.TryGetComponent(entity, out EntityStorageComponent? entityStorage)) return false;
if (!entMan.HasComponent<EntityStorageComponent>(entity))
return false;
var metaData = entMan.GetComponent<MetaDataComponent>(entity);
if (entityStorage.IsWeldedShut != Welded)
if (entMan.System<WeldableSystem>().IsWelded(entity) != Welded)
{
if (Welded)
args.PushMarkup(Loc.GetString("construction-examine-condition-door-weld", ("entityName", metaData.EntityName)) + "\n");