]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Oasis: add some emergency O2/N2 lockers (#34715)
authorOrange-Winds <orange.wind@outlook.com>
Tue, 28 Jan 2025 20:48:56 +0000 (12:48 -0800)
committerGitHub <noreply@github.com>
Tue, 28 Jan 2025 20:48:56 +0000 (13:48 -0700)
Added O2, N2, and Fire lockers to Oasis station as per discussions in the issue thread

Co-authored-by: Orange-Winds <sebastian.pelka@hotmail.com>
Resources/Maps/oasis.yml

index 6326e2d532136884cd1ab472a591a59c2f06a362..05bc7c2b7396b548ccace4b9d9659785d7fa7589 100644 (file)
@@ -12629,7 +12629,7 @@ entities:
       pos: 38.5,-9.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -10670.9795
+      secondsUntilStateChange: -11933.729
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -14550,7 +14550,7 @@ entities:
       pos: -22.5,26.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -32723.152
+      secondsUntilStateChange: -33985.9
       state: Opening
     - type: DeviceLinkSource
       lastSignals:
@@ -15401,7 +15401,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -131551.77
+      secondsUntilStateChange: -132814.52
       state: Opening
   - uid: 6934
     components:
@@ -15413,7 +15413,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -131554.39
+      secondsUntilStateChange: -132817.14
       state: Opening
   - uid: 6935
     components:
@@ -15425,7 +15425,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -131553.25
+      secondsUntilStateChange: -132816
       state: Opening
   - uid: 6936
     components:
@@ -15436,7 +15436,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -131552.47
+      secondsUntilStateChange: -132815.22
       state: Opening
 - proto: AirlockTheatreLocked
   entities:
@@ -77007,18 +77007,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -54.5,7.5
       parent: 2
-  - uid: 11826
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -45.5,3.5
-      parent: 2
-  - uid: 11827
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -45.5,2.5
-      parent: 2
   - uid: 11829
     components:
     - type: Transform
@@ -77029,18 +77017,6 @@ entities:
     - type: Transform
       pos: -43.5,1.5
       parent: 2
-  - uid: 13133
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,0.5
-      parent: 2
-  - uid: 13134
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-0.5
-      parent: 2
   - uid: 15043
     components:
     - type: Transform
@@ -77059,18 +77035,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 59.5,-1.5
       parent: 2
-  - uid: 15617
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-2.5
-      parent: 2
-  - uid: 18032
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 62.5,-1.5
-      parent: 2
   - uid: 18087
     components:
     - type: Transform
@@ -77145,12 +77109,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 53.5,2.5
       parent: 2
-  - uid: 23418
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 53.5,-1.5
-      parent: 2
   - uid: 26296
     components:
     - type: Transform
@@ -78202,6 +78160,16 @@ entities:
       parent: 2
 - proto: ClosetEmergencyFilledRandom
   entities:
+  - uid: 1367
+    components:
+    - type: Transform
+      pos: -46.5,3.5
+      parent: 2
+  - uid: 1371
+    components:
+    - type: Transform
+      pos: -1.5,33.5
+      parent: 2
   - uid: 3478
     components:
     - type: Transform
@@ -78247,6 +78215,26 @@ entities:
     - type: Transform
       pos: 10.5,-39.5
       parent: 2
+  - uid: 11826
+    components:
+    - type: Transform
+      pos: 0.5,-62.5
+      parent: 2
+  - uid: 13134
+    components:
+    - type: Transform
+      pos: 59.5,5.5
+      parent: 2
+  - uid: 15617
+    components:
+    - type: Transform
+      pos: -5.5,-62.5
+      parent: 2
+  - uid: 18032
+    components:
+    - type: Transform
+      pos: 62.5,-0.5
+      parent: 2
   - uid: 18917
     components:
     - type: Transform
@@ -78312,6 +78300,11 @@ entities:
     - type: Transform
       pos: 45.5,-45.5
       parent: 2
+  - uid: 20868
+    components:
+    - type: Transform
+      pos: 53.5,-2.5
+      parent: 2
   - uid: 23044
     components:
     - type: Transform
@@ -78379,6 +78372,11 @@ entities:
     - type: Transform
       pos: -11.5,-59.5
       parent: 2
+  - uid: 30121
+    components:
+    - type: Transform
+      pos: 62.5,-1.5
+      parent: 2
 - proto: ClosetFireFilled
   entities:
   - uid: 3477
@@ -78431,6 +78429,11 @@ entities:
     - type: Transform
       pos: 13.5,-33.5
       parent: 2
+  - uid: 13133
+    components:
+    - type: Transform
+      pos: 62.5,0.5
+      parent: 2
   - uid: 18965
     components:
     - type: Transform
@@ -78491,6 +78494,26 @@ entities:
     - type: Transform
       pos: 11.5,29.5
       parent: 2
+  - uid: 30122
+    components:
+    - type: Transform
+      pos: -45.5,3.5
+      parent: 2
+  - uid: 30124
+    components:
+    - type: Transform
+      pos: 1.5,-62.5
+      parent: 2
+  - uid: 30125
+    components:
+    - type: Transform
+      pos: -6.5,-62.5
+      parent: 2
+  - uid: 30129
+    components:
+    - type: Transform
+      pos: -1.5,32.5
+      parent: 2
 - proto: ClosetJanitorFilled
   entities:
   - uid: 3055
@@ -96269,7 +96292,7 @@ entities:
       pos: -13.5,-1.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -122875.75
+      secondsUntilStateChange: -124138.516
     - type: DeviceNetwork
       deviceLists:
       - 18275
@@ -142217,7 +142240,7 @@ entities:
       pos: 36.5,-35.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -159707.58
+      secondsUntilStateChange: -160970.33
       state: Opening
   - uid: 5211
     components:
@@ -166417,11 +166440,6 @@ entities:
     - type: Transform
       pos: 33.5,-3.5
       parent: 2
-  - uid: 20868
-    components:
-    - type: Transform
-      pos: 62.5,-0.5
-      parent: 2
   - uid: 20869
     components:
     - type: Transform
@@ -167049,24 +167067,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -2.5,-39.5
       parent: 2
-  - uid: 1367
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-33.5
-      parent: 2
   - uid: 1369
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-38.5
       parent: 2
-  - uid: 1371
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -2.5,-32.5
-      parent: 2
   - uid: 3438
     components:
     - type: Transform
@@ -167142,6 +167148,18 @@ entities:
     - type: Transform
       pos: 44.5,-11.5
       parent: 2
+  - uid: 9676
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-32.5
+      parent: 2
+  - uid: 11827
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-33.5
+      parent: 2
 - proto: Stool
   entities:
   - uid: 930
@@ -193329,7 +193347,7 @@ entities:
       lastSignals:
         DoorStatus: True
     - type: Door
-      secondsUntilStateChange: -10673.8125
+      secondsUntilStateChange: -11936.562
       state: Opening
     - type: Airlock
       autoClose: False
@@ -194763,7 +194781,7 @@ entities:
       pos: 24.5,2.5
       parent: 21002
     - type: Door
-      secondsUntilStateChange: -504912.22
+      secondsUntilStateChange: -506174.9
       state: Opening
   - uid: 28863
     components: