diff --git a/Resources/Changelog/Parts/atmos.yml b/Resources/Changelog/Parts/atmos.yml
new file mode 100644
index 0000000000..2731756e39
--- /dev/null
+++ b/Resources/Changelog/Parts/atmos.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Add
+    message: Added a few different gas canisters to atmospherics and engineering.
diff --git a/Resources/Changelog/Parts/funny_firelock.yml b/Resources/Changelog/Parts/funny_firelock.yml
new file mode 100644
index 0000000000..cfb0e8d8d6
--- /dev/null
+++ b/Resources/Changelog/Parts/funny_firelock.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix
+    message: Fixes ID Computer in Captain's Headquarters containing a Glass Firelock inside it, somehow... Oh, this directly fixes the bug where a breach in bar would close all firelocks except one, by the way.
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index e3c267ee9a..c342d44050 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -608,18 +608,11 @@ entities:
     parent: 853
     type: Transform
 - uid: 68
-  type: LockerCursed
+  type: VendingMachineCoffee
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -8.5,-25.5
+  - pos: -11.5,-17.5
     parent: 853
     type: Transform
-  - IsPlaceable: False
-    type: PlaceableSurface
-  - containers:
-      EntityStorageComponent: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 69
   type: PowerCellRecharger
   components:
@@ -889,6 +882,10 @@ entities:
   - pos: -7.5,-3.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 106
   type: WeldingFuelTank
   components:
@@ -975,34 +972,27 @@ entities:
     parent: 853
     type: Transform
 - uid: 118
-  type: MagazinePistolSmgTopMounted
+  type: ComputerMedicalRecords
   components:
-  - parent: 119
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      RangedMagazine-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
-- uid: 119
-  type: SmgWt550
-  components:
-  - pos: -7.2994337,21.672077
+  - pos: 0.5,32.5
+    parent: 853
+    type: Transform
+- uid: 119
+  type: ComputerSupplyRequest
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: 8.5,31.5
     parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
   - containers:
-      MagazineBarrel-chamber: !type:ContainerSlot {}
-      MagazineBarrel-magazine: !type:ContainerSlot
-        ent: 118
+      board: !type:Container
+        ents:
+        - 897
     type: ContainerContainer
 - uid: 120
-  type: VendingMachineDinnerware
+  type: VendingMachineSnack
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -13.5,1.5
+  - pos: -8.5,1.5
     parent: 853
     type: Transform
 - uid: 121
@@ -1096,9 +1086,9 @@ entities:
       cellslot_cell_container: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 130
-  type: VendingMachineCoffee
+  type: VendingMachineSnack
   components:
-  - pos: -11.5,-17.5
+  - pos: -22.5,0.5
     parent: 853
     type: Transform
 - uid: 131
@@ -4851,6 +4841,10 @@ entities:
     pos: -16.5,2.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 523
   type: AirlockMaintCommonLocked
   components:
@@ -4858,6 +4852,10 @@ entities:
     pos: -16.5,-3.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 524
   type: AirlockMaintCommonLocked
   components:
@@ -4865,6 +4863,10 @@ entities:
     pos: -14.5,-4.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 525
   type: Table
   components:
@@ -5077,6 +5079,10 @@ entities:
     pos: 0.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 555
   type: AirlockSecurityGlassLocked
   components:
@@ -5086,6 +5092,10 @@ entities:
     pos: -2.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 556
   type: Catwalk
   components:
@@ -5151,6 +5161,10 @@ entities:
     pos: -8.5,18.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 562
   type: AirlockExternalLocked
   components:
@@ -5158,6 +5172,10 @@ entities:
     pos: 14.5,14.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 563
   type: SupplyComputerCircuitboard
   components:
@@ -5193,6 +5211,10 @@ entities:
     pos: 17.5,11.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 567
   type: AirlockCargoGlassLocked
   components:
@@ -5202,6 +5224,10 @@ entities:
     pos: 17.5,10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 568
   type: AirlockCargoGlassLocked
   components:
@@ -5211,6 +5237,10 @@ entities:
     pos: 13.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 569
   type: AirlockMaintCommandLocked
   components:
@@ -5218,6 +5248,10 @@ entities:
     pos: 8.5,12.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 570
   type: AirlockCommandGlassLocked
   components:
@@ -5227,6 +5261,10 @@ entities:
     pos: 9.5,6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 571
   type: AirlockCommandGlassLocked
   components:
@@ -5236,6 +5274,10 @@ entities:
     pos: 7.5,6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 572
   type: AirlockCommandGlassLocked
   components:
@@ -5245,6 +5287,10 @@ entities:
     pos: 4.5,22.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 573
   type: AirlockCommandGlassLocked
   components:
