фиксы под тесты ура

2024-04-10 09:57:42 +07:00
parent 2ccac6de35
commit a61ace4a9a
35 changed files with 104 additions and 219 deletions
--- a/Content.IntegrationTests/Tests/PostMapInitTest.cs
+++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs
@@ -63,7 +63,14 @@ namespace Content.IntegrationTests.Tests
            "MeteorArena",
            "Atlas",
            "Reach",
-            "Train"
+            "Train",
+            "Atom", 
+            "DryDock",
+            "Polaris",
+            "Scoupidia",
+            "Triumph",
+            "Void",
+            "WonderBox"
        };

        /// <summary>
@@ -105,6 +112,7 @@ namespace Content.IntegrationTests.Tests
                    throw new Exception($"Failed to delete map {mapFile}", ex);
                }
            });
+
            await server.WaitRunTicks(1);

            await pair.CleanReturnAsync();
@@ -120,7 +128,8 @@ namespace Content.IntegrationTests.Tests
            var mapFolder = new ResPath("/Maps");
            var maps = resourceManager
                .ContentFindFiles(mapFolder)
-                .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
+                .Where(filePath =>
+                    filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
                .ToArray();

            foreach (var map in maps)
@@ -149,6 +158,7 @@ namespace Content.IntegrationTests.Tests

                Assert.That(postMapInit, Is.False, $"Map {map.Filename} was saved postmapinit");
            }
+
            await pair.CleanReturnAsync();
        }

@@ -214,9 +224,10 @@ namespace Content.IntegrationTests.Tests
                    Assert.That(mapLoader.TryLoad(shuttleMap, shuttlePath.ToString(), out var roots));
                    EntityUid shuttle = default!;
                    Assert.DoesNotThrow(() =>
-                    {
-                        shuttle = roots.First(uid => entManager.HasComponent<MapGridComponent>(uid));
-                    }, $"Failed to load {shuttlePath}");
+                        {
+                            shuttle = roots.First(uid => entManager.HasComponent<MapGridComponent>(uid));
+                        }, $"Failed to load {shuttlePath}");
+
                    Assert.That(
                        shuttleSystem.TryFTLDock(shuttle,
                            entManager.GetComponent<ShuttleComponent>(shuttle), targetGrid.Value),
@@ -244,10 +255,12 @@ namespace Content.IntegrationTests.Tests
                    var jobList = entManager.GetComponent<StationJobsComponent>(station).RoundStartJobList
                        .Where(x => x.Value != 0)
                        .Select(x => x.Key);
+
                    var spawnPoints = entManager.EntityQuery<SpawnPointComponent>()
                        .Where(spawnpoint => spawnpoint.SpawnType == SpawnPointType.Job)
                        .Select(spawnpoint => spawnpoint.Job.ID)
                        .Distinct();
+
                    List<string> missingSpawnPoints = new();
                    foreach (var spawnpoint in jobList.Except(spawnPoints))
                    {
@@ -268,13 +281,12 @@ namespace Content.IntegrationTests.Tests
                    throw new Exception($"Failed to delete map {mapProto}", ex);
                }
            });
+
            await server.WaitRunTicks(1);

            await pair.CleanReturnAsync();
        }

-
-
        private static int GetCountLateSpawn<T>(List<EntityUid> gridUids, IEntityManager entManager)
            where T : ISpawnPoint, IComponent
        {
@@ -286,8 +298,8 @@ namespace Content.IntegrationTests.Tests
                var spawner = (ISpawnPoint) comp;

                if (spawner.SpawnType is not SpawnPointType.LateJoin
-                || xform.GridUid == null
-                || !gridUids.Contains(xform.GridUid.Value))
+                    || xform.GridUid == null
+                    || !gridUids.Contains(xform.GridUid.Value))
                {
                    continue;
                }
@@ -336,7 +348,8 @@ namespace Content.IntegrationTests.Tests
            var mapFolder = new ResPath("/Maps");
            var maps = resourceManager
                .ContentFindFiles(mapFolder)
-                .Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
+                .Where(filePath =>
+                    filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
                .ToArray();

            var mapNames = new List<string>();
@@ -350,6 +363,7 @@ namespace Content.IntegrationTests.Tests
                {
                    continue;
                }
+
                mapNames.Add(rootedPath.ToString());
            }

