Bagel Fixe a pipes and some stuff (#16099)

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 0c4e920bf1a4d2eb546ae143aad95b7735081925..2fd7e9aef25c406216ced829567fe92a96a25c3c 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -79080,6 +79080,8 @@ entities:
       pos: 37.5,0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 11723\r
@@ -79088,6 +79090,8 @@ entities:
       pos: 40.5,0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 11739\r
@@ -79096,6 +79100,8 @@ entities:
       pos: 40.5,3.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 12629\r
@@ -79148,6 +79154,8 @@ entities:
       pos: 41.5,-0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13516\r
@@ -79156,6 +79164,8 @@ entities:
       pos: 37.5,-0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13517\r
@@ -79164,6 +79174,8 @@ entities:
       pos: 37.5,-1.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13537\r
@@ -83743,6 +83755,18 @@ entities:
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
+  - uid: 1641\r
+    components:\r
+    - rot: -1.5707963267948966 rad\r
+      pos: 4.5,18.5\r
+      parent: 60\r
+      type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
+    - bodyType: Static\r
+      type: Physics\r
+    - nextSound: 34.4476301\r
+      type: EmitSoundOnCollide\r
   - uid: 1657\r
     components:\r
     - pos: -25.5,-16.5\r
@@ -91014,6 +91038,17 @@ entities:
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
+  - uid: 7835\r
+    components:\r
+    - pos: 4.5,15.5\r
+      parent: 60\r
+      type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
+    - bodyType: Static\r
+      type: Physics\r
+    - nextSound: 40.0467708\r
+      type: EmitSoundOnCollide\r
   - uid: 7856\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -92387,6 +92422,8 @@ entities:
       pos: 38.5,0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13206\r
@@ -92394,6 +92431,8 @@ entities:
     - pos: 49.5,8.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13210\r
@@ -92402,6 +92441,8 @@ entities:
       pos: 40.5,-0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13237\r
@@ -92459,6 +92500,8 @@ entities:
     - pos: 49.5,7.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13505\r
@@ -92467,6 +92510,8 @@ entities:
       pos: 46.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13506\r
@@ -92475,6 +92520,8 @@ entities:
       pos: 45.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13507\r
@@ -92483,6 +92530,8 @@ entities:
       pos: 41.5,0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13508\r
@@ -92490,6 +92539,8 @@ entities:
     - pos: 49.5,4.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13509\r
@@ -92498,6 +92549,8 @@ entities:
       pos: 41.5,1.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13511\r
@@ -92506,6 +92559,8 @@ entities:
       pos: 43.5,3.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13512\r
@@ -92514,6 +92569,8 @@ entities:
       pos: 44.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13513\r
@@ -92522,6 +92579,8 @@ entities:
       pos: 43.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13514\r
@@ -92530,6 +92589,8 @@ entities:
       pos: 42.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13518\r
@@ -92538,6 +92599,8 @@ entities:
       pos: 38.5,-0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13519\r
@@ -92546,6 +92609,8 @@ entities:
       pos: 42.5,3.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13520\r
@@ -92553,6 +92618,8 @@ entities:
     - pos: 40.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13526\r
@@ -92561,6 +92628,8 @@ entities:
       pos: 41.5,3.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13529\r
@@ -92568,6 +92637,8 @@ entities:
     - pos: 40.5,1.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13539\r
@@ -92666,6 +92737,8 @@ entities:
       pos: 39.5,0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13587\r
@@ -92693,6 +92766,8 @@ entities:
     - pos: 49.5,6.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13594\r
@@ -92839,6 +92914,8 @@ entities:
       pos: 39.5,-0.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13810\r
@@ -93634,6 +93711,8 @@ entities:
     - pos: 49.5,5.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 14268\r
@@ -97256,16 +97335,6 @@ entities:
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
-  - uid: 16648\r
-    components:\r
-    - rot: -1.5707963267948966 rad\r
-      pos: 4.5,17.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#FF1212FF'\r
-      type: AtmosPipeColor\r
-    - bodyType: Static\r
-      type: Physics\r
   - uid: 16649\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -97340,6 +97409,19 @@ entities:
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
+  - uid: 16658\r
+    components:\r
+    - pos: 4.5,16.5\r
+      parent: 60\r
+      type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
+    - bodyType: Static\r
+      type: Physics\r
+    - enabled: True\r
+      type: AmbientSound\r
+    - nextSound: 39.6163766\r
+      type: EmitSoundOnCollide\r
   - uid: 16660\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -97424,35 +97506,6 @@ entities:
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
-  - uid: 16678\r
-    components:\r
-    - pos: 4.5,17.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-    - bodyType: Static\r
-      type: Physics\r
-  - uid: 16679\r
-    components:\r
-    - pos: 4.5,16.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-    - bodyType: Static\r
-      type: Physics\r
-    - enabled: True\r
-      type: AmbientSound\r
-  - uid: 16680\r
-    components:\r
-    - pos: 4.5,15.5\r
-      parent: 60\r
-      type: Transform\r
-    - color: '#0335FCFF'\r
-      type: AtmosPipeColor\r
-    - bodyType: Static\r
-      type: Physics\r
   - uid: 17146\r
     components:\r
     - rot: -1.5707963267948966 rad\r
@@ -104749,6 +104802,8 @@ entities:
       pos: 49.5,3.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13504\r
@@ -104756,6 +104811,8 @@ entities:
     - pos: 47.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13510\r
@@ -104764,6 +104821,8 @@ entities:
       pos: 41.5,2.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13534\r
@@ -104820,6 +104879,8 @@ entities:
     - pos: 49.5,9.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#0335FCFF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 14015\r
@@ -105779,28 +105840,30 @@ entities:
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
-  - uid: 16654\r
+  - uid: 16648\r
     components:\r
-    - rot: 3.141592653589793 rad\r
-      pos: 10.5,18.5\r
+    - pos: 4.5,17.5\r
       parent: 60\r
       type: Transform\r
-    - color: '#0335FCFF'\r
+    - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
-  - uid: 16656\r
+    - nextSound: 37.5504514\r
+      type: EmitSoundOnCollide\r
+  - uid: 16654\r
     components:\r
-    - pos: 2.5,18.5\r
+    - rot: 3.141592653589793 rad\r
+      pos: 10.5,18.5\r
       parent: 60\r
       type: Transform\r
     - color: '#0335FCFF'\r
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
-  - uid: 16658\r
+  - uid: 16656\r
     components:\r
-    - pos: 4.5,18.5\r
+    - pos: 2.5,18.5\r
       parent: 60\r
       type: Transform\r
     - color: '#0335FCFF'\r
@@ -110192,6 +110255,8 @@ entities:
       pos: 36.5,-1.5\r
       parent: 60\r
       type: Transform\r
+    - color: '#FF1212FF'\r
+      type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
   - uid: 13563\r
@@ -110434,7 +110499,7 @@ entities:
       pos: 4.5,14.5\r
       parent: 60\r
       type: Transform\r
-    - color: '#0335FCFF'\r
+    - color: '#FF1212FF'\r
       type: AtmosPipeColor\r
     - bodyType: Static\r
       type: Physics\r
@@ -120750,13 +120815,6 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
-- proto: LockerBrigmedicFilled\r
-  entities:\r
-  - uid: 1641\r
-    components:\r
-    - pos: -19.5,-2.5\r
-      parent: 60\r
-      type: Transform\r
 - proto: LockerCaptainFilled\r
   entities:\r
   - uid: 18504\r
@@ -121629,6 +121687,11 @@ entities:
         - 0\r
         - 0\r
       type: EntityStorage\r
+  - uid: 16678\r
+    components:\r
+    - pos: -19.5,-2.5\r
+      parent: 60\r
+      type: Transform\r
 - proto: LockerParamedicFilled\r
   entities:\r
   - uid: 185\r
@@ -142452,13 +142515,6 @@ entities:
     - pos: 31.5,-36.5\r
       parent: 60\r
       type: Transform\r
-- proto: SpawnPointBrigmedic\r
-  entities:\r
-  - uid: 7835\r
-    components:\r
-    - pos: -19.5,-4.5\r
-      parent: 60\r
-      type: Transform\r
 - proto: SpawnPointCaptain\r
   entities:\r
   - uid: 18681\r