diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 2a8d40a852..a48f06b50f 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -6296,7 +6296,8 @@ entities:
             0: 36863
             1: 28672
           6,-7:
-            1: 119
+            1: 115
+            2: 4
             0: 65416
           6,-6:
             0: 65535
@@ -7218,7 +7219,7 @@ entities:
             0: 65535
           -8,11:
             0: 64719
-            2: 816
+            3: 816
           -7,8:
             0: 65535
           -7,9:
@@ -7251,15 +7252,15 @@ entities:
             0: 65535
           -12,10:
             0: 62451
-            2: 3072
-            3: 12
+            3: 3072
+            4: 12
           -11,10:
-            2: 256
+            3: 256
             0: 65278
-            3: 1
+            4: 1
           -11,11:
             0: 52478
-            2: 1
+            3: 1
           -10,10:
             0: 65535
           -10,8:
@@ -7276,7 +7277,7 @@ entities:
             0: 65535
           -9,11:
             0: 63359
-            2: 2176
+            3: 2176
           -8,12:
             0: 48063
           -7,12:
@@ -7478,7 +7479,7 @@ entities:
           -1,11:
             0: 65535
           -5,12:
-            2: 30515
+            3: 30515
             0: 35020
           -5,13:
             0: 65535
@@ -7496,7 +7497,7 @@ entities:
             0: 65535
           -4,12:
             0: 17
-            2: 65518
+            3: 65518
           -4,13:
             0: 65535
           -4,14:
@@ -7504,7 +7505,7 @@ entities:
           -4,15:
             0: 61951
           -3,12:
-            2: 13107
+            3: 13107
             0: 52428
           -3,13:
             0: 65535
@@ -7536,13 +7537,13 @@ entities:
             0: 65535
           -7,14:
             0: 8191
-            2: 57344
+            3: 57344
           -7,15:
-            2: 238
+            3: 238
             0: 65297
           -6,12:
             0: 4369
-            2: 61166
+            3: 61166
           -6,13:
             0: 65535
           -6,14:
@@ -7854,7 +7855,7 @@ entities:
           17,-8:
             0: 29457
           17,-7:
-            3: 1
+            4: 1
             0: 4990
           17,-6:
             0: 4593
@@ -7982,14 +7983,14 @@ entities:
             0: 35771
           -12,8:
             0: 62451
-            4: 12
-            5: 3072
+            5: 12
+            6: 3072
           -12,9:
             0: 62451
-            2: 3084
+            3: 3084
           -12,11:
             0: 8947
-            2: 12
+            3: 12
           -12,12:
             0: 8751
           -12,13:
@@ -8183,11 +8184,11 @@ entities:
           -13,7:
             0: 39327
           -11,8:
-            4: 1
+            5: 1
             0: 65278
-            5: 256
+            6: 256
           -11,9:
-            2: 257
+            3: 257
             0: 65278
           1,12:
             0: 63897
@@ -8209,8 +8210,8 @@ entities:
             0: 65497
           -13,12:
             0: 53199
-            5: 48
-            4: 12288
+            6: 48
+            5: 12288
           -13,13:
             0: 61727
           -18,4:
@@ -8703,8 +8704,8 @@ entities:
             0: 255
           -14,12:
             0: 32639
-            5: 128
-            4: 32768
+            6: 128
+            5: 32768
           -14,13:
             0: 31
           -17,12:
@@ -8750,6 +8751,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 235
+          moles:
+          - 21.596506
+          - 81.243996
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -15205,6 +15221,13 @@ entities:
     - pos: -30.487093,19.620901
       parent: 60
       type: Transform
+- proto: BookChefGaming
+  entities:
+  - uid: 18647
+    components:
+    - pos: 24.502895,-35.332874
+      parent: 60
+      type: Transform
 - proto: BookEscalation
   entities:
   - uid: 23696
@@ -75793,21 +75816,33 @@ entities:
       type: Transform
 - proto: FoodMeat
   entities:
-  - uid: 2617
-    components:
-    - pos: 24.931736,-26.971676
-      parent: 60
-      type: Transform
-  - uid: 2618
-    components:
-    - pos: 24.712986,-27.159176
-      parent: 60
-      type: Transform
   - uid: 2619
     components:
-    - pos: 25.103611,-27.846676
-      parent: 60
+    - flags: InContainer
+      type: MetaData
+    - parent: 2623
       type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+  - uid: 19882
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2623
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
+  - uid: 21020
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2623
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: FoodMeatRatdoubleKebab
   entities:
   - uid: 6784
@@ -112728,7 +112763,7 @@ entities:
     - pos: -34.433372,-3.1512034
       parent: 60
       type: Transform
-- proto: lantern
+- proto: Lantern
   entities:
   - uid: 24223
     components:
@@ -113391,8 +113426,8 @@ entities:
         immutable: False
         temperature: 234.99966
         moles:
-        - 1.6495836
-        - 6.2055764
+        - 1.877957
+        - 7.0646954
         - 0
         - 0
         - 0
@@ -113404,6 +113439,19 @@ entities:
         - 0
         - 0
       type: EntityStorage
+    - containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 2619
+          - 19882
+          - 21020
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
+      type: ContainerContainer
   - uid: 17736
     components:
     - pos: -61.5,27.5
@@ -114992,6 +115040,13 @@ entities:
     - pos: -2.512361,3.5139241
       parent: 60
       type: Transform
+- proto: MysteryFigureBox
+  entities:
+  - uid: 2618
+    components:
+    - pos: -8.327919,25.771437
+      parent: 60
+      type: Transform
 - proto: NanoManipulatorStockPart
   entities:
   - uid: 9474
@@ -116245,6 +116300,18 @@ entities:
     - pos: 22.5,-14.5
       parent: 60
       type: Transform
+- proto: PosterContrabandDonk
+  entities:
+  - uid: 18473
+    components:
+    - pos: -46.5,-28.5
+      parent: 60
+      type: Transform
+  - uid: 18641
+    components:
+    - pos: 24.5,-38.5
+      parent: 60
+      type: Transform
 - proto: PosterContrabandDonutCorp
   entities:
   - uid: 9152
@@ -116259,6 +116326,11 @@ entities:
     - pos: -8.5,-39.5
       parent: 60
       type: Transform
+  - uid: 18642
+    components:
+    - pos: 27.5,-30.5
+      parent: 60
+      type: Transform
 - proto: PosterContrabandEnergySwords
   entities:
   - uid: 3978
@@ -116318,6 +116390,13 @@ entities:
     - pos: 0.5,16.5
       parent: 60
       type: Transform
+- proto: PosterContrabandInterdyne
+  entities:
+  - uid: 17253
+    components:
+    - pos: 41.5,-33.5
+      parent: 60
+      type: Transform
 - proto: PosterContrabandKosmicheskayaStantsiya
   entities:
   - uid: 7465
@@ -116411,6 +116490,13 @@ entities:
     - pos: 25.5,-10.5
       parent: 60
       type: Transform
+- proto: PosterContrabandSmoke
+  entities:
+  - uid: 18640
+    components:
+    - pos: 27.5,-28.5
+      parent: 60
+      type: Transform
 - proto: PosterContrabandSpaceCola
   entities:
   - uid: 16098
@@ -116465,6 +116551,13 @@ entities:
     - pos: 56.5,-9.5
       parent: 60
       type: Transform
+- proto: PosterContrabandWaffleCorp
+  entities:
+  - uid: 17467
+    components:
+    - pos: -23.5,2.5
+      parent: 60
+      type: Transform
 - proto: PosterContrabandWehWatches
   entities:
   - uid: 154
@@ -116719,6 +116812,13 @@ entities:
     - pos: 21.5,11.5
       parent: 60
       type: Transform
+- proto: PosterLegitNTTGC
+  entities:
+  - uid: 17250
+    components:
+    - pos: -11.5,13.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitPDAAd
   entities:
   - uid: 6776
@@ -116726,6 +116826,20 @@ entities:
     - pos: 2.5,-28.5
       parent: 60
       type: Transform
+- proto: PosterLegitPeriodicTable
+  entities:
+  - uid: 17002
+    components:
+    - pos: 36.5,-26.5
+      parent: 60
+      type: Transform
+- proto: PosterLegitRenault
+  entities:
+  - uid: 17249
+    components:
+    - pos: -6.5,-7.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitReportCrimes
   entities:
   - uid: 1635
@@ -116787,6 +116901,41 @@ entities:
     - pos: -42.5,-2.5
       parent: 60
       type: Transform
+- proto: PosterLegitSafetyMothDelam
+  entities:
+  - uid: 17245
+    components:
+    - pos: -8.5,30.5
+      parent: 60
+      type: Transform
+- proto: PosterLegitSafetyMothEpi
+  entities:
+  - uid: 17003
+    components:
+    - pos: 36.5,-27.5
+      parent: 60
+      type: Transform
+- proto: PosterLegitSafetyMothHardhat
+  entities:
+  - uid: 17005
+    components:
+    - pos: 9.5,16.5
+      parent: 60
+      type: Transform
+- proto: PosterLegitSafetyMothMeth
+  entities:
+  - uid: 17004
+    components:
+    - pos: 37.5,-33.5
+      parent: 60
+      type: Transform
+- proto: PosterLegitSafetyMothPiping
+  entities:
+  - uid: 17244
+    components:
+    - pos: -14.5,31.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitSafetyReport
   entities:
   - uid: 1698
@@ -116842,6 +116991,28 @@ entities:
     - pos: 47.5,23.5
       parent: 60
       type: Transform
+- proto: PosterLegitVacation
+  entities:
+  - uid: 2617
+    components:
+    - pos: -13.5,19.5
+      parent: 60
+      type: Transform
+  - uid: 17251
+    components:
+    - pos: -22.5,6.5
+      parent: 60
+      type: Transform
+  - uid: 17252
+    components:
+    - pos: -2.5,-48.5
+      parent: 60
+      type: Transform
+  - uid: 18639
+    components:
+    - pos: 31.5,-34.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitWorkForAFuture
   entities:
   - uid: 923
@@ -132978,6 +133149,13 @@ entities:
       pos: 9.5,-71.5
       parent: 60
       type: Transform
+- proto: SpawnMobAlexander
+  entities:
+  - uid: 18691
+    components:
+    - pos: 25.5,-31.5
+      parent: 60
+      type: Transform
 - proto: SpawnMobBandito
   entities:
   - uid: 10857
@@ -133037,6 +133215,13 @@ entities:
     - pos: -8.5,-3.5
       parent: 60
       type: Transform
+- proto: SpawnMobGoat
+  entities:
+  - uid: 18710
+    components:
+    - pos: 25.5,-28.5
+      parent: 60
+      type: Transform
 - proto: SpawnMobMcGriff
   entities:
   - uid: 4710