Airlocks retexture (#28)

* add: new airlock sprites

* fix: фикс отображения болтов двери на клиенте

* add missing states + remove redundant prototypes

---------

Co-authored-by: Remuchi <RemuchiOfficial@gmail.com>

Content.Client/Doors/AirlockSystem.cs

@@ -1,4 +1,5 @@
 using Content.Client.Wires.Visualizers;
+using Content.Shared.Doors;
 using Content.Shared.Doors.Components;
 using Content.Shared.Doors.Systems;
 using Content.Shared.Prying.Components;
@@ -25,6 +26,16 @@ public sealed class AirlockSystem : SharedAirlockSystem
         args.Cancelled = true;
     }
 
+    protected override void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
+    {
+        base.OnBeforeDoorClosed(uid, airlock, args);
+
+        if (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var boltLights) && boltLights)
+        {
+            args.Cancel();
+        }
+    }
+
     private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
     {
         // Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash.
@@ -34,9 +45,11 @@ public sealed class AirlockSystem : SharedAirlockSystem
         if (comp.OpenUnlitVisible) // Otherwise there are flashes of the fallback sprite between clicking on the door and the door closing animation starting.
         {
             door.OpenSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.OpenSpriteState));
-            door.OpenSpriteStates.Add((DoorVisualLayers.BaseBolted, "bolted_open_unlit"));
+            door.OpenSpriteStates.Add((DoorVisualLayers.BaseBolted, comp.OpenBoltedSpriteState));
+            door.OpenSpriteStates.Add((DoorVisualLayers.BaseEmergencyAccess, comp.OpenEmergencySpriteState));
             door.ClosedSpriteStates.Add((DoorVisualLayers.BaseUnlit, comp.ClosedSpriteState));
