From 9fe53959ec7a12e3b9ab325481904051078d77dc Mon Sep 17 00:00:00 2001
From: keronshb <54602815+keronshb@users.noreply.github.com>
Date: Thu, 3 Nov 2022 21:18:59 -0400
Subject: [PATCH] Fixes crates phasing through firelocks. (#12329)

---
 Content.Server/Physics/Controllers/ConveyorController.cs | 9 ++-------
 .../Entities/Structures/Doors/Firelocks/firelock.yml     | 5 +++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs
index 5b282c024c..16e1a058ef 100644
--- a/Content.Server/Physics/Controllers/ConveyorController.cs
+++ b/Content.Server/Physics/Controllers/ConveyorController.cs
@@ -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,9 +151,7 @@ namespace Content.Server.Physics.Controllers
                         continue;
 
                     if (physics.BodyType != BodyType.Static)
-                    {
                         _physics.WakeBody(physics);
-                    }
                 }
             }
         }
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
index 7f7ac961ab..1e51bb1e14 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
@@ -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
@@ -118,7 +119,7 @@
   - type: ContainerFill
     containers:
       board: [ FirelockElectronics ]
-        
+
 - type: entity
   id: FirelockGlass
   parent: Firelock