]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
bagel update (#23242)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Sat, 30 Dec 2023 21:12:55 +0000 (14:12 -0700)
committerGitHub <noreply@github.com>
Sat, 30 Dec 2023 21:12:55 +0000 (14:12 -0700)
* bagel update

* fix bagel apc light engi b4 woirk

Resources/Maps/bagel.yml

index ffb8cd0606dd052712969d58f908f03daf63a32c..9e59bbce63718f5c528381dc538a81e0c0594443 100644 (file)
@@ -306,7 +306,7 @@ entities:
           version: 6\r
         -1,2:\r
           ind: -1,2\r
-          tiles: WQAAAAACWQAAAAADeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAWQAAAAACaAAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAWQAAAAAAaAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABaAAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAMQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAWQAAAAACaAAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAMQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA\r
+          tiles: WQAAAAACWQAAAAADeQAAAAAAWQAAAAACWQAAAAADWQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAWQAAAAACaAAAAAAAWQAAAAACWQAAAAACeQAAAAAAeQAAAAAAWQAAAAADeQAAAAAAeQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAeQAAAAAAWQAAAAAAaAAAAAAAWQAAAAADWQAAAAABWQAAAAADWQAAAAABWQAAAAADWQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAABaAAAAAAAWQAAAAABWQAAAAABWQAAAAADWQAAAAABWQAAAAABWQAAAAAAeQAAAAAAMQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaQAAAAAAWQAAAAACaAAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAABeQAAAAAAMQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAWQAAAAADWQAAAAADaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAaAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAaAAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeAAAAAAAeQAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAAeAAAAAAA\r
           version: 6\r
         -3,2:\r
           ind: -3,2\r
@@ -32760,6 +32760,16 @@ entities:
     - pos: -11.5,27.5\r
       parent: 60\r
       type: Transform\r
+  - uid: 24451\r
+    components:\r
+    - pos: -9.5,29.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 24452\r
+    components:\r
+    - pos: -9.5,30.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: CableApcStack\r
   entities:\r
   - uid: 6603\r
@@ -62369,6 +62379,20 @@ entities:
     - pos: -16.5,-29.5\r
       parent: 60\r
       type: Transform\r
+- proto: DefaultStationBeaconAICore\r
+  entities:\r
+  - uid: 18703\r
+    components:\r
+    - pos: -111.5,26.5\r
+      parent: 60\r
+      type: Transform\r
+- proto: DefaultStationBeaconAISatellite\r
+  entities:\r
+  - uid: 18704\r
+    components:\r
+    - pos: -111.5,17.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: DefaultStationBeaconAME\r
   entities:\r
   - uid: 18272\r
@@ -62516,6 +62540,13 @@ entities:
     - pos: -15.5,-41.5\r
       parent: 60\r
       type: Transform\r
+- proto: DefaultStationBeaconDorms\r
+  entities:\r
+  - uid: 18705\r
+    components:\r
+    - pos: -34.5,24.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: DefaultStationBeaconEVAStorage\r
   entities:\r
   - uid: 4148\r
@@ -62523,6 +62554,13 @@ entities:
     - pos: 5.5,-37.5\r
       parent: 60\r
       type: Transform\r
+- proto: DefaultStationBeaconGravGen\r
+  entities:\r
+  - uid: 24449\r
+    components:\r
+    - pos: -12.5,2.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: DefaultStationBeaconHOPOffice\r
   entities:\r
   - uid: 21779\r
@@ -62692,6 +62730,13 @@ entities:
     - pos: 1.5,34.5\r
       parent: 60\r
       type: Transform\r
+- proto: DefaultStationBeaconTheater\r
+  entities:\r
+  - uid: 24450\r
+    components:\r
+    - pos: 22.5,-18.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: DefaultStationBeaconToolRoom\r
   entities:\r
   - uid: 24427\r
@@ -114512,26 +114557,6 @@ entities:
       type: Transform\r
     - powerLoad: 0\r
       type: ApcPowerReceiver\r
-  - uid: 5878\r
-    components:\r
-    - flags: PvsPriority\r
-      type: MetaData\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 52.5,-18.5\r
-      parent: 60\r
-      type: Transform\r
-    - powerLoad: 0\r
-      type: ApcPowerReceiver\r
-  - uid: 5879\r
-    components:\r
-    - flags: PvsPriority\r
-      type: MetaData\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 52.5,-12.5\r
-      parent: 60\r
-      type: Transform\r
-    - powerLoad: 0\r
-      type: ApcPowerReceiver\r
   - uid: 5905\r
     components:\r
     - flags: PvsPriority\r
@@ -116526,6 +116551,22 @@ entities:
       type: ApcPowerReceiver\r
 - proto: PoweredlightLED\r
   entities:\r
+  - uid: 3166\r
+    components:\r
+    - flags: PvsPriority\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 52.5,-17.5\r
+      parent: 60\r
+      type: Transform\r
+  - uid: 3167\r
+    components:\r
+    - flags: PvsPriority\r
+      type: MetaData\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 52.5,-13.5\r
+      parent: 60\r
+      type: Transform\r
   - uid: 3827\r
     components:\r
     - flags: PvsPriority\r
@@ -136161,24 +136202,24 @@ entities:
       type: Transform\r
 - proto: TeslaGroundingRod\r
   entities:\r
-  - uid: 11825\r
+  - uid: 5878\r
     components:\r
-    - pos: 6.5,38.5\r
+    - pos: -8.5,38.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 18703\r
+  - uid: 5879\r
     components:\r
-    - pos: -4.5,38.5\r
+    - pos: -8.5,39.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 18704\r
+  - uid: 11825\r
     components:\r
-    - pos: -3.5,38.5\r
+    - pos: -7.5,39.5\r
       parent: 60\r
       type: Transform\r
-  - uid: 18705\r
+  - uid: 17479\r
     components:\r
-    - pos: 5.5,38.5\r
+    - pos: -7.5,38.5\r
       parent: 60\r
       type: Transform\r
 - proto: Thruster\r
@@ -158511,28 +158552,6 @@ entities:
       type: Transform\r
     - location: newsroom\r
       type: WarpPoint\r
-  - uid: 3166\r
-    components:\r
-    - pos: 5.5,-23.5\r
-      parent: 60\r
-      type: Transform\r
-    - location: hopline\r
-      type: WarpPoint\r
-  - uid: 3167\r
-    components:\r
-    - pos: -7.5,-27.5\r
-      parent: 60\r
-      type: Transform\r
-    - location: jani\r
-      type: WarpPoint\r
-  - uid: 17479\r
-    components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 0.5,-2.5\r
-      parent: 7536\r
-      type: Transform\r
-    - location: Syndi Puddle\r
-      type: WarpPoint\r
 - proto: WarpPointBombing\r
   entities:\r
   - uid: 653\r