From abdb5b02021c49ba1ef7704f129c2106f95d03b7 Mon Sep 17 00:00:00 2001
From: Emisse <99158783+Emisse@users.noreply.github.com>
Date: Mon, 1 Aug 2022 21:16:02 -0600
Subject: [PATCH] Saltern Small Update (#10235)

---
 Resources/Maps/saltern.yml | 139 ++++++++++++++++++++++++++++++++-----
 1 file changed, 123 insertions(+), 16 deletions(-)

diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index ce9c04eace..58c39ef378 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -369,11 +369,15 @@ entities:
   - pos: -11.462591,18.639452
     parent: 852
     type: Transform
+  - unspawnedCount: 12
+    type: BallisticAmmoProvider
   - canCollide: False
     type: Physics
   - containers:
       storagebase: !type:Container
         ents: []
+      ballistic-ammo: !type:Container
+        ents: []
     type: ContainerContainer
 - uid: 26
   type: WallSolid
@@ -542,11 +546,15 @@ entities:
   - pos: -11.415716,18.436327
     parent: 852
     type: Transform
+  - unspawnedCount: 12
+    type: BallisticAmmoProvider
   - canCollide: False
     type: Physics
   - containers:
       storagebase: !type:Container
         ents: []
+      ballistic-ammo: !type:Container
+        ents: []
     type: ContainerContainer
 - uid: 47
   type: Grille
@@ -1308,6 +1316,8 @@ entities:
 - uid: 149
   type: AirlockCaptainLocked
   components:
+  - name: Captain's Bathroom
+    type: MetaData
   - pos: 12.5,25.5
     parent: 852
     type: Transform
@@ -4564,6 +4574,8 @@ entities:
   - pos: 10.372139,23.658413
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 491
@@ -4959,6 +4971,8 @@ entities:
   - pos: 22.50832,-12.354015
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 547
@@ -5426,6 +5440,8 @@ entities:
 - uid: 609
   type: AirlockJanitorLocked
   components:
+  - name: Janitor Closet
+    type: MetaData
   - pos: -22.5,9.5
     parent: 852
     type: Transform
@@ -5512,12 +5528,16 @@ entities:
 - uid: 622
   type: AirlockScienceGlassLocked
   components:
+  - name: Science
+    type: MetaData
   - pos: 0.5,-20.5
     parent: 852
     type: Transform
 - uid: 623
   type: AirlockScienceGlassLocked
   components:
+  - name: Science
+    type: MetaData
   - pos: 0.5,-19.5
     parent: 852
     type: Transform
@@ -5759,16 +5779,9 @@ entities:
     parent: 852
     type: Transform
 - uid: 658
-  type: DisposalJunction
   components:
-  - rot: 1.5707963267948966 rad
-    pos: -32.5,3.5
-    parent: 852
-    type: Transform
-  - containers:
-      DisposalJunction: !type:Container
-        ents: []
-    type: ContainerContainer
+  - index: 4
+    type: Map
 - uid: 659
   type: WallSolid
   components:
@@ -6260,6 +6273,8 @@ entities:
 - uid: 731
   type: AirlockCaptainLocked
   components:
+  - name: Captain's Bedroom
+    type: MetaData
   - pos: 9.5,25.5
     parent: 852
     type: Transform
@@ -7224,7 +7239,7 @@ entities:
   components:
   - name: Saltern Station
     type: MetaData
-  - parent: null
+  - parent: 658
     type: Transform
   - index: 0
     type: MapGrid
@@ -13561,6 +13576,10 @@ entities:
       - 0
       - 0
       - 0
+      - 0
+      - 0
+      - 0
+      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -13572,6 +13591,10 @@ entities:
       - 0
       - 0
       - 0
+      - 0
+      - 0
+      - 0
+      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -13583,6 +13606,10 @@ entities:
       - 0
       - 0
       - 0
+      - 0
+      - 0
+      - 0
+      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -13594,6 +13621,10 @@ entities:
       - 0
       - 0
       - 0
+      - 0
+      - 0
+      - 0
+      - 0
     - volume: 2500
       temperature: 293.15
       moles:
@@ -13605,6 +13636,10 @@ entities:
       - 0
       - 0
       - 0
+      - 0
+      - 0
+      - 0
+      - 0
     type: GridAtmosphere
   - angularDamping: 0.05
     linearDamping: 0.05
@@ -20843,6 +20878,8 @@ entities:
   - pos: -0.442379,13.650292
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 1419
@@ -21336,6 +21373,8 @@ entities:
 - uid: 1494
   type: AirlockCaptainGlassLocked
   components:
+  - name: Captain's Office
+    type: MetaData
   - pos: 5.5,25.5
     parent: 852
     type: Transform
@@ -23756,6 +23795,8 @@ entities:
 - uid: 1852
   type: AirlockHeadOfPersonnelLocked
   components:
+  - name: 'Head Of Personnel '
+    type: MetaData
   - pos: 6.5,17.5
     parent: 852
     type: Transform
@@ -25871,6 +25912,8 @@ entities:
   - pos: 7.643837,18.677101
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 2156
@@ -26294,11 +26337,15 @@ entities:
   - pos: -10.5,-6.5
     parent: 852
     type: Transform
+  - unspawnedCount: 12
+    type: BallisticAmmoProvider
   - canCollide: False
     type: Physics
   - containers:
       storagebase: !type:Container
         ents: []
+      ballistic-ammo: !type:Container
+        ents: []
     type: ContainerContainer
 - uid: 2220
   type: TableGlass
@@ -26318,11 +26365,15 @@ entities:
   - pos: -10.5,-6.5
     parent: 852
     type: Transform
+  - unspawnedCount: 12
+    type: BallisticAmmoProvider
   - canCollide: False
     type: Physics
   - containers:
       storagebase: !type:Container
         ents: []
+      ballistic-ammo: !type:Container
+        ents: []
     type: ContainerContainer
 - uid: 2223
   type: ReinforcedWindow
@@ -39928,6 +39979,8 @@ entities:
   - pos: -30.54503,-5.3981686
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 4093
@@ -39948,6 +40001,8 @@ entities:
   - pos: -30.466906,-1.5231686
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 4096
@@ -40424,6 +40479,8 @@ entities:
     pos: -21.5,10.5
     parent: 852
     type: Transform
+  - solution: bucket
+    type: Drink
 - uid: 4155
   type: CarpetGreen
   components:
@@ -40596,6 +40653,8 @@ entities:
   - pos: 0.41178536,-5.2814264
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 4179
@@ -46057,6 +46116,8 @@ entities:
   - pos: 37.66952,-0.30827445
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 4926
@@ -54930,6 +54991,8 @@ entities:
   - pos: -7.462167,20.657312
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 6023
@@ -59942,6 +60005,8 @@ entities:
   - pos: -0.4371283,-29.28531
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 6696
@@ -61516,11 +61581,15 @@ entities:
   - fixtures: []
     type: Fixtures
 - uid: 6931
-  type: OxygenCanister
+  type: DisposalYJunction
   components:
-  - pos: 24.5,15.5
+  - pos: -32.5,3.5
     parent: 852
     type: Transform
+  - containers:
+      DisposalJunction: !type:Container
+        ents: []
+    type: ContainerContainer
 - uid: 6932
   type: Rack
   components:
@@ -63026,6 +63095,8 @@ entities:
   - pos: 6.5934343,24.65432
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 7150
@@ -64254,6 +64325,8 @@ entities:
   - pos: 11.433,-31.299496
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 7320
@@ -64675,6 +64748,8 @@ entities:
   - pos: -4.4252543,-22.444613
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 7373
@@ -66203,6 +66278,14 @@ entities:
     pos: 21.5,22.5
     parent: 852
     type: Transform
+- uid: 7568
+  type: VendingMachineSalvage
+  components:
+  - name: Salvage Equipment
+    type: MetaData
+  - pos: 24.5,15.5
+    parent: 852
+    type: Transform
 - uid: 7569
   type: ClothingHeadHatUshanka
   components:
@@ -67707,6 +67790,8 @@ entities:
 - uid: 7786
   type: AirlockSecurityGlassLocked
   components:
+  - name: Perma
+    type: MetaData
   - pos: -14.5,10.5
     parent: 852
     type: Transform
@@ -67991,6 +68076,8 @@ entities:
   - pos: 8.54651,-28.293444
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 7827
@@ -68173,6 +68260,8 @@ entities:
   - pos: 26.628683,-25.257757
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 7853
@@ -71676,7 +71765,7 @@ entities:
 - uid: 8370
   components:
   - pos: -4.0828176,-36.69003
-    parent: null
+    parent: 658
     type: Transform
   - index: 1
     type: MapGrid
@@ -71713,7 +71802,7 @@ entities:
 - uid: 8374
   components:
   - pos: 16.442314,-37.900513
-    parent: null
+    parent: 658
     type: Transform
   - index: 2
     type: MapGrid
@@ -71773,7 +71862,7 @@ entities:
 - uid: 8381
   components:
   - pos: 38.86631,-37.97411
-    parent: null
+    parent: 658
     type: Transform
   - index: 3
     type: MapGrid
@@ -71792,7 +71881,7 @@ entities:
 - uid: 8382
   components:
   - pos: 44.788185,-37.833485
-    parent: null
+    parent: 658
     type: Transform
   - index: 4
     type: MapGrid
@@ -72294,6 +72383,8 @@ entities:
   - pos: -1.4903483,1.69441
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 8448
@@ -72470,6 +72561,8 @@ entities:
   - pos: -24.455732,-23.21139
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 8477
@@ -74026,6 +74119,8 @@ entities:
   - pos: -36.511345,-29.258835
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 8726
@@ -74936,6 +75031,8 @@ entities:
 - uid: 8833
   type: AirlockCommandGlassLocked
   components:
+  - name: Bridge
+    type: MetaData
   - pos: 3.5,22.5
     parent: 852
     type: Transform
@@ -75355,6 +75452,8 @@ entities:
   - pos: 26.48231,1.5389521
     parent: 852
     type: Transform
+  - solution: bucket
+    type: Drink
 - uid: 8882
   type: SurveillanceCameraSecurity
   components:
@@ -75791,6 +75890,8 @@ entities:
   - pos: -18.636322,-4.1902304
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - canCollide: False
     type: Physics
 - uid: 8942
@@ -76922,6 +77023,8 @@ entities:
     pos: -21.5,8.5
     parent: 852
     type: Transform
+  - solution: bucket
+    type: Drink
   - containers:
       storagebase: !type:Container
         ents: []
@@ -76934,6 +77037,8 @@ entities:
   - pos: -21.319218,10.682958
     parent: 852
     type: Transform
+  - solution: bucket
+    type: Drink
 - uid: 9097
   type: WaterCooler
   components:
@@ -77291,6 +77396,8 @@ entities:
   - pos: 14.479344,-6.1264844
     parent: 852
     type: Transform
+  - heldPrefix: off
+    type: Item
   - toggleAction:
       icon: Objects/Tools/flashlight.rsi/flashlight.png
       iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png