fix upstream: part 4

Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs

@@ -23,9 +23,11 @@ public sealed class GuideEntryPrototypeTests
         var resMan = client.ResolveDependency<IResourceManager>();
         var parser = client.ResolveDependency<DocumentParsingManager>();
         var prototypes = protoMan.EnumeratePrototypes<GuideEntryPrototype>().ToList();
+        var testOut = TestContext.Out;
 
         foreach (var proto in prototypes)
         {
+            await testOut.WriteLineAsync($"{proto.Id}");
             await client.WaitAssertion(() =>
             {
                 using var reader = resMan.ContentFileReadText(proto.Text);

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -49,6 +49,8 @@ namespace Content.IntegrationTests.Tests
         {
             "Dev",
             "TestTeg",
+            "CentCommMain",
+            "CentCommHarmony",
             "MeteorArena",
             "Core", // No current maintainer. In need of a rework...
             "Pebble", // Maintained by Plyushune
@@ -67,7 +69,7 @@ namespace Content.IntegrationTests.Tests
             "Lavatest", // Lavaland Change
             "Rad", // Maintained by Ichai
             // "Europa", // De-rotated, has significant issues.
-            //"Meta", // Maintained by Ichai
+            "Meta", // Maintained by Ichai
             "Cyberiad", // Maintained by Ichai
             "Lambda", // Maintained by Ichai
             "Bagel", // Maintained by Ichai

Resources/Maps/Shuttles/mining.yml

@@ -16,18 +16,6 @@ tilemap:
 entities:
 - proto: ""
   entities:
-  - uid: 153
-    components:
-    - type: MetaData
-      name: Map Entity
-    - type: Transform
-    - type: Map
-      mapPaused: True
-    - type: PhysicsMap
-    - type: GridTree
-    - type: MovedGrids
-    - type: Broadphase
-    - type: OccluderTree
   - uid: 181
     components:
     - type: MetaData

Resources/Maps/_Shitmed/Shuttles/ShuttleEvent/abductor_shuttle.yml

@@ -7,6 +7,18 @@ tilemap:
 entities:
 - proto: ""
   entities:
+  - uid: 253
+    components:
+    - type: MetaData
+      name: Map Entity
+    - type: Transform
+    - type: Map
+      mapPaused: True
+    - type: PhysicsMap
+    - type: GridTree
+    - type: MovedGrids
+    - type: Broadphase
+    - type: OccluderTree
   - uid: 1
     components:
     - type: MetaData

Resources/Prototypes/Catalog/Fills/Items/belt.yml

@@ -180,12 +180,14 @@
   name: grenadier chest rig
   suffix: Filled
   components:
-  - type: Item
-    size: Ginormous
-  - type: Storage
-    maxItemSize: Normal
-    grid:
-    - 0,0,7,1
+  # WD EDIT START
+  # - type: Item
+  #   size: Ginormous
+  # - type: Storage
+  #   maxItemSize: Normal
+  #  grid:
+  #   - 0,0,7,1
+  # WD EDIT END
   - type: StorageFill
     contents:
       - id: ExGrenade

Resources/Prototypes/Maps/core.yml

@@ -23,7 +23,6 @@
             Chef: [ 1, 3 ]
             Janitor: [ 2, 4 ]
             Captain: [ 1, 1 ]
-            Maid: [ 1, 1 ] # WWDP Combat Maid instead of CC roles
             # BlueshieldOfficer: [ 1, 1] - WD EDIT
             # NanotrasenRepresentative: [ 1, 1 ] - WD EDIT
             # Magistrate: [ 1, 1 ] # EE: Disabled

Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/syringe_gun.yml

@@ -45,8 +45,6 @@
     sprite: _Goobstation/Objects/Weapons/Guns/Cannons/syringe_gun.rsi
   - type: Tag
     tags:
-    - Gun
-    - Weapon
     - SyringeGunAmmo
 
 - type: entity

Resources/ServerInfo/Guidebook/Mobs/Tajaran.xml

@@ -68,4 +68,3 @@
   - [color=#ffa500]Быстрый метаболизм[/color]: Требуют больше еды для выживания.
 
 </Document>
-