Shuttle airlock cleanup (#5737)

Resources/Maps/knightship.yml

@@ -1281,7 +1281,7 @@ entities:
     parent: 0
     type: Transform
 - uid: 33
-  type: AirlockShuttle
+  type: AirlockExternalShuttleLocked
   components:
   - rot: -1.5707963267948966 rad
     pos: -5.5,1.5

Resources/Maps/saltern.yml

@@ -6947,7 +6947,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 656
-  type: AirlockShuttle
+  type: AirlockExternalShuttleLocked
   components:
   - rot: -1.5707963267948966 rad
     pos: -41.5,8.5
@@ -6998,7 +6998,7 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 661
-  type: AirlockShuttle
+  type: AirlockExternalShuttleLocked
   components:
   - rot: -1.5707963267948966 rad
     pos: -41.5,4.5

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

@@ -449,3 +449,12 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+
+# Shuttle airlocks
+- type: entity
+  parent: AirlockShuttle
+  id: AirlockExternalShuttleLocked
+  suffix: External, Locked
+  components:
+  - type: AccessReader
+    access: [["External"]]

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

@@ -1,44 +1,29 @@
 - type: entity
   id: AirlockShuttle
-  parent: BaseStructure
-  name: airlock
+  parent: Airlock
+  name: external airlock
   suffix: Docking
   description: Necessary for connecting two space craft together.
   components:
   - type: Docking
-  - type: InteractionOutline
   - type: Sprite
     netsync: false
     sprite: Structures/Doors/Airlocks/Standard/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: panel_open
-    #  map: ["enum.WiresVisualLayers.MaintenancePanel"]
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-    - shape:
-        !type:PhysShapeAabb
-          bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
-      mass: 100
-      mask:
-      - MobImpassable
-      layer:
-      - Opaque
-      - Impassable
-      - MobImpassable
-      - VaultImpassable
-      - SmallImpassable
+    - 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: panel_open
+      map: ["enum.WiresVisualLayers.MaintenancePanel"]
   - type: Door
+    bumpOpen: false
     closeTimeTwo: 0.4
     openTimeTwo: 0.4
     board: DoorElectronics
@@ -49,44 +34,9 @@
       path: /Audio/Effects/docking.ogg
     closeSound:
       path: /Audio/Effects/docking.ogg
-  #  denySound:
-  #    path: /Audio/Machines/airlock_deny.ogg
-  - type: Airlock
-  - type: Appearance
-    visuals:
-    - type: AirlockVisualizer
-      simpleVisuals: true
-  #  - type: WiresVisualizer
-  - type: ApcPowerReceiver
-  - type: ExtensionCableReceiver
-  #- type: Wires
-  #  BoardName: "Airlock Control"
-  #  LayoutId: Airlock
-  #- type: UserInterface
-  #  interfaces:
-  #  - key: enum.WiresUiKey.Key
-  #    type: WiresBoundUserInterface
+    denySound:
+      path: /Audio/Machines/airlock_deny.ogg
   - type: Airtight
     fixVacuum: true
     airBlockedDirection:
       - South
-  - type: Occluder
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 500
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-  #- type: Construction
-  #  graph: airlock
-  #  node: airlock
-  - type: IconSmooth
-    key: walls
-    mode: NoSprite
-  placement:
-    mode: SnapgridCenter

Resources/Textures/Structures/Doors/Airlocks/Standard/shuttle.rsi/meta.json

@@ -1,23 +1,20 @@
 {
   "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 for docking improvements",
+  "copyright": "Taken from CEV-Eris at commit https://github.com/discordia-space/CEV-Eris/commit/14517938186858388656a6aee14bf47af9e9649f - then modified by 20kdc & AJCM-git",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
+    {
+      "name": "bolted_unlit"
+    },
     {
       "name": "closed"
     },
     {
-      "name": "open"
-    },
-    {
-      "name": "lights_green"
-    },
-    {
-      "name": "lights_red"
+      "name": "closed_unlit"
     },
     {
       "name": "closing",
@@ -34,6 +31,39 @@
       ]
     ]
     },
+    {
+      "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": [
@@ -48,6 +78,57 @@
           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"
     }
   ]
 }