From 32554113244f1b1d73a5cff513ee789d114b319b Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sat, 16 Apr 2022 08:16:52 -0600
Subject: [PATCH] Saltern Update 2.9 (#7585)

---
 Resources/Maps/saltern.yml | 802 +++++++++++++++++++++----------------
 1 file changed, 461 insertions(+), 341 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 30389931e6..b3d9c957c2 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -144,95 +144,336 @@ grids:
     tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAMAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxAAAAMQAAADEAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGAAAABgAAAAxAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAwAAAAMAAAAAAAAAAAAAAAAAAAAA==
 entities:
 - uid: 0
-  type: Catwalk
+  type: GasPassiveVent
   components:
-  - pos: -3.5,21.5
+  - rot: 1.5707963267948966 rad
+    pos: 40.5,23.5
     parent: 857
     type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 1
-  type: ReinforcedWindow
+  type: WallReinforced
   components:
-  - pos: 13.5,-4.5
+  - pos: -10.5,-28.5
     parent: 857
     type: Transform
 - uid: 2
-  type: AtmosFixOxygenMarker
+  type: BoxLatex
   components:
-  - pos: 34.5,21.5
+  - pos: 21.584303,-4.310457
     parent: 857
     type: Transform
+  - containers:
+      storagebase: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 3
+  type: RadiationCollector
+  components:
+  - pos: 64.5,-0.5
+    parent: 857
+    type: Transform
+- uid: 4
+  type: VendingMachineCoffee
+  components:
+  - name: Hot drinks machine
+    type: MetaData
+  - pos: -11.5,-17.5
+    parent: 857
+    type: Transform
+  - enabled: False
+    type: AmbientSound
+- uid: 5
+  type: ToolboxElectricalFilled
+  components:
+  - pos: -29.499815,8.100836
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - containers:
+      storagebase: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 6
+  type: FirelockElectronics
+  components:
+  - pos: -29.687315,9.038336
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 7
+  type: MagazineMagnumSmgRubber
+  components:
+  - parent: 131
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - containers:
+      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 8
+  type: MopItem
+  components:
+  - pos: 25.68625,0.6714213
+    parent: 857
+    type: Transform
+- uid: 9
+  type: WarningAir
+  components:
+  - pos: 37.5,20.5
+    parent: 857
+    type: Transform
+- uid: 10
+  type: GasMinerOxygen
+  components:
+  - pos: 34.5,22.5
+    parent: 857
+    type: Transform
+  - fixtures: []
+    type: Fixtures
+- uid: 11
+  type: Chair
+  components:
+  - pos: 6.5,-8.5
+    parent: 857
+    type: Transform
+- uid: 12
   type: CableApcExtension
   components:
-  - pos: 13.5,-9.5
+  - pos: -13.5,10.5
     parent: 857
     type: Transform
   - enabled: False
     type: AmbientSound
   - canCollide: False
     type: Physics
-- uid: 4
-  type: TableReinforced
+- uid: 13
+  type: GasPassiveVent
   components:
-  - pos: -11.5,19.5
+  - rot: 1.5707963267948966 rad
+    pos: 46.5,23.5
     parent: 857
     type: Transform
-- uid: 5
-  type: SpawnMobMcGriff
+  - canCollide: False
+    type: Physics
+- uid: 14
+  type: CarpetBlue
   components:
-  - pos: -1.5,8.5
+  - pos: 11.5,23.5
     parent: 857
     type: Transform
-- uid: 6
-  type: WallReinforced
+- uid: 15
+  type: GasPipeBend
   components:
-  - pos: 39.5,22.5
+  - pos: 41.5,23.5
     parent: 857
     type: Transform
-- uid: 7
-  type: SpawnPointCaptain
-  components:
-  - pos: 11.5,24.5
-    parent: 857
-    type: Transform
-- uid: 8
+  - canCollide: False
+    type: Physics
+- uid: 16
   type: CarpetOrange
   components:
   - rot: -1.5707963267948966 rad
-    pos: -7.5,-1.5
+    pos: -6.5,-2.5
     parent: 857
     type: Transform
-- uid: 9
-  type: Poweredlight
+- uid: 17
+  type: CableHV
   components:
-  - rot: 1.5707963267948966 rad
-    pos: -25.5,6.5
+  - pos: 19.5,-30.5
+    parent: 857
+    type: Transform
+  - enabled: False
+    type: AmbientSound
+  - canCollide: False
+    type: Physics
+- uid: 18
+  type: MagazinePistolSmgTopMounted
+  components:
+  - pos: -14.24543,19.569979
     parent: 857
     type: Transform
-  - powerLoad: 0
-    type: ApcPowerReceiver
   - containers:
-      light_bulb: !type:ContainerSlot {}
+      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
+        ents: []
     type: ContainerContainer
-  - inputs:
-      On: []
-      Off: []
-      Toggle: []
-    type: SignalReceiver
-- uid: 10
-  type: SuspicionPistolSpawner
+- uid: 19
+  type: ShellShotgunBeanbag
+  components:
+  - pos: -11.418642,18.704296
+    parent: 857
+    type: Transform
+- uid: 20
+  type: GasPassiveVent
+  components:
+  - pos: 46.5,21.5
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 21
+  type: SuspicionGrenadesSpawner
   components:
   - rot: 4.371139006309477E-08 rad
-    pos: -10.5,-0.5
+    pos: 0.5,-15.5
     parent: 857
     type: Transform
-- uid: 11
+- uid: 22
+  type: Chair
+  components:
+  - pos: 11.5,1.5
+    parent: 857
+    type: Transform
+- uid: 23
+  type: CableHV
+  components:
+  - pos: 19.5,-29.5
+    parent: 857
+    type: Transform
+  - enabled: False
+    type: AmbientSound
+  - canCollide: False
+    type: Physics
+- uid: 24
+  type: WallReinforced
+  components:
+  - pos: 27.5,14.5
+    parent: 857
+    type: Transform
+- uid: 25
+  type: Grille
+  components:
+  - pos: 18.5,-18.5
+    parent: 857
+    type: Transform
+- uid: 26
+  type: ReinforcedWindow
+  components:
+  - pos: -7.5,-30.5
+    parent: 857
+    type: Transform
+- uid: 27
+  type: ReinforcedWindow
+  components:
+  - pos: -10.5,-29.5
+    parent: 857
+    type: Transform
+- uid: 28
+  type: ShellShotgunBeanbag
+  components:
+  - pos: -11.387392,18.344921
+    parent: 857
+    type: Transform
+- uid: 29
+  type: WallReinforced
+  components:
+  - pos: 20.5,-0.5
+    parent: 857
+    type: Transform
+- uid: 30
+  type: FirelockElectronics
+  components:
+  - pos: -29.42169,8.819586
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 31
   type: ShellShotgunSlug
   components:
-  - pos: -11.153017,18.298046
+  - pos: -11.153017,18.423046
     parent: 857
     type: Transform
-- uid: 12
+- uid: 32
+  type: GasPipeTJunction
+  components:
+  - rot: 3.141592653589793 rad
+    pos: 10.5,25.5
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+  - color: '#0335FCFF'
+    type: AtmosPipeColor
+  - enabled: False
+    type: AmbientSound
+- uid: 33
+  type: GasPassiveVent
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 38.5,23.5
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 34
+  type: CableApcExtension
+  components:
+  - pos: 12.5,-9.5
+    parent: 857
+    type: Transform
+  - enabled: False
+    type: AmbientSound
+  - canCollide: False
+    type: Physics
+- uid: 35
+  type: WallReinforced
+  components:
+  - pos: 35.5,23.5
+    parent: 857
+    type: Transform
+- uid: 36
+  type: MagazineMagnumSmg
+  components:
+  - pos: -13.293642,21.563671
+    parent: 857
+    type: Transform
+  - containers:
+      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 37
+  type: GasPassiveVent
+  components:
+  - rot: 1.5707963267948966 rad
+    pos: 42.5,23.5
+    parent: 857
+    type: Transform
+  - canCollide: False
+    type: Physics
+- uid: 38
+  type: CableMVStack
+  components:
+  - pos: 48.35775,5.619252
+    parent: 857
+    type: Transform
+- uid: 39
+  type: Grille
+  components:
+  - pos: 19.5,20.5
+    parent: 857
+    type: Transform
+- uid: 40
+  type: ShellShotgunBeanbag
+  components:
+  - pos: -11.418642,18.548046
+    parent: 857
+    type: Transform
+- uid: 41
+  type: BoxSterile
+  components:
+  - pos: 21.350922,-4.296852
+    parent: 857
+    type: Transform
+  - containers:
+      storagebase: !type:Container
+        ents: []
+    type: ContainerContainer
+- uid: 42
   type: MedicalScanner
   components:
   - pos: 7.5,-14.5
@@ -249,336 +490,95 @@ entities:
       machine_parts: !type:Container
         ents: []
     type: ContainerContainer
-- uid: 13
-  type: BoxSterile
-  components:
-  - pos: 21.350922,-4.296852
-    parent: 857
-    type: Transform
-  - containers:
-      storagebase: !type:Container
-        ents: []
-    type: ContainerContainer
-- uid: 14
-  type: ShellShotgunBeanbag
-  components:
-  - pos: -11.418642,18.548046
-    parent: 857
-    type: Transform
-- uid: 15
-  type: Grille
-  components:
-  - pos: 19.5,20.5
-    parent: 857
-    type: Transform
-- uid: 16
-  type: CableMVStack
-  components:
-  - pos: 48.35775,5.619252
-    parent: 857
-    type: Transform
-- uid: 17
-  type: GasPassiveVent
-  components:
-  - rot: 1.5707963267948966 rad
-    pos: 42.5,23.5
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 18
-  type: MagazineMagnumSmg
-  components:
-  - pos: -13.293642,21.563671
-    parent: 857
-    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
-- uid: 19
-  type: WallReinforced
-  components:
-  - pos: 35.5,23.5
-    parent: 857
-    type: Transform
-- uid: 20
-  type: CableApcExtension
-  components:
-  - pos: 12.5,-9.5
-    parent: 857
-    type: Transform
-  - enabled: False
-    type: AmbientSound
-  - canCollide: False
-    type: Physics
-- uid: 21
-  type: GasPassiveVent
-  components:
-  - rot: 1.5707963267948966 rad
-    pos: 38.5,23.5
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 22
-  type: GasPipeTJunction
-  components:
-  - rot: 3.141592653589793 rad
-    pos: 10.5,25.5
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - color: '#0335FCFF'
-    type: AtmosPipeColor
-  - enabled: False
-    type: AmbientSound
-- uid: 23
+- uid: 43
   type: ShellShotgunSlug
   components:
-  - pos: -11.153017,18.423046
-    parent: 857
-    type: Transform
-- uid: 24
-  type: FirelockElectronics
-  components:
-  - pos: -29.42169,8.819586
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 25
-  type: WallReinforced
-  components:
-  - pos: 20.5,-0.5
-    parent: 857
-    type: Transform
-- uid: 26
-  type: ShellShotgunBeanbag
-  components:
-  - pos: -11.387392,18.344921
-    parent: 857
-    type: Transform
-- uid: 27
-  type: ReinforcedWindow
-  components:
-  - pos: -10.5,-29.5
-    parent: 857
-    type: Transform
-- uid: 28
-  type: ReinforcedWindow
-  components:
-  - pos: -7.5,-30.5
-    parent: 857
-    type: Transform
-- uid: 29
-  type: Grille
-  components:
-  - pos: 18.5,-18.5
-    parent: 857
-    type: Transform
-- uid: 30
-  type: WallReinforced
-  components:
-  - pos: 27.5,14.5
-    parent: 857
-    type: Transform
-- uid: 31
-  type: CableHV
-  components:
-  - pos: 19.5,-29.5
-    parent: 857
-    type: Transform
-  - enabled: False
-    type: AmbientSound
-  - canCollide: False
-    type: Physics
-- uid: 32
-  type: Chair
-  components:
-  - pos: 11.5,1.5
-    parent: 857
-    type: Transform
-- uid: 33
-  type: SuspicionGrenadesSpawner
-  components:
-  - rot: 4.371139006309477E-08 rad
-    pos: 0.5,-15.5
-    parent: 857
-    type: Transform
-- uid: 34
-  type: GasPassiveVent
-  components:
-  - pos: 46.5,21.5
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 35
-  type: ShellShotgunBeanbag
-  components:
-  - pos: -11.418642,18.704296
-    parent: 857
-    type: Transform
-- uid: 36
-  type: MagazinePistolSmgTopMounted
-  components:
-  - pos: -14.24543,19.569979
-    parent: 857
-    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
-- uid: 37
-  type: CableHV
-  components:
-  - pos: 19.5,-30.5
-    parent: 857
-    type: Transform
-  - enabled: False
-    type: AmbientSound
-  - canCollide: False
-    type: Physics
-- uid: 38
-  type: CarpetOrange
-  components:
-  - rot: -1.5707963267948966 rad
-    pos: -6.5,-2.5
-    parent: 857
-    type: Transform
-- uid: 39
-  type: GasPipeBend
-  components:
-  - pos: 41.5,23.5
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 40
-  type: CarpetBlue
-  components:
-  - pos: 11.5,23.5
-    parent: 857
-    type: Transform
-- uid: 41
-  type: GasPassiveVent
-  components:
-  - rot: 1.5707963267948966 rad
-    pos: 46.5,23.5
-    parent: 857
-    type: Transform
-  - canCollide: False
-    type: Physics
-- uid: 42
-  type: CableApcExtension
-  components:
-  - pos: -13.5,10.5
-    parent: 857
-    type: Transform
-  - enabled: False
-    type: AmbientSound
-  - canCollide: False
-    type: Physics
-- uid: 43
-  type: Chair
-  components:
-  - pos: 6.5,-8.5
+  - pos: -11.153017,18.298046
     parent: 857
     type: Transform
 - uid: 44
-  type: GasMinerOxygen
+  type: SuspicionPistolSpawner
   components:
-  - pos: 34.5,22.5
+  - rot: 4.371139006309477E-08 rad
+    pos: -10.5,-0.5
     parent: 857
     type: Transform
-  - fixtures: []
-    type: Fixtures
 - uid: 45
-  type: WarningAir
+  type: Poweredlight
   components:
-  - pos: 37.5,20.5
+  - rot: 1.5707963267948966 rad
+    pos: -25.5,6.5
     parent: 857
     type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
 - uid: 46
-  type: MopItem
+  type: CarpetOrange
   components:
-  - pos: 25.68625,0.6714213
+  - rot: -1.5707963267948966 rad
+    pos: -7.5,-1.5
     parent: 857
     type: Transform
 - uid: 47
-  type: MagazineMagnumSmgRubber
+  type: SpawnPointCaptain
   components:
-  - parent: 131
+  - pos: 11.5,24.5
+    parent: 857
     type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 48
-  type: FirelockElectronics
+  type: WallReinforced
   components:
-  - pos: -29.687315,9.038336
+  - pos: 39.5,22.5
     parent: 857
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 49
-  type: ToolboxElectricalFilled
+  type: SpawnMobMcGriff
   components:
-  - pos: -29.499815,8.100836
+  - pos: -1.5,8.5
     parent: 857
     type: Transform
-  - canCollide: False
-    type: Physics
-  - containers:
-      storagebase: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 50
-  type: VendingMachineCoffee
+  type: TableReinforced
   components:
-  - name: Hot drinks machine
-    type: MetaData
-  - pos: -11.5,-17.5
+  - pos: -11.5,19.5
+    parent: 857
+    type: Transform
+- uid: 51
+  type: CableApcExtension
+  components:
+  - pos: 13.5,-9.5
     parent: 857
     type: Transform
   - enabled: False
     type: AmbientSound
-- uid: 51
-  type: RadiationCollector
-  components:
-  - pos: 64.5,-0.5
-    parent: 857
-    type: Transform
+  - canCollide: False
+    type: Physics
 - uid: 52
-  type: BoxLatex
+  type: AtmosFixOxygenMarker
   components:
-  - pos: 21.584303,-4.310457
+  - pos: 34.5,21.5
     parent: 857
     type: Transform
-  - containers:
-      storagebase: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 53
-  type: WallReinforced
+  type: ReinforcedWindow
   components:
-  - pos: -10.5,-28.5
+  - pos: 13.5,-4.5
     parent: 857
     type: Transform
 - uid: 54
-  type: GasPassiveVent
+  type: Catwalk
   components:
-  - rot: 1.5707963267948966 rad
-    pos: 40.5,23.5
+  - pos: -3.5,21.5
     parent: 857
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 55
   type: GasPipeBend
   components:
@@ -1171,7 +1171,7 @@ entities:
   - containers:
       Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-chamber: !type:ContainerSlot {}
       Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-magazine: !type:ContainerSlot
-        ent: 47
+        ent: 7
     type: ContainerContainer
 - uid: 132
   type: GasPipeBend
@@ -7531,6 +7531,8 @@ entities:
   - pos: -5.580298,-22.490946
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
 - uid: 733
   type: SpawnPointResearchDirector
   components:
@@ -18658,6 +18660,8 @@ entities:
   - pos: -5.236548,-22.16282
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
 - uid: 1051
   type: SoapNT
   components:
@@ -28630,19 +28634,31 @@ entities:
     parent: 857
     type: Transform
 - uid: 2330
-  type: WallReinforced
+  type: BlastDoor
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -13.5,-27.5
+  - pos: -13.5,-27.5
     parent: 857
     type: Transform
+  - inputs:
+      Open: []
+      Close: []
+      Toggle:
+      - port: Pressed
+        uid: 7285
+    type: SignalReceiver
 - uid: 2331
-  type: WallReinforced
+  type: BlastDoor
   components:
-  - rot: 4.371139006309477E-08 rad
-    pos: -14.5,-27.5
+  - pos: -14.5,-27.5
     parent: 857
     type: Transform
+  - inputs:
+      Open: []
+      Close: []
+      Toggle:
+      - port: Pressed
+        uid: 7285
+    type: SignalReceiver
 - uid: 2332
   type: WallReinforced
   components:
@@ -48298,6 +48314,10 @@ entities:
   - pos: -3.522485,18.33099
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
+  - solution: drink
+    type: DrainableSolution
 - uid: 4171
   type: AirlockMedicalLocked
   components:
@@ -78816,11 +78836,20 @@ entities:
     parent: 857
     type: Transform
 - uid: 7285
-  type: RollerBed
+  type: SignalButton
   components:
-  - pos: 18.44966,-20.370724
+  - pos: -15.5,-23.5
     parent: 857
     type: Transform
+  - fixtures: []
+    type: Fixtures
+  - outputs:
+      Pressed:
+      - port: Toggle
+        uid: 2331
+      - port: Toggle
+        uid: 2330
+    type: SignalTransmitter
 - uid: 7286
   type: ClothingUniformJumpskirtParamedic
   components:
@@ -78864,7 +78893,7 @@ entities:
     parent: 857
     type: Transform
 - uid: 7292
-  type: Bed
+  type: BedsheetMedical
   components:
   - pos: 19.5,-10.5
     parent: 857
@@ -78941,9 +78970,9 @@ entities:
     parent: 857
     type: Transform
 - uid: 7304
-  type: Bed
+  type: MedicalBed
   components:
-  - pos: 19.5,-8.5
+  - pos: 19.5,-10.5
     parent: 857
     type: Transform
 - uid: 7305
@@ -78969,11 +78998,11 @@ entities:
 - uid: 7308
   type: BedsheetMedical
   components:
-  - pos: 19.5,-10.5
+  - pos: 19.5,-8.5
     parent: 857
     type: Transform
 - uid: 7309
-  type: BedsheetMedical
+  type: MedicalBed
   components:
   - pos: 19.5,-8.5
     parent: 857
@@ -79513,6 +79542,10 @@ entities:
   - pos: -17.293661,-9.346272
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
+  - solution: drink
+    type: DrainableSolution
 - uid: 7383
   type: FoodBanana
   components:
@@ -81358,18 +81391,30 @@ entities:
   - pos: -15.680162,-10.396274
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
+  - solution: drink
+    type: DrainableSolution
 - uid: 7603
   type: DrinkVodkaBottleFull
   components:
   - pos: -15.508287,-10.396274
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
+  - solution: drink
+    type: DrainableSolution
 - uid: 7604
   type: DrinkVodkaBottleFull
   components:
   - pos: -15.320787,-10.396274
     parent: 857
     type: Transform
+  - solution: drink
+    type: RefillableSolution
+  - solution: drink
+    type: DrainableSolution
 - uid: 7605
   type: ClothingHeadHatUshanka
   components:
@@ -88060,6 +88105,10 @@ entities:
   - pos: -14.835613,-0.50339985
     parent: 857
     type: Transform
+  - solution: food
+    type: RefillableSolution
+  - solution: food
+    type: DrainableSolution
 - uid: 8481
   type: DisposalPipe
   components:
@@ -93260,4 +93309,75 @@ entities:
   - containers:
       ReagentDispenser-beaker: !type:ContainerSlot {}
     type: ContainerContainer
+- uid: 9127
+  type: PosterMapSaltern
+  components:
+  - pos: -39.5,7.5
+    parent: 857
+    type: Transform
+- uid: 9128
+  type: PosterMapSaltern
+  components:
+  - pos: -29.5,12.5
+    parent: 857
+    type: Transform
+- uid: 9129
+  type: PosterMapSaltern
+  components:
+  - pos: 1.5,22.5
+    parent: 857
+    type: Transform
+- uid: 9130
+  type: PosterMapSaltern
+  components:
+  - pos: 27.5,7.5
+    parent: 857
+    type: Transform
+- uid: 9131
+  type: PosterMapSaltern
+  components:
+  - pos: 6.5,-15.5
+    parent: 857
+    type: Transform
+- uid: 9132
+  type: StasisBed
+  components:
+  - pos: 18.5,-20.5
+    parent: 857
+    type: Transform
+- uid: 9133
+  type: Poweredlight
+  components:
+  - pos: 19.5,-4.5
+    parent: 857
+    type: Transform
+  - powerLoad: 0
+    type: ApcPowerReceiver
+  - containers:
+      light_bulb: !type:ContainerSlot {}
+    type: ContainerContainer
+  - inputs:
+      On: []
+      Off: []
+      Toggle: []
+    type: SignalReceiver
+- uid: 9134
+  type: JanitorialTrolley
+  components:
+  - rot: -1.5707963267948966 rad
+    pos: -21.5,8.5
+    parent: 857
+    type: Transform
+  - containers:
+      storagebase: !type:Container
+        ents: []
+      mop_slot: !type:ContainerSlot {}
+      trashbag_slot: !type:ContainerSlot {}
+    type: ContainerContainer
+- uid: 9135
+  type: MopBucket
+  components:
+  - pos: -21.319218,10.682958
+    parent: 857
+    type: Transform
 ...