Merge branch 'master' into upupup

# Conflicts:
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json

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.Client/Lobby/UI/LobbyGui.xaml

@@ -58,7 +58,7 @@
                     <Control VerticalExpand="True" />
 
                     <RichTextLabel Name="LabelName" Access="Public" HorizontalAlignment="Left"
-                                          VerticalAlignment="Center" Margin="0 0 0 350" />
+                                          VerticalAlignment="Center" Margin="0 0 0 380" />
 
                     <!-- Ohio Container -->
                     <PanelContainer HorizontalAlignment="Left" Name="Center" VerticalAlignment="Center">

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>

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

@@ -1004,6 +1004,13 @@
     - type: PriorityDock
       tag: DockArrivals
 
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttleEscape
+  suffix: External, Escape 3x4, Glass, Docking
+  components:
+    - type: GridFill
+
 - type: entity
   parent: AirlockGlassShuttle
   id: AirlockExternalGlassShuttleCargo
@@ -1014,13 +1021,6 @@
   - type: AccessReader
     access: [ [ "Cargo" ] ]
 
-- type: entity
-  parent: AirlockGlassShuttle
-  id: AirlockExternalGlassShuttleEscape
-  suffix: External, Escape 3x4, Glass, Docking
-  components:
-    - type: GridFill
-
 #HighSecDoors
 - type: entity
   parent: HighSecDoor

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

@@ -104,8 +104,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/syndicate.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
   parent: AirlockCargo
@@ -114,8 +112,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/mining.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
   parent: AirlockCommand # if you get centcom door somehow it counts as command, also inherit panel
@@ -134,8 +130,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
   parent: Airlock
@@ -144,8 +138,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Standard/hatch_maint.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 # Glass
 
@@ -298,8 +290,6 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/mining.rsi
-  - type: Airlock
-    openUnlitVisible: false
 
 - type: entity
   parent: AirlockCommandGlass # see standard
@@ -308,5 +298,7 @@
   components:
   - type: Sprite
     sprite: Structures/Doors/Airlocks/Glass/centcomm.rsi
+  - type: WiresPanelSecurity
+    securityLevel: medSecurity
   - type: Airlock
     openUnlitVisible: false

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,6 +129,9 @@
     - board
   - type: PlacementReplacement
     key: walls
+  - type: IconSmooth
+    key: walls
+    mode: NoSprite
   - type: PaintableAirlock
     group: Standard
     department: Civilian
@@ -143,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/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/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": [