diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml
index 0b7a3e73ac..fcf9c278a8 100644
--- a/Resources/Maps/barratry.yml
+++ b/Resources/Maps/barratry.yml
@@ -172,42 +172,24 @@ grids:
     tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==
 entities:
 - uid: 0
-  type: SpawnPointBartender
-  components:
-  - pos: -11.5,6.5
-    parent: 106
-    type: Transform
-- uid: 1
-  type: WallSolid
-  components:
-  - pos: -1.5,-29.5
-    parent: 106
-    type: Transform
-- uid: 2
-  type: WallSolid
-  components:
-  - pos: 2.5,-31.5
-    parent: 106
-    type: Transform
-- uid: 3
   type: WallSolid
   components:
   - pos: 2.5,-29.5
     parent: 106
     type: Transform
-- uid: 4
+- uid: 1
   type: WallSolid
   components:
   - pos: 2.5,-28.5
     parent: 106
     type: Transform
-- uid: 5
+- uid: 2
   type: WallReinforced
   components:
   - pos: -22.5,31.5
     parent: 106
     type: Transform
-- uid: 6
+- uid: 3
   type: CableMV
   components:
   - pos: -33.5,19.5
@@ -219,7 +201,7 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
-- uid: 7
+- uid: 4
   type: ClosetMaintenanceFilledRandom
   components:
   - pos: -53.5,25.5
@@ -231,19 +213,7 @@ entities:
       EntityStorageComponent: !type:Container
         ents: []
     type: ContainerContainer
-- uid: 8
-  type: CableMV
-  components:
-  - pos: -44.5,22.5
-    parent: 106
-    type: Transform
-  - enabled: False
-    type: AmbientSound
-  - canCollide: False
-    type: Physics
-  - fixtures: []
-    type: Fixtures
-- uid: 9
+- uid: 5
   type: CableMV
   components:
   - pos: -43.5,22.5
@@ -255,13 +225,13 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
-- uid: 10
+- uid: 6
   type: WallReinforced
   components:
   - pos: -46.5,26.5
     parent: 106
     type: Transform
-- uid: 11
+- uid: 7
   type: CableMV
   components:
   - pos: -38.5,19.5
@@ -273,55 +243,55 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
-- uid: 12
+- uid: 8
   type: WallReinforced
   components:
   - pos: -46.5,24.5
     parent: 106
     type: Transform
-- uid: 13
+- uid: 9
   type: WallSolid
   components:
   - pos: -48.5,23.5
     parent: 106
     type: Transform
-- uid: 14
+- uid: 10
   type: WallReinforced
   components:
   - pos: -54.5,24.5
     parent: 106
     type: Transform
-- uid: 15
+- uid: 11
   type: WallReinforced
   components:
   - pos: -60.5,-23.5
     parent: 106
     type: Transform
-- uid: 16
+- uid: 12
   type: WallReinforced
   components:
   - pos: -54.5,26.5
     parent: 106
     type: Transform
-- uid: 17
+- uid: 13
   type: Grille
   components:
   - pos: -52.5,26.5
     parent: 106
     type: Transform
-- uid: 18
+- uid: 14
   type: WallReinforced
   components:
   - pos: -51.5,26.5
     parent: 106
     type: Transform
-- uid: 19
+- uid: 15
   type: Grille
   components:
   - pos: -32.5,35.5
     parent: 106
     type: Transform
-- uid: 20
+- uid: 16
   type: GasPipeStraight
   components:
   - rot: 1.5707963267948966 rad
@@ -334,7 +304,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 21
+- uid: 17
   type: CableHV
   components:
   - pos: -26.5,-3.5
@@ -344,67 +314,61 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
-- uid: 22
+- uid: 18
   type: WallReinforced
   components:
   - pos: -26.5,33.5
     parent: 106
     type: Transform
-- uid: 23
+- uid: 19
   type: WallReinforced
   components:
   - pos: -42.5,35.5
     parent: 106
     type: Transform
-- uid: 24
+- uid: 20
   type: WallReinforced
   components:
   - pos: -41.5,29.5
     parent: 106
     type: Transform
-- uid: 25
+- uid: 21
   type: WallReinforced
   components:
   - pos: -41.5,27.5
     parent: 106
     type: Transform
-- uid: 26
+- uid: 22
   type: ReinforcedWindow
   components:
   - pos: -32.5,29.5
     parent: 106
     type: Transform
-- uid: 27
+- uid: 23
   type: WallReinforced
   components:
   - pos: -41.5,26.5
     parent: 106
     type: Transform
-- uid: 28
+- uid: 24
   type: WallReinforced
   components:
   - pos: -41.5,23.5
     parent: 106
     type: Transform
-- uid: 29
-  type: WallReinforced
-  components:
-  - pos: -43.5,23.5
-    parent: 106
-    type: Transform
-- uid: 30
+- uid: 25
   type: WallReinforced
   components:
   - pos: -42.5,23.5
     parent: 106
     type: Transform
-- uid: 31
+- uid: 26
   type: WallReinforced
   components:
   - pos: -45.5,23.5
     parent: 106
     type: Transform
-- uid: 32
+- uid: 27
   type: GasVentPump
   components:
   - rot: 1.5707963267948966 rad