--- a/Content.Server/_White/Keyhole/KeyholeSystem.cs
+++ b/Content.Server/_White/Keyhole/KeyholeSystem.cs
@@ -31,7 +31,7 @@ public sealed partial class KeyholeSystem : EntitySystem

    private void OnKeyInit(EntityUid uid, KeyComponent component, ComponentInit ev)
    {
-        component.FormId = _random.Next(1000);
+        component.FormId ??= _random.Next(1000);
    }

    private void OnKeyInsert(EntityUid uid, KeyComponent component, AfterInteractEvent ev)
--- a/Content.Shared/Changeling/SharedChangeling.cs
+++ b/Content.Shared/Changeling/SharedChangeling.cs
@@ -102,8 +102,8 @@ public sealed partial class AugmentedEyesightActionEvent : InstantActionEvent
 {
 }

-[Serializable, NetSerializable]
-public sealed class AugmentedEyesightPurchasedEvent : EntityEventArgs
+[Serializable, NetSerializable, DataDefinition]
+public sealed partial class AugmentedEyesightPurchasedEvent : EntityEventArgs
 {
 }

@@ -111,8 +111,8 @@ public sealed partial class DissonantShriekActionEvent : InstantActionEvent
 {
 }

-[Serializable, NetSerializable]
-public sealed class VoidAdaptationPurchasedEvent : EntityEventArgs
+[Serializable, NetSerializable, DataDefinition]
+public sealed partial class VoidAdaptationPurchasedEvent : EntityEventArgs
 {
 }

--- a/Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
+++ b/Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
@@ -1,9 +1,8 @@
 namespace Content.Shared._White.Keyhole.Components;

 [RegisterComponent]
-public partial class KeyBaseComponent : Component
+public abstract partial class KeyBaseComponent : Component
 {
    [ViewVariables(VVAccess.ReadWrite)]
-    [DataField]
    public int? FormId;
 }
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl
@@ -1,7 +1,7 @@
-ent-BodyBag_Container = мешок для тела
+ent-BodyBagContainer = мешок для тела
    .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов.
    .suffix = { "" }
-ent-BodyBag_Folded = мешок для тела
+ent-BodyBagFolded = мешок для тела
    .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов.
    .suffix = Сложенный
 ent-Ash = пепел
--- a/Resources/Maps/Gulags/gulag.yml
+++ b/Resources/Maps/Gulags/gulag.yml
@@ -32,7 +32,7 @@ entities:
      chunks:
        -1,-1:
          ind: -1,-1
-          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAKwAAAAAAKwAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAKwAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAKwAAAAAAKwAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAKwAAAAAAKwAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAUAAAAAAAUAAAAAAAWgAAAAAAWgAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAUAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAKwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAKwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAA
+          tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAKwAAAAAAKwAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAKwAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAATgAAAAAAegAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAKwAAAAAAKwAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAKwAAAAAAKwAAAAAAegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAUAAAAAAAUAAAAAAAWgAAAAAAWgAAAAAAUAAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAegAAAAAAUAAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAKwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAegAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAdQAAAAAAcgAAAAAAKwAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAAWgAAAAAA
          version: 6
        0,0:
          ind: 0,0
@@ -2073,8 +2073,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -11.5,5.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasMinerOxygen
  entities:
  - uid: 23
@@ -2083,8 +2081,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -11.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasMixer
  entities:
  - uid: 540
@@ -2096,8 +2092,6 @@ entities:
    - type: GasMixer
      inletTwoConcentration: 0.22000003
      inletOneConcentration: 0.78
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasOutletInjector
  entities:
  - uid: 245
@@ -2106,8 +2100,6 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -10.5,3.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasPassiveVent
  entities:
  - uid: 239
@@ -2115,24 +2107,18 @@ entities:
    - type: Transform
      pos: 11.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 638
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -10.5,5.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 652
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -10.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasPipeBend
  entities:
  - uid: 55
@@ -2805,8 +2791,6 @@ entities:
      rot: -1.5707963267948966 rad
      pos: -9.5,3.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasThermoMachineFreezer
  entities:
  - uid: 352
@@ -2815,8 +2799,6 @@ entities:
      rot: 3.141592653589793 rad
      pos: 11.5,3.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasVentPump
  entities:
  - uid: 101
@@ -2825,83 +2807,61 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -9.5,-0.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 107
    components:
    - type: Transform
      pos: -10.5,-10.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 121
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,-11.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 123
    components:
    - type: Transform
      pos: -3.5,0.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 265
    components:
    - type: Transform
      pos: 3.5,0.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 271
    components:
    - type: Transform
      pos: -3.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 343
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: 5.5,-6.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 364
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -8.5,5.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 368
    components:
    - type: Transform
      pos: 3.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 420
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: 2.5,-7.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 632
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -3.5,-6.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: GasVentScrubber
  entities:
  - uid: 223
