Fixes crates phasing through firelocks. (#12329)
This commit is contained in:
@@ -7,11 +7,8 @@ using Content.Server.Power.EntitySystems;
|
||||
using Content.Server.Recycling;
|
||||
using Content.Server.Recycling.Components;
|
||||
using Content.Shared.Conveyor;
|
||||
using Content.Shared.Item;
|
||||
using Content.Shared.Maps;
|
||||
using Content.Shared.Movement.Components;
|
||||
using Content.Shared.Physics;
|
||||
using Robust.Shared.Containers;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Physics;
|
||||
using Robust.Shared.Physics.Collision.Shapes;
|
||||
@@ -32,6 +29,7 @@ namespace Content.Server.Physics.Controllers
|
||||
[Dependency] private readonly RecyclerSystem _recycler = default!;
|
||||
[Dependency] private readonly SignalLinkerSystem _signalSystem = default!;
|
||||
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
|
||||
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
||||
|
||||
public const string ConveyorFixture = "conveyor";
|
||||
|
||||
@@ -94,9 +92,8 @@ namespace Content.Server.Physics.Controllers
|
||||
|
||||
private void UpdateAppearance(ConveyorComponent component)
|
||||
{
|
||||
if (!EntityManager.TryGetComponent<AppearanceComponent?>(component.Owner, out var appearance)) return;
|
||||
var isPowered = this.IsPowered(component.Owner, EntityManager);
|
||||
appearance.SetData(ConveyorVisuals.State, isPowered ? component.State : ConveyorState.Off);
|
||||
_appearance.SetData(component.Owner, ConveyorVisuals.State, isPowered ? component.State : ConveyorState.Off);
|
||||
}
|
||||
|
||||
private void OnSignalReceived(EntityUid uid, ConveyorComponent component, SignalReceivedEvent args)
|
||||
@@ -154,12 +151,10 @@ namespace Content.Server.Physics.Controllers
|
||||
continue;
|
||||
|
||||
if (physics.BodyType != BodyType.Static)
|
||||
{
|
||||
_physics.WakeBody(physics);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public bool CanRun(ConveyorComponent component)
|
||||
{
|
||||
|
||||
@@ -49,8 +49,9 @@
|
||||
- shape:
|
||||
!type:PhysShapeAabb
|
||||
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
|
||||
density: 100
|
||||
mask:
|
||||
- TabletopMachineMask
|
||||
- FullTileMask
|
||||
layer:
|
||||
- AirlockLayer
|
||||
- type: Door
|
||||
|
||||
Reference in New Issue
Block a user