-            door.ClosedSpriteStates.Add((DoorVisualLayers.BaseBolted, "bolted_unlit"));
+            door.ClosedSpriteStates.Add((DoorVisualLayers.BaseBolted, comp.ClosedBoltedSpriteState));
+            door.ClosedSpriteStates.Add((DoorVisualLayers.BaseEmergencyAccess, comp.ClosedEmergencySpriteState));
         }
 
         ((Animation) door.OpeningAnimation).AnimationTracks.Add(new AnimationTrackSpriteFlick
@@ -98,7 +111,7 @@ public sealed class AirlockSystem : SharedAirlockSystem
         {
             boltedVisible =
                 _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var lights, args.Component)
-                && lights && state is DoorState.Closed or DoorState.Welded;
+                && lights && state is DoorState.Closed or DoorState.Welded or DoorState.Open;
 
             emergencyLightsVisible =
                 _appearanceSystem.TryGetData<bool>(uid, DoorVisuals.EmergencyLights, out var eaLights,
@@ -123,7 +136,6 @@ public sealed class AirlockSystem : SharedAirlockSystem
             args.Sprite.LayerSetVisible(
                 DoorVisualLayers.BaseEmergencyAccess,
                 emergencyLightsVisible
-                && state != DoorState.Open
                 && state != DoorState.Opening
                 && state != DoorState.Closing
                 && !boltedVisible

Content.Shared/Doors/Components/AirlockComponent.cs

@@ -117,12 +117,36 @@ public sealed partial class AirlockComponent : Component
     [DataField]
     public string OpenSpriteState = "open_unlit";
 
+    /// <summary>
+    /// The sprite state used for the open bolted airlock lights.
+    /// </summary>
+    [DataField]
+    public string OpenBoltedSpriteState = "bolted_open_unlit";
+
+    /// <summary>
+    /// The sprite state used for the open emergency access airlock lights.
+    /// </summary>
+    [DataField]
+    public string OpenEmergencySpriteState = "emergency_open_unlit";
+
     /// <summary>
     /// The sprite state used for the closed airlock lights.
     /// </summary>
     [DataField]
     public string ClosedSpriteState = "closed_unlit";
 
+    /// <summary>
+    /// The sprite state used for the closed bolted airlock lights.
+    /// </summary>
+    [DataField]
+    public string ClosedBoltedSpriteState = "bolted_unlit";
+
+    /// <summary>
+    /// The sprite state used for the closed bolted airlock lights.
+    /// </summary>
+    [DataField]
+    public string ClosedEmergencySpriteState = "emergency_unlit";
+
     /// <summary>
     /// The sprite state used for the 'access denied' lights animation.
     /// </summary>

Content.Shared/Doors/Systems/SharedDoorSystem.cs

@@ -460,7 +460,7 @@ public abstract class SharedDoorSystem : EntitySystem
             //If the colliding entity is a slippable item ignore it by the airlock
             if (otherPhysics.CollisionLayer == (int)CollisionGroup.SlipLayer && otherPhysics.CollisionMask == (int)CollisionGroup.ItemMask)
                 continue;
-            
+
             //For when doors need to close over conveyor belts
             if (otherPhysics.CollisionLayer == (int) CollisionGroup.ConveyorMask)
                 continue;

Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml

@@ -501,7 +501,7 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-    
+
 - type: entity
   parent: AirlockChemistryGlass
   id: AirlockChemistryGlassLocked
@@ -1004,16 +1004,6 @@
     - type: PriorityDock
       tag: DockArrivals
 
-- type: entity
-  parent: AirlockGlassShuttle
-  id: AirlockExternalGlassShuttleCargo
-  suffix: Cargo
-  components:
-    - type: PriorityDock
-      tag: DockCargo
-    - type: AccessReader
-      access: [ [ "Cargo" ] ]
-
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleEscape
@@ -1021,6 +1011,16 @@
   components:
     - type: GridFill
 
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttleCargo
+  suffix: Cargo
+  components:
+  - type: PriorityDock
+    tag: DockCargo
+  - type: AccessReader
+    access: [ [ "Cargo" ] ]
+
 #HighSecDoors
 - type: entity
   parent: HighSecDoor

Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml

@@ -13,9 +13,11 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
+  - type: PaintableAirlock
+    department: Engineering
 
 - type: entity
-  parent: Airlock
+  parent: AirlockEngineering
   id: AirlockAtmospherics
   suffix: Atmospherics
   components:
@@ -29,6 +31,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
+  - type: PaintableAirlock
+    department: Cargo
 
 - type: entity
   parent: Airlock
@@ -37,9 +41,11 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/medical.rsi
+  - type: PaintableAirlock
+    department: Medical
 
 - type: entity
-  parent: Airlock
+  parent: AirlockMedical
   id: AirlockVirology
   suffix: Virology
   components:
@@ -47,12 +53,9 @@
     sprite: Structures/Doors/Airlocks/Standard/virology.rsi
 
 - type: entity
-  parent: Airlock
+  parent: AirlockMedical
   id: AirlockChemistry
   suffix: Chemistry
-  components:
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
 
 - type: entity
   parent: Airlock
@@ -61,6 +64,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/science.rsi
+  - type: PaintableAirlock
+    department: Science
 
 - type: entity
   parent: Airlock
@@ -71,6 +76,8 @@
     sprite: Structures/Doors/Airlocks/Standard/command.rsi
   - type: WiresPanelSecurity
     securityLevel: medSecurity
+  - type: PaintableAirlock
+    department: Command
 
 - type: entity
   parent: Airlock
@@ -79,6 +86,8 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/security.rsi
+  - type: PaintableAirlock
+    department: Security
 
 - type: entity
   parent: Airlock
@@ -89,36 +98,28 @@
     sprite: Structures/Doors/Airlocks/Standard/maint.rsi
 
 - type: entity
-  parent: Airlock
+  parent: AirlockSecurity # if you get syndie door somehow it counts as sec
   id: AirlockSyndicate
   suffix: Syndicate
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
-  parent: Airlock
+  parent: AirlockCargo
   id: AirlockMining
   suffix: Mining(Salvage)
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/mining.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
-  parent: Airlock
+  parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
   id: AirlockCentralCommand
   suffix: Central Command
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi
-  - type: WiresPanelSecurity
-    securityLevel: medSecurity
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -127,8 +128,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -137,8 +136,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 # Glass
 
@@ -191,7 +188,7 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
   - type: PaintableAirlock
-    group: Glass
+    department: Engineering
 
 - type: entity
   parent: AirlockGlass
@@ -200,18 +197,14 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/maint.rsi
-  - type: PaintableAirlock
-    group: Glass
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockEngineeringGlass
   id: AirlockAtmosphericsGlass
   suffix: Atmospherics
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi
-  - type: PaintableAirlock
-    group: Glass
 
 - type: entity
   parent: AirlockGlass
@@ -221,17 +214,7 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
   - type: PaintableAirlock
-    group: Glass
+    department: Cargo
-
-- type: entity
-  parent: AirlockGlass
-  id: AirlockChemistryGlass
-  suffix: Chemistry
-  components:
-  - type: Sprite
-    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
-  - type: PaintableAirlock
-    group: Glass
 
 - type: entity
   parent: AirlockGlass
@@ -241,17 +224,20 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/medical.rsi
   - type: PaintableAirlock
-    group: Glass
+    department: Medical
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockMedicalGlass
+  id: AirlockChemistryGlass
+  suffix: Chemistry
+
+- type: entity
+  parent: AirlockMedicalGlass
   id: AirlockVirologyGlass
   suffix: Virology
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/virology.rsi
-  - type: PaintableAirlock
-    group: Glass
 
 - type: entity
   parent: AirlockGlass
@@ -261,7 +247,7 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/science.rsi
   - type: PaintableAirlock
-    group: Glass
+    department: Science
 
 - type: entity
   parent: AirlockGlass
@@ -271,7 +257,7 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/command.rsi
   - type: PaintableAirlock
-    group: Glass
+    department: Command
   - type: WiresPanelSecurity
     securityLevel: medSecurity
 
@@ -283,32 +269,26 @@
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/security.rsi
   - type: PaintableAirlock
-    group: Glass
+    department: Security
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockSecurityGlass # see standard
   id: AirlockSyndicateGlass
   suffix: Syndicate
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi
-  - type: PaintableAirlock
-    group: Glass
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockCargoGlass
   id: AirlockMiningGlass
   suffix: Mining(Salvage)
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/mining.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
-  parent: AirlockGlass
+  parent: AirlockCommandGlass # see standard
   id: AirlockCentralCommandGlass
   suffix: Central Command
   components:
@@ -316,6 +296,3 @@
     sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
   - type: WiresPanelSecurity
     securityLevel: medSecurity
-  - type: Airlock
-    openUnlitVisible: false
-

Resources/Prototypes/Entities/Structures/Doors/Airlocks/assembly.yml

@@ -1,44 +1,347 @@
+#Atmospherics
 - type: entity
-  id: AirlockAssembly
+  parent: AirlockAssembly
+  id: AirlockAssemblyAtmospherics
   name: airlock assembly
-  description: It opens, it closes, and maybe crushes you.
+  suffix: Atmospherics
   components:
-  - type: Clickable
-  - type: InteractionOutline
   - type: Sprite
-    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
+    sprite: Structures/Doors/Airlocks/Standard/atmospherics.rsi
     state: "assembly"
-  - type: Physics
+
-  - type: Fixtures
+- type: entity
-    fixtures:
+  parent: AirlockAssembly
-      fix1:
+  id: AirlockAssemblyAtmosphericsGlass
-        shape:
+  name: airlock assembly
-          !type:PhysShapeAabb
+  suffix: Atmospherics, Glass
-          bounds: "-0.45,-0.45,0.45,0.45"
+  components:
-        density: 110
+  - type: Sprite
-        mask:
+    sprite: Structures/Doors/Airlocks/Glass/atmospherics.rsi
-        - FullTileMask
+    state: "assembly"
-        layer:
+
-        - HumanoidBlockLayer
+#Cargo
-  - type: Anchorable
+- type: entity
-    delay: 2
+  parent: AirlockAssembly
-  - type: Pullable
+  id: AirlockAssemblyCargo
-  - type: Transform
+  name: airlock assembly
-    anchored: true
+  suffix: Cargo
-    noRot: true
+  components:
-  - type: Damageable
+  - type: Sprite
-    damageContainer: Inorganic
+    sprite: Structures/Doors/Airlocks/Standard/cargo.rsi
-    damageModifierSet: Metallic
+    state: "assembly"
-  - type: Destructible
+
-    thresholds:
+- type: entity
-    - trigger:
+  parent: AirlockAssembly
-        !type:DamageTrigger
+  id: AirlockAssemblyCargoGlass
-        damage: 300
+  name: airlock assembly
-      behaviors:
+  suffix: Cargo, Glass
-      - !type:DoActsBehavior
+  components:
-        acts: ["Destruction"]
+  - type: Sprite
-  - type: Construction
+    sprite: Structures/Doors/Airlocks/Glass/cargo.rsi
-    graph: Airlock
+    state: "assembly"
-    node: assembly
+
-  placement:
+#Command
-    mode: SnapgridCenter
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCommand
+  name: airlock assembly
+  suffix: Command
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/command.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCommandGlass
+  name: airlock assembly
+  suffix: Command, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/command.rsi
+    state: "assembly"
+
+#Engineering
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyEngineering
+  name: airlock assembly
+  suffix: Engineering
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/engineering.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyEngineeringGlass
+  name: airlock assembly
+  suffix: Engineering, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/engineering.rsi
+    state: "assembly"
+
+#External
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyExternal
+  name: airlock assembly
+  suffix: External
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/external.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyExternalGlass
+  name: airlock assembly
+  suffix: External, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/external.rsi
+    state: "assembly"
+
+#Public (Glass Airlock)
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyGlass
+  name: airlock assembly
+  suffix: Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/glass.rsi
+    state: "assembly"
+
+#Freezer
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyFreezer
+  name: airlock assembly
+  suffix: Freezer
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/freezer.rsi
+    state: "assembly"
+
+#Maintenance
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMaintenance
+  name: airlock assembly
+  suffix: Maintenance
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMaintenanceGlass
+  name: airlock assembly
+  suffix: Maintenance, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/maint.rsi
+    state: "assembly"
+
+#Medical
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMedical
+  name: airlock assembly
+  suffix: Medical
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/medical.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMedicalGlass
+  name: airlock assembly
+  suffix: Medical, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/medical.rsi
+    state: "assembly"
+
+#Science
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyScience
+  name: airlock assembly
+  suffix: Science
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/science.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyScienceGlass
+  name: airlock assembly
+  suffix: Science, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/science.rsi
+    state: "assembly"
+
+#Security
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySecurity
+  name: airlock assembly
+  suffix: Security
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/security.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySecurityGlass
+  name: airlock assembly
+  suffix: Security, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/security.rsi
+    state: "assembly"
+
+#Shuttle
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttle
+  name: airlock assembly
+  suffix: Shuttle
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/shuttle.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttleGlass
+  name: airlock assembly
+  suffix: Shuttle, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
+    state: "assembly"
+
+#Virology
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyVirology
+  name: airlock assembly
+  suffix: Virology
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/virology.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyVirologyGlass
+  name: airlock assembly
+  suffix: Virology, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/virology.rsi
+    state: "assembly"
+
+#CentralCommand
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCentralCommand
+  name: airlock assembly
+  suffix: CentralCommand
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/centcomm.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyCentralCommandGlass
+  name: airlock assembly
+  suffix: CentralCommand, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
+    state: "assembly"
+
+#Mining
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMining
+  name: airlock assembly
+  suffix: Mining
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/mining.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyMiningGlass
+  name: airlock assembly
+  suffix: Mining, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/mining.rsi
+    state: "assembly"
+
+#Syndicate
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySyndicate
+  name: airlock assembly
+  suffix: Syndicate
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblySyndicateGlass
+  name: airlock assembly
+  suffix: Syndicate, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/syndicate.rsi
+    state: "assembly"
+
+#ShuttleSyndicate
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttleSyndicate
+  name: airlock assembly
+  suffix: ShuttleSyndicate
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi
+    state: "assembly"
+
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyShuttleSyndicateGlass
+  name: airlock assembly
+  suffix: ShuttleSyndicate, Glass
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
+    state: "assembly"
+
+#High Security
+- type: entity
+  parent: AirlockAssembly
+  id: AirlockAssemblyHighSec
+  name: airlock assembly
+  suffix: HighSec
+  components:
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/highsec/highsec.rsi
+    state: "assembly"

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml

@@ -0,0 +1,45 @@
+#Base
+- type: entity
+  id: AirlockAssembly
+  name: airlock assembly
+  description: It opens, it closes, and maybe crushes you.
+  components:
+  - type: Clickable
+  - type: InteractionOutline
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/basic.rsi
+    state: "assembly"
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 110
+        mask:
+        - FullTileMask
+        layer:
+        - HumanoidBlockLayer
+  - type: Anchorable
+    delay: 2
+  - type: Pullable
+  - type: Transform
+    anchored: true
+    noRot: true
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Metallic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Airlock
+    node: assembly
+  placement:
+    mode: SnapgridCenter

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: Airlock
   parent: BaseStructure
   name: airlock
@@ -27,7 +27,7 @@
     - state: emergency_unlit
       map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
       shader: unshaded
-    - state: panel_closed
+    - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AnimationPlayer
   - type: Physics
@@ -64,7 +64,6 @@
   - type: Weldable
     time: 3
   - type: Airlock
-    openUnlitVisible: true
   - type: NavMapDoor
   - type: DoorBolt
   - type: Appearance
@@ -130,8 +129,12 @@
     - board
   - type: PlacementReplacement
     key: walls
+  - type: IconSmooth
+    key: walls
+    mode: NoSprite
   - type: PaintableAirlock
     group: Standard
+    department: Civilian
   - type: AccessReader
   - type: StaticPrice
     price: 150
@@ -142,7 +145,6 @@
       - Airlock
       # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
   - type: PryUnpowered
-  - type: ReflectAspectMark
   placement:
     mode: SnapgridCenter
 

Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml

@@ -18,6 +18,7 @@
     sprite: Structures/Doors/Airlocks/Standard/external.rsi
   - type: PaintableAirlock
     group: External
+    department: null
 
 - type: entity
   parent: AirlockExternal

Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml

@@ -23,7 +23,7 @@
     - state: emergency_unlit
       map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
       shader: unshaded
-    - state: panel_closed
+    - state: panel_open
       map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: AnimationPlayer
   - type: Physics
@@ -103,4 +103,3 @@
     tags:
       - HighSecDoor
       # This tag is used to nagivate the Airlock construction graph. It's needed because this construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
-  - type: ReflectAspectMark

Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml

@@ -64,6 +64,7 @@
       - ForceNoFixRotations
   - type: PaintableAirlock
     group: Shuttle
+    department: null
   - type: Construction
     graph: AirlockShuttle
     node: airlock

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -108,7 +108,7 @@
     - type: AccessReader
       access: [ [ "Engineering" ] ]
     - type: ReflectAspectMark
-
+      
 - type: entity
   id: Firelock
   parent: BaseFirelock

Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml

@@ -228,12 +228,6 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger # WD edit end
         damage: 50
       behaviors:
       - !type:DoActsBehavior
@@ -246,11 +240,6 @@
           MaterialWebSilk:
             min: 3
             max: 5
-  - type: MeleeSound # WD edit start
-    soundGroups:
-      Brute:
-        path:
-          "/Audio/Weapons/slash.ogg" # WD edit end
   - type: Damageable
     damageModifierSet: Web
   - type: Door

Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml

@@ -97,10 +97,6 @@
     messagePerceivedByOthers: comp-window-knock
     interactSuccessSound:
       path: /Audio/Effects/glass_knock.ogg
-  - type: ReflectAspectMark
-  - type: Tag
-    tags:
-      - DeleteWithWindows
 
 - type: entity
   id: ShuttersNormal

Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseWindoor
   parent: BaseStructure
   abstract: true
@@ -139,7 +139,6 @@
   - type: StaticPrice
     price: 100
   - type: PryUnpowered
-  - type: ReflectAspectMark
 
 - type: entity
   id: BaseSecureWindoor

Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
   "size": {
     "x": 32,
     "y": 32
@@ -13,9 +13,6 @@
     {
       "name": "bolted_unlit"
     },
-    {
-      "name": "bolted_open_unlit"
-    },
     {
       "name": "closed"
     },
@@ -25,6 +22,12 @@
     {
       "name": "open_unlit"
     },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "emergency_open_unlit"
+    },
     {
       "name": "closing",
       "delays": [
@@ -59,12 +62,18 @@
           0.1,
           0.1,
           0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "open"
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "opening",
@@ -106,7 +115,12 @@
       ]
     },
     {
-      "name": "panel_closed"
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "panel_opening",
@@ -121,10 +135,6 @@
         ]
       ]
     },
-
-    {
-      "name": "panel_open"
-    },
     {
       "name": "sparks",
       "delays": [
@@ -147,8 +157,7 @@
           0.1,
           0.1,
           0.1,
-          0.1,
+          0.1
-          1.7
         ]
       ]
     },
@@ -161,7 +170,8 @@
           0.1,
           0.1,
           0.1,
-          0.1
+          0.1,
+          1.7
         ]
       ]
     },
@@ -185,13 +195,10 @@
       "name": "emergency_unlit",
       "delays": [
         [
-          1.2,
+          0.4,
-          1.2
+          0.4
         ]
       ]
-    },
-    {
-      "name": "emergency_open_unlit"
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
   "size": {
     "x": 32,
     "y": 32
@@ -13,9 +13,6 @@
     {
       "name": "bolted_unlit"
     },
-    {
-      "name": "bolted_open_unlit"
-    },
     {
       "name": "closed"
     },
@@ -25,6 +22,12 @@
     {
       "name": "open_unlit"
     },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "emergency_open_unlit"
+    },
     {
       "name": "closing",
       "delays": [
@@ -59,12 +62,18 @@
           0.1,
           0.1,
           0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "open"
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "opening",
@@ -106,7 +115,12 @@
       ]
     },
     {
-      "name": "panel_closed"
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "panel_opening",
@@ -121,10 +135,6 @@
         ]
       ]
     },
-
-    {
-      "name": "panel_open"
-    },
     {
       "name": "sparks",
       "delays": [
@@ -147,8 +157,7 @@
           0.1,
           0.1,
           0.1,
-          0.1,
+          0.1
-          1.7
         ]
       ]
     },
@@ -161,7 +170,8 @@
           0.1,
           0.1,
           0.1,
-          0.1
+          0.1,
+          1.7
         ]
       ]
     },
@@ -185,13 +195,10 @@
       "name": "emergency_unlit",
       "delays": [
         [
-          1.2,
+          0.4,
-          1.2
+          0.4
         ]
       ]
-    },
-    {
-      "name": "emergency_open_unlit"
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/commit/fd5cfd76acdf5bda9e46413c11006a6e825d51a9",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
   "size": {
     "x": 32,
     "y": 32
@@ -13,9 +13,6 @@
     {
       "name": "bolted_unlit"
     },
-    {
-      "name": "bolted_open_unlit"
-    },
     {
       "name": "closed"
     },
@@ -25,6 +22,12 @@
     {
       "name": "open_unlit"
     },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "emergency_open_unlit"
+    },
     {
       "name": "closing",
       "delays": [
@@ -59,12 +62,18 @@
           0.1,
           0.1,
           0.1,
+          0.1,
           0.1
         ]
       ]
     },
     {
-      "name": "open"
+      "name": "open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "opening",
@@ -106,7 +115,12 @@
       ]
     },
     {
-      "name": "panel_closed"
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "panel_opening",
@@ -121,10 +135,6 @@
         ]
       ]
     },