@@ -5254,6 +5300,10 @@ entities:
     pos: 2.5,22.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 574
   type: AirlockVaultLocked
   components:
@@ -5263,6 +5313,10 @@ entities:
     pos: -10.5,20.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 575
   type: AirlockVaultLocked
   components:
@@ -5272,6 +5326,10 @@ entities:
     pos: -12.5,17.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 576
   type: ChairOfficeDark
   components:
@@ -5325,6 +5383,10 @@ entities:
     pos: 27.5,7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 583
   type: solid_wall
   components:
@@ -5339,6 +5401,10 @@ entities:
     pos: -16.5,-7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 585
   type: LockerBoozeFilled
   components:
@@ -5367,6 +5433,10 @@ entities:
     pos: -20.5,-7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 588
   type: TableGlass
   components:
@@ -5383,6 +5453,10 @@ entities:
     pos: -25.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 590
   type: AirlockEngineering
   components:
@@ -5392,6 +5466,10 @@ entities:
     pos: -25.5,10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 591
   type: AirlockScienceLocked
   components:
@@ -5401,6 +5479,10 @@ entities:
     pos: -12.5,-20.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 592
   type: AirlockScienceLocked
   components:
@@ -5410,6 +5492,10 @@ entities:
     pos: -12.5,-19.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 593
   type: AirlockCommandGlassLocked
   components:
@@ -5419,6 +5505,10 @@ entities:
     pos: -3.5,-21.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 594
   type: AirlockCommandGlassLocked
   components:
@@ -5428,6 +5518,10 @@ entities:
     pos: -8.5,-21.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 595
   type: AirlockCommandGlassLocked
   components:
@@ -5437,6 +5531,10 @@ entities:
     pos: 20.5,-13.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 596
   type: AirlockMedicalGlassLocked
   components:
@@ -5446,6 +5544,10 @@ entities:
     pos: 17.5,-3.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 597
   type: AirlockMedicalGlassLocked
   components:
@@ -5455,6 +5557,10 @@ entities:
     pos: 7.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 598
   type: AirlockEngineeringGlassLocked
   components:
@@ -5464,6 +5570,10 @@ entities:
     pos: 30.5,5.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 599
   type: AirlockEngineeringGlassLocked
   components:
@@ -5473,6 +5583,10 @@ entities:
     pos: 30.5,3.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 600
   type: AirlockMaintCommonLocked
   components:
@@ -5480,6 +5594,10 @@ entities:
     pos: -20.5,11.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 601
   type: AirlockMaintCommonLocked
   components:
@@ -5487,6 +5605,10 @@ entities:
     pos: -32.5,2.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 602
   type: AirlockMaintIntLocked
   components:
@@ -5494,6 +5616,10 @@ entities:
     pos: -13.5,-13.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 603
   type: AirlockMaintIntLocked
   components:
@@ -5501,6 +5627,10 @@ entities:
     pos: -12.5,-8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 604
   type: AirlockMaintRnDLocked
   components:
@@ -5508,6 +5638,10 @@ entities:
     pos: -4.5,-11.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 605
   type: AirlockMaintCommonLocked
   components:
@@ -5515,6 +5649,10 @@ entities:
     pos: 5.5,14.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 606
   type: AirlockMaintCommonLocked
   components:
@@ -5522,6 +5660,10 @@ entities:
     pos: -16.5,6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 607
   type: AirlockSecurityGlassLocked
   components:
@@ -5531,6 +5673,10 @@ entities:
     pos: -6.5,6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 608
   type: ApcExtensionCable
   components:
@@ -5548,6 +5694,10 @@ entities:
     pos: 28.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 610
   type: AirlockServiceGlassLocked
   components:
@@ -5557,6 +5707,10 @@ entities:
     pos: -10.5,-1.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 611
   type: solid_wall
   components:
@@ -5573,6 +5727,10 @@ entities:
     pos: 0.5,17.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 613
   type: AirlockMaintCommonLocked
   components:
@@ -5580,6 +5738,10 @@ entities:
     pos: 1.5,-7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 614
   type: AirlockMaintCommonLocked
   components:
@@ -5587,6 +5749,10 @@ entities:
     pos: -23.5,-9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 615
   type: AirlockMaintCommonLocked
   components:
@@ -5594,6 +5760,10 @@ entities:
     pos: -34.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 616
   type: Airlock
   components:
@@ -5606,6 +5776,10 @@ entities:
   - access:
     - - Janitor
     type: AccessReader
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 617
   type: AirlockExternalLocked
   components:
@@ -5613,6 +5787,10 @@ entities:
     pos: 15.5,16.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 618
   type: AirlockMaintCommandLocked
   components:
@@ -5620,6 +5798,10 @@ entities:
     pos: 11.5,20.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 619
   type: Catwalk
   components:
