]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
bagel update (#22948)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Mon, 25 Dec 2023 08:11:05 +0000 (01:11 -0700)
committerGitHub <noreply@github.com>
Mon, 25 Dec 2023 08:11:05 +0000 (01:11 -0700)
Resources/Maps/bagel.yml

index 6c5fcead7f79ae5401798e31355bf418ba4b07dd..e9f1f53258adc13291d0de432de82f1f0ba24567 100644 (file)
@@ -502,6 +502,7 @@ entities:
             3355: -40,42\r
             3356: -40,44\r
             3358: -36,30\r
+            3808: -39,-8\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: Arrows\r
@@ -522,6 +523,7 @@ entities:
             3357: -36,31\r
             3368: -26,38\r
             3805: 47,-23\r
+            3809: -40,-4\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: ArrowsGreyscale\r
@@ -9399,8 +9401,10 @@ entities:
             0: 57344\r
           3,-2:\r
             0: 12288\r
+            2: 16384\r
           3,-1:\r
             0: 14199\r
+            2: 16384\r
           -4,0:\r
             0: 8750\r
           -4,1:\r
@@ -9442,6 +9446,21 @@ entities:
           - 0\r
           - 0\r
           - 0\r
+        - volume: 2500\r
+          temperature: 293.15\r
+          moles:\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
+          - 0\r
         chunkSize: 4\r
       type: GridAtmosphere\r
     - type: GasTileOverlay\r
@@ -14565,6 +14584,23 @@ entities:
     - pos: -53.47654,14.530401\r
       parent: 60\r
       type: Transform\r
+- proto: Ashtray\r
+  entities:\r
+  - uid: 9547\r
+    components:\r
+    - pos: -65.70355,25.732834\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 13985\r
+    components:\r
+    - pos: 15.477192,-36.587162\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 21351\r
+    components:\r
+    - pos: 32.2979,26.45987\r
+      parent: 60\r
+      type: Transform\r
 - proto: AtmosDeviceFanTiny\r
   entities:\r
   - uid: 297\r
@@ -54615,16 +54651,16 @@ entities:
       pos: 55.5,-13.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9548\r
+  - uid: 9309\r
     components:\r
     - rot: -1.5707963267948966 rad\r
-      pos: -36.5,-3.5\r
+      pos: -36.5,-2.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9549\r
+  - uid: 9546\r
     components:\r
     - rot: -1.5707963267948966 rad\r
-      pos: -36.5,-4.5\r
+      pos: -36.5,-3.5\r
       parent: 60\r
       type: Transform\r
   - uid: 9604\r
@@ -54676,12 +54712,6 @@ entities:
       pos: 44.5,12.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 13985\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: -36.5,-5.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 15697\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -106921,7 +106951,7 @@ entities:
   entities:\r
   - uid: 18459\r
     components:\r
-    - pos: 6.395408,-7.409923\r
+    - pos: 6.57388,-7.3136106\r
       parent: 60\r
       type: Transform\r
 - proto: IntercomAll\r
@@ -107542,6 +107572,13 @@ entities:
     - pos: 21.334734,-11.3924055\r
       parent: 60\r
       type: Transform\r
+- proto: LGBTQHandyFlag\r
+  entities:\r
+  - uid: 9548\r
+    components:\r
+    - pos: -41.49743,-36.512333\r
+      parent: 60\r
+      type: Transform\r
 - proto: LightBulb\r
   entities:\r
   - uid: 19737\r
@@ -110792,13 +110829,6 @@ entities:
     - pos: -116.34388,23.715736\r
       parent: 60\r
       type: Transform\r
-- proto: PenCap\r
-  entities:\r
-  - uid: 21351\r
-    components:\r
-    - pos: 6.7579217,-7.082321\r
-      parent: 60\r
-      type: Transform\r
 - proto: PersonalAI\r
   entities:\r
   - uid: 5378\r
@@ -112452,14 +112482,11 @@ entities:
     - containers:\r
         stash: !type:ContainerSlot {}\r
       type: ContainerContainer\r
-  - uid: 9309\r
+  - uid: 9549\r
     components:\r
-    - pos: -39.5,-3.5\r
+    - pos: -36.5,-4.5\r
       parent: 60\r
       type: Transform\r
-    - containers:\r
-        stash: !type:ContainerSlot {}\r
-      type: ContainerContainer\r
   - uid: 11530\r
     components:\r
     - pos: -41.5,25.5\r
@@ -116831,6 +116858,12 @@ entities:
       pos: 12.5,35.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 10585\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -38.5,-6.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 16130\r
     components:\r
     - rot: 1.5707963267948966 rad\r
@@ -117005,6 +117038,18 @@ entities:
       pos: -11.5,57.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24374\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -38.5,-5.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24375\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: -38.5,-4.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: RailingCorner\r
   entities:\r
   - uid: 24199\r
@@ -117930,11 +117975,6 @@ entities:
     - pos: -37.5,-24.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9546\r
-    components:\r
-    - pos: -36.5,-1.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 11241\r
     components:\r
     - pos: 10.5,-27.5\r
@@ -117977,11 +118017,6 @@ entities:
     - pos: -3.5,-65.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 9547\r
-    components:\r
-    - pos: -36.5,-2.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 13976\r
     components:\r
     - pos: -14.5,-10.5\r
@@ -135729,11 +135764,6 @@ entities:
     - pos: 11.5,15.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 10585\r
-    components:\r
-    - pos: -39.5,-7.5\r
-      parent: 60\r
-      type: Transform\r
   - uid: 19123\r
     components:\r
     - flags: SessionSpecific\r