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.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>