boom (#22150)

diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml
index f251fbda9de2aaa35d8e3cf7f7081f4777e9b50d..739c0da7241096218cff4f31d7602028921383eb 100644 (file)
--- a/Resources/Maps/barratry.yml
+++ b/Resources/Maps/barratry.yml
@@ -38,6 +38,7 @@ tilemap:
   105: FloorWhite\r
   108: FloorWhiteHerringbone\r
   109: FloorWhiteMini\r
+  110: FloorWhiteMono\r
   115: FloorWood\r
   117: Lattice\r
   118: Plating\r
@@ -110,7 +111,7 @@ entities:
           version: 6\r
         0,1:\r
           ind: 0,1\r
-          tiles: GwAAAAADGwAAAAABGwAAAAAAGwAAAAADGwAAAAABdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAABaQAAAAACaQAAAAADaQAAAAACdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAGwAAAAADGwAAAAACGwAAAAAAGwAAAAAAGwAAAAACdgAAAAAAaQAAAAADaQAAAAACaQAAAAAAaQAAAAADaQAAAAAAaQAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAAAaQAAAAACaQAAAAAAaQAAAAADaQAAAAABaQAAAAACaQAAAAACaQAAAAABaQAAAAACdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAABaQAAAAACaQAAAAAAdgAAAAAAaQAAAAACaQAAAAADdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAACdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAaQAAAAADdgAAAAAAaQAAAAABaQAAAAABaQAAAAAAdgAAAAAAaQAAAAABaQAAAAAAaQAAAAADaQAAAAABaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAaQAAAAABaQAAAAADaQAAAAACaQAAAAAAaQAAAAAAdgAAAAAAaQAAAAACaQAAAAACaQAAAAACaQAAAAABaQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAaQAAAAADdgAAAAAAaQAAAAABaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAACaQAAAAADaQAAAAAAaQAAAAABaQAAAAADaQAAAAADaQAAAAACaQAAAAABaQAAAAACaQAAAAAAaQAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAABdgAAAAAAaQAAAAABaQAAAAAAaQAAAAACaQAAAAACaQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAdgAAAAAAaQAAAAADaQAAAAAAaQAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAABaQAAAAAAaQAAAAADaQAAAAACaQAAAAACaQAAAAABaQAAAAADaQAAAAADaQAAAAADaQAAAAACaQAAAAABVwAAAAACVwAAAAAAVwAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAACaQAAAAACaQAAAAABaQAAAAABaQAAAAABaQAAAAABaQAAAAABaQAAAAAAaQAAAAAAaQAAAAADdgAAAAAAVwAAAAAAVwAAAAADaQAAAAADaQAAAAABaQAAAAABaQAAAAADaQAAAAAAaQAAAAADdgAAAAAAaQAAAAACaQAAAAABaQAAAAACaQAAAAABaQAAAAADaQAAAAABdgAAAAAAVwAAAAADVwAAAAAAaQAAAAADdgAAAAAAaQAAAAAAaQAAAAABaQAAAAAAaQAAAAACdgAAAAAAaQAAAAADaQAAAAACaQAAAAABaQAAAAADaQAAAAAAaQAAAAADdgAAAAAAVwAAAAAAVwAAAAAD\r
+          tiles: GwAAAAADGwAAAAABGwAAAAAAGwAAAAADGwAAAAABdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAABaQAAAAACaQAAAAADaQAAAAACdgAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAGwAAAAADGwAAAAACGwAAAAAAGwAAAAAAGwAAAAACdgAAAAAAaQAAAAADaQAAAAACaQAAAAAAaQAAAAADaQAAAAAAaQAAAAAAdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAGwAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAACdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAAAaQAAAAACaQAAAAAAaQAAAAADaQAAAAABaQAAAAACaQAAAAACaQAAAAABaQAAAAACdgAAAAAAZQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAABaQAAAAACaQAAAAAAdgAAAAAAaQAAAAACaQAAAAADdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAACdgAAAAAAZQAAAAAAdgAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAaQAAAAADaQAAAAADaQAAAAADdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAADdgAAAAAAaQAAAAABaQAAAAABaQAAAAAAdgAAAAAAaQAAAAABaQAAAAAAaQAAAAADaQAAAAABaQAAAAACaQAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAABaQAAAAADaQAAAAACaQAAAAAAaQAAAAAAdgAAAAAAaQAAAAACaQAAAAACaQAAAAACaQAAAAABaQAAAAAAaQAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAADaQAAAAAAaQAAAAABaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAADaQAAAAABbgAAAAAAbgAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAaQAAAAACaQAAAAADaQAAAAAAaQAAAAABaQAAAAADaQAAAAADaQAAAAACaQAAAAABaQAAAAACaQAAAAAAaQAAAAABbgAAAAAAbgAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAACaQAAAAABdgAAAAAAaQAAAAABaQAAAAAAaQAAAAACaQAAAAACaQAAAAADbgAAAAAAbgAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAdgAAAAAAaQAAAAADaQAAAAAAaQAAAAABdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAAAdgAAAAAAdgAAAAAAdgAAAAAAaQAAAAABaQAAAAAAaQAAAAADaQAAAAACaQAAAAACaQAAAAABaQAAAAADaQAAAAADaQAAAAADaQAAAAACaQAAAAABVwAAAAACVwAAAAAAVwAAAAACaQAAAAAAaQAAAAACaQAAAAABaQAAAAACaQAAAAACaQAAAAABaQAAAAABaQAAAAABaQAAAAABaQAAAAABaQAAAAAAaQAAAAAAaQAAAAADdgAAAAAAVwAAAAAAVwAAAAADaQAAAAADaQAAAAABaQAAAAABaQAAAAADaQAAAAAAaQAAAAADdgAAAAAAaQAAAAACaQAAAAABaQAAAAACaQAAAAABaQAAAAADaQAAAAABdgAAAAAAVwAAAAADVwAAAAAAaQAAAAADdgAAAAAAaQAAAAAAaQAAAAABaQAAAAAAaQAAAAACdgAAAAAAaQAAAAADaQAAAAACaQAAAAABaQAAAAADaQAAAAAAaQAAAAADdgAAAAAAVwAAAAAAVwAAAAAD\r
           version: 6\r
         -1,1:\r
           ind: -1,1\r
@@ -1742,6 +1743,11 @@ entities:
             8011: -73,52\r
             8012: -72,54\r
             8013: -73,55\r
+            8027: 10,23\r
+            8028: 11,22\r
+            8056: 11,26\r
+            8057: 12,25\r
+            8058: 12,24\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: DirtHeavy\r
@@ -5620,6 +5626,9 @@ entities:
             7999: -64,59\r
             8000: -64,58\r
             8001: -66,57\r
+            8032: 10,22\r
+            8033: 11,22\r
+            8034: 11,23\r
         - node:\r
             cleanable: True\r
             angle: 3.141592653589793 rad\r
@@ -5661,6 +5670,16 @@ entities:
             7774: 23,13\r
             7775: 22,12\r
             7997: -63,60\r
+            8038: 10,23\r
+            8039: 12,22\r
+            8054: 12,24\r
+            8055: 8,26\r
+            8059: 12,24\r
+            8060: 11,25\r
+            8061: 11,24\r
+            8062: 12,26\r
+            8063: 11,26\r
+            8064: 12,25\r
         - node:\r
             color: '#FFFFFFFF'\r
             id: DirtLight\r
@@ -6494,8 +6513,6 @@ entities:
             3081: 9,23\r
             3082: 8,24\r
             3083: 8,23\r
-            3084: 10,22\r
-            3085: 10,22\r
             3086: 7,23\r
             3087: 5,23\r
             3088: 9,24\r
@@ -7031,6 +7048,8 @@ entities:
             7280: -43,1\r
             7289: -43,66\r
             7290: -43,66\r
+            8042: 12,23\r
+            8043: 12,22\r
         - node:\r
             cleanable: True\r
             angle: 3.141592653589793 rad\r
@@ -7667,7 +7686,6 @@ entities:
             3228: 6,23\r
             3229: 8,22\r
             3230: 9,22\r
-            3231: 10,22\r
             3232: 9,23\r
             3233: 8,23\r
             3234: 9,24\r
@@ -8197,6 +8215,7 @@ entities:
             7282: -43,1\r
             7283: -43,1\r
             7291: -43,66\r
+            8048: 12,23\r
         - node:\r
             cleanable: True\r
             angle: 3.141592653589793 rad\r
@@ -8399,6 +8418,7 @@ entities:
             2782: 7,26\r
             2783: 8,26\r
             2784: 9,26\r
+            8019: 11,23\r
         - node:\r
             color: '#9FED5896'\r
             id: HalfTileOverlayGreyscale\r
@@ -8467,6 +8487,8 @@ entities:
             2774: 7,22\r
             2775: 8,22\r
             2776: 9,22\r
+            8017: 10,22\r
+            8018: 11,22\r
         - node:\r
             color: '#DE3A3A96'\r
             id: HalfTileOverlayGreyscale180\r
@@ -8589,7 +8611,6 @@ entities:
             2752: 12,29\r
             2753: 10,25\r
             2754: 10,24\r
-            2755: 10,23\r
             2756: 4,33\r
             2757: 4,32\r
             2758: 5,30\r
@@ -9044,6 +9065,7 @@ entities:
             id: QuarterTileOverlayGreyscale90\r
           decals:\r
             2800: 4,31\r
+            8016: 10,23\r
         - node:\r
             color: '#EFB34196'\r
             id: QuarterTileOverlayGreyscale90\r
@@ -9093,10 +9115,10 @@ entities:
             color: '#52B4E996'\r
             id: ThreeQuarterTileOverlayGreyscale180\r
           decals:\r
-            2789: 10,22\r
             2790: 12,28\r
             2791: 4,19\r
             2792: 5,28\r
+            8015: 12,22\r
         - node:\r
             color: '#DE3A3A96'\r
             id: ThreeQuarterTileOverlayGreyscale180\r
@@ -9143,6 +9165,7 @@ entities:
             2794: 12,31\r
             2795: 4,34\r
             2796: 10,26\r
+            8014: 12,23\r
         - node:\r
             color: '#9FED5896'\r
             id: ThreeQuarterTileOverlayGreyscale90\r
@@ -11549,6 +11572,9 @@ entities:
       pos: 1.5,32.5\r
       parent: 1\r
       type: Transform\r
+    - ShutdownSubscribers:\r
+      - 8324\r
+      type: DeviceNetwork\r
     - devices:\r
       - 2055\r
       - 2868\r
@@ -11579,6 +11605,7 @@ entities:
       - 3021\r
       - 15082\r
       - 15083\r
+      - 8324\r
       type: DeviceList\r
   - uid: 13304\r
     components:\r
@@ -12944,6 +12971,11 @@ entities:
       type: Transform\r
 - proto: AirlockMaintMedLocked\r
   entities:\r
+  - uid: 1171\r
+    components:\r
+    - pos: 13.5,22.5\r
+      parent: 1\r
+      type: Transform\r
   - uid: 1365\r
     components:\r
     - pos: 12.5,15.5\r
@@ -12954,11 +12986,6 @@ entities:
     - pos: 13.5,35.5\r
       parent: 1\r
       type: Transform\r
-  - uid: 1971\r
-    components:\r
-    - pos: 11.5,22.5\r
-      parent: 1\r
-      type: Transform\r
   - uid: 2008\r
     components:\r
     - pos: 5.5,40.5\r
@@ -35987,16 +36014,6 @@ entities:
     - pos: 14.5,18.5\r
       parent: 1\r
       type: Transform\r
-  - uid: 12823\r
-    components:\r
-    - pos: 13.5,21.5\r
-      parent: 1\r
-      type: Transform\r
-  - uid: 12824\r
-    components:\r
-    - pos: 12.5,22.5\r
-      parent: 1\r
-      type: Transform\r
   - uid: 12825\r
     components:\r
     - pos: 15.5,23.5\r
@@ -46348,6 +46365,13 @@ entities:
     - enabled: True\r
       type: PointLight\r
     - type: ActiveEmergencyLight\r
+- proto: EmergencyRollerBedSpawnFolded\r
+  entities:\r
+  - uid: 9198\r
+    components:\r
+    - pos: 11.616604,24.635866\r
+      parent: 1\r
+      type: Transform\r
 - proto: Emitter\r
   entities:\r
   - uid: 9982\r
@@ -48093,6 +48117,15 @@ entities:
       pos: -15.5,57.5\r
       parent: 1\r
       type: Transform\r
+  - uid: 8324\r
+    components:\r
+    - rot: 1.5707963267948966 rad\r
+      pos: 10.5,23.5\r
+      parent: 1\r
+      type: Transform\r
+    - ShutdownSubscribers:\r
+      - 13299\r
+      type: DeviceNetwork\r
   - uid: 8544\r
     components:\r
     - rot: 3.141592653589793 rad\r
@@ -67072,11 +67105,6 @@ entities:
     - pos: 9.5,7.5\r
       parent: 1\r
       type: Transform\r
-  - uid: 1174\r
-    components:\r
-    - pos: 13.5,23.5\r
-      parent: 1\r
-      type: Transform\r
   - uid: 1175\r
     components:\r
     - pos: 21.5,22.5\r
@@ -73000,6 +73028,13 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
+- proto: LockerParamedicFilled\r
+  entities:\r
+  - uid: 1173\r
+    components:\r
+    - pos: 11.5,26.5\r
+      parent: 1\r
+      type: Transform\r
 - proto: LockerQuarterMasterFilled\r
   entities:\r
   - uid: 3668\r
@@ -74150,6 +74185,11 @@ entities:
     - pos: 7.876455,22.58581\r
       parent: 1\r
       type: Transform\r
+  - uid: 9199\r
+    components:\r
+    - pos: 12.600979,26.534712\r
+      parent: 1\r
+      type: Transform\r
   - uid: 10921\r
     components:\r
     - pos: -11.50255,62.54268\r
@@ -76003,18 +76043,6 @@ entities:
     - pos: 23.5,37.5\r
       parent: 1\r
       type: Transform\r
-- proto: PottedPlant27\r
-  entities:\r
-  - uid: 71\r
-    components:\r
-    - pos: 12.5,25.5\r
-      parent: 1\r
-      type: Transform\r
-  - uid: 80\r
-    components:\r
-    - pos: 12.5,26.5\r
-      parent: 1\r
-      type: Transform\r
 - proto: PottedPlantRandom\r
   entities:\r
   - uid: 278\r
@@ -80184,11 +80212,6 @@ entities:
     - pos: 13.5,16.5\r
       parent: 1\r
       type: Transform\r
-  - uid: 8190\r
-    components:\r
-    - pos: 13.5,21.5\r
-      parent: 1\r
-      type: Transform\r
   - uid: 8192\r
     components:\r
     - pos: 19.5,12.5\r
@@ -83055,13 +83078,6 @@ entities:
     - pos: -58.5,83.5\r
       parent: 1\r
       type: Transform\r
-- proto: ShardGlass\r
-  entities:\r
-  - uid: 8324\r
-    components:\r
-    - pos: 11.47951,24.442\r
-      parent: 1\r
-      type: Transform\r
 - proto: SheetGlass\r
   entities:\r
   - uid: 262\r
@@ -84974,6 +84990,13 @@ entities:
     - pos: -37.5,32.5\r
       parent: 1\r
       type: Transform\r
+- proto: SpawnPointParamedic\r
+  entities:\r
+  - uid: 9197\r
+    components:\r
+    - pos: 12.5,25.5\r
+      parent: 1\r
+      type: Transform\r
 - proto: SpawnPointQuartermaster\r
   entities:\r
   - uid: 3667\r
@@ -87295,6 +87318,11 @@ entities:
     - pos: 18.5,40.5\r
       parent: 1\r
       type: Transform\r
+  - uid: 9196\r
+    components:\r
+    - pos: 12.5,26.5\r
+      parent: 1\r
+      type: Transform\r
   - uid: 9226\r
     components:\r
     - pos: -63.5,41.5\r
@@ -89301,11 +89329,9 @@ entities:
       type: Transform\r
 - proto: VendingMachineMediDrobe\r
   entities:\r
-  - uid: 2064\r
+  - uid: 8190\r
     components:\r
-    - flags: SessionSpecific\r
-      type: MetaData\r
-    - pos: 10.5,23.5\r
+    - pos: 9.5,22.5\r
       parent: 1\r
       type: Transform\r
 - proto: VendingMachineNutri\r
@@ -91793,6 +91819,11 @@ entities:
     - pos: -9.5,-6.5\r
       parent: 1\r
       type: Transform\r
+  - uid: 71\r
+    components:\r
+    - pos: 13.5,23.5\r
+      parent: 1\r
+      type: Transform\r
   - uid: 73\r
     components:\r
     - pos: -10.5,-10.5\r
@@ -92668,11 +92699,6 @@ entities:
     - pos: 9.5,21.5\r
       parent: 1\r
       type: Transform\r
-  - uid: 1171\r
-    components:\r
-    - pos: 12.5,23.5\r
-      parent: 1\r
-      type: Transform\r
   - uid: 1177\r
     components:\r
     - pos: 13.5,24.5\r
@@ -97816,6 +97842,14 @@ entities:
     - pos: -68.5,9.5\r
       parent: 1\r
       type: Transform\r
+- proto: WallSolidDiagonal\r
+  entities:\r
+  - uid: 80\r
+    components:\r
+    - rot: 3.141592653589793 rad\r
+      pos: 13.5,21.5\r
+      parent: 1\r
+      type: Transform\r
 - proto: WallSolidRust\r
   entities:\r
   - uid: 17\r
@@ -98363,11 +98397,6 @@ entities:
     - pos: 21.5,24.5\r
       parent: 1\r
       type: Transform\r
-  - uid: 1173\r
-    components:\r
-    - pos: 11.5,23.5\r
-      parent: 1\r
-      type: Transform\r
   - uid: 1176\r
     components:\r
     - pos: 12.5,12.5\r
@@ -101794,6 +101823,13 @@ entities:
       pos: -59.5,32.5\r
       parent: 1\r
       type: Transform\r
+- proto: WindoorSecureExternalLocked\r
+  entities:\r
+  - uid: 1971\r
+    components:\r
+    - pos: 12.5,24.5\r
+      parent: 1\r
+      type: Transform\r
 - proto: WindoorSecureHeadOfPersonnelLocked\r
   entities:\r
   - uid: 3458\r
@@ -102265,6 +102301,11 @@ entities:
       type: Transform\r
 - proto: WindowDirectional\r
   entities:\r
+  - uid: 1174\r
+    components:\r
+    - pos: 11.5,24.5\r
+      parent: 1\r
+      type: Transform\r
   - uid: 1229\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -102282,6 +102323,12 @@ entities:
     - pos: 19.5,0.5\r
       parent: 1\r
       type: Transform\r
+  - uid: 2064\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 11.5,24.5\r
+      parent: 1\r
+      type: Transform\r
   - uid: 2695\r
     components:\r
     - rot: 3.141592653589793 rad\r

diff --git a/Resources/Prototypes/Maps/barratry.yml b/Resources/Prototypes/Maps/barratry.yml
index 2aab48bcc076e90fee5831f703168cea092b5fe5..8fa07ebe2a3e1ea55e33a1c42224a2dc44f4653e 100644 (file)
--- a/Resources/Prototypes/Maps/barratry.yml
+++ b/Resources/Prototypes/Maps/barratry.yml
@@ -42,6 +42,7 @@
             Chemist: [ 2, 2 ]
             MedicalDoctor: [ 3, 3 ]
             MedicalIntern: [ 2, 4 ]
+            Paramedic: [ 1, 1 ]
             #science
             ResearchDirector: [ 1, 1 ]
             SeniorResearcher: [ 1, 1 ]