@@ -415,7 +379,7 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 33
+- uid: 28
   type: GasVentScrubber
   components:
   - pos: -29.5,18.5
@@ -425,13 +389,13 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 34
+- uid: 29
   type: Rack
   components:
   - pos: -44.5,31.5
     parent: 106
     type: Transform
-- uid: 35
+- uid: 30
   type: GasVentPump
   components:
   - rot: 3.141592653589793 rad
@@ -442,7 +406,7 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 36
+- uid: 31
   type: GasVentPump
   components:
   - rot: 3.141592653589793 rad
@@ -453,7 +417,7 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 37
+- uid: 32
   type: CableMV
   components:
   - pos: -32.5,19.5
@@ -465,7 +429,7 @@ entities:
     type: Physics
   - fixtures: []
     type: Fixtures
-- uid: 38
+- uid: 33
   type: CrateSalvageEquipment
   components:
   - pos: -27.5,-29.5
@@ -481,7 +445,7 @@ entities:
         ents: []
       PaperLabel: !type:ContainerSlot {}
     type: ContainerContainer
-- uid: 39
+- uid: 34
   type: GasPipeFourway
   components:
   - pos: -38.5,17.5
@@ -493,7 +457,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 40
+- uid: 35
   type: GasPipeFourway
   components:
   - pos: -32.5,17.5
@@ -505,7 +469,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 41
+- uid: 36
   type: GasVentPump
   components:
   - rot: 3.141592653589793 rad
@@ -516,7 +480,7 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 42
+- uid: 37
   type: GasPipeStraight
   components:
   - rot: 1.5707963267948966 rad
@@ -529,7 +493,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 43
+- uid: 38
   type: GasPipeStraight
   components:
   - rot: 1.5707963267948966 rad
@@ -542,7 +506,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 44
+- uid: 39
   type: GasPipeStraight
   components:
   - rot: 3.141592653589793 rad
@@ -555,7 +519,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 45
+- uid: 40
   type: GasVentScrubber
   components:
   - rot: 1.5707963267948966 rad
@@ -566,7 +530,7 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 46
+- uid: 41
   type: GasPipeFourway
   components:
   - pos: -45.5,19.5
@@ -578,7 +542,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 47
+- uid: 42
   type: GasPipeStraight
   components:
   - rot: 3.141592653589793 rad
@@ -591,7 +555,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 48
+- uid: 43
   type: GasPipeStraight
   components:
   - rot: 3.141592653589793 rad
@@ -602,7 +566,7 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 49
+- uid: 44
   type: GasPipeStraight
   components:
   - rot: 1.5707963267948966 rad
@@ -615,19 +579,19 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 50
+- uid: 45
   type: WallReinforced
   components:
   - pos: -33.5,23.5
     parent: 106
     type: Transform
-- uid: 51
+- uid: 46
   type: WallReinforced
   components:
   - pos: -40.5,23.5
     parent: 106
     type: Transform
-- uid: 52
+- uid: 47
   type: GasPipeStraight
   components:
   - rot: 1.5707963267948966 rad
@@ -640,7 +604,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 53
+- uid: 48
   type: GasPipeBend
   components:
   - rot: 1.5707963267948966 rad
@@ -653,7 +617,7 @@ entities:
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 54
+- uid: 49
   type: GasVentScrubber
   components:
   - rot: -1.5707963267948966 rad
@@ -664,30 +628,66 @@ entities:
     type: AtmosPipeColor
   - canCollide: False
     type: Physics
-- uid: 55
+- uid: 50
   type: WallReinforced
   components:
   - pos: -50.5,26.5
     parent: 106
     type: Transform
-- uid: 56
+- uid: 51
   type: WallReinforced
   components:
   - pos: -42.5,26.5
     parent: 106
     type: Transform
-- uid: 57
+- uid: 52
   type: PosterLegitScience
   components:
   - pos: 12.5,-30.5
     parent: 106
     type: Transform
-- uid: 58
+- uid: 53
   type: WallReinforced
   components:
   - pos: -41.5,28.5
     parent: 106
     type: Transform
+- uid: 54
+  type: WallReinforced
+  components:
+  - pos: -43.5,23.5
+    parent: 106
+    type: Transform
+- uid: 55
+  type: WallSolid
+  components:
+  - pos: 2.5,-31.5
+    parent: 106
+    type: Transform
+- uid: 56
+  type: WallSolid
+  components:
+  - pos: -1.5,-29.5
+    parent: 106
+    type: Transform
+- uid: 57
+  type: SpawnPointBartender
+  components:
+  - pos: -11.5,6.5
+    parent: 106
+    type: Transform
+- uid: 58
+  type: CableMV
+  components:
+  - pos: -44.5,22.5
+    parent: 106
+    type: Transform
+  - enabled: False
+    type: AmbientSound
+  - canCollide: False
+    type: Physics
+  - fixtures: []
+    type: Fixtures
 - uid: 59
   type: CableApcExtension
   components:
@@ -17613,6 +17613,8 @@ entities:
       - 0
       - 0
     type: GridAtmosphere
+  - id: Barratry
+    type: BecomesStation
 - uid: 107
   type: WallReinforced
   components: