Amber Armory Restock (#35045)

diff --git a/Resources/Maps/amber.yml b/Resources/Maps/amber.yml
index bb07d048130411ce3650a2edcc009c4322bf59b4..eb2dba6e11ffdba2346dbeab34bd17773b72914a 100644 (file)
--- a/Resources/Maps/amber.yml
+++ b/Resources/Maps/amber.yml
@@ -129,7 +129,7 @@ entities:
           version: 6
         -2,0:
           ind: -2,0
-          tiles: DgAAAAAAHAAAAAABHAAAAAABHAAAAAABHAAAAAABHAAAAAAAHAAAAAADHAAAAAADHAAAAAACHAAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAADgAAAAAAHAAAAAACDgAAAAAADgAAAAAADgAAAAAAHAAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABDgAAAAAACQAAAAAACQAAAAAADgAAAAAAHAAAAAADHAAAAAABHAAAAAAAHAAAAAABDgAAAAAAHAAAAAADHAAAAAADHAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAACQAAAAAACQAAAAABDgAAAAAAHAAAAAAAHAAAAAABHAAAAAACHAAAAAACHAAAAAABHAAAAAABHAAAAAADHAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAACQAAAAABCQAAAAAADgAAAAAAHAAAAAADHAAAAAADHAAAAAADHAAAAAABDgAAAAAAHAAAAAAAHAAAAAABHAAAAAACDgAAAAAADgAAAAAADgAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABHAAAAAAAHAAAAAAAHAAAAAABHAAAAAACHAAAAAADHAAAAAABHAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABDgAAAAAALgAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAAAHAAAAAACHAAAAAABDgAAAAAAHAAAAAAAHAAAAAABHAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAALAAAAAAALAAAAAAADgAAAAAAHAAAAAACHAAAAAADHAAAAAACHAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAADgAAAAAADgAAAAAAMwAAAAACHAAAAAABHAAAAAAAHAAAAAABHAAAAAABDgAAAAAAIwAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAAMwAAAAADMwAAAAABMwAAAAADHAAAAAADHAAAAAACHAAAAAADHAAAAAABHAAAAAACIwAAAAAAIwAAAAADIwAAAAACDgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAAMwAAAAABMwAAAAADMwAAAAACHAAAAAACHAAAAAADHAAAAAABHAAAAAAADgAAAAAAIwAAAAACIwAAAAABIwAAAAACDgAAAAAADgAAAAAADgAAAAAALwAAAAAADgAAAAAADgAAAAAAMwAAAAADMwAAAAACHAAAAAAAHAAAAAAAHAAAAAADHAAAAAACDgAAAAAAIwAAAAABIwAAAAAAIwAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABHAAAAAACHAAAAAACHAAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAAAQAAAAADDgAAAAAADgAAAAAAGwAAAAAADgAAAAAACQAAAAABCQAAAAADCQAAAAABCQAAAAABCQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAD
+          tiles: HAAAAAAAHAAAAAABHAAAAAABHAAAAAABHAAAAAABHAAAAAAAHAAAAAADHAAAAAADHAAAAAACHAAAAAACHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAADgAAAAAACQAAAAADHAAAAAAADgAAAAAAHAAAAAACDgAAAAAADgAAAAAAHAAAAAAAHAAAAAABHAAAAAAADgAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAADgAAAAAACQAAAAABHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAAAHAAAAAADHAAAAAABHAAAAAAAHAAAAAABHAAAAAAAHAAAAAADHAAAAAADHAAAAAAAHAAAAAAAHAAAAAAADgAAAAAACQAAAAACHAAAAAAAHAAAAAAAHAAAAAAADgAAAAAAHAAAAAAAHAAAAAABHAAAAAACHAAAAAACHAAAAAABHAAAAAABHAAAAAADHAAAAAAAHAAAAAAAHAAAAAAADgAAAAAACQAAAAADHAAAAAAACQAAAAABCQAAAAAADgAAAAAAHAAAAAADHAAAAAADHAAAAAADHAAAAAABHAAAAAAAHAAAAAAAHAAAAAABHAAAAAACDgAAAAAADgAAAAAADgAAAAAACQAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABHAAAAAAAHAAAAAAAHAAAAAABHAAAAAACHAAAAAADHAAAAAABHAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAABHAAAAAAALgAAAAAAHAAAAAAADgAAAAAAHAAAAAADHAAAAAAAHAAAAAACHAAAAAABDgAAAAAAHAAAAAAAHAAAAAABHAAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAALAAAAAAALAAAAAAADgAAAAAAHAAAAAACHAAAAAADHAAAAAACHAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAADgAAAAAADgAAAAAAMwAAAAACHAAAAAABHAAAAAAAHAAAAAABHAAAAAABDgAAAAAAIwAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAACQAAAAACDgAAAAAAMwAAAAADMwAAAAABMwAAAAADHAAAAAADHAAAAAACHAAAAAADHAAAAAABHAAAAAACIwAAAAAAIwAAAAADIwAAAAACDgAAAAAADgAAAAAADgAAAAAACQAAAAADDgAAAAAAMwAAAAABMwAAAAADMwAAAAACHAAAAAACHAAAAAADHAAAAAABHAAAAAAADgAAAAAAIwAAAAACIwAAAAABIwAAAAACDgAAAAAADgAAAAAADgAAAAAALwAAAAAADgAAAAAADgAAAAAAMwAAAAADMwAAAAACHAAAAAAAHAAAAAAAHAAAAAADHAAAAAACDgAAAAAAIwAAAAABIwAAAAAAIwAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAACDgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABHAAAAAACHAAAAAACHAAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAABDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAAAQAAAAADDgAAAAAADgAAAAAAGwAAAAAADgAAAAAACQAAAAABCQAAAAADCQAAAAABCQAAAAABCQAAAAADDgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAAQAAAAAD
           version: 6
         -2,1:
           ind: -2,1
@@ -161,7 +161,7 @@ entities:
           version: 6
         -3,0:
           ind: -3,0
-          tiles: LgAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAADDgAAAAAADgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAALgAAAAAALAAAAAAALAAAAAAALAAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAABHAAAAAADHAAAAAACDgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAABHAAAAAACHAAAAAACDgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAACHAAAAAADHAAAAAACDgAAAAAALAAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAAHAAAAAADHAAAAAADHAAAAAACDgAAAAAALgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAACDgAAAAAALgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAALAAAAAAALAAAAAAADgAAAAAAGwAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAAGwAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAAGwAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALAAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAA
+          tiles: LgAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAAHAAAAAADDgAAAAAADgAAAAAALgAAAAAALgAAAAAALAAAAAAAHAAAAAAAHAAAAAAALgAAAAAALAAAAAAALAAAAAAALAAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAABHAAAAAADHAAAAAACDgAAAAAALgAAAAAALgAAAAAALAAAAAAAHAAAAAAAHAAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAABHAAAAAACHAAAAAACDgAAAAAALAAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAADgAAAAAAHAAAAAADHAAAAAACHAAAAAADHAAAAAACDgAAAAAALAAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAAHAAAAAADHAAAAAADHAAAAAACDgAAAAAALgAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAACDgAAAAAALgAAAAAADgAAAAAADgAAAAAAHAAAAAAAHAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAADgAAAAAADgAAAAAAGwAAAAAAHAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAALAAAAAAALAAAAAAADgAAAAAAGwAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAAGwAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAADgAAAAAAGwAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAAGwAAAAAADgAAAAAADgAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALgAAAAAALgAAAAAALgAAAAAALAAAAAAALAAAAAAALgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAADgAAAAAA
           version: 6
         -3,1:
           ind: -3,1
@@ -496,13 +496,11 @@ entities:
             color: '#DE3A3A96'
             id: Bot
           decals:
-            14552: -23,6
             14553: -23,4
             14554: -21,5
             14555: -21,4
             14556: -21,3
             14557: -21,2
-            14558: -22,2
             14559: -23,2
         - node:
             color: '#FFFFFFFF'
@@ -1917,7 +1915,6 @@ entities:
           decals:
             9349: -30,1
             14560: -23,3
-            14561: -23,5
             14562: -25,5
             14563: -25,3
             14564: -26,8
@@ -1981,6 +1978,11 @@ entities:
             18350: 33,16
             18351: 32,16
             18352: 31,16
+        - node:
+            color: '#DE3A3A96'
+            id: DeliveryGreyscale
+          decals:
+            20090: -23,5
         - node:
             cleanable: True
             zIndex: 1
@@ -3180,7 +3182,6 @@ entities:
             11551: -21,4
             11553: -23,3
             11554: -23,4
-            11555: -23,5
             11559: -24,-2
             11560: -25,-2
             11561: -27,-2
@@ -12256,7 +12257,8 @@ entities:
             0: 34958
             1: 12288
           -8,-2:
-            0: 65034
+            0: 64522
+            7: 512
           -9,-2:
             0: 64904
             1: 3
@@ -12286,14 +12288,16 @@ entities:
           -6,-3:
             0: 53727
           -6,-2:
-            0: 65039
+            0: 64527
+            7: 512
           -6,-1:
-            0: 65422
+            0: 65420
+            7: 2
           -6,-5:
             0: 64511
           -6,0:
             0: 59907
-            7: 1024
+            8: 1024
           -8,-8:
             0: 65535
           -8,-9:
@@ -14480,6 +14484,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -14589,6 +14608,20 @@ entities:
     - type: InstantAction
       originalIconColor: '#FFFFFFFF'
       container: 3686
+  - uid: 23312
+    components:
+    - type: Transform
+      parent: 23311
+    - type: InstantAction
+      originalIconColor: '#FFFFFFFF'
+      container: 23311
+  - uid: 23314
+    components:
+    - type: Transform
+      parent: 23313
+    - type: InstantAction
+      originalIconColor: '#FFFFFFFF'
+      container: 23313
 - proto: ActionToggleLight
   entities:
   - uid: 121
@@ -28309,6 +28342,15 @@ entities:
     - type: Transform
       pos: -28.489655,-38.298656
       parent: 2
+- proto: BoxBeanbag
+  entities:
+  - uid: 16029
+    components:
+    - type: Transform
+      parent: 14645
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: BoxBodyBag
   entities:
   - uid: 448
@@ -28359,7 +28401,7 @@ entities:
   - uid: 3955
     components:
     - type: Transform
-      pos: -27.009739,15.621929
+      pos: -27.031143,15.570824
       parent: 2
 - proto: BoxFolderBlack
   entities:
@@ -28451,7 +28493,7 @@ entities:
   - uid: 92
     components:
     - type: Transform
-      pos: -27.519772,6.606838
+      pos: -26.883673,15.703636
       parent: 2
 - proto: BoxInflatable
   entities:
@@ -28490,6 +28532,15 @@ entities:
     - type: Transform
       pos: -54.49606,-31.291697
       parent: 2
+- proto: BoxLethalshot
+  entities:
+  - uid: 15168
+    components:
+    - type: Transform
+      parent: 14645
+    - type: Physics
+      canCollide: False
+    - type: InsideEntityStorage
 - proto: BoxLightbulb
   entities:
   - uid: 8656
@@ -28963,11 +29014,10 @@ entities:
       parent: 2
 - proto: ButtonFrameJanitor
   entities:
-  - uid: 1247
+  - uid: 407
     components:
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-2.5
+      pos: -18.5,0.5
       parent: 2
   - uid: 16116
     components:
@@ -63239,12 +63289,17 @@ entities:
   - uid: 2599
     components:
     - type: Transform
-      pos: -20.651012,5.6188574
+      pos: -20.614132,6.803402
       parent: 2
   - uid: 14105
     components:
     - type: Transform
-      pos: -20.400887,5.5041943
+      pos: -20.591784,6.61318
+      parent: 2
+  - uid: 23309
+    components:
+    - type: Transform
+      pos: -20.58104,6.4969034
       parent: 2
 - proto: ClothingMaskBreath
   entities:
@@ -63385,24 +63440,36 @@ entities:
     - type: Transform
       pos: 27.65064,-12.475961
       parent: 2
-- proto: ClothingOuterArmorReflective
+- proto: ClothingOuterArmorBulletproof
   entities:
-  - uid: 627
+  - uid: 245
     components:
     - type: Transform
-      pos: -21.27595,6.6553745
+      pos: -21.188942,6.61409
       parent: 2
-  - uid: 8729
+  - uid: 416
+    components:
+    - type: Transform
+      pos: -21.173317,6.52034
+      parent: 2
+  - uid: 23307
+    components:
+    - type: Transform
+      pos: -21.286655,6.6918373
+      parent: 2
+- proto: ClothingOuterArmorReflective
+  entities:
+  - uid: 627
     components:
     - type: Transform
-      pos: -21.263597,6.5225677
+      pos: -20.224054,6.715275
       parent: 2
 - proto: ClothingOuterArmorRiot
   entities:
   - uid: 6250
     components:
     - type: Transform
-      pos: -20.638523,5.589691
+      pos: -20.871235,6.678402
       parent: 2
     - type: GroupExamine
       group:
@@ -63436,7 +63503,12 @@ entities:
   - uid: 6885
     components:
     - type: Transform
-      pos: -20.471773,5.495876
+      pos: -20.888659,6.503805
+      parent: 2
+  - uid: 23308
+    components:
+    - type: Transform
+      pos: -20.888659,6.610859
       parent: 2
 - proto: ClothingOuterCoatLabChem
   entities:
@@ -63478,12 +63550,12 @@ entities:
   - uid: 19589
     components:
     - type: Transform
-      pos: -20.669172,5.685884
+      pos: -22.740864,4.6130686
       parent: 2
   - uid: 19998
     components:
     - type: Transform
-      pos: -20.408627,5.5503736
+      pos: -22.725239,4.683381
       parent: 2
     - type: GroupExamine
       group:
@@ -63512,6 +63584,11 @@ entities:
           priority: 0
           component: Armor
         title: null
+  - uid: 23317
+    components:
+    - type: Transform
+      pos: -22.725239,4.511506
+      parent: 2
 - proto: ClothingOuterWinterBar
   entities:
   - uid: 7386
@@ -64091,12 +64168,6 @@ entities:
       parent: 2
 - proto: computerBodyScanner
   entities:
-  - uid: 453
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -30.5,10.5
-      parent: 2
   - uid: 14114
     components:
     - type: Transform
@@ -64501,6 +64572,12 @@ entities:
       parent: 2
 - proto: ComputerTelevision
   entities:
+  - uid: 1297
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-42.5
+      parent: 2
   - uid: 7593
     components:
     - type: Transform
@@ -65165,8 +65242,11 @@ entities:
   - uid: 4184
     components:
     - type: Transform
+      anchored: True
       pos: -22.5,2.5
       parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: CrateServiceBoozeDispenser
   entities:
   - uid: 2764
@@ -66006,10 +66086,11 @@ entities:
       parent: 2
 - proto: DefibrillatorCabinetFilled
   entities:
-  - uid: 447
+  - uid: 453
     components:
     - type: Transform
-      pos: -30.5,12.5
+      rot: 1.5707963267948966 rad
+      pos: -29.5,9.5
       parent: 2
   - uid: 5482
     components:
@@ -71889,6 +71970,13 @@ entities:
     - type: Transform
       pos: 26.5,-33.5
       parent: 2
+- proto: DresserWardenFilled
+  entities:
+  - uid: 3145
+    components:
+    - type: Transform
+      pos: -22.5,-3.5
+      parent: 2
 - proto: DrinkBeerBottleFull
   entities:
   - uid: 4302
@@ -76057,13 +76145,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 4655
-    components:
-    - type: Transform
-      pos: -17.5,-34.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 9834
     components:
     - type: Transform
@@ -76087,13 +76168,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 13019
-    components:
-    - type: Transform
-      pos: -39.5,-22.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 14062
     components:
     - type: Transform
@@ -76101,13 +76175,6 @@ entities:
       parent: 2
     - type: Fixtures
       fixtures: {}
-  - uid: 14126
-    components:
-    - type: Transform
-      pos: -48.5,-45.5
-      parent: 2
-    - type: Fixtures
-      fixtures: {}
   - uid: 14495
     components:
     - type: Transform
@@ -106967,8 +107034,11 @@ entities:
   - uid: 2207
     components:
     - type: Transform
+      anchored: True
       pos: -21.5,2.5
       parent: 2
+    - type: Physics
+      bodyType: Static
     - type: EntityStorage
       air:
         volume: 200
@@ -107004,22 +107074,43 @@ entities:
   - uid: 19954
     components:
     - type: Transform
+      anchored: True
       pos: -20.5,4.5
       parent: 2
+    - type: Physics
+      bodyType: Static
+- proto: GunSafePistolMk58
+  entities:
+  - uid: 8729
+    components:
+    - type: Transform
+      anchored: True
+      pos: -20.5,5.5
+      parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: GunSafeRifleLecter
   entities:
   - uid: 19580
     components:
     - type: Transform
+      anchored: True
       pos: -20.5,3.5
       parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: GunSafeShotgunKammerer
   entities:
   - uid: 3956
     components:
+    - type: MetaData
+      desc: A standard-issue Nanotrasen storage unit, contains 2 kammerer shotguns.
     - type: Transform
+      anchored: True
       pos: -20.5,2.5
       parent: 2
+    - type: Physics
+      bodyType: Static
 - proto: GyroscopeUnanchored
   entities:
   - uid: 21926
@@ -108058,6 +108149,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,-2.5
       parent: 2
+    - type: DeviceLinkSink
+      invokeCounter: 4
   - uid: 16102
     components:
     - type: Transform
@@ -108099,6 +108192,18 @@ entities:
     - type: Transform
       pos: -1.404727,-55.421238
       parent: 2
+- proto: JetpackSecurityFilled
+  entities:
+  - uid: 23318
+    components:
+    - type: Transform
+      pos: -22.334614,4.6755686
+      parent: 2
+  - uid: 23319
+    components:
+    - type: Transform
+      pos: -22.311176,4.589631
+      parent: 2
 - proto: Jug
   entities:
   - uid: 12111
@@ -109481,6 +109586,11 @@ entities:
     - type: Transform
       pos: -26.5,17.5
       parent: 2
+  - uid: 17715
+    components:
+    - type: Transform
+      pos: -23.5,17.5
+      parent: 2
 - proto: LockerWallMedicalFilled
   entities:
   - uid: 21456
@@ -109489,13 +109599,46 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 17.5,2.5
       parent: 2
-- proto: LockerWardenFilled
+- proto: LockerWardenFilledHardsuit
   entities:
   - uid: 14645
     components:
     - type: Transform
-      pos: -22.5,-3.5
+      anchored: True
+      pos: -22.5,-5.5
       parent: 2
+    - type: Physics
+      bodyType: Static
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+    - type: ContainerContainer
+      containers:
+        entity_storage: !type:Container
+          showEnts: False
+          occludes: True
+          ents:
+          - 15168
+          - 16029
+        paper_label: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: LockerWeldingSuppliesFilled
   entities:
   - uid: 951
@@ -112700,11 +112843,16 @@ entities:
       parent: 2
 - proto: PortableFlasher
   entities:
-  - uid: 17715
+  - uid: 19570
     components:
     - type: Transform
-      pos: -22.5,4.5
+      anchored: False
+      pos: -24.5,4.5
       parent: 2
+    - type: TriggerOnProximity
+      enabled: False
+    - type: Physics
+      bodyType: Dynamic
 - proto: PortableGeneratorJrPacman
   entities:
   - uid: 5702
@@ -113289,12 +113437,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,-15.5
       parent: 2
-  - uid: 2896
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -23.5,0.5
-      parent: 2
   - uid: 4143
     components:
     - type: Transform
@@ -113368,6 +113510,11 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-0.5
       parent: 2
+  - uid: 23306
+    components:
+    - type: Transform
+      pos: -20.5,-2.5
+      parent: 2
 - proto: PowerDrill
   entities:
   - uid: 4425
@@ -116971,6 +117118,11 @@ entities:
     - type: Transform
       pos: 25.5,-58.5
       parent: 2
+  - uid: 14126
+    components:
+    - type: Transform
+      pos: -22.5,4.5
+      parent: 2
   - uid: 14188
     components:
     - type: Transform
@@ -117155,12 +117307,6 @@ entities:
     - type: Transform
       pos: 52.5,-60.5
       parent: 2
-  - uid: 19570
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -20.5,5.5
-      parent: 2
   - uid: 19904
     components:
     - type: Transform
@@ -123426,6 +123572,19 @@ entities:
         actions: !type:Container
           ents:
           - 5100
+  - uid: 23311
+    components:
+    - type: Transform
+      pos: -21.509254,6.5594025
+      parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 23312
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 23312
 - proto: RiotLaserShield
   entities:
   - uid: 632
@@ -123433,6 +123592,11 @@ entities:
     - type: Transform
       pos: -21.73,6.63
       parent: 2
+  - uid: 23310
+    components:
+    - type: Transform
+      pos: -21.509254,6.6375275
+      parent: 2
 - proto: RiotShield
   entities:
   - uid: 3686
@@ -123448,6 +123612,19 @@ entities:
         actions: !type:Container
           ents:
           - 22750
+  - uid: 23313
+    components:
+    - type: Transform
+      pos: -21.478004,6.457841
+      parent: 2
+    - type: Blocking
+      blockingToggleActionEntity: 23314
+    - type: ActionsContainer
+    - type: ContainerContainer
+      containers:
+        actions: !type:Container
+          ents:
+          - 23314
 - proto: RobocopCircuitBoard
   entities:
   - uid: 16469
@@ -123660,7 +123837,7 @@ entities:
       parent: 2
 - proto: SecurityTechFab
   entities:
-  - uid: 19546
+  - uid: 23315
     components:
     - type: Transform
       pos: -22.5,6.5
@@ -123670,7 +123847,7 @@ entities:
   - uid: 505
     components:
     - type: Transform
-      pos: -26.553318,15.678647
+      pos: -26.50823,15.627335
       parent: 2
 - proto: SeedExtractor
   entities:
@@ -124025,11 +124202,6 @@ entities:
     - type: Transform
       pos: 8.238255,18.595078
       parent: 2
-  - uid: 3145
-    components:
-    - type: Transform
-      pos: -20.667923,6.48617
-      parent: 2
   - uid: 4238
     components:
     - type: Transform
@@ -124107,7 +124279,7 @@ entities:
   - uid: 14425
     components:
     - type: Transform
-      pos: -20.355423,6.705071
+      pos: -27.496094,6.6315174
       parent: 2
   - uid: 16603
     components:
@@ -124801,13 +124973,10 @@ entities:
       parent: 2
 - proto: SignalButton
   entities:
-  - uid: 1297
+  - uid: 1247
     components:
-    - type: MetaData
-      name: Janitor Light
     - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -18.5,-2.5
+      pos: -18.5,0.5
       parent: 2
     - type: DeviceLinkSource
       linkedPorts:
@@ -128231,23 +128400,33 @@ entities:
       parent: 2
 - proto: SpawnPointSecurityCadet
   entities:
-  - uid: 416
+  - uid: 4655
     components:
     - type: Transform
-      pos: -27.5,16.5
+      pos: -25.5,12.5
       parent: 2
-  - uid: 417
+  - uid: 23316
     components:
     - type: Transform
-      pos: -26.5,16.5
+      pos: -25.5,11.5
       parent: 2
 - proto: SpawnPointSecurityOfficer
   entities:
+  - uid: 12452
+    components:
+    - type: Transform
+      pos: -26.5,16.5
+      parent: 2
   - uid: 12650
     components:
     - type: Transform
       pos: -23.5,16.5
       parent: 2
+  - uid: 13019
+    components:
+    - type: Transform
+      pos: -27.5,16.5
+      parent: 2
   - uid: 15016
     components:
     - type: Transform
@@ -128258,11 +128437,6 @@ entities:
     - type: Transform
       pos: -25.5,16.5
       parent: 2
-  - uid: 15168
-    components:
-    - type: Transform
-      pos: -22.5,16.5
-      parent: 2
 - proto: SpawnPointServiceWorker
   entities:
   - uid: 22779
@@ -128540,6 +128714,11 @@ entities:
       parent: 2
 - proto: StasisBed
   entities:
+  - uid: 417
+    components:
+    - type: Transform
+      pos: -30.5,10.5
+      parent: 2
   - uid: 6573
     components:
     - type: Transform
@@ -128971,12 +129150,12 @@ entities:
   - uid: 3561
     components:
     - type: Transform
-      pos: -20.47044,6.5382667
+      pos: -27.563713,0.6023197
       parent: 2
   - uid: 5118
     components:
     - type: Transform
-      pos: -20.720564,6.5591145
+      pos: -27.657381,0.62545776
       parent: 2
 - proto: SubstationBasic
   entities:
@@ -129236,6 +129415,24 @@ entities:
     - type: Transform
       pos: -30.5,-5.5
       parent: 2
+    - type: EntityStorage
+      air:
+        volume: 200
+        immutable: False
+        temperature: 293.14673
+        moles:
+        - 1.7459903
+        - 6.568249
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
   - uid: 11806
     components:
     - type: Transform
@@ -129255,13 +129452,6 @@ entities:
     - type: Transform
       pos: 26.5,-35.5
       parent: 2
-- proto: SuitStorageWarden
-  entities:
-  - uid: 16029
-    components:
-    - type: Transform
-      pos: -22.5,-5.5
-      parent: 2
 - proto: SurveillanceCameraCommand
   entities:
   - uid: 2990
@@ -133785,10 +133975,10 @@ entities:
       parent: 2
 - proto: VendingMachineSec
   entities:
-  - uid: 407
+  - uid: 19546
     components:
     - type: Transform
-      pos: -23.5,17.5
+      pos: -22.5,17.5
       parent: 2
 - proto: VendingMachineSecDrobe
   entities:
@@ -133878,6 +134068,13 @@ entities:
     - type: Transform
       pos: -53.5,-31.5
       parent: 2
+- proto: VendingMachineWallMedical
+  entities:
+  - uid: 447
+    components:
+    - type: Transform
+      pos: -30.5,12.5
+      parent: 2
 - proto: VendingMachineYouTool
   entities:
   - uid: 3385
@@ -148332,13 +148529,6 @@ entities:
     - type: Transform
       pos: 32.5,-29.5
       parent: 2
-- proto: WardrobeSecurityFilled
-  entities:
-  - uid: 12452
-    components:
-    - type: Transform
-      pos: -22.5,17.5
-      parent: 2
 - proto: WardrobeYellowFilled
   entities:
   - uid: 2311
@@ -148494,11 +148684,6 @@ entities:
       parent: 2
 - proto: WeaponCapacitorRecharger
   entities:
-  - uid: 245
-    components:
-    - type: Transform
-      pos: -20.5,6.5
-      parent: 2
   - uid: 378
     components:
     - type: Transform
@@ -148509,6 +148694,11 @@ entities:
     - type: Transform
       pos: -27.5,3.5
       parent: 2
+  - uid: 2896
+    components:
+    - type: Transform
+      pos: -23.5,0.5
+      parent: 2
   - uid: 13661
     components:
     - type: Transform
@@ -148536,6 +148726,13 @@ entities:
     - type: Transform
       pos: -24.54724,13.558739
       parent: 2
+- proto: WeaponShotgunEnforcer
+  entities:
+  - uid: 23320
+    components:
+    - type: Transform
+      pos: -22.484701,-3.1598477
+      parent: 2
 - proto: WeaponSubMachineGunWt550
   entities:
   - uid: 14803

diff --git a/Resources/Prototypes/Maps/amber.yml b/Resources/Prototypes/Maps/amber.yml
index 02e277ec629c414bdfb75a194b938c68900c893d..b2d09e911d193a63d660d622aef506f7c3f94552 100644 (file)
--- a/Resources/Prototypes/Maps/amber.yml
+++ b/Resources/Prototypes/Maps/amber.yml
@@ -2,7 +2,7 @@
   id: Amber
   mapName: 'Amber'
   mapPath: /Maps/amber.yml
-  minPlayers: 7
+  minPlayers: 15
   maxPlayers: 60
   stations:
     Amber: