Merge branch 'new-frontiers-14:master' into LockersAgain

new-frontiers-14 · Nov 12, 2023 · f6da9f4 · f6da9f4
2 parents 03ac766 + e3a8e4c
commit f6da9f4
Show file tree

Hide file tree

Showing 5 changed files with 170 additions and 823 deletions.
diff --git a/Resources/Maps/Shuttles/decadedove.yml b/Resources/Maps/Shuttles/decadedove.yml
@@ -633,7 +633,7 @@ entities:
     - pos: 1.5,4.5
       parent: 1
       type: Transform
-    - secondsUntilStateChange: -14388.413
+    - secondsUntilStateChange: -14652.679
       state: Opening
       type: Door
   - uid: 311
@@ -707,7 +707,7 @@ entities:
       pos: -9.5,-0.5
       parent: 1
       type: Transform
-    - secondsUntilStateChange: -1005.1962
+    - secondsUntilStateChange: -1269.4619
       state: Opening
       type: Door
   - uid: 418
@@ -2776,41 +2776,29 @@ entities:
       type: Transform
     - canCollide: False
       type: Physics
-- proto: EncryptionKeyCommand
+- proto: EncryptionKeyCommon
   entities:
   - uid: 293
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 12.566157,5.575511
-      parent: 1
-      type: Transform
-  - uid: 466
-    components:
-    - rot: 1.5707963267948966 rad
-      pos: 13.488032,5.575511
-      parent: 1
-      type: Transform
-  - uid: 820
     components:
     - flags: InContainer
       type: MetaData
     - parent: 816
       type: Transform
     - canCollide: False
       type: Physics
-- proto: EncryptionKeyCommon
+- proto: EncryptionKeyEngineering
   entities:
-  - uid: 817
+  - uid: 819
     components:
     - flags: InContainer
       type: MetaData
     - parent: 816
       type: Transform
     - canCollide: False
       type: Physics
-- proto: EncryptionKeyEngineering
+- proto: EncryptionKeyTraffic
   entities:
-  - uid: 819
+  - uid: 466
     components:
     - flags: InContainer
       type: MetaData
@@ -3837,6 +3825,8 @@ entities:
     - pos: 8.5,-0.5
       parent: 1
       type: Transform
+    - locked: False
+      type: Lock
     - air:
         volume: 200
         immutable: False
@@ -5028,10 +5018,10 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 817
           - 818
           - 819
-          - 820
+          - 293
+          - 466
         machine_board: !type:Container
           showEnts: False
           occludes: True