@@ -2909,78 +2869,58 @@ entities:
    - type: Transform
      pos: -2.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 273
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -2.5,-6.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 274
    components:
    - type: Transform
      pos: -6.5,-10.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 275
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -2.5,-11.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 347
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -8.5,3.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 492
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: -2.5,-2.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 493
    components:
    - type: Transform
      rot: -1.5707963267948966 rad
      pos: 10.5,-6.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 494
    components:
    - type: Transform
      pos: 5.5,4.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 496
    components:
    - type: Transform
      rot: 3.141592653589793 rad
      pos: 5.5,-2.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 613
    components:
    - type: Transform
      rot: 1.5707963267948966 rad
      pos: -9.5,-1.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: Gateway
  entities:
  - uid: 726
@@ -3234,15 +3174,11 @@ entities:
    - type: Transform
      pos: -1.5,-11.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
  - uid: 564
    components:
    - type: Transform
      pos: -1.5,-12.5
      parent: 818
-    - type: AtmosDevice
-      joinedGrid: 818
 - proto: Pickaxe
  entities:
  - uid: 583
@@ -3355,11 +3291,6 @@ entities:
      rot: 3.141592653589793 rad
      pos: 6.5,-3.5
      parent: 818
-  - uid: 568
-    components:
-    - type: Transform
-      pos: -4.5,-14.5
-      parent: 818
  - uid: 569
    components:
    - type: Transform
@@ -3435,11 +3366,6 @@ entities:
      rot: 1.5707963267948966 rad
      pos: 1.5,-8.5
      parent: 818
-  - uid: 744
-    components:
-    - type: Transform
-      pos: -1.5,-14.5
-      parent: 818
  - uid: 745
    components:
    - type: Transform
@@ -3802,6 +3728,8 @@ entities:
    - type: Transform
      pos: 11.5,0.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineChefvend
  entities:
  - uid: 796
@@ -3809,6 +3737,8 @@ entities:
    - type: Transform
      pos: 11.5,-0.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineChemDrobe
  entities:
  - uid: 440
@@ -3816,6 +3746,8 @@ entities:
    - type: Transform
      pos: -7.5,-5.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineCondiments
  entities:
  - uid: 703
@@ -3824,6 +3756,8 @@ entities:
      rot: -1.5707963267948966 rad
      pos: 9.5,-3.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineMedical
  entities:
  - uid: 435
@@ -3831,6 +3765,8 @@ entities:
    - type: Transform
      pos: -9.5,1.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineNutri
  entities:
  - uid: 793
@@ -3838,6 +3774,8 @@ entities:
    - type: Transform
      pos: 2.5,5.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineSeedsUnlocked
  entities:
  - uid: 464
@@ -3845,6 +3783,8 @@ entities:
    - type: Transform
      pos: 3.5,5.5
      parent: 818
+    - type: Advertise
+      enabled: False
 - proto: VendingMachineTankDispenserEVA
  entities:
  - uid: 707
--- a/Resources/Maps/White/Scoupidia.yml
+++ b/Resources/Maps/White/Scoupidia.yml
@@ -36564,7 +36564,7 @@ entities:
    - type: Physics
      canCollide: False
    - type: InsideEntityStorage
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 1660
    components:
--- a/Resources/Maps/White/Void.yml
+++ b/Resources/Maps/White/Void.yml
@@ -31975,7 +31975,7 @@ entities:
    - pos: 3.494173,63.048206
      parent: 2
      type: Transform
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 2798
    components:
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -16501,7 +16501,7 @@ entities:
    - type: Transform
      pos: -49.629227,-28.475441
      parent: 60
- proto: BodyBag_Container
+- proto: BodyBagContainer
  entities:
  - uid: 2049
    components:
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -16605,7 +16605,7 @@ entities:
      rot: 1.5707963267948966 rad
      pos: -9.5,47.5
      parent: 8364
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 27686
    components:
--- a/Resources/Maps/cluster.yml
+++ b/Resources/Maps/cluster.yml
@@ -8170,7 +8170,7 @@ entities:
    - type: Transform
      pos: -26.622076,24.452543
      parent: 1
- proto: BodyBag_Container
+- proto: BodyBagContainer
  entities:
  - uid: 8242
    components:
--- a/Resources/Maps/core.yml
+++ b/Resources/Maps/core.yml
@@ -20176,7 +20176,7 @@ entities:
    - type: Transform
      pos: 19.5,-51.5
      parent: 2
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 161
    components:
--- a/Resources/Maps/europa.yml
+++ b/Resources/Maps/europa.yml
@@ -16638,7 +16638,7 @@ entities:
    - type: Transform
      pos: 30.5,56.5
      parent: 1
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 2490
    components:
--- a/Resources/Maps/meta.yml
+++ b/Resources/Maps/meta.yml
@@ -15185,7 +15185,7 @@ entities:
    - type: Transform
      pos: -42.538452,-53.54715
      parent: 5350
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 23085
    components:
--- a/Resources/Maps/train.yml
+++ b/Resources/Maps/train.yml
@@ -12257,7 +12257,7 @@ entities:
    - type: Transform
      pos: 6.380858,-242.27087
      parent: 2
- proto: BodyBag_Folded
+- proto: BodyBagFolded
  entities:
  - uid: 2706
    components:
--- a/Resources/Prototypes/Alerts/changeling.yml
+++ b/Resources/Prototypes/Alerts/changeling.yml
@@ -1,41 +1,9 @@
 - type: alert
  id: Chemicals
+  category: Health #it's like ghostie health
  icons:
  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
    state: essence0
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence1
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence2
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence3
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence4
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence5
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence6
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence7
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence8
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence9
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence10
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence11
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence12
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence13
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence14
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence15
-  - sprite: /Textures/Interface/Alerts/essence_counter.rsi
-    state: essence16
+  alertViewEntity: AlertEssenceSpriteView
  name: alerts-changeling-chemicals-name
  description: alerts-changeling-chemicals-desc
-  minSeverity: 0
-  maxSeverity: 16
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -14,13 +14,11 @@
    FoodCondimentBottleVinegar: 2
    ReagentContainerOliveoil: 2
    FoodContainerEgg: 2
-    ReagentContainerMilk: 3
-    ReagentContainerMilkSoy: 3
+    DrinkMilkCarton: 3
+    DrinkSoyMilkCarton: 3
    MonkeyCubeBox: 1
    ReagentContainerMayo: 1
    VariantCubeBox: 1
-    DrinkMilkCarton: 2
-    DrinkSoyMilkCarton: 1
    FoodButter: 4
    FoodCheese: 1
    FoodMeat: 6
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -15,7 +15,7 @@
    FlashlightLantern: 6
    Floodlight: 2
    RadioHandheld: 10
-    StackHolderHealingItem: 2
+    Brutepack: 2
    InflatableWallStack1: 40
    InflatableDoorStack1: 10
    SeismicCharge: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -4,7 +4,6 @@
    Handcuffs: 8
    Zipties: 12
    GrenadeFlashBang: 4
-    TearSmokeGrenade: 4
    SmokeGrenade: 6
    GrenadeStinger: 4
    Flash: 7
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml
@@ -12,7 +12,7 @@
    GasAnalyzer: 5
    FlashlightLantern: 5
    ClothingHandsGlovesColorYellowBudget: 5
-    AirlockPainter: 5
+    SprayPainter: 5
    Multitool: 5

  contrabandInventory:
--- a/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml
@@ -8,6 +8,9 @@
    storedRotation: -90
  - type: HolosignProjector
  - type: UseDelay
+  - type: ContainerContainer
+    containers:
+      cell_slot: !type:ContainerSlot
  - type: Sprite
    sprite: Objects/Devices/Holoprojectors/custodial.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Tools/energydome.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/energydome.yml
@@ -173,7 +173,7 @@
    - On
    - Off
  - type: EnergyDomeGenerator
-    enabled: true
+    enabled: false
    damageEnergyDraw: 100
    domePrototype: EnergyDomeSlowing
    canDeviceNetworkUse: true
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -19,18 +19,15 @@
          - MachineLayer
  - type: Lathe
  - type: MaterialStorage
-    whitelist:
-      tags:
-      - Sheet
-      - RawMaterial
-      - Ingot
-      entities:
-      - Steel
-      - Glass
-      - Gold
-      - Plasma
-      - Uranium
-      - Plastic
+    materialWhiteList:
+    - Steel
+    - Glass
+    - Gold
+    - Plasma
+    - Uranium
+    - Gold
+    - Silver
+    - Plastic
  - type: Destructible
    thresholds:
    - trigger:
@@ -207,7 +204,6 @@
      - ShellShotgunBeanbag
      - CartridgeRifleRubber
      - CartridgeLightRifleRubber
-      - MagazineBoxPistolRubber
      - MagazineBoxMagnumRubber
      - MagazineBoxRifleRubber
      - MagazineBoxLightRifleRubber
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/fireaxe_cabinet.yml
@@ -4,8 +4,8 @@
  description: There is a small label that reads "For Emergency use only" along with details for safe use of the axe. As if.
  components:
  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StructuralInorganic
+    damageContainer: StructuralInorganic
+    damageModifierSet: RGlass
  - type: Destructible
    thresholds:
      - trigger:
--- a/Resources/Prototypes/Maps/Scoupidia.yml
+++ b/Resources/Prototypes/Maps/Scoupidia.yml
@@ -60,4 +60,3 @@
            SeniorOfficer: [ 1, 1 ]
            SeniorPhysician: [ 1, 1 ]
            SeniorEngineer: [ 1, 1 ]
-            SeniorSalvageSpecialist: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/Triumph.yml
+++ b/Resources/Prototypes/Maps/Triumph.yml
@@ -60,4 +60,3 @@
            SeniorOfficer: [ 1, 1 ]
            SeniorPhysician: [ 1, 1 ]
            SeniorEngineer: [ 1, 1 ]
-            SeniorSalvageSpecialist: [ 1, 1 ]
--- a/Resources/Prototypes/Maps/WonderBox.yml
+++ b/Resources/Prototypes/Maps/WonderBox.yml
@@ -59,5 +59,4 @@
            SeniorOfficer: [ 1, 1 ]
            SeniorPhysician: [ 1, 1 ]
            SeniorEngineer: [ 1, 1 ]
-            SeniorSalvageSpecialist: [ 1, 1 ]

--- a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/medibot.yml
@@ -14,7 +14,7 @@
      - tag: DiscreteHealthAnalyzer
        icon:
          sprite: Objects/Specific/Medical/healthanalyzer.rsi
-          state: analyzer
+          state: icon
        name: анализатор здоровья
        doAfter: 2
      - tag: ProximitySensor
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -314,15 +314,6 @@
    Steel: 300
    Plastic: 300

- type: latheRecipe
-  id: MagazineBoxPistolRubber
-  result: MagazineBoxPistolRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 300
-
 - type: latheRecipe
  id: MagazineBoxMagnum
  result: MagazineBoxMagnum
@@ -340,15 +331,6 @@
    Steel: 500
    Plastic: 700

- type: latheRecipe
-  id: MagazineBoxMagnumRubber
-  result: MagazineBoxMagnumRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 300
-
 - type: latheRecipe
  id: MagazineRifle
  result: MagazineRifle
@@ -373,15 +355,6 @@
  materials:
    Steel: 900

- type: latheRecipe
-  id: MagazineBoxRifleRubber
-  result: MagazineBoxRifleRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 550
-
 - type: latheRecipe
  id: MagazineBoxRifleRubber
  result: MagazineBoxRifleRubber
@@ -399,15 +372,6 @@
  materials:
    Steel: 900

- type: latheRecipe
-  id: MagazineBoxLightRifleRubber
-  result: MagazineBoxLightRifleRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 550
-
 - type: latheRecipe
  id: MagazineBoxLightRifleRubber
  result: MagazineBoxLightRifleRubber
--- a/Resources/Prototypes/Store/presets.yml
+++ b/Resources/Prototypes/Store/presets.yml
@@ -28,16 +28,16 @@
  id: StorePresetUplinkNoDiscounts
  storeName: Uplink
  categories:
-  - UplinkWeapons
+  - UplinkWeaponry
  - UplinkAmmo
  - UplinkExplosives
-  - UplinkMisc
-  - UplinkBundles
-  - UplinkTools
-  - UplinkUtility
+  - UplinkChemicals
+  - UplinkDeception
+  - UplinkDisruption
  - UplinkImplants
+  - UplinkAllies
+  - UplinkWearables
  - UplinkJob
-  - UplinkArmor
  - UplinkPointless
  currencyWhitelist:
  - Telecrystal
--- a/Resources/Prototypes/White/Catalog/uplink.yml
+++ b/Resources/Prototypes/White/Catalog/uplink.yml
@@ -6,7 +6,7 @@
  cost:
    Telecrystal: 2
  categories:
-    - UplinkArmor
+    - UplinkWearables

 - type: listing
  id: UplinkMiniEbow
@@ -17,7 +17,7 @@
  cost:
    Telecrystal: 10
  categories:
-  - UplinkWeapons
+  - UplinkWeaponry
  conditions:
  - !type:StoreWhitelistCondition
    blacklist:
@@ -34,7 +34,7 @@
  cost:
    Telecrystal: 6
  categories:
-  - UplinkWeapons
+  - UplinkWeaponry
  conditions:
  - !type:StoreWhitelistCondition
    blacklist:
@@ -50,7 +50,7 @@
  cost:
    Telecrystal: 16
  categories:
-  - UplinkWeapons
+  - UplinkWeaponry
  saleLimit: 1

 - type: listing
@@ -103,7 +103,7 @@
  cost:
    Telecrystal: 3
  categories:
-  - UplinkArmor
+  - UplinkWearables
  conditions:
  - !type:StoreWhitelistCondition
    blacklist:
@@ -119,7 +119,7 @@
  cost:
    Telecrystal: 3
  categories:
-  - UplinkArmor
+  - UplinkWearables
  conditions:
  - !type:StoreWhitelistCondition
    whitelist:
@@ -135,7 +135,7 @@
 #  cost:
 #    Telecrystal: 20
 #  categories:
-#  - UplinkWeapons
+#  - UplinkWeaponry
 #  saleLimit: 1

 - type: listing
@@ -147,7 +147,7 @@
  cost:
    Telecrystal: 10
  categories:
-  - UplinkWeapons
+  - UplinkWeaponry
  conditions:
  - !type:StoreWhitelistCondition
    blacklist:
--- a/Resources/Prototypes/White/Fluff/fluff.yml
+++ b/Resources/Prototypes/White/Fluff/fluff.yml
@@ -1224,6 +1224,7 @@
    - type: ContainerContainer
      containers:
        toggleable-clothing: !type:ContainerSlot
+        storagebase: !type:Container
    - type: PointLight
      radius: 2
      energy: 2
--- a/Resources/Prototypes/White/Mobs/Pets/pets.yml
+++ b/Resources/Prototypes/White/Mobs/Pets/pets.yml
@@ -56,7 +56,7 @@
      gender: female
  - type: Bloodstream
    bloodMaxVolume: 150
-    bloodReagent: SpiderBlood
+    bloodReagent: InsectBlood
  - type: Pacified
  - type: Tag
    tags:
--- a/Resources/Prototypes/White/Objects/Scrolls/magic.yml
+++ b/Resources/Prototypes/White/Objects/Scrolls/magic.yml
@@ -5,6 +5,7 @@
    - type: Physics
      bodyType: Dynamic
      fixedRotation: false
+      canCollide: false
    - type: Sprite
      sprite: Structures/Specific/Anomalies/Cores/bluespace_core.rsi
      noRot: true
@@ -32,6 +33,7 @@
    - type: Physics
      bodyType: Dynamic
      fixedRotation: false
+      canCollide: false
    - type: Sprite
      sprite: Structures/Specific/Anomalies/Cores/electric_core.rsi
      noRot: true
@@ -59,6 +61,7 @@
    - type: Physics
      bodyType: Dynamic
      fixedRotation: false
+      canCollide: false
    - type: Sprite
      sprite: Structures/Specific/Anomalies/Cores/bluespace_core.rsi
      noRot: true
@@ -86,6 +89,7 @@
    - type: Physics
      bodyType: Dynamic
      fixedRotation: false
+      canCollide: false
    - type: Sprite
      sprite: Structures/Specific/Anomalies/Cores/pyro_core.rsi
      noRot: true
@@ -113,6 +117,7 @@
    - type: Physics
      bodyType: Dynamic
      fixedRotation: false
+      canCollide: false
    - type: Sprite
      sprite: Objects/Magic/card.rsi
      layers:
--- a/Resources/Prototypes/White/Objects/Scrolls/scrolls.yml
+++ b/Resources/Prototypes/White/Objects/Scrolls/scrolls.yml
@@ -4,6 +4,7 @@
  name: "Magic Scroll"
  description: "A relic of arcane lore, this ancient parchment bears witness to countless mystical incantations and forgotten spells."
  noSpawn: true
+  abstract: true
  components:
    - type: Sprite
      sprite: White/Misc/scrolls.rsi