@@ -5636,6 +5818,10 @@ entities:
     pos: 38.5,1.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 621
   type: AirlockMaintCommonLocked
   components:
@@ -5643,6 +5829,10 @@ entities:
     pos: -33.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 622
   type: AirlockScienceGlassLocked
   components:
@@ -5652,6 +5842,10 @@ entities:
     pos: -3.5,-18.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 623
   type: AirlockScienceLocked
   components:
@@ -5661,6 +5855,10 @@ entities:
     pos: 0.5,-20.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 624
   type: AirlockScienceLocked
   components:
@@ -5670,6 +5868,10 @@ entities:
     pos: 0.5,-19.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 625
   type: AirlockMaintRnDLocked
   components:
@@ -5677,6 +5879,10 @@ entities:
     pos: -11.5,-21.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 626
   type: AirlockMaintMedLocked
   components:
@@ -5684,6 +5890,10 @@ entities:
     pos: 20.5,-10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 627
   type: AirlockMaintMedLocked
   components:
@@ -5691,6 +5901,10 @@ entities:
     pos: 14.5,-18.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 628
   type: AirlockMaintCommonLocked
   components:
@@ -5698,6 +5912,10 @@ entities:
     pos: 0.5,20.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 629
   type: AirlockSecurityGlassLocked
   components:
@@ -5707,6 +5925,10 @@ entities:
     pos: -9.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 630
   type: AirlockSecurityGlassLocked
   components:
@@ -5716,6 +5938,10 @@ entities:
     pos: -10.5,15.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 631
   type: AirlockMedicalGlassLocked
   components:
@@ -5725,6 +5951,10 @@ entities:
     pos: 8.5,-12.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 632
   type: AirlockMedicalGlassLocked
   components:
@@ -5734,6 +5964,10 @@ entities:
     pos: 19.5,-18.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 633
   type: AirlockMedicalGlassLocked
   components:
@@ -5743,6 +5977,10 @@ entities:
     pos: 20.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 634
   type: AirlockMedicalGlassLocked
   components:
@@ -5752,6 +5990,10 @@ entities:
     pos: 11.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 635
   type: AirlockMedicalGlassLocked
   components:
@@ -5761,6 +6003,10 @@ entities:
     pos: 10.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 636
   type: AirlockMaintCommandLocked
   components:
@@ -5768,6 +6014,10 @@ entities:
     pos: -1.5,22.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 637
   type: AirlockMaintCommonLocked
   components:
@@ -5775,6 +6025,10 @@ entities:
     pos: 21.5,2.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 638
   type: AirlockMaintCommonLocked
   components:
@@ -5782,6 +6036,10 @@ entities:
     pos: 6.5,-19.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 639
   type: AirlockCommandLocked
   components:
@@ -5791,6 +6049,10 @@ entities:
     pos: 5.5,25.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 640
   type: AirlockCommandGlassLocked
   components:
@@ -5800,6 +6062,10 @@ entities:
     pos: 1.5,25.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 641
   type: AirlockCommandGlassLocked
   components:
@@ -5809,6 +6075,10 @@ entities:
     pos: 1.5,24.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 642
   type: AirlockMaintRnDLocked
   components:
@@ -5816,6 +6086,10 @@ entities:
     pos: -16.5,-16.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 643
   type: AirlockMaintCargoLocked
   components:
@@ -5823,6 +6097,10 @@ entities:
     pos: 25.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 644
   type: AirlockMaintEngiLocked
   components:
@@ -5830,6 +6108,10 @@ entities:
     pos: 43.5,0.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 645
   type: AirlockMaintEngiLocked
   components:
@@ -5837,6 +6119,10 @@ entities:
     pos: 29.5,10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 646
   type: AirlockEngineeringLocked
   components:
@@ -5846,6 +6132,10 @@ entities:
     pos: 40.5,10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 647
   type: AirlockEngineeringLocked
   components:
@@ -5855,6 +6145,10 @@ entities:
     pos: 41.5,10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 648
   type: AirlockEngineeringGlassLocked
   components:
@@ -5864,6 +6158,10 @@ entities:
     pos: 33.5,7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 649
   type: AirlockEngineeringGlassLocked
   components:
@@ -5873,6 +6171,10 @@ entities:
     pos: 33.5,1.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 650
   type: AirlockEngineeringLocked
   components:
@@ -5882,6 +6184,10 @@ entities:
     pos: 49.5,-1.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 651
   type: AirlockSecurityGlassLocked
   components:
@@ -5891,6 +6197,10 @@ entities:
     pos: -6.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 652
   type: AirlockSecurityGlassLocked
   components:
@@ -5900,6 +6210,10 @@ entities:
     pos: -5.5,9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 653
   type: AirlockSecurityGlassLocked
   components:
