From 50f03a5b17ab44e45df92bd455c52ad7b3758535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= <zddm@outlook.es>
Date: Sat, 7 Nov 2020 23:58:33 +0100
Subject: [PATCH] Fix firelock occlusion.

---
 .../GameObjects/Components/Atmos/FirelockComponent.cs        | 5 -----
 .../Prototypes/Entities/Constructible/Doors/firelock.yml     | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs
index 4584bec9c4..5724e64a4c 100644
--- a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs
@@ -44,11 +44,6 @@ namespace Content.Server.GameObjects.Components.Atmos
             AutoClose = false;
             Safety = false;
 
-            if (Occludes && Owner.TryGetComponent(out OccluderComponent occluder))
-            {
-                occluder.Enabled = false;
-            }
-
             State = DoorState.Open;
             SetAppearance(DoorVisualState.Open);
         }
diff --git a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
index 58b0c499ee..3da88aa3f5 100644
--- a/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
+++ b/Resources/Prototypes/Entities/Constructible/Doors/firelock.yml
@@ -24,6 +24,7 @@
           map: ["enum.WiresVisualLayers.MaintenancePanel"]
 
     - type: Physics
+      on: false
       shapes:
         - !type:PhysShapeAabb
           bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
@@ -54,6 +55,7 @@
     - type: Airtight
       fixVacuum: true
     - type: Occluder
+      enabled: false
     - type: SnapGrid
       offset: Center
   placement:
@@ -80,8 +82,6 @@
     - type: Firelock
       occludes: false
       canCrush: false
-    - type: Occluder
-      enabled: false
     - type: Sprite
       sprite: Constructible/Structures/Doors/edge_door_hazard.rsi
     - type: Airtight