-
-    {
-      "name": "panel_open"
-    },
     {
       "name": "sparks",
       "delays": [
@@ -147,8 +157,7 @@
           0.1,
           0.1,
           0.1,
-          0.1,
+          0.1
-          1.7
         ]
       ]
     },
@@ -161,7 +170,8 @@
           0.1,
           0.1,
           0.1,
-          0.1
+          0.1,
+          1.7
         ]
       ]
     },
@@ -185,13 +195,10 @@
       "name": "emergency_unlit",
       "delays": [
         [
-          1.2,
+          0.4,
-          1.2
+          0.4
         ]
       ]
-    },
-    {
-      "name": "emergency_open_unlit"
     }
   ]
 }

Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/58e5354cdbc304847c9ef20963320d21f418b58e and edited by Nairod(github) for SS14",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
   "size": {
     "x": 32,
     "y": 32
@@ -19,6 +19,15 @@
     {
       "name": "closed_unlit"
     },
+    {
+      "name": "open_unlit"
+    },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "emergency_open_unlit"
+    },
     {
       "name": "closing",
       "delays": [
@@ -106,7 +115,12 @@
       ]
     },
     {
-      "name": "panel_closed"
+      "name": "panel_open",
+      "delays": [
+        [
+          1
+        ]
+      ]
     },
     {
       "name": "panel_opening",
@@ -121,9 +135,6 @@
         ]
       ]
     },
-    {
-      "name": "panel_open"
-    },
     {
       "name": "sparks",
       "delays": [