@@ -5909,6 +6223,10 @@ entities:
     pos: -5.5,6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 654
   type: AirlockExternalLocked
   components:
@@ -5918,6 +6236,10 @@ entities:
     pos: -39.5,-3.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 655
   type: AirlockExternalLocked
   components:
@@ -5927,6 +6249,10 @@ entities:
     pos: -37.5,-3.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 656
   type: AirlockExternalLocked
   components:
@@ -5936,6 +6262,10 @@ entities:
     pos: -41.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 657
   type: LowWall
   components:
@@ -5959,6 +6289,10 @@ entities:
     pos: -39.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 660
   type: AirlockExternalLocked
   components:
@@ -5968,6 +6302,10 @@ entities:
     pos: -39.5,4.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 661
   type: AirlockExternalLocked
   components:
@@ -5977,6 +6315,10 @@ entities:
     pos: -41.5,4.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 662
   type: TableReinforced
   components:
@@ -6031,6 +6373,10 @@ entities:
   - pos: -20.5,-5.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 669
   type: Window
   components:
@@ -7412,6 +7758,10 @@ entities:
   - pos: -8.5,-6.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 822
   type: ToiletDirtyWater
   components:
@@ -11839,47 +12189,54 @@ entities:
     parent: 853
     type: Transform
 - uid: 871
-  type: AutolatheMachineCircuitboard
+  type: ResearchComputerCircuitboard
   components:
-  - parent: 1044
+  - parent: 872
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 872
-  type: MatterBinStockPart
+  type: ComputerResearchAndDevelopment
   components:
-  - parent: 1044
+  - rot: 1.5707963267948966 rad
+    pos: -5.5,-15.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      board: !type:Container
+        ents:
+        - 871
+    type: ContainerContainer
 - uid: 873
-  type: MatterBinStockPart
+  type: BlockGameArcade
   components:
-  - parent: 1044
+  - pos: -6.5,1.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      board: !type:Container
+        ents:
+        - 875
+    type: ContainerContainer
 - uid: 874
-  type: MatterBinStockPart
+  type: VendingMachineCigs
   components:
-  - parent: 1044
+  - pos: -7.5,1.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 875
-  type: MicroManipulatorStockPart
+  type: BlockGameArcadeComputerCircuitboard
   components:
-  - parent: 1044
+  - parent: 873
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 876
-  type: SheetGlass1
+  type: ComputerPowerMonitoring
   components:
-  - parent: 1044
+  - pos: 7.5,32.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 877
   type: reinforced_wall
   components:
@@ -12050,19 +12407,23 @@ entities:
     parent: 853
     type: Transform
 - uid: 897
-  type: VendingMachineSnack
+  type: SupplyRequestComputerCircuitboard
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -8.5,1.5
-    parent: 853
+  - parent: 119
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 898
-  type: VendingMachineCigs
+  type: ComputerComms
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -7.5,1.5
+  - pos: 3.5,32.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents:
+        - 959
+    type: ContainerContainer
 - uid: 899
   type: VendingMachineTheater
   components:
@@ -12485,17 +12846,12 @@ entities:
     parent: 853
     type: Transform
 - uid: 959
-  type: ComputerSupplyRequest
+  type: CommsComputerCircuitboard
   components:
-  - rot: 4.71238902409608 rad
-    pos: 8.5,31.5
-    parent: 853
+  - parent: 898
     type: Transform
-  - containers:
-      board: !type:Container
-        ents:
-        - 4024
-    type: ContainerContainer
+  - canCollide: False
+    type: Physics
 - uid: 960
   type: ChairOfficeDark
   components:
@@ -12506,10 +12862,10 @@ entities:
   - bodyType: Dynamic
     type: Physics
 - uid: 961
-  type: ComputerMedicalRecords
+  type: ComputerPowerMonitoring
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 0.5,32.5
+  - rot: 1.5707963267948966 rad
+    pos: 29.5,-1.5
     parent: 853
     type: Transform
 - uid: 962
@@ -12584,47 +12940,35 @@ entities:
     parent: 853
     type: Transform
 - uid: 971
-  type: ComputerPowerMonitoring
+  type: IDComputerCircuitboard
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 7.5,32.5
-    parent: 853
+  - parent: 1574
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 972
-  type: ComputerAlert
+  type: MatterBinStockPart
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 6.5,32.5
-    parent: 853
+  - parent: 4273
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 973
-  type: ComputerId
+  type: CommsComputerCircuitboard
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 7.5,21.5
-    parent: 853
+  - parent: 3178
     type: Transform
