From f3084e43c33c6f38acf3ddb131b0a647c2595372 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Sat, 23 Jul 2022 19:38:57 -0600
Subject: [PATCH] Saltern Update 4.1 (#9990)

---
 Resources/Maps/saltern.yml | 159 +++++++++----------------------------
 1 file changed, 39 insertions(+), 120 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 103bf162ee..ce9c04eace 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -1111,15 +1111,11 @@ entities:
     parent: 852
     type: Transform
 - uid: 123
-  type: DrinkTeacup
+  type: RandomDrinkGlass
   components:
-  - pos: -2.553536,-1.3362706
+  - pos: -3.5,-4.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 124
   type: AirlockMedicalGlassLocked
   components:
@@ -4128,15 +4124,15 @@ entities:
     parent: 852
     type: Transform
 - uid: 425
-  type: DrinkFlask
+  type: WallmountTelescreen
   components:
-  - pos: 10.669014,23.580288
+  - pos: -9.5,22.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 426
   type: RandomSpawner
   components:
@@ -18550,15 +18546,11 @@ entities:
     parent: 852
     type: Transform
 - uid: 1158
-  type: DrinkHotCoffee
+  type: RandomFoodSingle
   components:
-  - pos: -3.3885732,8.831585
+  - pos: -2.5,-1.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 1159
   type: CableApcExtension
   components:
@@ -39494,7 +39486,6 @@ entities:
   - containers:
       entity_storage: !type:Container
         ents:
-        - 4203
         - 4213
     type: ContainerContainer
 - uid: 4037
@@ -40339,15 +40330,11 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 4145
-  type: DrinkGoldschlagerBottleFull
+  type: RandomFoodMeal
   components:
-  - pos: -3.522485,18.33099
+  - pos: -10.5,1.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 4146
   type: AirlockMedicalLocked
   components:
@@ -40803,14 +40790,15 @@ entities:
     parent: 852
     type: Transform
 - uid: 4203
-  type: DrinkShinyFlask
+  type: WallmountTelescreen
   components:
-  - parent: 4036
+  - pos: -0.5,9.5
+    parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
+  - containers:
+      board: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 4204
   type: Chair
   components:
@@ -41467,15 +41455,14 @@ entities:
     parent: 852
     type: Transform
 - uid: 4293
-  type: DrinkMugMoebius
+  type: WeaponCapacitorRecharger
   components:
-  - pos: 24.469133,13.720518
+  - pos: -2.5,7.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
+  - containers:
+      charger-slot: !type:ContainerSlot {}
+    type: ContainerContainer
 - uid: 4294
   type: ClothingHeadHelmetRiot
   components:
@@ -43569,8 +43556,6 @@ entities:
   components:
   - parent: 7057
     type: Transform
-  - canCollide: False
-    type: Physics
 - uid: 4586
   type: BedsheetSpawner
   components:
@@ -59945,15 +59930,12 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 6694
-  type: DrinkWineGlass
+  type: AtmosDeviceFanTiny
   components:
-  - pos: 3.7816217,-30.082186
+  - anchored: True
+    pos: -44.5,0.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 6695
   type: Lamp
   components:
@@ -62968,15 +62950,12 @@ entities:
   - canCollide: False
     type: Physics
 - uid: 7138
-  type: DrinkDoctorsDelightGlass
+  type: AtmosDeviceFanTiny
   components:
-  - pos: 22.430195,-13.166515
+  - anchored: True
+    pos: -44.5,2.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 7139
   type: CrateFilledSpawner
   components:
@@ -64478,15 +64457,12 @@ entities:
     parent: 852
     type: Transform
 - uid: 7346
-  type: DrinkBottleOfNothingFull
+  type: AtmosDeviceFanTiny
   components:
-  - pos: -17.293661,-9.346272
+  - anchored: True
+    pos: -44.5,8.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 7347
   type: FoodBanana
   components:
@@ -66214,35 +66190,19 @@ entities:
     parent: 852
     type: Transform
 - uid: 7566
-  type: DrinkVodkaBottleFull
+  type: AtmosDeviceFanTiny
   components:
-  - pos: -15.680162,-10.396274
+  - anchored: True
+    pos: -44.5,10.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 7567
-  type: DrinkVodkaBottleFull
+  type: AtmosDeviceFanTiny
   components:
-  - pos: -15.508287,-10.396274
+  - anchored: True
+    pos: 21.5,22.5
     parent: 852
     type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
-- uid: 7568
-  type: DrinkVodkaBottleFull
-  components:
-  - pos: -15.320787,-10.396274
-    parent: 852
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 7569
   type: ClothingHeadHatUshanka
   components:
@@ -67507,17 +67467,6 @@ entities:
     type: Transform
   - canCollide: False
     type: Physics
-- uid: 7748
-  type: WallWeaponCapacitorRecharger
-  components:
-  - pos: -0.5,9.5
-    parent: 852
-    type: Transform
-  - fixtures: []
-    type: Fixtures
-  - containers:
-      charger-slot: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 7749
   type: ReinforcedWindow
   components:
@@ -68831,26 +68780,6 @@ entities:
   - pos: 20.5,22.5
     parent: 852
     type: Transform
-- uid: 7946
-  type: DrinkWhiskeyBottleFull
-  components:
-  - pos: -23.917706,-23.088701
-    parent: 852
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
-- uid: 7947
-  type: DrinkShotGlass
-  components:
-  - pos: -23.448956,-23.260576
-    parent: 852
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 7948
   type: ClosetMaintenanceFilledRandom
   components:
@@ -70577,16 +70506,6 @@ entities:
   - pos: 43.5,-23.5
     parent: 852
     type: Transform
-- uid: 8203
-  type: DrinkShotGlass
-  components:
-  - pos: -23.261456,-23.119951
-    parent: 852
-    type: Transform
-  - canCollide: False
-    type: Physics
-  - solution: drink
-    type: DrainableSolution
 - uid: 8204
   type: Bucket
   components: