diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
index d73b52caf6..99e102d6d2 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/structures/shuttle.yml
@@ -132,6 +132,13 @@
       steps:
       - tool: Screwing
         doAfter: 2
+    - to: skeletonGlass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - material: ReinforcedGlass
+        amount: 2
+        doAfter: 2
     - to: skeletonWelded
       completed:
       - !type:SpawnPrototype
@@ -154,3 +161,35 @@
       steps:
       - tool: Prying
         doAfter: 5
+
+  - node: skeletonGlass
+    entity: AirlockShuttleAssembly
+    edges:
+    - to: skeletonSilver
+      completed:
+        - !type:SpawnPrototype
+          prototype: SheetRGlass1
+          amount: 2
+      steps:
+      - tool: Prying
+        doAfter: 4
+    - to: airlockGlass
+      conditions:
+      - !type:EntityAnchored {}
+      steps:
+      - tool: Screwing
+        doAfter: 2
+
+  - node: airlockGlass
+    entity: AirlockGlassShuttle
+    edges:
+      - to: skeletonGlass
+        conditions:
+          - !type:EntityAnchored {}
+          - !type:DoorWelded {}
+          - !type:AirlockBolted
+            value: false
+          - !type:WirePanel {}
+        steps:
+          - tool: Prying
+            doAfter: 5
diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml
index a14ed93bea..ce7a31dbc8 100644
--- a/Resources/Prototypes/Recipes/Construction/structures.yml
+++ b/Resources/Prototypes/Recipes/Construction/structures.yml
@@ -595,6 +595,24 @@
   conditions:
   - !type:TileNotBlocked
 
+- type: construction
+  name: glass shuttle airlock
+  id: AirlockGlassShuttle
+  graph: AirlockShuttle
+  startNode: start
+  targetNode: airlockGlass
+  category: construction-category-structures
+  description: It opens, it closes, and maybe crushes you. Necessary for connecting two space craft together. This one has a window.
+  icon:
+    sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
+    state: closed
+  #  state: assembly
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: false
+  conditions:
+    - !type:TileNotBlocked
+
 - type: construction
   name: windoor
   id: Windoor