From c1fe000a7bd372125359401aae181ed6c5896e71 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Fri, 7 Jul 2023 02:06:04 -0600
Subject: [PATCH] sus (#17873)

---
 Resources/Maps/bagel.yml    | 241 ++++++++++++++++++--------
 Resources/Maps/box.yml      | 128 ++++++++++----
 Resources/Maps/fland.yml    | 122 +++++++++----
 Resources/Maps/marathon.yml | 177 +++++++++++++++----
 Resources/Maps/meta.yml     | 332 +++++++++++++++++++++++-------------
 Resources/Maps/omega.yml    | 217 +++++++++++++++++------
 Resources/Maps/packed.yml   | 101 ++++++++++-
 7 files changed, 971 insertions(+), 347 deletions(-)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 8a3ab4e08f..65ac833424 100644
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -5994,7 +5994,8 @@ entities:
           0,-3:
             0: 65535
           0,-2:
-            0: 65535
+            0: 63479
+            1: 2056
           0,-1:
             0: 65535
           1,-3:
@@ -6261,19 +6262,19 @@ entities:
             0: 65535
           5,-8:
             0: 32767
-            1: 32768
+            2: 32768
           5,-7:
             0: 65399
-            1: 136
+            2: 136
           5,-6:
             0: 65535
           5,-5:
             0: 65535
           6,-8:
             0: 36863
-            1: 28672
+            2: 28672
           6,-7:
-            1: 119
+            2: 119
             0: 65416
           6,-6:
             0: 65535
@@ -6883,7 +6884,7 @@ entities:
             0: 65535
           14,-5:
             0: 65279
-            2: 256
+            3: 256
           4,-13:
             0: 65535
           -8,-10:
@@ -7196,7 +7197,7 @@ entities:
             0: 65535
           -8,11:
             0: 64719
-            3: 816
+            4: 816
           -7,8:
             0: 65535
           -7,9:
@@ -7229,15 +7230,15 @@ entities:
             0: 65535
           -12,10:
             0: 62451
-            3: 3072
-            4: 12
+            4: 3072
+            5: 12
           -11,10:
-            3: 256
+            4: 256
             0: 65278
-            4: 1
+            5: 1
           -11,11:
             0: 52478
-            3: 1
+            4: 1
           -10,10:
             0: 65535
           -10,8:
@@ -7254,7 +7255,7 @@ entities:
             0: 65535
           -9,11:
             0: 63359
-            3: 2176
+            4: 2176
           -8,12:
             0: 48063
           -7,12:
@@ -7511,9 +7512,9 @@ entities:
             0: 65535
           -7,14:
             0: 8191
-            3: 57344
+            4: 57344
           -7,15:
-            3: 238
+            4: 238
             0: 65297
           -6,12:
             0: 65535
@@ -7828,7 +7829,7 @@ entities:
           17,-8:
             0: 29457
           17,-7:
-            4: 1
+            5: 1
             0: 4990
           17,-6:
             0: 4593
@@ -7956,14 +7957,14 @@ entities:
             0: 35771
           -12,8:
             0: 62451
-            5: 12
-            6: 3072
+            6: 12
+            7: 3072
           -12,9:
             0: 62451
-            3: 3084
+            4: 3084
           -12,11:
             0: 8947
-            3: 12
+            4: 12
           -12,12:
             0: 8751
           -12,13:
@@ -8157,11 +8158,11 @@ entities:
           -13,7:
             0: 39327
           -11,8:
-            5: 1
+            6: 1
             0: 65278
-            6: 256
+            7: 256
           -11,9:
-            3: 257
+            4: 257
             0: 65278
           1,12:
             0: 63897
@@ -8183,8 +8184,8 @@ entities:
             0: 65497
           -13,12:
             0: 53199
-            6: 48
-            5: 12288
+            7: 48
+            6: 12288
           -13,13:
             0: 61727
           -18,4:
@@ -8677,8 +8678,8 @@ entities:
             0: 255
           -14,12:
             0: 32639
-            6: 128
-            5: 32768
+            7: 128
+            6: 32768
           -14,13:
             0: 31
           -17,12:
@@ -8709,6 +8710,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.596506
+          - 81.243996
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 235
           moles:
@@ -15450,13 +15466,6 @@ entities:
     - pos: 0.97444147,20.461615
       parent: 60
       type: Transform
-- proto: BoxMagazinePistolSubMachineGunHighVelocity
-  entities:
-  - uid: 9018
-    components:
-    - pos: -28.662039,2.7893302
-      parent: 60
-      type: Transform
 - proto: BoxMouthSwab
   entities:
   - uid: 8886
@@ -63383,6 +63392,35 @@ entities:
     - pos: -11.417416,-50.455223
       parent: 60
       type: Transform
+- proto: ClothingOuterArmorBasic
+  entities:
+  - uid: 19886
+    components:
+    - pos: -24.397709,1.3971437
+      parent: 60
+      type: Transform
+  - uid: 20003
+    components:
+    - pos: -24.397709,1.3971437
+      parent: 60
+      type: Transform
+- proto: ClothingOuterArmorBulletproof
+  entities:
+  - uid: 21011
+    components:
+    - pos: -24.521177,1.5767841
+      parent: 60
+      type: Transform
+  - uid: 21012
+    components:
+    - pos: -24.521177,1.5767841
+      parent: 60
+      type: Transform
+  - uid: 21016
+    components:
+    - pos: -24.521177,1.5767841
+      parent: 60
+      type: Transform
 - proto: ClothingOuterArmorReflective
   entities:
   - uid: 24113
@@ -63482,6 +63520,46 @@ entities:
     - pos: -40.51241,3.5016193
       parent: 60
       type: Transform
+  - uid: 9093
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 18441
+      type: Transform
+    - group:
+      - hoverMessage: ""
+        contextText: verb-examine-group-other
+        icon: /Textures/Interface/examine-star.png
+        components:
+        - Armor
+        - ClothingSpeedModifier
+        entries:
+        - message: This decreases your speed by [color=yellow]20%[/color].
+          priority: 0
+          component: ClothingSpeedModifier
+        - message: >-
+            It provides the following protection:
+
+            - [color=yellow]Blunt[/color] damage reduced by [color=lightblue]10%[/color].
+
+            - [color=yellow]Slash[/color] damage reduced by [color=lightblue]10%[/color].
+
+            - [color=yellow]Piercing[/color] damage reduced by [color=lightblue]10%[/color].
+
+            - [color=yellow]Heat[/color] damage reduced by [color=lightblue]10%[/color].
+
+            - [color=yellow]Radiation[/color] damage reduced by [color=lightblue]10%[/color].
+
+            - [color=yellow]Caustic[/color] damage reduced by [color=lightblue]15%[/color].
+
+            - [color=orange]Explosion[/color] damage reduced by [color=lightblue]10%[/color].
+          priority: 0
+          component: Armor
+        title: null
+      type: GroupExamine
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitEVA
   entities:
   - uid: 5207
@@ -65903,8 +65981,8 @@ entities:
         immutable: False
         temperature: 293.1496
         moles:
-        - 1.6495836
-        - 6.2055764
+        - 1.877957
+        - 7.0646954
         - 0
         - 0
         - 0
@@ -65921,12 +65999,12 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 18835
-          - 18834
-          - 18823
-          - 18792
-          - 18731
           - 18442
+          - 18731
+          - 18792
+          - 18823
+          - 18834
+          - 18835
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -114141,8 +114219,8 @@ entities:
         immutable: False
         temperature: 293.1496
         moles:
-        - 1.6495836
-        - 6.2055764
+        - 1.877957
+        - 7.0646954
         - 0
         - 0
         - 0
@@ -114159,11 +114237,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
+          - 9018
           - 18453
           - 18548
           - 17492
           - 17491
           - 17379
+          - 9093
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -114770,18 +114850,6 @@ entities:
     - pos: 4.5,-44.5
       parent: 60
       type: Transform
-- proto: MagazineBoxPistol
-  entities:
-  - uid: 9093
-    components:
-    - pos: -28.427664,2.5080802
-      parent: 60
-      type: Transform
-  - uid: 9524
-    components:
-    - pos: -28.427664,2.6487052
-      parent: 60
-      type: Transform
 - proto: MagazinePistol
   entities:
   - uid: 21335
@@ -116019,6 +116087,13 @@ entities:
     - pos: -19.5,19.5
       parent: 60
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 19730
+    components:
+    - pos: 25.5,-14.5
+      parent: 60
+      type: Transform
 - proto: PaintingSaturn
   entities:
   - uid: 21752
@@ -117200,6 +117275,13 @@ entities:
     - pos: -62.5,11.5
       parent: 60
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 13788
+    components:
+    - pos: 42.5,-15.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitBlessThisSpess
   entities:
   - uid: 18208
@@ -117214,6 +117296,13 @@ entities:
     - pos: 11.5,20.5
       parent: 60
       type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 13787
+    components:
+    - pos: 46.5,11.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 621
@@ -117328,6 +117417,13 @@ entities:
     - pos: 9.5,-27.5
       parent: 60
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 19885
+    components:
+    - pos: 26.5,-14.5
+      parent: 60
+      type: Transform
 - proto: PosterLegitNanomichiAd
   entities:
   - uid: 6631
@@ -134541,6 +134637,17 @@ entities:
     - pos: 25.537956,-7.7012243
       parent: 60
       type: Transform
+- proto: SpaceCash1000
+  entities:
+  - uid: 9018
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 18441
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: SpaceVillainArcadeFilled
   entities:
   - uid: 5301
@@ -157396,21 +157503,21 @@ entities:
     - pos: -24.45179,2.5628066
       parent: 60
       type: Transform
-- proto: WeaponSubMachineGunDrozdRubber
+- proto: WeaponSubMachineGunDrozd
   entities:
+  - uid: 9524
+    components:
+    - pos: -28.494457,2.634122
+      parent: 60
+      type: Transform
+  - uid: 11536
+    components:
+    - pos: -28.510082,2.337247
+      parent: 60
+      type: Transform
   - uid: 13667
     components:
-    - pos: -28.5329,2.411416
-      parent: 60
-      type: Transform
-  - uid: 13787
-    components:
-    - pos: -28.517275,2.708291
-      parent: 60
-      type: Transform
-  - uid: 13788
-    components:
-    - pos: -28.517275,2.552041
+    - pos: -28.494457,2.493497
       parent: 60
       type: Transform
 - proto: WeaponSubMachineGunWt550
diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index 139421e7da..2548ced53a 100644
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -5655,7 +5655,8 @@ entities:
           -9,0:
             0: 65199
           -9,1:
-            0: 65278
+            0: 64254
+            4: 1024
           -9,2:
             0: 65530
           -9,3:
@@ -6752,7 +6753,7 @@ entities:
             0: 65535
           4,-17:
             0: 34959
-            4: 30576
+            5: 30576
           5,-20:
             0: 62540
           5,-19:
@@ -6957,7 +6958,7 @@ entities:
             0: 65535
           3,-17:
             0: 34959
-            5: 30576
+            6: 30576
           0,-24:
             0: 63624
           0,-23:
@@ -7487,6 +7488,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 24.678276
+          - 92.837326
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -7532,12 +7548,10 @@ entities:
     - type: OccluderTree
     - type: Shuttle
     - type: RadiationGridResistance
-    - nextShake: 0
-      shakeTimes: 10
+    - shakeTimes: 10
       type: GravityShake
     - type: GasTileOverlay
-    - nextUpdate: 0
-      type: SpreaderGrid
+    - type: SpreaderGrid
     - type: GridPathfinding
   - uid: 11906
     components:
@@ -7585,8 +7599,7 @@ entities:
     - type: OccluderTree
     - type: Shuttle
     - type: RadiationGridResistance
-    - nextUpdate: 0
-      type: SpreaderGrid
+    - type: SpreaderGrid
     - type: GridPathfinding
 - proto: AcousticGuitarInstrument
   entities:
@@ -10503,7 +10516,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 21828
       type: Docking
-    - SecondsUntilStateChange: -32520.906
+    - SecondsUntilStateChange: -33170.543
       changeAirtight: False
       state: Opening
       type: Door
@@ -10551,7 +10564,7 @@ entities:
     - dockJointId: docking46345
       dockedWith: 562
       type: Docking
-    - SecondsUntilStateChange: -32520.906
+    - SecondsUntilStateChange: -33170.543
       changeAirtight: False
       state: Opening
       type: Door
@@ -12363,7 +12376,7 @@ entities:
     - pos: 69.5,-3.5
       parent: 8364
       type: Transform
-- proto: AMEController
+- proto: AmeController
   entities:
   - uid: 18760
     components:
@@ -14141,8 +14154,6 @@ entities:
     - pos: 31.489525,-32.317123
       parent: 8364
       type: Transform
-    - nextAttack: 750.9046614
-      type: MeleeWeapon
   - uid: 21180
     components:
     - pos: 74.27338,-18.287746
@@ -14548,8 +14559,6 @@ entities:
       type: MetaData
     - parent: 20886
       type: Transform
-    - nextAttack: 3063.5165265
-      type: MeleeWeapon
     - canCollide: False
       type: Physics
     - type: InsideEntityStorage
@@ -76375,6 +76384,17 @@ entities:
     - pos: 58.27977,8.379128
       parent: 8364
       type: Transform
+- proto: ClothingOuterHardsuitBasic
+  entities:
+  - uid: 26585
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 20886
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitEVA
   entities:
   - uid: 5317
@@ -77094,8 +77114,6 @@ entities:
       pos: -28.5,-23.5
       parent: 8364
       type: Transform
-    - nextPrintTime: 31.5168737
-      type: CargoBountyConsole
 - proto: ComputerCargoOrders
   entities:
   - uid: 2899
@@ -79199,6 +79217,17 @@ entities:
     - pos: -33.5,-6.5
       parent: 8364
       type: Transform
+- proto: CrayonRainbow
+  entities:
+  - uid: 26054
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 20886
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: Crematorium
   entities:
   - uid: 10576
@@ -129387,8 +129416,6 @@ entities:
     - pos: -10.088213,9.755057
       parent: 8364
       type: Transform
-    - nextAttack: 1188.9447201
-      type: MeleeWeapon
   - uid: 26848
     components:
     - pos: -12.493954,3.065948
@@ -131267,8 +131294,8 @@ entities:
         immutable: False
         temperature: 293.1496
         moles:
-        - 4.999335
-        - 18.80702
+        - 2.145937
+        - 8.072811
         - 0
         - 0
         - 0
@@ -131285,9 +131312,12 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 21277
+          - 26054
           - 25839
+          - 26062
+          - 26585
           - 20932
+          - 21277
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -133473,8 +133503,6 @@ entities:
     - pos: 54.482033,-24.522997
       parent: 8364
       type: Transform
-    - nextAttack: 4442.2490056
-      type: MeleeWeapon
   - uid: 25977
     components:
     - pos: 24.446787,-32.484436
@@ -133675,6 +133703,13 @@ entities:
     - pos: 8.5,-10.5
       parent: 8364
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 26595
+    components:
+    - pos: 20.5,1.5
+      parent: 8364
+      type: Transform
 - proto: PaintingTheGreatWave
   entities:
   - uid: 15278
@@ -135017,6 +135052,18 @@ entities:
     - pos: 58.5,-34.5
       parent: 8364
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 26592
+    components:
+    - pos: 28.5,-27.5
+      parent: 8364
+      type: Transform
+  - uid: 26593
+    components:
+    - pos: 37.5,-47.5
+      parent: 8364
+      type: Transform
 - proto: PosterLegitBuild
   entities:
   - uid: 17020
@@ -135024,6 +135071,13 @@ entities:
     - pos: 2.5,-50.5
       parent: 8364
       type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 26594
+    components:
+    - pos: -27.5,-28.5
+      parent: 8364
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 12051
@@ -135064,6 +135118,13 @@ entities:
     - pos: -10.5,-28.5
       parent: 8364
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 26596
+    components:
+    - pos: 23.5,6.5
+      parent: 8364
+      type: Transform
 - proto: PosterLegitNanotrasenLogo
   entities:
   - uid: 3196
@@ -147232,8 +147293,6 @@ entities:
     - pos: 39.535873,-18.379318
       parent: 8364
       type: Transform
-    - nextAttack: 4724.4472423
-      type: MeleeWeapon
   - uid: 21416
     components:
     - pos: 79.5,-47.5
@@ -151744,6 +151803,17 @@ entities:
     - pos: -57.5,-61.5
       parent: 8364
       type: Transform
+- proto: SpaceCash1000
+  entities:
+  - uid: 26062
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 20886
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: SpaceVillainArcadeComputerCircuitboard
   entities:
   - uid: 16326
@@ -158252,8 +158322,6 @@ entities:
     - pos: 22.5,-21.5
       parent: 8364
       type: Transform
-    - nextEmpEject: 791.7830475
-      type: VendingMachine
 - proto: VendingMachineCigs
   entities:
   - uid: 940
@@ -158629,8 +158697,6 @@ entities:
     - pos: 56.5,-24.5
       parent: 8364
       type: Transform
-    - nextEmpEject: 699.7160408
-      type: VendingMachine
 - proto: VendingMachineSalvage
   entities:
   - uid: 21793
diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml
index f0f7e602f7..da179acaa7 100644
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -15265,7 +15265,7 @@ entities:
             0: 65535
           21,11:
             0: 63487
-            1: 2048
+            4: 2048
           22,8:
             0: 65535
           22,9:
@@ -15825,8 +15825,7 @@ entities:
       type: GridAtmosphere
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - nextUpdate: 0
-      type: SpreaderGrid
+    - type: SpreaderGrid
     - type: GridPathfinding
 - proto: AcousticGuitarInstrument
   entities:
@@ -21030,7 +21029,7 @@ entities:
       pos: 5.5,84.5
       parent: 13329
       type: Transform
-- proto: AMEController
+- proto: AmeController
   entities:
   - uid: 23456
     components:
@@ -101258,6 +101257,23 @@ entities:
     - pos: 37.78265,58.574413
       parent: 13329
       type: Transform
+- proto: ClothingOuterArmorBasic
+  entities:
+  - uid: 16653
+    components:
+    - pos: 19.353907,13.4972
+      parent: 13329
+      type: Transform
+  - uid: 16654
+    components:
+    - pos: 19.353907,13.4972
+      parent: 13329
+      type: Transform
+  - uid: 16655
+    components:
+    - pos: 19.353907,13.4972
+      parent: 13329
+      type: Transform
 - proto: ClothingOuterArmorBulletproof
   entities:
   - uid: 10663
@@ -101344,6 +101360,17 @@ entities:
     - pos: 78.48971,19.483404
       parent: 13329
       type: Transform
+- proto: ClothingOuterHardsuitBasic
+  entities:
+  - uid: 16651
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 30732
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitEVA
   entities:
   - uid: 5416
@@ -102358,8 +102385,6 @@ entities:
     - pos: 9.5,-15.5
       parent: 13329
       type: Transform
-    - nextPrintTime: 72.4042044
-      type: CargoBountyConsole
 - proto: ComputerCargoOrders
   entities:
   - uid: 11747
@@ -105017,6 +105042,17 @@ entities:
     - pos: 84.367096,14.589357
       parent: 13329
       type: Transform
+- proto: CrayonRainbow
+  entities:
+  - uid: 16650
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 30732
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: Crematorium
   entities:
   - uid: 6625
@@ -105081,8 +105117,6 @@ entities:
     - pos: 30.455694,-46.39517
       parent: 13329
       type: Transform
-    - nextAttack: 13973.983491
-      type: MeleeWeapon
   - uid: 20082
     components:
     - pos: 62.451862,-42.416447
@@ -121456,22 +121490,16 @@ entities:
     - pos: -12.641854,22.481508
       parent: 13329
       type: Transform
-    - nextSound: 101.5948546
-      type: EmitSoundOnCollide
   - uid: 16625
     components:
     - pos: -12.641854,22.481508
       parent: 13329
       type: Transform
-    - nextSound: 101.8160562
-      type: EmitSoundOnCollide
   - uid: 16626
     components:
     - pos: -12.641854,22.481508
       parent: 13329
       type: Transform
-    - nextSound: 102.0502686
-      type: EmitSoundOnCollide
 - proto: GalaxythistleSeeds
   entities:
   - uid: 1788
@@ -170832,22 +170860,16 @@ entities:
     - pos: -12.360604,22.497133
       parent: 13329
       type: Transform
-    - nextSound: 104.6166449
-      type: EmitSoundOnCollide
   - uid: 16628
     components:
     - pos: -12.360604,22.497133
       parent: 13329
       type: Transform
-    - nextSound: 104.8818856
-      type: EmitSoundOnCollide
   - uid: 16629
     components:
     - pos: -12.360604,22.497133
       parent: 13329
       type: Transform
-    - nextSound: 105.1831611
-      type: EmitSoundOnCollide
 - proto: Lamp
   entities:
   - uid: 6569
@@ -172435,8 +172457,8 @@ entities:
         immutable: False
         temperature: 293.1495
         moles:
-        - 3.0981817
-        - 11.655066
+        - 1.8541656
+        - 6.9751945
         - 0
         - 0
         - 0
@@ -172453,9 +172475,12 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 30733
+          - 16651
+          - 16652
+          - 16650
           - 30734
           - 30735
+          - 30733
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -176457,6 +176482,13 @@ entities:
     - pos: -11.5,51.5
       parent: 13329
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 16658
+    components:
+    - pos: -14.5,11.5
+      parent: 13329
+      type: Transform
 - proto: PaintingSkeletonBoof
   entities:
   - uid: 35213
@@ -177583,6 +177615,13 @@ entities:
     - pos: 33.5,26.5
       parent: 13329
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 16657
+    components:
+    - pos: 12.5,54.5
+      parent: 13329
+      type: Transform
 - proto: PosterLegitBlessThisSpess
   entities:
   - uid: 35334
@@ -177590,6 +177629,13 @@ entities:
     - pos: 122.5,-0.5
       parent: 13329
       type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 16656
+    components:
+    - pos: 12.5,-28.5
+      parent: 13329
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 1545
@@ -177665,6 +177711,13 @@ entities:
     - pos: 63.5,49.5
       parent: 13329
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 16659
+    components:
+    - pos: -10.5,11.5
+      parent: 13329
+      type: Transform
 - proto: PosterLegitNanotrasenLogo
   entities:
   - uid: 1639
@@ -198172,6 +198225,17 @@ entities:
     - pos: 29.221989,-29.186216
       parent: 13329
       type: Transform
+- proto: SpaceCash1000
+  entities:
+  - uid: 16652
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 30732
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: SpaceMedipen
   entities:
   - uid: 29294
@@ -207738,8 +207802,6 @@ entities:
     - pos: 25.5,38.5
       parent: 13329
       type: Transform
-    - nextEmpEject: 378.0880196
-      type: VendingMachine
 - proto: VendingMachineCigs
   entities:
   - uid: 1145
@@ -208065,8 +208127,6 @@ entities:
     - pos: -11.5,22.5
       parent: 13329
       type: Transform
-    - nextEmpEject: 84.8595034
-      type: VendingMachine
 - proto: VendingMachineDetDrobe
   entities:
   - uid: 4532
@@ -208239,8 +208299,6 @@ entities:
     - pos: 33.5,-19.5
       parent: 13329
       type: Transform
-    - nextEmpEject: 350.5145517
-      type: VendingMachine
 - proto: VendingMachineSalvage
   entities:
   - uid: 11650
@@ -232404,22 +232462,16 @@ entities:
     - pos: 19.52061,11.77124
       parent: 13329
       type: Transform
-    - nextFire: 67.3981568
-      type: Gun
   - uid: 1349
     components:
     - pos: 19.536236,11.443115
       parent: 13329
       type: Transform
-    - nextFire: 64.2499646
-      type: Gun
   - uid: 13339
     components:
     - pos: 19.536236,11.630615
       parent: 13329
       type: Transform
-    - nextFire: 65.33228
-      type: Gun
 - proto: WeaponSubMachineGunWt550
   entities:
   - uid: 10508
diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 5e634ce8d5..4577328044 100644
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -5843,7 +5843,8 @@ entities:
           0,9:
             0: 40723
           0,10:
-            0: 52733
+            0: 52605
+            2: 128
           0,11:
             0: 35068
           1,8:
@@ -6237,16 +6238,16 @@ entities:
           5,-5:
             0: 65535
           6,-8:
-            0: 7967
-            2: 224
-            3: 57344
-          6,-7:
             0: 7967
             3: 224
             4: 57344
+          6,-7:
+            0: 7967
+            4: 224
+            5: 57344
           6,-6:
             0: 65311
-            5: 224
+            6: 224
           6,-5:
             0: 65535
           7,-8:
@@ -6295,7 +6296,7 @@ entities:
             0: 65535
           6,-9:
             0: 7967
-            3: 57568
+            4: 57568
           7,-9:
             0: 13107
           -4,-12:
@@ -6886,7 +6887,7 @@ entities:
             0: 65280
           -16,14:
             0: 52862
-            2: 128
+            3: 128
           -16,15:
             0: 3976
           -16,13:
@@ -6923,6 +6924,7 @@ entities:
             0: 61007
           -20,10:
             0: 62718
+            4: 2816
           -20,9:
             0: 61166
           -20,11:
@@ -6931,6 +6933,7 @@ entities:
             0: 61007
           -19,10:
             0: 62718
+            4: 2816
           -19,9:
             0: 61166
           -19,11:
@@ -6939,6 +6942,7 @@ entities:
             0: 8739
           -18,10:
             0: 64752
+            4: 768
           -18,9:
             0: 2
           -18,11:
@@ -6967,6 +6971,7 @@ entities:
             0: 3136
           -23,10:
             0: 62968
+            4: 2560
           -23,11:
             0: 35061
           -23,8:
@@ -6977,6 +6982,7 @@ entities:
             0: 61007
           -22,10:
             0: 62718
+            4: 2816
           -22,9:
             0: 61166
           -22,11:
@@ -6985,6 +6991,7 @@ entities:
             0: 61007
           -21,10:
             0: 62718
+            4: 2816
           -21,9:
             0: 61166
           -21,11:
@@ -7383,12 +7390,12 @@ entities:
             0: 65535
           9,-16:
             0: 22399
-            3: 43136
+            4: 43136
           9,-15:
             0: 65277
-            3: 258
+            4: 258
           10,-16:
-            3: 32769
+            4: 32769
             0: 32766
           10,-15:
             0: 65535
@@ -7402,17 +7409,17 @@ entities:
             0: 65534
           8,-17:
             0: 63359
-            3: 2176
+            4: 2176
           8,-19:
             0: 60616
           9,-19:
             0: 64511
-            3: 1024
+            4: 1024
           9,-18:
             0: 49143
-            3: 16392
+            4: 16392
           9,-17:
-            3: 311
+            4: 311
             0: 65224
           9,-20:
             0: 57344
@@ -7420,19 +7427,19 @@ entities:
             0: 61440
           10,-19:
             0: 64703
-            3: 832
+            4: 832
           10,-18:
             0: 29695
-            3: 35840
+            4: 35840
           10,-17:
             0: 65535
           11,-19:
             0: 29489
           11,-18:
             0: 60655
-            3: 4880
+            4: 4880
           11,-17:
-            3: 8193
+            4: 8193
             0: 57342
           7,-17:
             0: 34944
@@ -7607,6 +7614,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 23.246532
+          - 87.451256
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -58763,14 +58785,7 @@ entities:
     - pos: -38.429283,-20.300697
       parent: 30
       type: Transform
-- proto: ClothingHeadHelmetCosmonaut
-  entities:
-  - uid: 16767
-    components:
-    - pos: -17.446564,-106.45651
-      parent: 30
-      type: Transform
-- proto: ClothingHeadHelmetHelmet
+- proto: ClothingHeadHelmetBasic
   entities:
   - uid: 1986
     components:
@@ -58787,6 +58802,13 @@ entities:
     - pos: -39.575058,56.668564
       parent: 30
       type: Transform
+- proto: ClothingHeadHelmetCosmonaut
+  entities:
+  - uid: 16767
+    components:
+    - pos: -17.446564,-106.45651
+      parent: 30
+      type: Transform
 - proto: ClothingHeadHelmetTemplar
   entities:
   - uid: 16772
@@ -59008,6 +59030,40 @@ entities:
     - pos: -0.49387097,-7.362574
       parent: 30
       type: Transform
+- proto: ClothingOuterArmorBasic
+  entities:
+  - uid: 12131
+    components:
+    - pos: -39.48033,56.411068
+      parent: 30
+      type: Transform
+  - uid: 14249
+    components:
+    - pos: -39.48033,56.411068
+      parent: 30
+      type: Transform
+  - uid: 14435
+    components:
+    - pos: -39.48033,56.411068
+      parent: 30
+      type: Transform
+- proto: ClothingOuterArmorBulletproof
+  entities:
+  - uid: 16243
+    components:
+    - pos: -39.286102,56.736275
+      parent: 30
+      type: Transform
+  - uid: 16244
+    components:
+    - pos: -39.286102,56.736275
+      parent: 30
+      type: Transform
+  - uid: 16251
+    components:
+    - pos: -39.286102,56.736275
+      parent: 30
+      type: Transform
 - proto: ClothingOuterArmorCult
   entities:
   - uid: 18249
@@ -59109,6 +59165,17 @@ entities:
     - pos: 19.488726,8.340895
       parent: 30
       type: Transform
+- proto: ClothingOuterHardsuitBasic
+  entities:
+  - uid: 11194
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 5608
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitEVAPrisoner
   entities:
   - uid: 2381
@@ -61372,6 +61439,17 @@ entities:
     - pos: -58.516808,51.429756
       parent: 30
       type: Transform
+- proto: CrayonRainbow
+  entities:
+  - uid: 12091
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 5608
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: Crematorium
   entities:
   - uid: 6908
@@ -107771,8 +107849,8 @@ entities:
         immutable: False
         temperature: 293.1496
         moles:
-        - 3.4430928
-        - 12.952587
+        - 2.0214376
+        - 7.6044564
         - 0
         - 0
         - 0
@@ -107789,10 +107867,12 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 21184
-          - 6975
-          - 5615
+          - 11194
           - 5616
+          - 5615
+          - 6975
+          - 21184
+          - 12091
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -109752,6 +109832,13 @@ entities:
     - pos: 18.5,59.5
       parent: 30
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 14969
+    components:
+    - pos: 1.5,15.5
+      parent: 30
+      type: Transform
 - proto: PaintingTheGreatWave
   entities:
   - uid: 7745
@@ -110835,6 +110922,18 @@ entities:
     - pos: -26.5,-12.5
       parent: 30
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 15969
+    components:
+    - pos: -21.5,-11.5
+      parent: 30
+      type: Transform
+  - uid: 16242
+    components:
+    - pos: -23.5,-20.5
+      parent: 30
+      type: Transform
 - proto: PosterLegitBuild
   entities:
   - uid: 10142
@@ -110842,6 +110941,13 @@ entities:
     - pos: -18.5,-33.5
       parent: 30
       type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 14968
+    components:
+    - pos: 29.5,-8.5
+      parent: 30
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 1387
@@ -110921,6 +111027,13 @@ entities:
     - pos: -42.5,23.5
       parent: 30
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 15203
+    components:
+    - pos: 6.5,11.5
+      parent: 30
+      type: Transform
 - proto: PosterLegitNanomichiAd
   entities:
   - uid: 1648
diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml
index 77b8b755df..af106fd72c 100644
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -5047,7 +5047,8 @@ entities:
           1,-4:
             0: 65535
           2,-4:
-            0: 65535
+            0: 49151
+            1: 16384
           2,-3:
             0: 65535
           2,-2:
@@ -5272,7 +5273,7 @@ entities:
             0: 65535
           8,-4:
             0: 61713
-            1: 3822
+            2: 3822
           8,-3:
             0: 65535
           8,-2:
@@ -5280,7 +5281,7 @@ entities:
           8,-1:
             0: 65535
           9,-4:
-            1: 7
+            2: 7
             0: 65528
           9,-3:
             0: 65535
@@ -5314,14 +5315,14 @@ entities:
             0: 65535
           8,-5:
             0: 8191
-            1: 57344
+            2: 57344
           9,-7:
             0: 65535
           9,-6:
             0: 65535
           9,-5:
             0: 36863
-            1: 28672
+            2: 28672
           10,-7:
             0: 65535
           10,-6:
@@ -6332,18 +6333,18 @@ entities:
             0: 65535
           12,-8:
             0: 30591
-            2: 34944
+            3: 34944
           13,-8:
             0: 17487
-            2: 13104
-            3: 34944
+            3: 13104
+            4: 34944
           13,-7:
             0: 65535
           13,-6:
             0: 65535
           14,-8:
             0: 52431
-            3: 13104
+            4: 13104
           14,-7:
             0: 65535
           14,-6:
@@ -6364,44 +6365,44 @@ entities:
             0: 65535
           16,-4:
             0: 32631
-            4: 136
-            5: 32768
+            5: 136
+            6: 32768
           16,-3:
             0: 32631
-            5: 32904
+            6: 32904
           16,-2:
             0: 65399
-            5: 136
+            6: 136
           16,-1:
             0: 13299
           17,-4:
-            4: 51
+            5: 51
             0: 53196
-            5: 12288
+            6: 12288
           17,-3:
-            5: 12339
+            6: 12339
             0: 53196
           17,-2:
-            5: 51
+            6: 51
             0: 65484
           16,-7:
             0: 65522
           16,-6:
             0: 32767
-            5: 32768
+            6: 32768
           16,-5:
             0: 32631
-            5: 136
-            4: 32768
+            6: 136
+            5: 32768
           17,-7:
             0: 65527
           17,-6:
             0: 53247
-            5: 12288
+            6: 12288
           17,-5:
-            5: 51
+            6: 51
             0: 53196
-            4: 12288
+            5: 12288
           12,-9:
             0: 61941
           13,-9:
@@ -6522,7 +6523,7 @@ entities:
             0: 4010
           18,-4:
             0: 43690
-            5: 5
+            6: 5
           18,-2:
             0: 43690
           19,-3:
@@ -6531,7 +6532,7 @@ entities:
             0: 7970
           19,-4:
             0: 8738
-            5: 34957
+            6: 34957
           19,-2:
             0: 8930
           16,-8:
@@ -6552,7 +6553,7 @@ entities:
             0: 8754
           19,-5:
             0: 8994
-            5: 34944
+            6: 34944
           12,-10:
             0: 61696
           13,-10:
@@ -7041,7 +7042,7 @@ entities:
             0: 65535
           3,-14:
             0: 61713
-            5: 3822
+            6: 3822
           3,-13:
             0: 65535
           -2,-16:
@@ -7286,7 +7287,7 @@ entities:
             0: 32655
           19,3:
             0: 30583
-            5: 32768
+            6: 32768
           16,4:
             0: 4383
           16,5:
@@ -7339,7 +7340,7 @@ entities:
             0: 61423
           23,3:
             0: 52974
-            5: 12288
+            6: 12288
           20,-3:
             0: 61440
           20,-2:
@@ -7366,7 +7367,7 @@ entities:
             0: 65535
           23,-4:
             0: 52428
-            5: 3
+            6: 3
           24,0:
             0: 61439
           24,1:
@@ -7375,7 +7376,7 @@ entities:
             0: 56797
           24,3:
             0: 13305
-            5: 51200
+            6: 51200
           25,0:
             0: 65535
           25,1:
@@ -7402,7 +7403,7 @@ entities:
             0: 35315
           24,-4:
             0: 47923
-            5: 140
+            6: 140
           24,-3:
             0: 48063
           24,-2:
@@ -7435,7 +7436,7 @@ entities:
             0: 65399
           24,4:
             0: 65523
-            5: 8
+            6: 8
           24,5:
             0: 15
           25,4:
@@ -7488,7 +7489,7 @@ entities:
             0: 61440
           24,-5:
             0: 16383
-            5: 32768
+            6: 32768
           25,-6:
             0: 65008
           25,-5:
@@ -7526,27 +7527,27 @@ entities:
           10,15:
             0: 3
           20,3:
-            5: 62532
+            6: 62532
           21,3:
-            5: 62532
+            6: 62532
           22,3:
-            5: 62532
+            6: 62532
           20,-4:
-            5: 34959
+            6: 34959
           21,-4:
-            5: 34959
+            6: 34959
           22,-4:
-            5: 15
+            6: 15
           20,4:
-            5: 1092
+            6: 1092
           21,4:
-            5: 1092
+            6: 1092
           22,4:
-            5: 1092
+            6: 1092
           20,-5:
-            5: 34944
+            6: 34944
           21,-5:
-            5: 34944
+            6: 34944
         uniqueMixes:
         - volume: 2500
           temperature: 293.15
@@ -7563,6 +7564,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 23.61947
+          - 88.8542
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 235
           moles:
@@ -7646,8 +7662,7 @@ entities:
     - type: Shuttle
     - type: GasTileOverlay
     - type: RadiationGridResistance
-    - nextUpdate: 0
-      type: SpreaderGrid
+    - type: SpreaderGrid
     - type: GridPathfinding
 - proto: AcousticGuitarInstrument
   entities:
@@ -12401,7 +12416,7 @@ entities:
     - pos: -17.5,-71.5
       parent: 5350
       type: Transform
-- proto: AMEController
+- proto: AmeController
   entities:
   - uid: 23971
     components:
@@ -13529,8 +13544,6 @@ entities:
     - pos: -15.644806,-26.365438
       parent: 5350
       type: Transform
-    - nextAttack: 1374.3738653
-      type: MeleeWeapon
   - uid: 16484
     components:
     - pos: -54.463097,-54.219025
@@ -13894,6 +13907,15 @@ entities:
     - pos: 32.50686,14.562178
       parent: 5350
       type: Transform
+  - uid: 26609
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 1932
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: BikeHornInstrument
   entities:
   - uid: 3210
@@ -61071,8 +61093,6 @@ entities:
       pos: -9.5,-33.5
       parent: 5350
       type: Transform
-    - nextAttack: 3609.3286078
-      type: MeleeWeapon
 - proto: ChairFoldingSpawnFolded
   entities:
   - uid: 24159
@@ -61965,29 +61985,21 @@ entities:
     - pos: -15.650829,-22.419653
       parent: 5350
       type: Transform
-    - nextAttack: 2104.5674098
-      type: MeleeWeapon
   - uid: 14385
     components:
     - pos: -15.525829,-22.169653
       parent: 5350
       type: Transform
-    - nextAttack: 2105.0638582
-      type: MeleeWeapon
   - uid: 14857
     components:
     - pos: -15.400829,-22.419653
       parent: 5350
       type: Transform
-    - nextAttack: 2107.2619066
-      type: MeleeWeapon
   - uid: 14858
     components:
     - pos: -15.291454,-22.138403
       parent: 5350
       type: Transform
-    - nextAttack: 2108.9662715
-      type: MeleeWeapon
 - proto: ChemistryHotplate
   entities:
   - uid: 16075
@@ -65492,19 +65504,7 @@ entities:
     - pos: -40.532333,-25.270031
       parent: 5350
       type: Transform
-- proto: ClothingHeadHelmetEVA
-  entities:
-  - uid: 7303
-    components:
-    - pos: -14.579267,45.526848
-      parent: 5350
-      type: Transform
-  - uid: 7739
-    components:
-    - pos: -16.735516,45.511223
-      parent: 5350
-      type: Transform
-- proto: ClothingHeadHelmetHelmetOld
+- proto: ClothingHeadHelmetBasic
   entities:
   - uid: 10424
     components:
@@ -65521,6 +65521,18 @@ entities:
     - pos: -5.3470535,40.47909
       parent: 5350
       type: Transform
+- proto: ClothingHeadHelmetEVA
+  entities:
+  - uid: 7303
+    components:
+    - pos: -14.579267,45.526848
+      parent: 5350
+      type: Transform
+  - uid: 7739
+    components:
+    - pos: -16.735516,45.511223
+      parent: 5350
+      type: Transform
 - proto: ClothingHeadHelmetRiot
   entities:
   - uid: 10377
@@ -65855,6 +65867,40 @@ entities:
     - pos: 37.5058,-31.421124
       parent: 5350
       type: Transform
+- proto: ClothingOuterArmorBasic
+  entities:
+  - uid: 26620
+    components:
+    - pos: -1.6187449,37.43342
+      parent: 5350
+      type: Transform
+  - uid: 26621
+    components:
+    - pos: -1.6187449,37.43342
+      parent: 5350
+      type: Transform
+  - uid: 26622
+    components:
+    - pos: -1.6187449,37.43342
+      parent: 5350
+      type: Transform
+- proto: ClothingOuterArmorBulletproof
+  entities:
+  - uid: 26623
+    components:
+    - pos: -1.4624949,37.40217
+      parent: 5350
+      type: Transform
+  - uid: 26624
+    components:
+    - pos: -1.4624949,37.40217
+      parent: 5350
+      type: Transform
+  - uid: 26625
+    components:
+    - pos: -1.4624949,37.40217
+      parent: 5350
+      type: Transform
 - proto: ClothingOuterArmorRiot
   entities:
   - uid: 10357
@@ -65935,6 +65981,17 @@ entities:
     - pos: -5.527274,-39.534935
       parent: 5350
       type: Transform
+- proto: ClothingOuterHardsuitBasic
+  entities:
+  - uid: 26611
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 1932
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitEVAPrisoner
   entities:
   - uid: 8249
@@ -66751,8 +66808,6 @@ entities:
       pos: -33.5,12.5
       parent: 5350
       type: Transform
-    - nextPrintTime: 21.5667713
-      type: CargoBountyConsole
 - proto: ComputerCargoOrders
   entities:
   - uid: 5126
@@ -68340,6 +68395,17 @@ entities:
     - pos: -27.5,-65.5
       parent: 5350
       type: Transform
+- proto: CrayonRainbow
+  entities:
+  - uid: 26610
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 1932
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: Crematorium
   entities:
   - uid: 21810
@@ -68478,15 +68544,11 @@ entities:
     - pos: -35.546013,-49.426834
       parent: 5350
       type: Transform
-    - nextUpdate: 27.5632284
-      type: PowerCellDraw
   - uid: 18423
     components:
     - pos: -25.546011,-49.44246
       parent: 5350
       type: Transform
-    - nextUpdate: 28.9164612
-      type: PowerCellDraw
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 5343
@@ -68573,8 +68635,6 @@ entities:
     - pos: -8.590656,-27.399559
       parent: 5350
       type: Transform
-    - nextAttack: 3033.0467846
-      type: MeleeWeapon
 - proto: DiceBag
   entities:
   - uid: 2761
@@ -76058,6 +76118,11 @@ entities:
     - pos: 19.5,-27.5
       parent: 5350
       type: Transform
+  - uid: 26615
+    components:
+    - pos: -29.5,-42.5
+      parent: 5350
+      type: Transform
 - proto: ExtinguisherCabinetOpen
   entities:
   - uid: 22178
@@ -122924,8 +122989,6 @@ entities:
     - pos: 42.042435,37.355846
       parent: 5350
       type: Transform
-    - nextAttack: 1342.3605519
-      type: MeleeWeapon
 - proto: hydroponicsTray
   entities:
   - uid: 3073
@@ -123932,8 +123995,6 @@ entities:
     - pos: -15.441681,-26.256063
       parent: 5350
       type: Transform
-    - nextAttack: 1376.471092
-      type: MeleeWeapon
   - uid: 16481
     components:
     - pos: -54.57247,-49.0741
@@ -124970,8 +125031,8 @@ entities:
         immutable: False
         temperature: 293.1495
         moles:
-        - 3.848459
-        - 14.477538
+        - 2.053867
+        - 7.7264524
         - 0
         - 0
         - 0
@@ -124992,9 +125053,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 1942
-          - 2478
           - 1938
+          - 2478
+          - 26609
+          - 1942
+          - 26610
+          - 26611
+          - 26612
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -127303,8 +127368,6 @@ entities:
     - pos: -6.50108,-35.54017
       parent: 5350
       type: Transform
-    - nextAttack: 3595.5228284
-      type: MeleeWeapon
 - proto: NuclearBomb
   entities:
   - uid: 1933
@@ -127490,6 +127553,13 @@ entities:
     - pos: -29.5,-5.5
       parent: 5350
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 26617
+    components:
+    - pos: 38.5,-8.5
+      parent: 5350
+      type: Transform
 - proto: PaintingSkeletonCigarette
   entities:
   - uid: 24693
@@ -128629,6 +128699,18 @@ entities:
     - pos: 44.5,-13.5
       parent: 5350
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 26613
+    components:
+    - pos: -30.5,-38.5
+      parent: 5350
+      type: Transform
+  - uid: 26614
+    components:
+    - pos: -26.5,-43.5
+      parent: 5350
+      type: Transform
 - proto: PosterLegitBuild
   entities:
   - uid: 12294
@@ -128636,6 +128718,13 @@ entities:
     - pos: 44.5,5.5
       parent: 5350
       type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 26619
+    components:
+    - pos: -30.5,13.5
+      parent: 5350
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 9511
@@ -128667,6 +128756,13 @@ entities:
     - pos: 13.5,-38.5
       parent: 5350
       type: Transform
+- proto: PosterLegitHelpOthers
+  entities:
+  - uid: 26616
+    components:
+    - pos: -23.5,-42.5
+      parent: 5350
+      type: Transform
 - proto: PosterLegitIan
   entities:
   - uid: 1389
@@ -128681,6 +128777,13 @@ entities:
     - pos: -13.5,0.5
       parent: 5350
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 26618
+    components:
+    - pos: 39.5,-13.5
+      parent: 5350
+      type: Transform
 - proto: PosterLegitNanomichiAd
   entities:
   - uid: 1388
@@ -140698,7 +140801,7 @@ entities:
     - pos: 9.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -24481.41
+    - SecondsUntilStateChange: -25007.025
       state: Closing
       type: Door
     - inputs:
@@ -140713,7 +140816,7 @@ entities:
     - pos: 10.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -24481.41
+    - SecondsUntilStateChange: -25007.025
       state: Closing
       type: Door
     - inputs:
@@ -140728,7 +140831,7 @@ entities:
     - pos: 11.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -24481.41
+    - SecondsUntilStateChange: -25007.025
       state: Closing
       type: Door
     - inputs:
@@ -140743,7 +140846,7 @@ entities:
     - pos: 13.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -24481.41
+    - SecondsUntilStateChange: -25007.025
       state: Closing
       type: Door
     - inputs:
@@ -140758,7 +140861,7 @@ entities:
     - pos: 14.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -24481.41
+    - SecondsUntilStateChange: -25007.025
       state: Closing
       type: Door
     - inputs:
@@ -140773,7 +140876,7 @@ entities:
     - pos: 15.5,-47.5
       parent: 5350
       type: Transform
-    - SecondsUntilStateChange: -24481.41
+    - SecondsUntilStateChange: -25007.025
       state: Closing
       type: Door
     - inputs:
@@ -143129,15 +143232,11 @@ entities:
       pos: -43.5,27.5
       parent: 5350
       type: Transform
-    - nextChargeTime: 287.513468
-      type: SolutionRegeneration
   - uid: 6157
     components:
     - pos: -22.5,-22.5
       parent: 5350
       type: Transform
-    - nextChargeTime: 2466.2628163
-      type: SolutionRegeneration
   - uid: 12696
     components:
     - rot: -1.5707963267948966 rad
@@ -143265,8 +143364,6 @@ entities:
     - pos: 25.5,-15.5
       parent: 5350
       type: Transform
-    - nextChargeTime: 2452.9494029
-      type: SolutionRegeneration
   - uid: 16796
     components:
     - rot: 1.5707963267948966 rad
@@ -144839,6 +144936,17 @@ entities:
     - pos: -5.417899,-39.628685
       parent: 5350
       type: Transform
+- proto: SpaceCash1000
+  entities:
+  - uid: 26612
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 1932
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: SpaceMedipen
   entities:
   - uid: 16249
@@ -152050,8 +152158,6 @@ entities:
     - pos: -23.5,-22.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 1783.2015653
-      type: VendingMachine
 - proto: VendingMachineChemicals
   entities:
   - uid: 14515
@@ -152061,8 +152167,6 @@ entities:
     - pos: -20.5,-22.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 1138.1384564
-      type: VendingMachine
 - proto: VendingMachineCigs
   entities:
   - uid: 1082
@@ -152330,8 +152434,6 @@ entities:
     - pos: 26.5,0.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 93.5618202
-      type: VendingMachine
 - proto: VendingMachineDetDrobe
   entities:
   - uid: 9978
@@ -152501,8 +152603,6 @@ entities:
     - pos: -5.5,-31.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 3289.9117938
-      type: VendingMachine
 - proto: VendingMachineMediDrobe
   entities:
   - uid: 14497
@@ -152546,8 +152646,6 @@ entities:
     - pos: -39.5,28.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 47.272158
-      type: VendingMachine
 - proto: VendingMachineSciDrobe
   entities:
   - uid: 22580
@@ -152614,8 +152712,6 @@ entities:
     - pos: -19.5,-28.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 836.7551207
-      type: VendingMachine
   - uid: 15157
     components:
     - flags: SessionSpecific
@@ -152817,8 +152913,6 @@ entities:
     - pos: 25.5,19.5
       parent: 5350
       type: Transform
-    - nextEmpEject: 3965.0257929
-      type: VendingMachine
 - proto: VendingMachineYouTool
   entities:
   - uid: 3815
@@ -170817,8 +170911,6 @@ entities:
     - pos: 18.538572,39.67288
       parent: 5350
       type: Transform
-    - nextFire: 647.0521771
-      type: Gun
 - proto: WeaponLaserCarbine
   entities:
   - uid: 24712
@@ -170843,8 +170935,6 @@ entities:
     - pos: 18.527746,39.344753
       parent: 5350
       type: Transform
-    - nextFire: 641.384507
-      type: Gun
 - proto: WeaponRevolverDeckard
   entities:
   - uid: 1942
diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml
index cc266ec790..6f18566858 100644
--- a/Resources/Maps/omega.yml
+++ b/Resources/Maps/omega.yml
@@ -3026,7 +3026,8 @@ entities:
           -3,7:
             0: 65535
           -2,6:
-            0: 65535
+            0: 63487
+            2: 2048
           -2,7:
             0: 65535
           -1,6:
@@ -3473,7 +3474,7 @@ entities:
             0: 65535
           5,-8:
             0: 13119
-            2: 52416
+            3: 52416
           5,-7:
             0: 65535
           5,-6:
@@ -3482,7 +3483,7 @@ entities:
             0: 65535
           6,-8:
             0: 56543
-            2: 8992
+            3: 8992
           6,-7:
             0: 65535
           6,-6:
@@ -3749,9 +3750,9 @@ entities:
             0: 65535
           -12,4:
             0: 3618
-            2: 204
+            3: 204
           -11,4:
-            2: 17
+            3: 17
             0: 35754
           -11,5:
             0: 52424
@@ -3797,28 +3798,28 @@ entities:
             0: 32768
           -14,0:
             0: 16191
-            3: 192
-            4: 49152
+            4: 192
+            5: 49152
           -14,1:
             0: 16191
-            2: 49344
+            3: 49344
           -14,2:
             0: 16191
-            5: 192
-            2: 49152
+            6: 192
+            3: 49152
           -14,3:
             0: 49407
           -13,0:
             0: 61423
-            3: 16
-            4: 4096
+            4: 16
+            5: 4096
           -13,1:
             0: 61423
-            2: 4112
+            3: 4112
           -13,2:
             0: 61423
-            5: 16
-            2: 4096
+            6: 16
+            3: 4096
           -13,3:
             0: 31999
           -15,-4:
@@ -3954,6 +3955,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.554012
+          - 81.084145
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -4021,12 +4037,10 @@ entities:
     - type: OccluderTree
     - type: Shuttle
     - type: RadiationGridResistance
-    - nextShake: 0
-      shakeTimes: 10
+    - shakeTimes: 10
       type: GravityShake
     - type: GasTileOverlay
-    - nextUpdate: 0
-      type: SpreaderGrid
+    - type: SpreaderGrid
     - type: GridPathfinding
 - proto: AcousticGuitarInstrument
   entities:
@@ -6767,14 +6781,14 @@ entities:
     - pos: -18.5,-34.5
       parent: 4812
       type: Transform
-- proto: AMEController
+- proto: AmeController
   entities:
   - uid: 10778
     components:
     - pos: -42.5,-10.5
       parent: 4812
       type: Transform
-- proto: AMEJar
+- proto: AmeJar
   entities:
   - uid: 4233
     components:
@@ -9611,15 +9625,11 @@ entities:
     - pos: -14.534683,-25.485569
       parent: 4812
       type: Transform
-    - nextAttack: 7329.2030995
-      type: MeleeWeapon
   - uid: 7796
     components:
     - pos: -14.284683,-25.329319
       parent: 4812
       type: Transform
-    - nextAttack: 7329.870705
-      type: MeleeWeapon
   - uid: 9030
     components:
     - pos: -40.278786,-34.952698
@@ -9842,6 +9852,15 @@ entities:
     - pos: -10.612676,1.3979684
       parent: 4812
       type: Transform
+  - uid: 9615
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2709
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: BikeHornInstrument
   entities:
   - uid: 1726
@@ -30539,15 +30558,11 @@ entities:
     - pos: -15.593227,-23.348886
       parent: 4812
       type: Transform
-    - nextAttack: 7210.4142935
-      type: MeleeWeapon
   - uid: 7584
     components:
     - pos: -15.530727,-23.473886
       parent: 4812
       type: Transform
-    - nextAttack: 7211.2040117
-      type: MeleeWeapon
 - proto: ChemistryHotplate
   entities:
   - uid: 12473
@@ -33091,6 +33106,40 @@ entities:
     - pos: 7.5457907,-3.3420944
       parent: 4812
       type: Transform
+- proto: ClothingOuterArmorBasic
+  entities:
+  - uid: 9636
+    components:
+    - pos: -33.593445,20.66048
+      parent: 4812
+      type: Transform
+  - uid: 9658
+    components:
+    - pos: -33.593445,20.66048
+      parent: 4812
+      type: Transform
+  - uid: 9971
+    components:
+    - pos: -33.593445,20.66048
+      parent: 4812
+      type: Transform
+- proto: ClothingOuterArmorBulletproof
+  entities:
+  - uid: 9972
+    components:
+    - pos: -35.562195,19.41048
+      parent: 4812
+      type: Transform
+  - uid: 9990
+    components:
+    - pos: -35.562195,19.41048
+      parent: 4812
+      type: Transform
+  - uid: 9992
+    components:
+    - pos: -35.562195,19.41048
+      parent: 4812
+      type: Transform
 - proto: ClothingOuterArmorRiot
   entities:
   - uid: 10958
@@ -33138,6 +33187,17 @@ entities:
     - pos: -17.511423,32.47987
       parent: 4812
       type: Transform
+- proto: ClothingOuterHardsuitBasic
+  entities:
+  - uid: 9625
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2709
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingOuterHardsuitSalvage
   entities:
   - uid: 6765
@@ -33308,6 +33368,17 @@ entities:
     - pos: -36.543808,-24.229988
       parent: 4812
       type: Transform
+- proto: ClothingUniformJumpsuitNanotrasen
+  entities:
+  - uid: 9626
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2709
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: ClothingUniformJumpsuitOperative
   entities:
   - uid: 9060
@@ -33667,8 +33738,6 @@ entities:
       pos: 18.5,17.5
       parent: 4812
       type: Transform
-    - nextPrintTime: 17.516836
-      type: CargoBountyConsole
 - proto: ComputerCargoOrders
   entities:
   - uid: 2752
@@ -34806,6 +34875,17 @@ entities:
     - pos: -28.516111,30.589315
       parent: 4812
       type: Transform
+- proto: CrayonRainbow
+  entities:
+  - uid: 9589
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2709
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: Crematorium
   entities:
   - uid: 7228
@@ -58417,8 +58497,6 @@ entities:
     - pos: -5.5136886,26.677116
       parent: 4812
       type: Transform
-    - nextUpdate: 5025.9893972
-      type: PowerCellDraw
 - proto: HandLabeler
   entities:
   - uid: 1802
@@ -60229,8 +60307,8 @@ entities:
         immutable: False
         temperature: 293.14957
         moles:
-        - 1.6033952
-        - 6.031821
+        - 1.8742619
+        - 7.050795
         - 0
         - 0
         - 0
@@ -60252,8 +60330,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 12504
+          - 9589
           - 12503
+          - 12504
+          - 9613
+          - 9615
+          - 9625
+          - 9626
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -61391,6 +61474,13 @@ entities:
     - pos: 1.5,-7.5
       parent: 4812
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 9634
+    components:
+    - pos: -7.5,2.5
+      parent: 4812
+      type: Transform
 - proto: PaintingSleepingGypsy
   entities:
   - uid: 7742
@@ -62083,6 +62173,25 @@ entities:
     - pos: 36.5,-24.5
       parent: 4812
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 9627
+    components:
+    - pos: -23.5,-21.5
+      parent: 4812
+      type: Transform
+  - uid: 9628
+    components:
+    - pos: -13.5,-29.5
+      parent: 4812
+      type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 9635
+    components:
+    - pos: 21.5,17.5
+      parent: 4812
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 4586
@@ -62121,6 +62230,13 @@ entities:
     - pos: 8.5,30.5
       parent: 4812
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 9629
+    components:
+    - pos: -9.5,2.5
+      parent: 4812
+      type: Transform
 - proto: PosterLegitNanomichiAd
   entities:
   - uid: 4529
@@ -70137,6 +70253,17 @@ entities:
     - pos: 53.5,-36.5
       parent: 4812
       type: Transform
+- proto: SpaceCash1000
+  entities:
+  - uid: 9613
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 2709
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: SpaceVillainArcadeFilled
   entities:
   - uid: 3774
@@ -73825,8 +73952,6 @@ entities:
     - pos: -23.706095,-17.394772
       parent: 4812
       type: Transform
-    - nextAttack: 57.9007159
-      type: MeleeWeapon
 - proto: ToyRubberDuck
   entities:
   - uid: 2496
@@ -74172,8 +74297,6 @@ entities:
     - pos: -10.5,-14.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 23.6779791
-      type: VendingMachine
 - proto: VendingMachineCigs
   entities:
   - uid: 917
@@ -74324,8 +74447,6 @@ entities:
     - pos: 0.5,-3.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 118.2830236
-      type: VendingMachine
 - proto: VendingMachineDetDrobe
   entities:
   - uid: 5361
@@ -74390,8 +74511,6 @@ entities:
     - pos: -14.5,-18.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 1872.0582256
-      type: VendingMachine
 - proto: VendingMachineHappyHonk
   entities:
   - uid: 1565
@@ -74437,8 +74556,6 @@ entities:
     - pos: -8.5,-28.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 5578.5066485
-      type: VendingMachine
 - proto: VendingMachineMediDrobe
   entities:
   - uid: 7399
@@ -74448,8 +74565,6 @@ entities:
     - pos: -8.5,-25.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 5593.5597802
-      type: VendingMachine
 - proto: VendingMachineNutri
   entities:
   - uid: 1092
@@ -74484,8 +74599,6 @@ entities:
     - pos: 4.5,-23.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 73.1995168
-      type: VendingMachine
 - proto: VendingMachineSalvage
   entities:
   - uid: 3434
@@ -74562,8 +74675,6 @@ entities:
     - pos: -18.5,-26.5
       parent: 4812
       type: Transform
-    - nextEmpEject: 1190.5940375
-      type: VendingMachine
   - uid: 9020
     components:
     - flags: SessionSpecific
@@ -84278,8 +84389,6 @@ entities:
     - pos: -14.514914,-25.438694
       parent: 4812
       type: Transform
-    - nextAttack: 7349.4337622
-      type: MeleeWeapon
   - uid: 8589
     components:
     - pos: -18.546284,12.599279
diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml
index 4147b2cc27..a2257467e2 100644
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml
@@ -879,7 +879,8 @@ entities:
           4,8:
             0: 65535
           4,9:
-            0: 65535
+            0: 32767
+            6: 32768
           4,10:
             0: 61439
           4,11:
@@ -1666,6 +1667,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.15
+          moles:
+          - 21.823418
+          - 82.09762
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
       type: GridAtmosphere
     - chunkCollection:
@@ -10165,11 +10181,17 @@ entities:
     - pos: 63.5,29.5
       parent: 2
       type: Transform
+    - links:
+      - 12829
+      type: DeviceLinkSink
   - uid: 5361
     components:
     - pos: 64.5,29.5
       parent: 2
       type: Transform
+    - links:
+      - 12829
+      type: DeviceLinkSink
   - uid: 5875
     components:
     - pos: -0.5,-27.5
@@ -36843,6 +36865,15 @@ entities:
     - pos: 106.45511,-16.386364
       parent: 2
       type: Transform
+  - uid: 12828
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 12094
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: Crematorium
   entities:
   - uid: 9729
@@ -61207,6 +61238,17 @@ entities:
     - pos: 4.5,-6.5
       parent: 2
       type: Transform
+- proto: JetpackBlueFilled
+  entities:
+  - uid: 12827
+    components:
+    - flags: InContainer
+      type: MetaData
+    - parent: 12094
+      type: Transform
+    - canCollide: False
+      type: Physics
+    - type: InsideEntityStorage
 - proto: JetpackMiniFilled
   entities:
   - uid: 10308
@@ -61554,8 +61596,8 @@ entities:
         immutable: False
         temperature: 293.14954
         moles:
-        - 1.8962268
-        - 7.133425
+        - 1.8976884
+        - 7.138923
         - 0
         - 0
         - 0
@@ -61572,11 +61614,13 @@ entities:
           showEnts: False
           occludes: True
           ents:
-          - 7391
-          - 7304
-          - 11863
-          - 12102
           - 11861
+          - 12102
+          - 7304
+          - 7391
+          - 12827
+          - 12828
+          - 11863
         paper_label: !type:ContainerSlot
           showEnts: False
           occludes: True
@@ -62414,6 +62458,13 @@ entities:
     - pos: 35.5,42.5
       parent: 2
       type: Transform
+- proto: PaintingSadClown
+  entities:
+  - uid: 12832
+    components:
+    - pos: 28.5,8.5
+      parent: 2
+      type: Transform
 - proto: PaperBin10
   entities:
   - uid: 1483
@@ -62858,6 +62909,20 @@ entities:
     - pos: 56.5,21.5
       parent: 2
       type: Transform
+- proto: PosterLegitAnatomyPoster
+  entities:
+  - uid: 12830
+    components:
+    - pos: 60.5,5.5
+      parent: 2
+      type: Transform
+- proto: PosterLegitCarpMount
+  entities:
+  - uid: 12833
+    components:
+    - pos: 17.5,25.5
+      parent: 2
+      type: Transform
 - proto: PosterLegitCleanliness
   entities:
   - uid: 11818
@@ -62894,6 +62959,13 @@ entities:
     - pos: 21.5,-3.5
       parent: 2
       type: Transform
+- proto: PosterLegitMime
+  entities:
+  - uid: 12831
+    components:
+    - pos: 24.5,5.5
+      parent: 2
+      type: Transform
 - proto: PosterLegitNanomichiAd
   entities:
   - uid: 12320
@@ -69366,6 +69438,21 @@ entities:
         - 12822
         - 12824
       type: DeviceLinkSource
+  - uid: 12829
+    components:
+    - pos: 63.5,25.5
+      parent: 2
+      type: Transform
+    - linkedPorts:
+        5351:
+        - Pressed: Toggle
+        5361:
+        - Pressed: Toggle
+      registeredSinks:
+        Pressed:
+        - 5351
+        - 5361
+      type: DeviceLinkSource
 - proto: SignAnomaly
   entities:
   - uid: 7376