Fix more tests (#15762)

diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 6e2947771558d85b78bf0142d4fcff172d3cc1ee..1b2e82ef23b24be32740853ab64cb23c81e11a6b 100644 (file)
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -135,6 +135,7 @@ namespace Content.IntegrationTests.Tests.Disposal
   id: DisposalTrunkDummy
   components:
   - type: DisposalEntry
+  - type: DisposalTube
   - type: Transform
     anchored: true
 ";

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 216360de64af864fd9d0fc1f84582ce65c9cb8c1..895f0d2ee95cd3b9a3560cdde430441e64aebcd1 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -95546,7 +95546,6 @@ entities:
     type: Transform\r
   - devices:\r
     - 21628\r
-    - invalid\r
     - 9631\r
     - 9651\r
     type: DeviceList\r
@@ -169477,7 +169476,6 @@ entities:
     - 21492\r
     - 21491\r
     - 18608\r
-    - invalid\r
     - 18272\r
     - 18270\r
     - 18434\r
@@ -169543,7 +169541,6 @@ entities:
     - 3996\r
     - 4001\r
     - 585\r
-    - invalid\r
     - 928\r
     - 904\r
     - 19834\r
@@ -169564,7 +169561,6 @@ entities:
     - 3996\r
     - 4001\r
     - 585\r
-    - invalid\r
     - 19834\r
     - 19835\r
     - 19836\r
@@ -169694,7 +169690,6 @@ entities:
     type: Transform\r
   - devices:\r
     - 21508\r
-    - invalid\r
     - 5940\r
     - 6097\r
     - 6098\r
@@ -169710,7 +169705,6 @@ entities:
     type: Transform\r
   - devices:\r
     - 21508\r
-    - invalid\r
     - 5940\r
     - 6097\r
     - 6098\r
@@ -170365,7 +170359,6 @@ entities:
     - 6127\r
     - 6126\r
     - 6125\r
-    - invalid\r
     - 21559\r
     - 12591\r
     - 12592\r
@@ -170389,7 +170382,6 @@ entities:
     - 6127\r
     - 6126\r
     - 6125\r
-    - invalid\r
     - 21559\r
     - 4369\r
     - 1198\r
@@ -170538,7 +170530,6 @@ entities:
     - 21568\r
     - 2370\r
     - 2360\r
-    - invalid\r
     type: DeviceList\r
 - uid: 21568\r
   type: AirSensor\r
@@ -170843,7 +170834,6 @@ entities:
     type: Transform\r
   - devices:\r
     - 1385\r
-    - invalid\r
     - 1397\r
     type: DeviceList\r
 - uid: 21594\r
@@ -171085,7 +171075,6 @@ entities:
     - 9409\r
     - 9410\r
     - 9411\r
-    - invalid\r
     - 12594\r
     - 5938\r
     - 12571\r
@@ -171188,7 +171177,6 @@ entities:
   - devices:\r
     - 21631\r
     - 7146\r
-    - invalid\r
     - 6015\r
     - 5990\r
     - 21632\r
@@ -171316,7 +171304,6 @@ entities:
     - 13979\r
     - 13962\r
     - 13961\r
-    - invalid\r
     - 17627\r
     - 17632\r
     - 17628\r
@@ -171342,7 +171329,6 @@ entities:
     - 13979\r
     - 13962\r
     - 13961\r
-    - invalid\r
     - 17627\r
     - 17632\r
     - 17628\r
@@ -171414,7 +171400,6 @@ entities:
     - 21648\r
     - 16559\r
     - 16560\r
-    - invalid\r
     type: DeviceList\r
 - uid: 21648\r
   type: AirSensor\r
@@ -171445,7 +171430,6 @@ entities:
     - 21648\r
     - 16559\r
     - 16560\r
-    - invalid\r
     - 21655\r
     - 21656\r
     type: DeviceList\r
@@ -172341,7 +172325,6 @@ entities:
   - devices:\r
     - 5565\r
     - 5562\r
-    - invalid\r
     - 5563\r
     - 8466\r
     - 21733\r
@@ -172647,7 +172630,6 @@ entities:
     - 6133\r
     - 5901\r
     - 5900\r
-    - invalid\r
     - 12001\r
     - 12589\r
     - 4369\r
@@ -184182,7 +184164,6 @@ entities:
     - 6133\r
     - 5901\r
     - 5900\r
-    - invalid\r
     - 4369\r
     - 1198\r
     - 4546\r

diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml
index 5de0d6eb6fd11740268f5d0073637b025c8f2dc1..1a1222669fbbb0dc406ac60f04674cf88339c0da 100644 (file)
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -75204,7 +75204,7 @@ entities:
     parent: 8364\r
     type: Transform\r
 - uid: 10005\r
-  type: AirlockExternalGlassShuttleEscape\r
+  type: AirlockGlassShuttle\r
   components:\r
   - rot: -1.5707963267948966 rad\r
     pos: -22.5,24.5\r
@@ -94901,7 +94901,7 @@ entities:
     parent: 8364\r
     type: Transform\r
 - uid: 12644\r
-  type: AirlockExternalGlassShuttleEscape\r
+  type: AirlockGlassShuttle\r
   components:\r
   - rot: 1.5707963267948966 rad\r
     pos: 93.5,-26.5\r