diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index ba83acc4b2..7f0b299b3d 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -79,7 +79,6 @@
   - type: AccessReader
     access: [["Kitchen"], ["Hydroponics"]]
 
-
 - type: entity
   parent: AirlockEngineering
   id: AirlockEngineeringLocked
@@ -265,6 +264,14 @@
   - type: AccessReader
     access: [["Bar"]]
 
+- type: entity
+  parent: AirlockExternalGlass
+  id: AirlockExternalGlassLocked
+  suffix: External, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]
+
 - type: entity
   parent: AirlockGlass
   id: AirlockKitchenGlassLocked
@@ -353,6 +360,54 @@
   - type: AccessReader
     access: [["Command"]]
 
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockCaptainGlassLocked
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockChiefMedicalOfficerGlassLocked
+  suffix: ChiefMedicalOfficer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefMedicalOfficer"]]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockChiefEngineerGlassLocked
+  suffix: ChiefEngineer, Locked
+  components:
+  - type: AccessReader
+    access: [["ChiefEngineer"]]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockHeadOfSecurityGlassLocked
+  suffix: HeadOfSecurity, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfSecurity"]]
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockResearchDirectorGlassLocked
+  suffix: ResearchDirector, Locked
+  components:
+  - type: AccessReader
+    access: [["ResearchDirector"]]
+    
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockHeadOfPersonnelGlassLocked
+  suffix: HeadOfPersonnel, Locked
+  components:
+  - type: AccessReader
+    access: [["HeadOfPersonnel"]]
+    
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockSecurityGlassLocked
@@ -368,6 +423,14 @@
   components:
   - type: AccessReader
     access: [["Brig"]]
+    
+- type: entity
+  parent: AirlockSecurityGlass
+  id: AirlockArmoryGlassLocked
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
   
 - type: entity
   parent: AirlockEVALocked
@@ -534,7 +597,15 @@
 - type: entity
   parent: AirlockShuttle
   id: AirlockExternalShuttleLocked
-  suffix: External, Locked
+  suffix: External, Docking, Locked
   components:
   - type: AccessReader
     access: [["External"]]
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttleLocked
+  suffix: External, Docking, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
index eea48b8ac0..26e4bc9b96 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/external.yml
@@ -21,3 +21,13 @@
     visuals:
     - type: AirlockVisualizer
     - type: WiresVisualizer
+
+- type: entity
+  parent: AirlockExternal
+  id: AirlockExternalGlass
+  suffix: Glass, External
+  components:
+  - type: Occluder
+    enabled: false
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Glass/external.rsi
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
index 988c79fd8f..d6326af038 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml
@@ -45,3 +45,33 @@
     fixVacuum: true
     airBlockedDirection:
       - South
+
+- type: entity
+  id: AirlockGlassShuttle
+  parent: AirlockShuttle
+  name: external airlock
+  suffix: Glass, Docking
+  description: Necessary for connecting two space craft together.
+  components:
+  - type: Docking
+  - type: Sprite
+    netsync: false
+    sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
+    layers:
+    - state: closed
+      map: ["enum.DoorVisualLayers.Base"]
+    - state: closed_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseUnlit"]
+    - state: welded
+      map: ["enum.DoorVisualLayers.BaseWelded"]
+    - state: bolted_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseBolted"]
+    - state: emergency_unlit
+      shader: unshaded
+      map: ["enum.DoorVisualLayers.BaseEmergencyAccess"]
+    - state: panel_open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
+  - type: Occluder
+    enabled: false
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
index c1b43e3984..19416462d4 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml
@@ -11,6 +11,7 @@
   description: It's a sturdy window and a sliding door. Wow!
 
 # TODO remove these with parameterized prototypes/whatever we end up doing
+# Windoors (alphabetical)
 - type: entity
   parent: Windoor
   id: WindoorBarLocked
@@ -18,6 +19,22 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+    
+- type: entity
+  parent: Windoor
+  id: WindoorCargoLocked
+  suffix: Cargo, Locked
+  components:
+  - type: AccessReader
+    access: [["Cargo"]]
+
+- type: entity
+  parent: Windoor
+  id: WindoorChapelLocked
+  suffix: Chapel, Locked
+  components:
+  - type: AccessReader
+    access: [["Chapel"]]
 
 - type: entity
   parent: Windoor
@@ -28,12 +45,54 @@
     access: [["Hydroponics"]]
 
 - type: entity
-  parent: WindoorSecure
-  id: WindoorMedicalLocked
-  suffix: Medical, Locked
+  parent: Windoor
+  id: WindoorJanitorLocked
+  suffix: Janitor, Locked
   components:
   - type: AccessReader
-    access: [["Medical"]]
+    access: [["Janitor"]]
+
+- type: entity
+  parent: Windoor
+  id: WindoorKitchenLocked
+  suffix: Kitchen, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
+    
+- type: entity
+  parent: Windoor
+  id: WindoorTheatreLocked
+  suffix: Theatre, Locked
+  components:
+  - type: AccessReader
+    access: [["Theatre"]]
+
+# Secure
+
+- type: entity
+  parent: WindoorSecurityLocked
+  id: WindoorArmoryLocked
+  suffix: Armory, Locked
+  components:
+  - type: AccessReader
+    access: [["Armory"]]
+
+- type: entity
+  parent: WindoorSecurityLocked
+  id: WindoorBrigLocked
+  suffix: Brig, Locked
+  components:
+  - type: AccessReader
+    access: [["Brig"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureChapelLocked
+  suffix: Chapel, Locked
+  components:
+  - type: AccessReader
+    access: [["Chapel"]]
 
 - type: entity
   parent: WindoorSecure
@@ -42,15 +101,7 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
-
-- type: entity
-  parent: WindoorSecure
-  id: WindoorScienceLocked
-  suffix: Science, Locked
-  components:
-  - type: AccessReader
-    access: [["Research"]]
-
+    
 - type: entity
   parent: WindoorSecure
   id: WindoorCommandLocked
@@ -62,12 +113,44 @@
     LayoutId: WindoorCommand
 
 - type: entity
-  parent: Windoor
-  id: WindoorCargoLocked
-  suffix: Cargo, Locked
+  parent: WindoorSecure
+  id: WindoorEngineeringLocked
+  suffix: Engineering, Locked
   components:
   - type: AccessReader
-    access: [["Cargo"]]
+    access: [["Engineering"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureJanitorLocked
+  suffix: Janitor, Locked
+  components:
+  - type: AccessReader
+    access: [["Janitor"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureKitchenLocked
+  suffix: Kitchen, Locked
+  components:
+  - type: AccessReader
+    access: [["Kitchen"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorMedicalLocked
+  suffix: Medical, Locked
+  components:
+  - type: AccessReader
+    access: [["Medical"]]
+
+- type: entity
+  parent: WindoorSecure
+  id: WindoorSecureSalvageLocked
+  suffix: Salvage, Locked
+  components:
+  - type: AccessReader
+    access: [["Salvage"]]
 
 - type: entity
   parent: WindoorSecure
@@ -79,50 +162,10 @@
   - type: Wires
     LayoutId: WindoorSecurity
 
-- type: entity
-  parent: WindoorSecurityLocked
-  id: WindoorBrigLocked
-  suffix: Brig, Locked
-  components:
-  - type: AccessReader
-    access: [["Brig"]]
-
-- type: entity
-  parent: WindoorSecurityLocked
-  id: WindoorArmoryLocked
-  suffix: Armory, Locked
-  components:
-  - type: AccessReader
-    access: [["Armory"]]
-
 - type: entity
   parent: WindoorSecure
-  id: WindoorEngineeringLocked
-  suffix: Engineering, Locked
+  id: WindoorScienceLocked
+  suffix: Science, Locked
   components:
   - type: AccessReader
-    access: [["Engineering"]]
-
-- type: entity
-  parent: WindoorSecure
-  id: WindoorChapelLocked
-  suffix: Chapel, Locked
-  components:
-  - type: AccessReader
-    access: [["Chapel"]]
-
-- type: entity
-  parent: WindoorSecure
-  id: WindoorJanitorLocked
-  suffix: Janitor, Locked
-  components:
-  - type: AccessReader
-    access: [["Janitor"]]
-
-- type: entity
-  parent: WindoorSecure
-  id: WindoorKitchenLocked
-  suffix: Kitchen, Locked
-  components:
-  - type: AccessReader
-    access: [["Kitchen"]]
+    access: [["Research"]]
\ No newline at end of file
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png
new file mode 100644
index 0000000000..7c80bc210c
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/bolted_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png
new file mode 100644
index 0000000000..119666c833
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png
new file mode 100644
index 0000000000..844bd201f1
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closed_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png
new file mode 100644
index 0000000000..761e9164ce
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png
new file mode 100644
index 0000000000..51ae8ad362
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/closing_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png
new file mode 100644
index 0000000000..dfe4d406ed
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/deny_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png
new file mode 100644
index 0000000000..31f7a5f9f0
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/emergency_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
new file mode 100644
index 0000000000..8806685e8c
--- /dev/null
+++ b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/meta.json
@@ -0,0 +1,143 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git, glass by Peptide90",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "panel_open"
+    },
+    {
+      "name": "panel_opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+      ]
+    ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          0.4,
+          0.4
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png
new file mode 100644
index 0000000000..5b2e45d833
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png
new file mode 100644
index 0000000000..0546c13db5
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png
new file mode 100644
index 0000000000..51ae8ad362
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/opening_unlit.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png
new file mode 100644
index 0000000000..6afe206992
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_closing.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png
new file mode 100644
index 0000000000..d7d4122c08
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_open.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png
new file mode 100644
index 0000000000..e6c87d740e
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/panel_opening.png differ
diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png
new file mode 100644
index 0000000000..eed2758c79
Binary files /dev/null and b/Resources/Textures/Structures/Doors/Airlocks/Glass/shuttle.rsi/welded.png differ