-  - containers:
-      IdCardConsole-privilegedId: !type:ContainerSlot {}
-      IdCardConsole-targetId: !type:ContainerSlot {}
-      board: !type:Container
-        ents:
-        - 3945
-    type: ContainerContainer
+  - canCollide: False
+    type: Physics
 - uid: 974
-  type: ComputerId
+  type: PlushieSlime
   components:
-  - rot: 3.141592697301183 rad
-    pos: 8.5,23.5
+  - rot: 3.141592653589793 rad
+    pos: -9.151907,-25.740355
     parent: 853
     type: Transform
-  - containers:
-      IdCardConsole-privilegedId: !type:ContainerSlot {}
-      IdCardConsole-targetId: !type:ContainerSlot {}
-      board: !type:Container
-        ents:
-        - 3946
-    type: ContainerContainer
+  - canCollide: False
+    type: Physics
 - uid: 975
   type: Table
   components:
@@ -12669,17 +13013,12 @@ entities:
   - bodyType: Dynamic
     type: Physics
 - uid: 980
-  type: ComputerComms
+  type: VendingMachineSovietSoda
   components:
-  - rot: 3.141592697301183 rad
-    pos: 9.5,23.5
+  - rot: 3.141592653589793 rad
+    pos: -11.5,-9.5
     parent: 853
     type: Transform
-  - containers:
-      board: !type:Container
-        ents:
-        - 3992
-    type: ContainerContainer
 - uid: 981
   type: ChairOfficeDark
   components:
@@ -12771,17 +13110,11 @@ entities:
   - location: bar
     type: WarpPoint
 - uid: 992
-  type: ComputerComms
+  type: VendingMachineDinnerware
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 3.5,32.5
+  - pos: -13.5,1.5
     parent: 853
     type: Transform
-  - containers:
-      board: !type:Container
-        ents:
-        - 4032
-    type: ContainerContainer
 - uid: 993
   type: Table
   components:
@@ -12977,6 +13310,10 @@ entities:
   - pos: 2.5,27.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1016
   type: FirelockGlass
   components:
@@ -13180,43 +13517,22 @@ entities:
     parent: 853
     type: Transform
 - uid: 1043
-  type: Protolathe
+  type: BodyScannerComputerCircuitboard
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -3.5,-12.5
-    parent: 853
+  - parent: 1044
     type: Transform
-  - containers:
-      machine_board: !type:Container
-        ents:
-        - 4272
-      machine_parts: !type:Container
-        ents:
-        - 4273
-        - 4274
-        - 4275
-        - 4276
-        - 4277
-        - 4278
-    type: ContainerContainer
+  - canCollide: False
+    type: Physics
 - uid: 1044
-  type: Autolathe
+  type: computerBodyScanner
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -5.5,-12.5
+  - pos: 10.5,-13.5
     parent: 853
     type: Transform
   - containers:
-      machine_board: !type:Container
+      board: !type:Container
         ents:
-        - 871
-      machine_parts: !type:Container
-        ents:
-        - 872
-        - 873
-        - 874
-        - 875
-        - 876
+        - 1043
     type: ContainerContainer
 - uid: 1045
   type: ChairOfficeLight
@@ -13324,17 +13640,11 @@ entities:
       light_bulb: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1058
-  type: ComputerResearchAndDevelopment
+  type: VendingMachineSeeds
   components:
-  - rot: 1.5707963705062866 rad
-    pos: -5.5,-15.5
+  - pos: -18.5,-2.5
     parent: 853
     type: Transform
-  - containers:
-      board: !type:Container
-        ents:
-        - 4009
-    type: ContainerContainer
 - uid: 1059
   type: LowWall
   components:
@@ -13728,8 +14038,8 @@ entities:
 - uid: 1101
   type: ComputerMedicalRecords
   components:
-  - rot: 3.141592697301183 rad
-    pos: 24.5,-15.5
+  - rot: 3.141592653589793 rad
+    pos: 6.5,-5.5
     parent: 853
     type: Transform
 - uid: 1102
@@ -14014,12 +14324,14 @@ entities:
       CloningPod-bodyContainer: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1136
-  type: VendingMachineSeeds
+  type: SheetPlasteel
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -18.5,-2.5
+  - rot: 3.141592653589793 rad
+    pos: 46.608032,4.3461604
     parent: 853
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 1137
   type: reinforced_wall
   components:
@@ -14346,12 +14658,14 @@ entities:
     parent: 853
     type: Transform
 - uid: 1176
-  type: ComputerMedicalRecords
+  type: SheetPlasteel
   components:
-  - rot: 3.141592697301183 rad
-    pos: 6.5,-5.5
+  - rot: 3.141592653589793 rad
+    pos: 46.920532,4.6742854
     parent: 853
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 1177
   type: ChairOfficeLight
   components:
@@ -14771,12 +15085,18 @@ entities:
     parent: 853
     type: Transform
 - uid: 1222
-  type: ComputerPowerMonitoring
+  type: SmgWt550
   components:
-  - rot: 1.5707963705062866 rad
-    pos: 29.5,-1.5
+  - pos: -7.338622,21.61197
     parent: 853
     type: Transform
+  - canCollide: False
+    type: Physics
+  - containers:
+      MagazineBarrel-chamber: !type:ContainerSlot {}
+      MagazineBarrel-magazine: !type:ContainerSlot
+        ent: 3179
+    type: ContainerContainer
 - uid: 1223
   type: LockerToolFilled
   components:
@@ -14928,12 +15248,18 @@ entities:
     parent: 853
     type: Transform
 - uid: 1236
-  type: VendingMachineSnack
+  type: CrateMaterialPlasteel
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -22.5,0.5
+  - rot: 3.141592653589793 rad
+    pos: 40.5,13.5
     parent: 853
     type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1237
   type: RCD
   components:
@@ -15479,6 +15805,10 @@ entities:
     pos: 1.5,-23.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1288
   type: PoweredSmallLight
   components:
@@ -16713,6 +17043,10 @@ entities:
   - pos: 4.5,27.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1397
   type: LowWall
   components:
@@ -17758,10 +18092,10 @@ entities:
       MedicalScanner-bodyContainer: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 1545
-  type: ComputerAlert
+  type: PlasmaCanister
   components:
-  - rot: 1.5707963705062866 rad
-    pos: 29.5,-2.5
+  - rot: 3.141592653589793 rad
+    pos: 41.5,13.48527
     parent: 853
     type: Transform
 - uid: 1546
@@ -17966,30 +18300,24 @@ entities:
     parent: 853
     type: Transform
 - uid: 1573
-  type: CrateGeneric
+  type: ComputerAlert
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 39.5,13.5
+  - rot: 1.5707963267948966 rad
+    pos: 29.5,-2.5
     parent: 853
     type: Transform
-  - IsPlaceable: False
-    type: PlaceableSurface
-  - containers:
-      EntityStorageComponent: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1574
-  type: CrateGeneric
+  type: ComputerId
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 38.5,13.5
+  - pos: 7.5,21.5
     parent: 853
     type: Transform
-  - IsPlaceable: False
-    type: PlaceableSurface
   - containers:
-      EntityStorageComponent: !type:Container
-        ents: []
+      IdCardConsole-privilegedId: !type:ContainerSlot {}
+      IdCardConsole-targetId: !type:ContainerSlot {}
+      board: !type:Container
+        ents:
+        - 971
     type: ContainerContainer
 - uid: 1575
   type: Table
@@ -18110,6 +18438,10 @@ entities:
     pos: 33.5,-5.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1592
   type: Catwalk
   components:
@@ -20098,6 +20430,10 @@ entities:
     pos: 6.5,17.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1870
   type: reinforced_wall
   components:
@@ -20902,6 +21238,10 @@ entities:
     pos: -14.5,11.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 1985
   type: reinforced_wall
   components:
@@ -23094,6 +23434,10 @@ entities:
     pos: -12.5,-2.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 2294
   type: solid_wall
   components:
@@ -23932,17 +24276,12 @@ entities:
       PumpBarrel-chamber-container: !type:ContainerSlot {}
     type: ContainerContainer
 - uid: 2412
-  type: BlockGameArcade
+  type: MatterBinStockPart
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -6.5,1.5
-    parent: 853
+  - parent: 4273
     type: Transform
-  - containers:
-      board: !type:Container
-        ents:
-        - 2414
-    type: ContainerContainer
+  - canCollide: False
+    type: Physics
 - uid: 2413
   type: solid_wall
   components:
@@ -23951,12 +24290,17 @@ entities:
     parent: 853
     type: Transform
 - uid: 2414
-  type: BlockGameArcadeComputerCircuitboard
+  type: LockerGeneric
   components:
-  - parent: 2412
+  - pos: -8.5,-25.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 2415
   type: ApcExtensionCable
   components:
@@ -24042,10 +24386,9 @@ entities:
         ents: []
     type: ContainerContainer
 - uid: 2426
-  type: VendingMachineSovietSoda
+  type: ComputerAlert
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -11.5,-9.5
+  - pos: 6.5,32.5
     parent: 853
     type: Transform
 - uid: 2427
@@ -31827,18 +32170,28 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 3178
-  type: Emitter
+  type: ComputerComms
   components:
-  - pos: 43.5,11.5
+  - rot: 3.141592653589793 rad
+    pos: 9.5,23.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents:
+        - 973
+    type: ContainerContainer
 - uid: 3179
-  type: AMEJar
+  type: MagazinePistolSmgTopMounted
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 38.25703,11.473667
-    parent: 853
+  - parent: 1222
     type: Transform
+  - canCollide: False
+    type: Physics
+  - containers:
+      RangedMagazine-magazine: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3180
   type: ApcExtensionCable
   components:
@@ -38900,18 +39253,30 @@ entities:
   - pos: 23.5,-10.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3881
   type: AirlockMaintSecLocked
   components:
   - pos: -16.5,16.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3882
   type: AirlockMaintCommandLocked
   components:
   - pos: 12.5,22.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3883
   type: EmergencyLight
   components:
@@ -39514,18 +39879,19 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 3945
-  type: ApcExtensionCable
+  type: SheetGlass1
   components:
-  - parent: 973
+  - parent: 4273
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 3946
-  type: FirelockGlass
+  type: MicroManipulatorStockPart
   components:
-  - rot: 4.371139006309477E-08 rad
-    parent: 974
+  - parent: 4273
     type: Transform
-  - airBlocked: False
-    type: Airtight
+  - canCollide: False
+    type: Physics
 - uid: 3947
   type: ApcExtensionCable
   components:
@@ -39949,12 +40315,12 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 3992
-  type: CommsComputerCircuitboard
+  type: Emitter
   components:
-  - parent: 980
+  - rot: 3.141592653589793 rad
+    pos: 43.5,11.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 3993
   type: FirelockGlass
   components:
@@ -40096,12 +40462,25 @@ entities:
   - airBlocked: False
     type: Airtight
 - uid: 4009
-  type: ResearchComputerCircuitboard
+  type: Protolathe
   components:
-  - parent: 1058
+  - rot: 1.5707963267948966 rad
+    pos: -3.5,-12.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      machine_board: !type:Container
+        ents:
+        - 4024
+      machine_parts: !type:Container
+        ents:
+        - 4032
+        - 4082
+        - 4173
+        - 4174
+        - 4181
+        - 4272
+    type: ContainerContainer
 - uid: 4010
   type: Firelock
   components:
@@ -40224,9 +40603,9 @@ entities:
   - airBlocked: False
     type: Airtight
 - uid: 4024
-  type: SupplyRequestComputerCircuitboard
+  type: ProtolatheMachineCircuitboard
   components:
-  - parent: 959
+  - parent: 4009
     type: Transform
   - canCollide: False
     type: Physics
@@ -40289,9 +40668,9 @@ entities:
     parent: 853
     type: Transform
 - uid: 4032
-  type: CommsComputerCircuitboard
+  type: MatterBinStockPart
   components:
-  - parent: 992
+  - parent: 4009
     type: Transform
   - canCollide: False
     type: Physics
@@ -40698,10 +41077,9 @@ entities:
   - startingCharge: 12224.357
     type: Battery
 - uid: 4082
-  type: Skub
+  type: MatterBinStockPart
   components:
-  - pos: -40.49734,4.5469456
-    parent: 853
+  - parent: 4009
     type: Transform
   - canCollide: False
     type: Physics
@@ -40859,6 +41237,10 @@ entities:
     pos: -31.5,-7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4105
   type: Catwalk
   components:
@@ -40889,6 +41271,10 @@ entities:
     pos: -26.5,0.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4109
   type: Airlock
   components:
@@ -40898,6 +41284,10 @@ entities:
     pos: -26.5,-2.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4110
   type: Airlock
   components:
@@ -40907,6 +41297,10 @@ entities:
     pos: -26.5,-5.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4111
   type: SalternApc
   components:
@@ -40956,6 +41350,10 @@ entities:
     pos: -24.5,-12.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4117
   type: TableWood
   components:
@@ -41436,22 +41834,21 @@ entities:
     pos: 16.5,-15.5
     parent: 853
     type: Transform
-- uid: 4173
-  type: computerBodyScanner
-  components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 10.5,-13.5
-    parent: 853
-    type: Transform
   - containers:
       board: !type:Container
-        ents:
-        - 4174
+        ents: []
     type: ContainerContainer
-- uid: 4174
-  type: BodyScannerComputerCircuitboard
+- uid: 4173
+  type: MicroManipulatorStockPart
   components:
-  - parent: 4173
+  - parent: 4009
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 4174
+  type: MicroManipulatorStockPart
+  components:
+  - parent: 4009
     type: Transform
   - canCollide: False
     type: Physics
@@ -41508,12 +41905,12 @@ entities:
     parent: 853
     type: Transform
 - uid: 4181
-  type: AMEJar
+  type: Beaker
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 38.585155,11.629917
-    parent: 853
+  - parent: 4009
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 4182
   type: KitchenReagentGrinder
   components:
@@ -42205,54 +42602,73 @@ entities:
     parent: 853
     type: Transform
 - uid: 4272
