From de5973d84a0a38001f63d6efc3dcbfc545cbe3f7 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sat, 30 Dec 2023 14:12:55 -0700
Subject: [PATCH] bagel update (#23242)

* bagel update

* fix bagel apc light engi b4 woirk
---
 Resources/Maps/bagel.yml | 121 ++++++++++++++++++++++-----------------
 1 file changed, 70 insertions(+), 51 deletions(-)

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