-  type: ProtolatheMachineCircuitboard
+  type: Beaker
   components:
-  - parent: 1043
+  - parent: 4009
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 4273
-  type: MatterBinStockPart
+  type: Autolathe
   components:
-  - parent: 1043
+  - rot: 1.5707963267948966 rad
+    pos: -5.5,-12.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      machine_board: !type:Container
+        ents:
+        - 4274
+      machine_parts: !type:Container
+        ents:
+        - 4275
+        - 2412
+        - 972
+        - 3946
+        - 3945
+    type: ContainerContainer
 - uid: 4274
-  type: MatterBinStockPart
+  type: AutolatheMachineCircuitboard
   components:
-  - parent: 1043
+  - parent: 4273
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 4275
-  type: MicroManipulatorStockPart
+  type: MatterBinStockPart
   components:
-  - parent: 1043
+  - parent: 4273
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 4276
-  type: MicroManipulatorStockPart
+  type: ComputerId
   components:
-  - parent: 1043
+  - rot: 3.141592653589793 rad
+    pos: 8.5,23.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
+  - containers:
+      IdCardConsole-privilegedId: !type:ContainerSlot {}
+      IdCardConsole-targetId: !type:ContainerSlot {}
+      board: !type:Container
+        ents:
+        - 4277
+    type: ContainerContainer
 - uid: 4277
-  type: Beaker
+  type: IDComputerCircuitboard
   components:
-  - parent: 1043
+  - parent: 4276
     type: Transform
   - canCollide: False
     type: Physics
 - uid: 4278
-  type: Beaker
+  type: ComputerMedicalRecords
   components:
-  - parent: 1043
+  - rot: 3.141592653589793 rad
+    pos: 24.5,-15.5
+    parent: 853
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4279
   type: TraitorDMRedemptionMachineSpawner
   components:
@@ -42542,6 +42958,10 @@ entities:
     pos: 45.5,8.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4320
   type: AirlockEngineeringLocked
   components:
@@ -42551,6 +42971,10 @@ entities:
     pos: 45.5,7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4321
   type: Poweredlight
   components:
@@ -43226,6 +43650,10 @@ entities:
     pos: 44.5,-14.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4400
   type: AirlockExternalLocked
   components:
@@ -43233,6 +43661,10 @@ entities:
     pos: 54.5,-14.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4401
   type: Emitter
   components:
@@ -43946,6 +44378,10 @@ entities:
     pos: 46.5,-9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4477
   type: AirlockExternalLocked
   components:
@@ -43953,6 +44389,10 @@ entities:
     pos: 52.5,-9.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4478
   type: AirlockEngineeringLocked
   components:
@@ -43962,6 +44402,10 @@ entities:
     pos: 49.5,-7.5
     parent: 853
     type: Transform
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4479
   type: SalternSmes
   components:
@@ -46313,4 +46757,146 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
+- uid: 4755
+  type: AirCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 31.5,14.485172
+    parent: 853
+    type: Transform
+- uid: 4756
+  type: AirCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 32.5,14.485172
+    parent: 853
+    type: Transform
+- uid: 4757
+  type: AirCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 33.5,14.485172
+    parent: 853
+    type: Transform
+- uid: 4758
+  type: AirCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 34.5,14.485172
+    parent: 853
+    type: Transform
+- uid: 4759
+  type: AirCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 35.5,14.485172
+    parent: 853
+    type: Transform
+- uid: 4760
+  type: OxygenCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 30.5,13.485297
+    parent: 853
+    type: Transform
+- uid: 4761
+  type: OxygenCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 30.5,12.47174
+    parent: 853
+    type: Transform
+- uid: 4762
+  type: CrateMaterialGlass
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 39.5,13.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 4763
+  type: NitrogenCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 36.5,13.485297
+    parent: 853
+    type: Transform
+- uid: 4764
+  type: NitrogenCanister
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 36.5,12.47174
+    parent: 853
+    type: Transform
+- uid: 4765
+  type: CrateMaterialSteel
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 38.5,13.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 4766
+  type: AMEJar
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 42.867836,11.333441
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 4767
+  type: AMEJar
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 42.50846,11.364691
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 4768
+  type: CrateEngineeringAMEControl
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 38.5,11.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 4769
+  type: CrateEngineeringAMEShielding
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 39.5,11.5
+    parent: 853
+    type: Transform
+  - IsPlaceable: False
+    type: PlaceableSurface
+  - containers:
+      EntityStorageComponent: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 4770
+  type: SpaceVillainArcadeComputerCircuitboard
+  components:
+  - rot: 3.141592653589793 rad
+    pos: -9.558157,-25.271605
+    parent: 853
+    type: Transform
+  - canCollide: False
+    type: Physics
 ...