Merge pull request #99 from frosty-dev/ups

Ups

Content.Server/Atmos/EntitySystems/AtmosphereSystem.CVars.cs

@@ -12,9 +12,14 @@ namespace Content.Server.Atmos.EntitySystems
         public float SpaceWindPressureForceDivisorPush { get; private set; }
         public float SpaceWindMaxVelocity { get; private set; }
         public float SpaceWindMaxPushForce { get; private set; }
+        public float SpaceWindMinimumCalculatedMass { get; private set; }
+        public float SpaceWindMaximumCalculatedInverseMass { get; private set; }
+        public bool MonstermosUseExpensiveAirflow { get; private set; }
         public bool MonstermosEqualization { get; private set; }
         public bool MonstermosDepressurization { get; private set; }
         public bool MonstermosRipTiles { get; private set; }
+        public float MonstermosRipTilesMinimumPressure { get; private set; }
+        public float MonstermosRipTilesPressureOffset { get; private set; }
         public bool GridImpulse { get; private set; }
         public float SpacingEscapeRatio { get; private set; }
         public float SpacingMinGas { get; private set; }
@@ -26,6 +31,7 @@ namespace Content.Server.Atmos.EntitySystems
         public float AtmosTickRate { get; private set; }
         public float Speedup { get; private set; }
         public float HeatScale { get; private set; }
+        public float HumanoidThrowMultiplier { get; private set; }
 
         /// <summary>
         /// Time between each atmos sub-update.  If you are writing an atmos device, use AtmosDeviceUpdateEvent.dt
@@ -41,9 +47,14 @@ namespace Content.Server.Atmos.EntitySystems
             Subs.CVar(_cfg, CCVars.SpaceWindPressureForceDivisorPush, value => SpaceWindPressureForceDivisorPush = value, true);
             Subs.CVar(_cfg, CCVars.SpaceWindMaxVelocity, value => SpaceWindMaxVelocity = value, true);
             Subs.CVar(_cfg, CCVars.SpaceWindMaxPushForce, value => SpaceWindMaxPushForce = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMinimumCalculatedMass, value => SpaceWindMinimumCalculatedMass = value, true);
+            Subs.CVar(_cfg, CCVars.SpaceWindMaximumCalculatedInverseMass, value => SpaceWindMaximumCalculatedInverseMass = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosUseExpensiveAirflow, value => MonstermosUseExpensiveAirflow = value, true);
             Subs.CVar(_cfg, CCVars.MonstermosEqualization, value => MonstermosEqualization = value, true);
             Subs.CVar(_cfg, CCVars.MonstermosDepressurization, value => MonstermosDepressurization = value, true);
             Subs.CVar(_cfg, CCVars.MonstermosRipTiles, value => MonstermosRipTiles = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosRipTilesMinimumPressure, value => MonstermosRipTilesMinimumPressure = value, true);
+            Subs.CVar(_cfg, CCVars.MonstermosRipTilesPressureOffset, value => MonstermosRipTilesPressureOffset = value, true);
             Subs.CVar(_cfg, CCVars.AtmosGridImpulse, value => GridImpulse = value, true);
             Subs.CVar(_cfg, CCVars.AtmosSpacingEscapeRatio, value => SpacingEscapeRatio = value, true);
             Subs.CVar(_cfg, CCVars.AtmosSpacingMinGas, value => SpacingMinGas = value, true);
@@ -55,6 +66,7 @@ namespace Content.Server.Atmos.EntitySystems
             Subs.CVar(_cfg, CCVars.AtmosHeatScale, value => { HeatScale = value; InitializeGases(); }, true);
             Subs.CVar(_cfg, CCVars.ExcitedGroups, value => ExcitedGroups = value, true);
             Subs.CVar(_cfg, CCVars.ExcitedGroupsSpaceIsAllConsuming, value => ExcitedGroupsSpaceIsAllConsuming = value, true);
+            Subs.CVar(_cfg, CCVars.AtmosHumanoidThrowMultiplier, value => HumanoidThrowMultiplier = value, true);
         }
     }
 }

Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs

@@ -1,5 +1,6 @@
 using Content.Server.Atmos.Components;
 using Content.Shared.Atmos;
+using Content.Shared.Humanoid;
 using Content.Shared.Mobs.Components;
 using Content.Shared.Physics;
 using Robust.Shared.Audio;
@@ -49,8 +50,7 @@ namespace Content.Server.Atmos.EntitySystems
                 comp.Accumulator = 0f;
                 toRemove.Add(ent);
 
-                if (HasComp<MobStateComponent>(uid) &&
-                    TryComp<PhysicsComponent>(uid, out var body))
+                if (TryComp<PhysicsComponent>(uid, out var body))
                 {
                     _physics.SetBodyStatus(uid, body, BodyStatus.OnGround);
                 }
@@ -70,27 +70,10 @@ namespace Content.Server.Atmos.EntitySystems
             }
         }
 
-        private void AddMobMovedByPressure(EntityUid uid, MovedByPressureComponent component, PhysicsComponent body)
-        {
-            if (!TryComp<FixturesComponent>(uid, out var fixtures))
-                return;
-
-            _physics.SetBodyStatus(uid, body, BodyStatus.InAir);
-
-            foreach (var (id, fixture) in fixtures.Fixtures)
-            {
-                _physics.RemoveCollisionMask(uid, id, fixture, (int) CollisionGroup.TableLayer, manager: fixtures);
-            }
-
-            // TODO: Make them dynamic type? Ehh but they still want movement so uhh make it non-predicted like weightless?
-            // idk it's hard.
-
-            component.Accumulator = 0f;
-            _activePressures.Add((uid, component));
-        }
-
         private void HighPressureMovements(Entity<GridAtmosphereComponent> gridAtmosphere, TileAtmosphere tile, EntityQuery<PhysicsComponent> bodies, EntityQuery<TransformComponent> xforms, EntityQuery<MovedByPressureComponent> pressureQuery, EntityQuery<MetaDataComponent> metas)
         {
+            if (tile.PressureDifference < SpaceWindMinimumCalculatedMass * SpaceWindMinimumCalculatedMass)
+                return;
             // TODO ATMOS finish this
 
             // Don't play the space wind sound on tiles that are on fire...
@@ -120,7 +103,8 @@ namespace Content.Server.Atmos.EntitySystems
             var gridWorldRotation = xforms.GetComponent(gridAtmosphere).WorldRotation;
 
             // If we're using monstermos, smooth out the yeet direction to follow the flow
-            if (MonstermosEqualization)
+            //TODO This is bad, don't run this. It just makes the throws worse by somehow rounding them to orthogonal
+            if (!MonstermosEqualization)
             {
                 // We step through tiles according to the pressure direction on the current tile.
                 // The goal is to get a general direction of the airflow in the area.
@@ -160,7 +144,7 @@ namespace Content.Server.Atmos.EntitySystems
                         (entity, pressureMovements),
                         gridAtmosphere.Comp.UpdateCounter,
                         tile.PressureDifference,
-                        tile.PressureDirection, 0,
+                        tile.PressureDirection,
                         tile.PressureSpecificTarget != null ? _mapSystem.ToCenterCoordinates(tile.GridIndex, tile.PressureSpecificTarget.GridIndices) : EntityCoordinates.Invalid,
                         gridWorldRotation,
                         xforms.GetComponent(entity),
@@ -181,12 +165,29 @@ namespace Content.Server.Atmos.EntitySystems
             tile.PressureDirection = differenceDirection;
         }
 
+        //INFO The EE version of this function drops pressureResistanceProbDelta, since it's not needed. If you are for whatever reason calling this function
+        //INFO And if it isn't working, you've probably still got the pressureResistanceProbDelta line included.
+        /// <notes>
+        /// EXPLANATION:
+        /// pressureDifference = Force of Air Flow on a given tile
+        /// physics.Mass = Mass of the object potentially being thrown
+        /// physics.InvMass = 1 divided by said Mass. More CPU efficient way to do division.
+        ///
+        /// Objects can only be thrown if the force of air flow is greater than the SQUARE of their mass or {SpaceWindMinimumCalculatedMass}, whichever is heavier
+        /// This means that the heavier an object is, the exponentially more force is required to move it
+        /// The force of a throw is equal to the force of air pressure, divided by an object's mass. So not only are heavier objects
+        /// less likely to be thrown, they are also harder to throw,
+        /// while lighter objects are yeeted easily, and from great distance.
+        ///
+        /// For a human sized entity with a standard weight of 80kg and a spacing between a hard vacuum and a room pressurized at 101kpa,
+        /// The human shall only be moved if he is either very close to the hole, or is standing in a region of high airflow
+        /// </notes>
+
         public void ExperiencePressureDifference(
             Entity<MovedByPressureComponent> ent,
             int cycle,
             float pressureDifference,
             AtmosDirection direction,
-            float pressureResistanceProbDelta,
             EntityCoordinates throwTarget,
             Angle gridWorldRotation,
             TransformComponent? xform = null,
@@ -199,50 +200,28 @@ namespace Content.Server.Atmos.EntitySystems
             if (!Resolve(uid, ref xform))
                 return;
 
-            // TODO ATMOS stuns?
 
-            var maxForce = MathF.Sqrt(pressureDifference) * 2.25f;
-            var moveProb = 100f;
-
-            if (component.PressureResistance > 0)
-                moveProb = MathF.Abs((pressureDifference / component.PressureResistance * MovedByPressureComponent.ProbabilityBasePercent) -
-                                     MovedByPressureComponent.ProbabilityOffset);
-
-            // Can we yeet the thing (due to probability, strength, etc.)
-            if (moveProb > MovedByPressureComponent.ProbabilityOffset && _robustRandom.Prob(MathF.Min(moveProb / 100f, 1f))
-                                                                      && !float.IsPositiveInfinity(component.MoveResist)
-                                                                      && (physics.BodyType != BodyType.Static
-                                                                          && (maxForce >= (component.MoveResist * MovedByPressureComponent.MoveForcePushRatio)))
-                || (physics.BodyType == BodyType.Static && (maxForce >= (component.MoveResist * MovedByPressureComponent.MoveForceForcePushRatio))))
+            if (physics.BodyType != BodyType.Static
+                && !float.IsPositiveInfinity(component.MoveResist))
             {
-                if (HasComp<MobStateComponent>(uid))
+                var moveForce = pressureDifference * MathF.Max(physics.InvMass, SpaceWindMaximumCalculatedInverseMass);
+                if (HasComp<HumanoidAppearanceComponent>(ent))
+                    moveForce *= HumanoidThrowMultiplier;
+                if (moveForce > physics.Mass)
                 {
-                    AddMobMovedByPressure(uid, component, physics);
-                }
-
-                if (maxForce > MovedByPressureComponent.ThrowForce)
-                {
-                    var moveForce = maxForce;
-                    moveForce /= (throwTarget != EntityCoordinates.Invalid) ? SpaceWindPressureForceDivisorThrow : SpaceWindPressureForceDivisorPush;
-                    moveForce *= MathHelper.Clamp(moveProb, 0, 100);
-
-                    // Apply a sanity clamp to prevent being thrown through objects.
-                    var maxSafeForceForObject = SpaceWindMaxVelocity * physics.Mass;
-                    moveForce = MathF.Min(moveForce, maxSafeForceForObject);
-
                     // Grid-rotation adjusted direction
                     var dirVec = (direction.ToAngle() + gridWorldRotation).ToWorldVec();
+                    moveForce *= MathF.Max(physics.InvMass, SpaceWindMaximumCalculatedInverseMass);
 
-                    // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs.
+                    //TODO Consider replacing throw target with proper trigonometry angles.
                     if (throwTarget != EntityCoordinates.Invalid)
                     {
-                        var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized();
-                        _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics);
+                        var pos = throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition + dirVec;
+                        _throwing.TryThrow(uid, pos.Normalized() * MathF.Min(moveForce, SpaceWindMaxVelocity), moveForce);
                     }
                     else
                     {
-                        moveForce = MathF.Min(moveForce, SpaceWindMaxPushForce);
-                        _physics.ApplyLinearImpulse(uid, dirVec * moveForce, body: physics);
+                        _throwing.TryThrow(uid, dirVec.Normalized() * MathF.Min(moveForce, SpaceWindMaxVelocity), moveForce);
                     }
 
                     component.LastHighPressureMovementAirCycle = cycle;

Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs

@@ -5,11 +5,13 @@ using Content.Server.Doors.Systems;
 using Content.Shared.Atmos;
 using Content.Shared.Atmos.Components;
 using Content.Shared.Database;
+using Content.Shared.Maps;
+using Robust.Shared.Map;
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Components;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
-
 namespace Content.Server.Atmos.EntitySystems
 {
     public sealed partial class AtmosphereSystem
@@ -137,7 +139,7 @@ namespace Content.Server.Atmos.EntitySystems
             var logN = MathF.Log2(tileCount);
 
             // Optimization - try to spread gases using an O(n log n) algorithm that has a chance of not working first to avoid O(n^2)
-            if (giverTilesLength > logN && takerTilesLength > logN)
+            if (!MonstermosUseExpensiveAirflow && giverTilesLength > logN && takerTilesLength > logN)
             {
                 // Even if it fails, it will speed up the next part.
                 Array.Sort(_equalizeTiles, 0, tileCount, _monstermosComparer);
@@ -550,7 +552,8 @@ namespace Content.Server.Atmos.EntitySystems
                 }
 
                 InvalidateVisuals(ent, otherTile);
-                HandleDecompressionFloorRip(mapGrid, otherTile, otherTile.MonstermosInfo.CurrentTransferAmount);
+                if (MonstermosRipTiles && otherTile.PressureDifference > MonstermosRipTilesMinimumPressure)
+                    HandleDecompressionFloorRip(mapGrid, otherTile, otherTile.PressureDifference);
             }
 
             if (GridImpulse && tileCount > 0)
@@ -682,14 +685,14 @@ namespace Content.Server.Atmos.EntitySystems
             adj.MonstermosInfo[idx.ToOppositeDir()] -= amount;
         }
 
-        private void HandleDecompressionFloorRip(MapGridComponent mapGrid, TileAtmosphere tile, float sum)
+        private void HandleDecompressionFloorRip(MapGridComponent mapGrid, TileAtmosphere tile, float delta)
         {
-            if (!MonstermosRipTiles)
+            if (!mapGrid.TryGetTileRef(tile.GridIndices, out var tileRef))
                 return;
+            var tileref = tileRef.Tile;
 
-            var chance = MathHelper.Clamp(0.01f + (sum / SpacingMaxWind) * 0.3f, 0.003f, 0.3f);
-
-            if (sum > 20 && _robustRandom.Prob(chance))
+            var tileDef = (ContentTileDefinition) _tileDefinitionManager[tileref.TypeId];
+            if (!tileDef.Reinforced && tileDef.TileRipResistance < delta * MonstermosRipTilesPressureOffset)
                 PryTile(mapGrid, tile.GridIndices);
         }
 

Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs

@@ -6,6 +6,7 @@ using Content.Server.NodeContainer.EntitySystems;
 using Content.Shared.Atmos.EntitySystems;
 using Content.Shared.Doors.Components;
 using Content.Shared.Maps;
+using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio.Systems;
@@ -37,6 +38,7 @@ public sealed partial class AtmosphereSystem : SharedAtmosphereSystem
     [Dependency] private readonly TileSystem _tile = default!;
     [Dependency] private readonly MapSystem _map = default!;
     [Dependency] public readonly PuddleSystem Puddle = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
 
     private const float ExposedUpdateDelay = 1f;
     private float _exposedTimer = 0f;

Content.Server/Temperature/Systems/TemperatureSystem.cs

@@ -171,8 +171,9 @@ public sealed class TemperatureSystem : EntitySystem
         {
             return Atmospherics.MinimumHeatCapacity;
         }
-
-        return comp.SpecificHeat * physics.FixturesMass;
+        if (physics.Mass < 1)
+            return comp.SpecificHeat;
+        else return comp.SpecificHeat * physics.FixturesMass;
     }
 
     private void OnInit(EntityUid uid, InternalTemperatureComponent comp, MapInitEvent args)

Content.Server/_White/TTS/TTSManager.cs

@@ -63,9 +63,10 @@ public sealed class TTSManager
     {
         var url = _cfg.GetCVar(WhiteCVars.TtsApiUrl);
         var maxCacheSize = _cfg.GetCVar(WhiteCVars.TtsMaxCacheSize);
-        if (string.IsNullOrWhiteSpace(url))
+        if (string.IsNullOrWhiteSpace(url)) // zaebal padat
         {
-            throw new Exception("TTS Api url not specified");
+            _sawmill.Log(LogLevel.Error, nameof(TTSManager), "TTS Api url not specified");
+            return null;
         }
 
         WantedCount.Inc();
@@ -193,4 +194,4 @@ public sealed class TTSManager
         [JsonPropertyName("audio")]
         public string Audio { get; set; }
     }
-}
+}

Content.Shared/CCVar/CCVars.cs

@@ -1054,7 +1054,7 @@ namespace Content.Shared.CCVar
         ///     Useful to prevent clipping through objects.
         /// </summary>
         public static readonly CVarDef<float> SpaceWindMaxVelocity =
-            CVarDef.Create("atmos.space_wind_max_velocity", 30f, CVar.SERVERONLY);
+            CVarDef.Create("atmos.space_wind_max_velocity", 15f, CVar.SERVERONLY);
 
         /// <summary>
         ///     The maximum force that may be applied to an object by pushing (i.e. not throwing) atmospheric pressure differences.
@@ -1063,6 +1063,24 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<float> SpaceWindMaxPushForce =
             CVarDef.Create("atmos.space_wind_max_push_force", 20f, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     If an object's mass is below this number, then this number is used in place of mass to determine whether air pressure can throw an object.
+        ///     This has nothing to do with throwing force, only acting as a way of reducing the odds of tiny 5 gram objects from being yeeted by people's breath
+        /// </summary>
+        /// <remarks>
+        ///     If you are reading this because you want to change it, consider looking into why almost every item in the game weighs only 5 grams
+        ///     And maybe do your part to fix that? :)
+        /// </remarks>
+        public static readonly CVarDef<float> SpaceWindMinimumCalculatedMass =
+            CVarDef.Create("atmos.space_wind_minimum_calculated_mass", 10f, CVar.SERVERONLY);
+
+        /// <summary>
+        /// 	Calculated as 1/Mass, where Mass is the physics.Mass of the desired threshold.
+        /// 	If an object's inverse mass is lower than this, it is capped at this. Basically, an upper limit to how heavy an object can be before it stops resisting space wind more.
+        /// </summary>
+        public static readonly CVarDef<float> SpaceWindMaximumCalculatedInverseMass =
+            CVarDef.Create("atmos.space_wind_maximum_calculated_inverse_mass", 0.04f, CVar.SERVERONLY);
+
         /// <summary>
         ///     Whether monstermos tile equalization is enabled.
         /// </summary>
@@ -1084,7 +1102,21 @@ namespace Content.Shared.CCVar
 		///     Also looks weird on slow spacing for unrelated reasons. If you do want to enable this, you should probably turn on instaspacing.
         /// </summary>
         public static readonly CVarDef<bool> MonstermosRipTiles =
-            CVarDef.Create("atmos.monstermos_rip_tiles", false, CVar.SERVERONLY);
+            CVarDef.Create("atmos.monstermos_rip_tiles", true, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Taken as the cube of a tile's mass, this acts as a minimum threshold of mass for which air pressure calculates whether or not to rip a tile from the floor
+        ///     This should be set by default to the cube of the game's lowest mass tile as defined in their prototypes, but can be increased for server performance reasons
+        /// </summary>
+        public static readonly CVarDef<float> MonstermosRipTilesMinimumPressure =
+            CVarDef.Create("atmos.monstermos_rip_tiles_min_pressure", 7500f, CVar.SERVERONLY);
+
+        /// <summary>
+        ///     Taken after the minimum pressure is checked, the effective pressure is multiplied by this amount.
+        ///		This allows server hosts to finely tune how likely floor tiles are to be ripped apart by air pressure
+        /// </summary>
+        public static readonly CVarDef<float> MonstermosRipTilesPressureOffset =
+            CVarDef.Create("atmos.monstermos_rip_tiles_pressure_offset", 0.44f, CVar.SERVERONLY);
 
         /// <summary>
         ///     Whether explosive depressurization will cause the grid to gain an impulse.
@@ -1115,6 +1147,13 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<float> AtmosSpacingMaxWind =
             CVarDef.Create("atmos.mmos_max_wind", 500f, CVar.SERVERONLY);
 
+        /// <summary>
+        /// Increases default airflow calculations to O(n^2) complexity, for use with heavy space wind optimizations. Potato servers BEWARE
+        /// This solves the problem of objects being trapped in an infinite loop of slamming into a wall repeatedly.
+        /// </summary>
+        public static readonly CVarDef<bool> MonstermosUseExpensiveAirflow =
+            CVarDef.Create("atmos.mmos_expensive_airflow", true, CVar.SERVERONLY);
+
         /// <summary>
         ///     Whether atmos superconduction is enabled.
         /// </summary>
@@ -1171,6 +1210,13 @@ namespace Content.Shared.CCVar
         public static readonly CVarDef<float> AtmosHeatScale =
             CVarDef.Create("atmos.heat_scale", 8f, CVar.SERVERONLY);
 
+        /// <summary>
+        ///     A multiplier on the amount of force applied to Humanoid entities, as tracked by HumanoidAppearanceComponent
+        ///     This multiplier is added after all other checks are made, and applies to both throwing force, and how easy it is for an entity to be thrown.
+        /// </summary>
+        public static readonly CVarDef<float> AtmosHumanoidThrowMultiplier =
+            CVarDef.Create("atmos.humanoid_throw_multiplier", 2f, CVar.SERVERONLY);
+
         /*
          * MIDI instruments
          */

Content.Shared/Maps/ContentTileDefinition.cs

@@ -117,5 +117,11 @@ namespace Content.Shared.Maps
         {
             TileId = id;
         }
+
+        [DataField]
+        public bool Reinforced = false;
+
+        [DataField]
+        public float TileRipResistance = 125f;
     }
 }

Resources/Changelog/ChangelogWhite.yml

@@ -6653,3 +6653,31 @@
   id: 415
   time: '2024-07-23T23:19:31.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/483
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D \u0430\u0442\
+      \u043C\u043E\u0441 \u0441 Einstein-Engines, \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0440\u0430\u0437\u0433\u0435\u0440\u043C\u0435\u0442\u0438\u0437\u0430\u0446\
+      \u0438\u0438 \u0441\u0442\u0430\u043B\u0438 \u043A\u0443\u0434\u0430 \u0431\u043E\
+      \u043B\u0435\u0435 \u044D\u0444\u0444\u0435\u043A\u0442\u043D\u044B\u043C\u0438\
+      , \u0430 \u0441\u0430\u043C\u0430 \u0441\u0438\u0441\u0442\u0435\u043C\u0430\
+      \ \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0431\u043E\
+      \u043B\u0435\u0435 \u043E\u043F\u0442\u0438\u043C\u0438\u0437\u0438\u0440\u043E\
+      \u0432\u0430\u043D\u043D\u043E\u0439."
+    type: Add
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D \u043E\u0442\u0441\u0442\
+      \u0443\u043F \u0443 \u043F\u0440\u0438\u0447\u0438\u043D\u044B \u0432\u044B\u0437\
+      \u043E\u0432\u0430 \u0448\u0430\u0442\u0442\u043B\u0430"
+    type: Fix
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u043E \u043F\u0430\u0434\
+      \u0435\u043D\u0438\u0435 \u043B\u043E\u043A\u0430\u043B\u043A\u0438, \u043A\u043E\
+      \u0433\u0434\u0430 \u0422\u0422\u0421 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442\
+      \ \u043D\u0430\u0439\u0442\u0438 \u0441\u0441\u044B\u043B\u043A\u0443 \u043D\
+      \u0430 \u0430\u043F\u0438. \u0415\u0441\u043B\u0438 \u043D\u0430 \u0441\u0435\
+      \u0440\u0432\u0435\u0440\u0435 \u0441\u043B\u043E\u043C\u0430\u0435\u0442\u0441\
+      \u044F \u0442\u0442\u0441 - \u044D\u0442\u043E \u044F \u0441\u0434\u0435\u043B\
+      \u0430\u043B, \u0437\u043D\u0430\u0439\u0442\u0435."
+    type: Fix
+  id: 416
+  time: '2024-07-24T19:40:38.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/491

Resources/Locale/ru-RU/_white/round-end/round-end-system.ftl

@@ -2,4 +2,4 @@
 round-end-system-shuttle-called-announcement-reason =
     Эвакуационный шаттл был вызван. Он прибудет через: {$time} {$units}.
 
-        Причина: {$reason}
+    Причина: {$reason}

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -22,7 +22,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.25
-        density: 10
+        density: 0.8
         mask:
         - FlyingMobMask
         layer:
@@ -89,7 +89,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.1
-        density: 30
+        density: 0.1
         mask:
         - FlyingMobMask
         layer:
@@ -325,7 +325,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 100
+        density: 0.0007
         mask:
         - SmallMobMask
         layer:
@@ -428,7 +428,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 120
+        density: 0.007
         mask:
         - SmallMobMask
         layer:
@@ -1518,7 +1518,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 100
+        density: 0.76
         mask:
         - SmallMobMask
         layer:
@@ -2450,7 +2450,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 50 #They actually are pretty light, I looked it up
+        density: 16.66
         mask:
         - MobMask
         layer:
@@ -2527,7 +2527,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 50
+        density: 25.5
         mask:
         - MobMask
         layer:
@@ -2676,7 +2676,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 15
+        density: 9
         mask:
         - MobMask
         layer:
@@ -2822,6 +2822,17 @@
         Base: caracal_flop
       Dead:
         Base: caracal_dead
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 30
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
 
 - type: entity
   name: kitten
@@ -2855,6 +2866,17 @@
     thresholds:
       0: Alive
       25: Dead
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 2
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
 
 - type: entity
   name: sloth
@@ -2935,7 +2957,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 5
+        density: 4
         mask:
         - MobMask
         layer:
@@ -3012,7 +3034,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.2
-        density: 120
+        density: 0.8
         mask:
         - SmallMobMask
         layer:
@@ -3134,7 +3156,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 250
+        density: 750
         mask:
         - MobMask
         layer:
@@ -3219,7 +3241,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        density: 100 # High, because wood is heavy.
+        density: 15
         mask:
         - MobMask
         layer:

Resources/Prototypes/Entities/Objects/Fun/CardGames/Cards/cards_base.yml

@@ -0,0 +1,67 @@
+# BASE CARDS
+
+- type: entity
+  parent: BaseItem
+  id: BaseCard
+  abstract: true
+  name: карта
+  description: Игральная карта.
+  components:
+    - type: Item
+      size: Small
+    - type: SpawnItemsOnUse
+      sound:
+        path: /Audio/Effects/unwrap.ogg
+    - type: Tag
+      tags:
+        - Card
+
+- type: entity
+  parent: BaseCard
+  id: BaseCardDiamonds
+  abstract: true
+  components:
+    - type: Sprite
+      sprite: Objects/Fun/Cards/diamonds.rsi
+
+- type: entity
+  parent: BaseCard
+  id: BaseCardSpades
+  abstract: true
+  components:
+    - type: Sprite
+      sprite: Objects/Fun/Cards/spades.rsi
+
+- type: entity
+  parent: BaseCard
+  id: BaseCardHearts
+  abstract: true
+  components:
+    - type: Sprite
+      sprite: Objects/Fun/Cards/hearts.rsi
+
+- type: entity
+  parent: BaseCard
+  id: BaseCardClubs
+  abstract: true
+  components:
+    - type: Sprite
+      sprite: Objects/Fun/Cards/clubs.rsi
+
+- type: entity
+  parent: BaseItem
+  id: BaseCardUnknown
+  abstract: true
+  name: неизвестная карта
+  description: Скрывает неизвестную карту.
+  components:
+    - type: Sprite
+      sprite: Objects/Fun/Cards/Other.rsi
+      state: Unknown
+      sound:
+        path: /Audio/Effects/unwrap.ogg
+    - type: Item
+      size: Small
+    - type: Tag
+      tags:
+        - Card

Resources/Prototypes/Entities/Objects/Fun/CardGames/Cards/cards_clubs.yml

@@ -0,0 +1,276 @@
+# CARDS
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_2
+  name: карта крести 2
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_2
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown3
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_3
+  name: карта крести 3
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_3
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown7
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_4
+  name: карта крести 4
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_4
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown11
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_5
+  name: карта крести 5
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_5
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown15
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_6
+  name: карта крести 6
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_6
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown19
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_7
+  name: карта крести 7
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_7
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown23
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_8
+  name: карта крести 8
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_8
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown27
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_9
+  name: карта крести 9
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_9
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown31
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_10
+  name: карта крести 10
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_10
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown35
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_j
+  name: карта крести Валет
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_j
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown39
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_q
+  name: карта крести Королева
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_q
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown43
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_k
+  name: карта крести Король
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_k
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown47
+
+- type: entity
+  parent: BaseCardClubs
+  id: Cardclubs_a
+  name: карта крести Туз
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: clubs_a
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown51
+
+# UNKNOWN CARDS
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown3
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_2
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown7
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_3
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown11
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_4
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown15
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_5
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown19
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_6
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown23
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_7
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown27
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_8
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown31
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_9
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown35
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_10
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown39
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_j
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown43
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_q
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown47
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_k
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown51
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardclubs_a

Resources/Prototypes/Entities/Objects/Fun/CardGames/Cards/cards_diamonds.yml

@@ -0,0 +1,276 @@
+# CARDS
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_2
+  name: карта бубны 2
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_2
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown1
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_3
+  name: карта бубны 3
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_3
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown5
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_4
+  name: карта бубны 4
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_4
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown9
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_5
+  name: карта бубны 5
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_5
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown13
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_6
+  name: карта бубны 6
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_6
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown17
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_7
+  name: карта бубны 7
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_7
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown21
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_8
+  name: карта бубны 8
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_8
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown25
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_9
+  name: карта бубны 9
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_9
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown29
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_10
+  name: карта бубны 10
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_10
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown33
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_j
+  name: карта бубны Валет
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_j
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown37
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_q
+  name: карта бубны Королева
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_q
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown41
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_k
+  name: карта бубны Король
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_k
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown45
+
+- type: entity
+  parent: BaseCardDiamonds
+  id: Carddiamonds_a
+  name: карта бубны Туз
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: diamonds_a
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown49
+
+# UNKNOWN CARDS
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown1
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_2
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown5
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_3
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown9
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_4
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown13
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_5
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown17
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_6
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown21
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_7
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown25
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_8
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown29
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_9
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown33
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_10
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown37
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_j
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown41
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_q
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown45
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_k
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown49
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Carddiamonds_a

Resources/Prototypes/Entities/Objects/Fun/CardGames/Cards/cards_hearts.yml

@@ -0,0 +1,276 @@
+# CARDS
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_2
+  name: карта черви 2
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_2
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown2
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_3
+  name: карта черви 3
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_3
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown6
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_4
+  name: карта черви 4
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_4
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown10
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_5
+  name: карта черви 5
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_5
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown14
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_6
+  name: карта черви 6
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_6
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown18
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_7
+  name: карта черви 7
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_7
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown22
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_8
+  name: карта черви 8
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_8
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown26
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_9
+  name: карта черви 9
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_9
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown30
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_10
+  name: карта черви 10
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_10
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown34
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_j
+  name: карта черви Валет
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_j
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown38
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_q
+  name: карта черви Королева
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_q
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown42
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_k
+  name: карта черви Король
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_k
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown46
+
+- type: entity
+  parent: BaseCardHearts
+  id: Cardhearts_a
+  name: карта черви Туз
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: hearts_a
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown50
+
+# UNKNOWN CARDS
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown2
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_2
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown6
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_3
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown10
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_4
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown14
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_5
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown18
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_6
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown22
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_7
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown26
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_8
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown30
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_9
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown34
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_10
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown38
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_j
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown42
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_q
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown46
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_k
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown50
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardhearts_a

Resources/Prototypes/Entities/Objects/Fun/CardGames/Cards/cards_other.yml

@@ -0,0 +1,293 @@
+# CARDS 36
+
+- type: entity
+  parent: BaseStorageItem
+  id: CardBag36
+  name: средняя колода игральных карт
+  suffix: 36
+  description: Новейшая колода игральных карт.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Cards/Other.rsi
+    state: deck
+  - type: Item
+    size: Huge
+  - type: Storage
+    maxItemSize: Small
+    grid:
+      - 0,0,8,7
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+        - Card
+  - type: Tag
+    tags:
+    - TrashBag
+  - type: Appearance
+  - type: Dumpable
+  - type: StorageFill
+    contents:
+      - id: CardUnknown47
+      - id: CardUnknown50
+      - id: CardUnknown51
+      - id: CardUnknown20
+      - id: CardUnknown26
+      - id: CardUnknown30
+      - id: CardUnknown52
+      - id: CardUnknown36
+      - id: CardUnknown41
+      - id: CardUnknown23
+      - id: CardUnknown48
+      - id: CardUnknown27
+      - id: CardUnknown33
+      - id: CardUnknown17
+      - id: CardUnknown28
+      - id: CardUnknown22
+      - id: CardUnknown29
+      - id: CardUnknown32
+      - id: CardUnknown21
+      - id: CardUnknown43
+      - id: CardUnknown42
+      - id: CardUnknown24
+      - id: CardUnknown45
+      - id: CardUnknown34
+      - id: CardUnknown18
+      - id: CardUnknown49
+      - id: CardUnknown25
+      - id: CardUnknown46
+      - id: CardUnknown35
+      - id: CardUnknown19
+      - id: CardUnknown38
+      - id: CardUnknown40
+      - id: CardUnknown31
+      - id: CardUnknown39
+      - id: CardUnknown37
+      - id: CardUnknown44
+
+# CARDS 52
+
+- type: entity
+  parent: BaseStorageItem
+  id: CardBag52
+  name: большая колода игральных карт
+  suffix: 52
+  description: Новейшая колода игральных карт.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Cards/Other.rsi
+    state: deck
+  - type: Item
+    size: Huge
+  - type: Storage
+    maxItemSize: Small
+    grid:
+      - 0,0,10,9
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+        - Card
+  - type: Tag
+    tags:
+    - TrashBag
+  - type: Appearance
+  - type: Dumpable
+  - type: StorageFill
+    contents:
+      - id: CardUnknown25
+      - id: CardUnknown52
+      - id: CardUnknown3
+      - id: CardUnknown4
+      - id: CardUnknown37
+      - id: CardUnknown49
+      - id: CardUnknown27
+      - id: CardUnknown29
+      - id: CardUnknown17
+      - id: CardUnknown8
+      - id: CardUnknown11
+      - id: CardUnknown39
+      - id: CardUnknown42
+      - id: CardUnknown9
+      - id: CardUnknown26
+      - id: CardUnknown38
+      - id: CardUnknown44
+      - id: CardUnknown32
+      - id: CardUnknown36
+      - id: CardUnknown45
+      - id: CardUnknown30
+      - id: CardUnknown50
+      - id: CardUnknown2
+      - id: CardUnknown43
+      - id: CardUnknown20
+      - id: CardUnknown47
+      - id: CardUnknown22
+      - id: CardUnknown51
+      - id: CardUnknown31
+      - id: CardUnknown18
+      - id: CardUnknown34
+      - id: CardUnknown19
+      - id: CardUnknown28
+      - id: CardUnknown33
+      - id: CardUnknown41
+      - id: CardUnknown24
+      - id: CardUnknown1
+      - id: CardUnknown48
+      - id: CardUnknown15
+      - id: CardUnknown5
+      - id: CardUnknown13
+      - id: CardUnknown7
+      - id: CardUnknown16
+      - id: CardUnknown40
+      - id: CardUnknown14
+      - id: CardUnknown46
+      - id: CardUnknown6
+      - id: CardUnknown21
+      - id: CardUnknown23
+      - id: CardUnknown35
+      - id: CardUnknown10
+      - id: CardUnknown12
+
+# CARDS CRATE
+
+#- type: entity
+#  parent: CrateBaseWeldable
+#  id: CardCrate1
+#  name: сундук с картами
+#  suffix: 36
+#  components:
+#  - type: Icon
+#    sprite: Structures/Storage/Crates/generic.rsi
+#  - type: Sprite
+#    sprite: Structures/Storage/Crates/generic.rsi
+#  - type: StorageFill
+#    contents:
+#      - id: CardUnknown47
+#      - id: CardUnknown50
+#      - id: CardUnknown51
+#      - id: CardUnknown20
+#      - id: CardUnknown26
+#      - id: CardUnknown30
+#      - id: CardUnknown52
+#      - id: CardUnknown36
+#      - id: CardUnknown41
+#      - id: CardUnknown23
+#      - id: CardUnknown48
+#      - id: CardUnknown27
+#      - id: CardUnknown33
+#      - id: CardUnknown17
+#      - id: CardUnknown28
+#      - id: CardUnknown22
+#      - id: CardUnknown29
+#      - id: CardUnknown32
+#      - id: CardUnknown21
+#      - id: CardUnknown43
+#      - id: CardUnknown42
+#      - id: CardUnknown24
+#      - id: CardUnknown45
+#      - id: CardUnknown34
+#      - id: CardUnknown18
+#      - id: CardUnknown49
+#      - id: CardUnknown25
+#      - id: CardUnknown46
+#      - id: CardUnknown35
+#      - id: CardUnknown19
+#      - id: CardUnknown38
+#      - id: CardUnknown40
+#      - id: CardUnknown31
+#      - id: CardUnknown39
+#      - id: CardUnknown37
+#      - id: CardUnknown44
+#
+#- type: entity
+#  parent: CrateBaseWeldable
+#  id: CardCrate2
+#  name: сундук с картами
+#  suffix: 52
+#  components:
+#  - type: Icon
+#    sprite: Structures/Storage/Crates/generic.rsi
+#  - type: Sprite
+#    sprite: Structures/Storage/Crates/generic.rsi
+#  - type: StorageFill
+#    contents:
+#      - id: CardUnknown25
+#      - id: CardUnknown52
+#      - id: CardUnknown3
+#      - id: CardUnknown4
+#      - id: CardUnknown37
+#      - id: CardUnknown49
+#      - id: CardUnknown27
+#      - id: CardUnknown29
+#      - id: CardUnknown17
+#      - id: CardUnknown8
+#      - id: CardUnknown11
+#      - id: CardUnknown39
+#      - id: CardUnknown42
+#      - id: CardUnknown9
+#      - id: CardUnknown26
+#      - id: CardUnknown38
+#      - id: CardUnknown44
+#      - id: CardUnknown32
+#      - id: CardUnknown36
+#      - id: CardUnknown45
+#      - id: CardUnknown30
+#      - id: CardUnknown50
+#      - id: CardUnknown2
+#      - id: CardUnknown43
+#      - id: CardUnknown20
+#      - id: CardUnknown47
+#      - id: CardUnknown22
+#      - id: CardUnknown51
+#      - id: CardUnknown31
+#      - id: CardUnknown18
+#      - id: CardUnknown34
+#      - id: CardUnknown19
+#      - id: CardUnknown28
+#      - id: CardUnknown33
+#      - id: CardUnknown41
+#      - id: CardUnknown24
+#      - id: CardUnknown1
+#      - id: CardUnknown48
+#      - id: CardUnknown15
+#      - id: CardUnknown5
+#      - id: CardUnknown13
+#      - id: CardUnknown7
+#      - id: CardUnknown16
+#      - id: CardUnknown40
+#      - id: CardUnknown14
+#      - id: CardUnknown46
+#      - id: CardUnknown6
+#      - id: CardUnknown21
+#      - id: CardUnknown23
+#      - id: CardUnknown35
+#      - id: CardUnknown10
+#      - id: CardUnknown12
+
+
+# PLAYERS CARDS
+
+- type: entity
+  parent: BaseStorageItem
+  id: PlayerCardBag
+  name: колода карт игрока
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/Cards/Other.rsi
+    state: fan
+  - type: Item
+    size: Normal
+  - type: Storage
+    maxItemSize: Small
+    grid:
+      - 0,0,5,5
+    quickInsert: true
+    areaInsert: false
+    whitelist:
+      tags:
+        - Card
+  - type: Tag
+    tags:
+      - TrashBag
+  - type: Appearance
+  - type: Dumpable

Resources/Prototypes/Entities/Objects/Fun/CardGames/Cards/cards_spades.yml

@@ -0,0 +1,276 @@
+# CARDS
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_2
+  name: карта пики 2
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_2
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown4
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_3
+  name: карта пики 3
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_3
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown8
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_4
+  name: карта пики 4
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_4
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown12
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_5
+  name: карта пики 5
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_5
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown16
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_6
+  name: карта пики 6
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_6
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown20
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_7
+  name: карта пики 7
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_7
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown24
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_8
+  name: карта пики 8
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_8
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown28
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_9
+  name: карта пики 9
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_9
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown32
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_10
+  name: карта пики 10
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_10
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown36
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_j
+  name: карта пики Валет
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_j
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown40
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_q
+  name: карта пики Королева
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_q
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown44
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_k
+  name: карта пики Король
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_k
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown48
+
+- type: entity
+  parent: BaseCardSpades
+  id: Cardspades_a
+  name: карта пики туз
+  description: Игральная карта.
+  components:
+    - type: Sprite
+      state: spades_a
+    - type: SpawnItemsOnUse
+      items:
+        - id: CardUnknown52
+
+# UNKNOWN CARDS
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown4
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_2
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown8
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_3
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown12
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_4
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown16
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_5
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown20
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_6
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown24
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_7
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown28
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_8
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown32
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_9
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown36
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_10
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown40
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_j
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown44
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_q
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown48
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_k
+
+- type: entity
+  parent: BaseCardUnknown
+  id: CardUnknown52
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+      - id: Cardspades_a

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_card_base.yml

@@ -0,0 +1,73 @@
+# BASE UNO CARDS
+
+- type: entity
+  parent: BaseItem
+  id: BaseUnoCard
+  abstract: true
+  name: карта
+  description: Карта UNO.
+  components:
+  - type: Item
+    size: Small
+  - type: SpawnItemsOnUse
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - UnoCard
+
+- type: entity
+  parent: BaseUnoCard
+  id: BaseUnoCardBlue
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/UnoCards/uno_blue.rsi
+    scale: 0.5, 0.5
+
+- type: entity
+  parent: BaseUnoCard
+  id: BaseUnoCardGreen
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/UnoCards/uno_green.rsi
+    scale: 0.5, 0.5
+
+- type: entity
+  parent: BaseUnoCard
+  id: BaseUnoCardRed
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/UnoCards/uno_red.rsi
+    scale: 0.5, 0.5
+
+- type: entity
+  parent: BaseUnoCard
+  id: BaseUnoCardYellow
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
+    scale: 0.5, 0.5
+
+- type: entity
+  parent: BaseItem
+  id: BaseUnoUnknownCard
+  abstract: true
+  name: неизвестная карта
+  description: Скрывает неизвестную карту UNO.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/UnoCards/uno_special.rsi
+    state: cardback
+    scale: 0.5, 0.5
+  - type: Item
+    size: Small
+  - type: SpawnItemsOnUse
+    sound:
+      path: /Audio/Effects/unwrap.ogg
+  - type: Tag
+    tags:
+    - UnoCard

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_cards_blue.yml

@@ -0,0 +1,276 @@
+# BLUE CARDS
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue0
+  name: синяя карта UNO. 0
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue0
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue0
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue1
+  name: синяя карта UNO. 1
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue1
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue1
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue2
+  name: синяя карта UNO. 2
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue2
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue2
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue3
+  name: синяя карта UNO. 3
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue3
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue3
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue4
+  name: синяя карта UNO. 4
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue4
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue4
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue5
+  name: синяя карта UNO. 5
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue5
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue5
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue6
+  name: синяя карта UNO. 6
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue6
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue6
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue7
+  name: синяя карта UNO. 7
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue7
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue7
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue8
+  name: синяя карта UNO. 8
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue8
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue8
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlue9
+  name: синяя карта UNO. 9
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblue9
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlue9
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBluePlus
+  name: синяя карта UNO. плюс 2
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unoblueplus
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBluePlus
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlueReverse
+  name: синяя карта UNO. реверс
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unobluereverse
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlueReverse
+
+- type: entity
+  parent: BaseUnoCardBlue
+  id: UnoCardBlueStop
+  name: синяя карта UNO. стоп
+  description: Игральная Карта UNO.
+  components:
+  - type: Sprite
+    state: unobluestop
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardUnknownBlueStop
+
+# UNKNOWN BLUE CARDS
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue0
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue0
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue1
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue1
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue2
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue2
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue3
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue3
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue4
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue4
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue5
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue5
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue6
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue6
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue7
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue7
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue8
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue8
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlue9
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlue9
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBluePlus
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBluePlus
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlueReverse
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlueReverse
+
+- type: entity
+  parent: BaseUnoUnknownCard
+  id: UnoCardUnknownBlueStop
+  noSpawn: true
+  components:
+  - type: SpawnItemsOnUse
+    items:
+    - id: UnoCardBlueStop

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_cards_green.yml

@@ -1,193 +1,167 @@
+# GREEN CARDS
 
-# Green Cards
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen0
-  name: Зелёная карта UNO 0
-  description: Игральная карта UNO
+  name: зелёная карта UNO 0
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen0
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen0
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen1
-  name: Зелёная карта UNO 1
-  description: Игральная карта UNO
+  name: зелёная карта UNO 1
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen1
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen1
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen2
-  name: Зелёная карта UNO 2
-  description: Игральная карта UNO
+  name: зелёная карта UNO 2
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen2
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen2
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen3
-  name: Зелёная карта UNO 3
-  description: Игральная карта UNO
+  name: зелёная карта UNO 3
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen3
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen3
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen4
-  name: Зелёная карта UNO 4
-  description: Игральная карта UNO
+  name: зелёная карта UNO 4
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen4
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen4
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen5
-  name: Зелёная карта UNO 5
-  description: Игральная карта UNO
+  name: зелёная карта UNO 5
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen5
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen5
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen6
-  name: Зелёная карта UNO 6
-  description: Игральная карта UNO
+  name: зелёная карта UNO 6
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen6
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen6
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen7
-  name: Зелёная карта UNO 7
-  description: Игральная карта UNO
+  name: зелёная карта UNO 7
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen7
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen7
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen8
-  name: Зелёная карта UNO 8
-  description: Игральная карта UNO
+  name: зелёная карта UNO 8
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen8
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen8
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreen9
-  name: Зелёная карта UNO 9
-  description: Игральная карта UNO
+  name: зелёная карта UNO 9
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreen9
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreen9
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreenPlus
-  name: Зелёная карта UNO плюс 2
-  description: Игральная карта UNO
+  name: зелёная карта UNO плюс 2
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreenplus
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreenPlus
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreenReverse
-  name: Зелёная карта UNO реверс
-  description: Игральная карта UNO
+  name: зелёная карта UNO реверс
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreenreverse
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreenReverse
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardGreen
   id: UnoCardGreenStop
-  name: Зелёная карта UNO стоп
-  description: Игральная карта UNO
+  name: зелёная карта UNO стоп
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_green.rsi
     state: unogreenstop
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownGreenStop
 
-# Green Cards Unknown
+# UNKNOWN GREEN CARDS
+
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen0
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -196,8 +170,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen1
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -206,8 +179,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen2
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -216,8 +188,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen3
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -226,8 +197,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen4
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -236,8 +206,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen5
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -246,8 +215,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen6
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -256,8 +224,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen7
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -266,8 +233,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen8
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -276,8 +242,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreen9
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -286,8 +251,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreenPlus
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -296,8 +260,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreenReverse
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -306,8 +269,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownGreenStop
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_cards_other.yml

@@ -1,8 +1,8 @@
 - type: entity
   parent: BaseStorageItem
   id: UnoCardBag
-  name: Карты UNO
-  description: Игральные карты UNO
+  name: упаковка карт UNO
+  description: Упаковка с игральными картами UNO.
   components:
   - type: Sprite
     sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -138,7 +138,7 @@
 - type: entity
   parent: BaseStorageItem
   id: UnoPlayerCardBag
-  name: Карты игрока UNO
+  name: колода карт игрока UNO
   components:
   - type: Sprite
     sprite: Objects/Fun/UnoCards/uno_special.rsi

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_cards_red.yml

@@ -1,193 +1,167 @@
+# RED CARDS
 
-# Red Cards
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed0
-  name: Красная карта UNO 0
-  description: Игральная карта UNO
+  name: красная карта UNO 0
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored0
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed0
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed1
-  name: Красная карта UNO 1
-  description: Игральная карта UNO
+  name: красная карта UNO 1
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored1
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed1
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed2
-  name: Красная карта UNO 2
-  description: Игральная карта UNO
+  name: красная карта UNO 2
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored2
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed2
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed3
-  name: Красная карта UNO 3
-  description: Игральная карта UNO
+  name: красная карта UNO 3
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored3
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed3
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed4
-  name: Красная карта UNO 4
-  description: Игральная карта UNO
+  name: красная карта UNO 4
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored4
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed4
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed5
-  name: Красная карта UNO 5
-  description: Игральная карта UNO
+  name: красная карта UNO 5
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored5
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed5
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed6
-  name: Красная карта UNO 6
-  description: Игральная карта UNO
+  name: красная карта UNO 6
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored6
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed6
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed7
-  name: Красная карта UNO 7
-  description: Игральная карта UNO
+  name: красная карта UNO 7
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored7
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed7
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed8
-  name: Красная карта UNO 8
-  description: Игральная карта UNO
+  name: красная карта UNO 8
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored8
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed8
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRed9
-  name: Красная карта UNO 9
-  description: Игральная карта UNO
+  name: красная карта UNO 9
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unored9
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRed9
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRedPlus
-  name: Красная карта UNO плюс 2
-  description: Игральная карта UNO
+  name: красная карта UNO плюс 2
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unoredplus
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRedPlus
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRedReverse
-  name: Красная карта UNO реверс
-  description: Игральная карта UNO
+  name: красная карта UNO реверс
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unoredreverse
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRedReverse
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardRed
   id: UnoCardRedStop
-  name: Красная карта UNO стоп
-  description: Игральная карта UNO
+  name: красная карта UNO стоп
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_red.rsi
     state: unoredstop
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownRedStop
 
-# Red Cards Unknown
+# UNKNOWN RED CARDS
+
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed0
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -196,8 +170,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed1
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -206,8 +179,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed2
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -216,8 +188,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed3
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -226,8 +197,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed4
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -236,8 +206,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed5
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -246,8 +215,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed6
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -256,8 +224,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed7
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -266,8 +233,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed8
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -276,8 +242,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRed9
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -286,8 +251,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRedPlus
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -296,8 +260,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRedReverse
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -306,8 +269,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownRedStop
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_cards_special.yml

@@ -1,10 +1,10 @@
+# SPECIAL
 
-# Special
 - type: entity
   parent: BaseUnoCard
   id: UnoCardSpecial
-  name: Карта смены цвета
-  description: Игральная карта UNO
+  name: карта смены цвета
+  description: Игральная карта UNO.
   components:
   - type: Sprite
     sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -17,19 +17,19 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownSpecial
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardSpecial
 
-# Special Four
+# SPECIAL FOUR
+
 - type: entity
   parent: BaseUnoCard
   id: UnoCardSpecialFour
-  name: Карта возьми 4
-  description: Игральная карта UNO
+  name: карта возьми 4
+  description: Игральная карта UNO.
   components:
   - type: Sprite
     sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -42,8 +42,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownSpecialFour
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -53,8 +52,8 @@
 #- type: entity
 #  parent: BaseUnoCard
 #  id: UnoCardSpecialBlueFour
-#  name: Карта смены цвета
-#  description: Игральная карта UNO
+#  name: карта смены цвета
+#  description: Игральная карта UNO.
 #  components:
 #  - type: Sprite
 #    sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -67,8 +66,7 @@
 #- type: entity
 #  parent: BaseUnoUnknownCard
 #  id: UnoCardUnknownSpecialBlueFour
-#  name: Неизвестная карта
-#  description: Игральная карта UNO
+#  noSpawn: true
 #  components:
 #  - type: SpawnItemsOnUse
 #    items:
@@ -78,8 +76,8 @@
 #- type: entity
 #  parent: BaseUnoCard
 #  id: UnoCardSpecialGreenFour
-#  name: Карта смены цвета
-#  description: Игральная карта UNO
+#  name: карта смены цвета
+#  description: Игральная карта UNO.
 #  components:
 #  - type: Sprite
 #    sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -92,8 +90,7 @@
 #- type: entity
 #  parent: BaseUnoUnknownCard
 #  id: UnoCardUnknownSpecialGreenFour
-#  name: Неизвестная карта
-#  description: Игральная карта UNO
+#  noSpawn: true
 #  components:
 #  - type: SpawnItemsOnUse
 #    items:
@@ -103,8 +100,8 @@
 #- type: entity
 #  parent: BaseUnoCard
 #  id: UnoCardSpecialRedFour
-#  name: Карта смены цвета
-#  description: Игральная карта UNO
+#  name: карта смены цвета
+#  description: Игральная карта UNO.
 #  components:
 #  - type: Sprite
 #    sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -117,8 +114,7 @@
 #- type: entity
 #  parent: BaseUnoUnknownCard
 #  id: UnoCardUnknownSpecialRedFour
-#  name: Неизвестная карта
-#  description: Игральная карта UNO
+#  noSpawn: true
 #  components:
 #  - type: SpawnItemsOnUse
 #    items:
@@ -128,8 +124,8 @@
 #- type: entity
 #  parent: BaseUnoCard
 #  id: UnoCardSpecialYellowFour
-#  name: Карта смены цвета
-#  description: Игральная карта UNO
+#  name: карта смены цвета
+#  description: Игральная карта UNO.
 #  components:
 #  - type: Sprite
 #    sprite: Objects/Fun/UnoCards/uno_special.rsi
@@ -142,8 +138,7 @@
 #- type: entity
 #  parent: BaseUnoUnknownCard
 #  id: UnoCardUnknownSpecialYellowFour
-#  name: Неизвестная карта
-#  description: Игральная карта UNO
+#  noSpawn: true
 #  components:
 #  - type: SpawnItemsOnUse
 #    items:

Resources/Prototypes/Entities/Objects/Fun/CardGames/Uno/uno_cards_yellow.yml

@@ -1,193 +1,167 @@
+# YELLOW CARDS
 
-# Yellow Cards
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow0
-  name: Жёлтая карта UNO 0
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 0
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow0
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow0
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow1
-  name: Жёлтая карта UNO 1
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 1
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow1
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow1
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow2
-  name: Жёлтая карта UNO 2
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 2
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow2
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow2
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow3
-  name: Жёлтая карта UNO 3
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 3
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow3
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow3
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow4
-  name: Жёлтая карта UNO 4
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 4
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow4
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow4
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow5
-  name: Жёлтая карта UNO 5
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 5
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow5
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow5
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow6
-  name: Жёлтая карта UNO 6
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 6
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow6
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow6
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow7
-  name: Жёлтая карта UNO 7
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 7
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow7
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow7
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow8
-  name: Жёлтая карта UNO 8
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 8
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow8
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow8
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellow9
-  name: Жёлтая карта UNO 9
-  description: Игральная карта UNO
+  name: жёлтая карта UNO 9
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellow9
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellow9
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellowPlus
-  name: Жёлтая карта UNO плюс 2
-  description: Игральная карта UNO
+  name: жёлтая карта UNO плюс 2
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellowplus
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellowPlus
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellowReverse
-  name: Жёлтая карта UNO реверс
-  description: Игральная карта UNO
+  name: жёлтая карта UNO реверс
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellowreverse
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellowReverse
 
 - type: entity
-  parent: BaseUnoCard
+  parent: BaseUnoCardYellow
   id: UnoCardYellowStop
-  name: Жёлтая карта UNO стоп
-  description: Игральная карта UNO
+  name: жёлтая карта UNO стоп
+  description: Игральная карта UNO.
   components:
   - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_yellow.rsi
     state: unoyellowstop
-    scale: 0.5, 0.5
   - type: SpawnItemsOnUse
     items:
     - id: UnoCardUnknownYellowStop
 
-# Yellow Cards Uknown
+# UNKNOWN YELLOW CARDS
+
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow0
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -196,8 +170,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow1
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -206,8 +179,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow2
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -216,8 +188,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow3
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -226,8 +197,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow4
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -236,8 +206,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow5
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -246,8 +215,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow6
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -256,8 +224,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow7
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -266,8 +233,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow8
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -276,8 +242,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellow9
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -286,8 +251,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellowPlus
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -296,8 +260,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellowReverse
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:
@@ -306,8 +269,7 @@
 - type: entity
   parent: BaseUnoUnknownCard
   id: UnoCardUnknownYellowStop
-  name: Неизвестная карта
-  description: Игральная карта UNO
+  noSpawn: true
   components:
   - type: SpawnItemsOnUse
     items:

Resources/Prototypes/Entities/Objects/Fun/unocards_blue.yml

@@ -1,357 +0,0 @@
-- type: Tag
-  id: UnoCard
-
-- type: entity
-  parent: BaseItem
-  id: BaseUnoCard
-  name: Карта
-  description: Карта UNO
-  abstract: true
-  components:
-  - type: Item
-    size: Small
-  - type: SpawnItemsOnUse
-    sound:
-      path: /Audio/Effects/unwrap.ogg
-    items:
-    - id: UnoCardUnknownBlue0
-  - type: Tag
-    tags:
-    - UnoCard
-
-- type: entity
-  parent: BaseItem
-  id: BaseUnoUnknownCard
-  name: Карта
-  description: Неизвестная карта UNO
-  abstract: true
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_special.rsi
-    state: cardback
-    scale: 0.5, 0.5
-  - type: Item
-    size: Small
-  - type: SpawnItemsOnUse
-    sound:
-      path: /Audio/Effects/unwrap.ogg
-    items:
-    - id: UnoCardBlue0
-  - type: Tag
-    tags:
-    - UnoCard
-
-
-# Blue Cards
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue0
-  name: Синяя карта UNO 0
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue0
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue0
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue1
-  name: Синяя карта UNO 1
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue1
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue1
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue2
-  name: Синяя карта UNO 2
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue2
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue2
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue3
-  name: Синяя карта UNO 3
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue3
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue3
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue4
-  name: Синяя карта UNO 4
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue4
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue4
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue5
-  name: Синяя карта UNO 5
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue5
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue5
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue6
-  name: Синяя карта UNO 6
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue6
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue6
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue7
-  name: Синяя карта UNO 7
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue7
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue7
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue8
-  name: Синяя карта UNO 8
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue8
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue8
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlue9
-  name: Синяя карта UNO 9
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblue9
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlue9
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBluePlus
-  name: Синяя карта UNO плюс 2
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unoblueplus
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBluePlus
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlueReverse
-  name: Синяя карта UNO реверс
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unobluereverse
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlueReverse
-
-- type: entity
-  parent: BaseUnoCard
-  id: UnoCardBlueStop
-  name: Синяя карта UNO стоп
-  description: Игральная карта UNO
-  components:
-  - type: Sprite
-    sprite: Objects/Fun/UnoCards/uno_blue.rsi
-    state: unobluestop
-    scale: 0.5, 0.5
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardUnknownBlueStop
-
-# Blue Cards Uknown
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue0
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue0
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue1
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue1
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue2
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue2
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue3
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue3
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue4
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue4
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue5
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue5
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue6
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue6
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue7
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue7
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue8
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue8
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlue9
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlue9
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBluePlus
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBluePlus
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlueReverse
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlueReverse
-
-- type: entity
-  parent: BaseUnoUnknownCard
-  id: UnoCardUnknownBlueStop
-  name: Неизвестная карта
-  description: Игральная карта UNO
-  components:
-  - type: SpawnItemsOnUse
-    items:
-    - id: UnoCardBlueStop

Resources/Prototypes/Tiles/floors.yml

@@ -15,6 +15,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelCheckerLight
@@ -33,6 +34,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteelCheckerLight
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelCheckerDark
@@ -51,6 +53,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteelCheckerDark
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelMini
@@ -69,6 +72,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelPavement
@@ -87,6 +91,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelDiagonal
@@ -105,6 +110,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelOffset
@@ -117,6 +123,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelMono
@@ -135,6 +142,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelPavementVertical
@@ -153,6 +161,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelHerringbone
@@ -171,6 +180,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorSteelDiagonalMini
@@ -189,6 +199,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorBrassFilled
@@ -201,7 +212,8 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBrassFilled
   heatCapacity: 10000
-  
+  tileRipResistance: 220
+
 - type: tile
   id: FloorBrassReebe
   name: tiles-brass-floor-reebe
@@ -213,6 +225,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBrassReebe
   heatCapacity: 10000
+  tileRipResistance: 220
 
 - type: tile
   id: FloorPlastic
@@ -231,6 +244,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWood
@@ -251,6 +265,7 @@
     collection: BarestepWood
   itemDrop: FloorTileItemWood
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhite
@@ -269,6 +284,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteMini
@@ -287,6 +303,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhitePavement
@@ -305,6 +322,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteDiagonal
@@ -323,6 +341,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteOffset
@@ -335,6 +354,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteMono
@@ -353,6 +373,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhitePavementVertical
@@ -371,6 +392,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteHerringbone
@@ -389,6 +411,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhiteDiagonalMini
@@ -407,6 +430,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorWhitePlastic
@@ -425,6 +449,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemWhite
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorDark
@@ -443,6 +468,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkMini
@@ -461,6 +487,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkPavement
@@ -479,6 +506,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkDiagonal
@@ -497,6 +525,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkOffset
@@ -509,6 +538,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkMono
@@ -527,6 +557,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkPavementVertical
@@ -545,6 +576,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkHerringbone
@@ -563,6 +595,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkDiagonalMini
@@ -581,6 +614,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorDarkPlastic
@@ -599,6 +633,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemDark
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorTechMaint
@@ -611,6 +646,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemTechmaint
   heatCapacity: 10000
+  tileRipResistance: 250
 
 - type: tile
   id: FloorReinforced
@@ -623,6 +659,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemReinforced
   heatCapacity: 10000
+  reinforced: true
 
 - type: tile
   id: FloorMono
@@ -635,6 +672,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMono
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorLino
@@ -647,6 +685,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemLino
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorSteelDirty
@@ -659,6 +698,7 @@
     collection: FootstepPlating
   itemDrop: FloorTileItemDirty
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorElevatorShaft
@@ -671,6 +711,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemElevatorShaft
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorMetalDiamond
@@ -683,6 +724,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemMetalDiamond
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorRockVault
@@ -695,6 +737,7 @@
     collection: FootstepAsteroid
   itemDrop: FloorTileItemRockVault
   heatCapacity: 10000
+  tileRipResistance:  400
 
 - type: tile
   id: FloorBlue
@@ -707,6 +750,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemBlue
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorSteelLime
@@ -725,6 +769,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemLime
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorMining
@@ -737,6 +782,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMining
   heatCapacity: 10000
+  tileRipResistance: 250
 
 - type: tile
   id: FloorMiningDark
@@ -749,6 +795,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMiningDark
   heatCapacity: 10000
+  tileRipResistance: 250
 
 - type: tile
   id: FloorMiningLight
@@ -761,6 +808,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemMiningLight
   heatCapacity: 10000
+  tileRipResistance: 250
 
 # Departamental
 - type: tile
@@ -774,6 +822,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemFreezer
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorShowroom
@@ -792,6 +841,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShowroom
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorHydro
@@ -804,6 +854,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemHydro
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorBar
@@ -822,6 +873,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemBar
   heatCapacity: 10000
+  tileRipResistance: 100
 
 - type: tile
   id: FloorClown
@@ -834,6 +886,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemClown
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorMime
@@ -846,6 +899,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemMime
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorKitchen
@@ -858,6 +912,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemKitchen
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorLaundry
@@ -870,6 +925,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemLaundry
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorSteelDamaged
@@ -889,6 +945,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel #This should probably be made null when it becomes possible to make it such, in SS13 prying destroyed tiles wouldn't give you anything.
   heatCapacity: 10000
+  tileRipResistance: 175
 
 - type: tile
   id: FloorSteelBurnt
@@ -905,6 +962,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel #Same case as FloorSteelDamaged, make it null when possible
   heatCapacity: 10000
+  tileRipResistance: 175
 
 
 # Concrete
@@ -926,6 +984,7 @@
   itemDrop: FloorTileItemConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorConcreteMono
@@ -945,6 +1004,7 @@
   itemDrop: FloorTileItemConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorConcreteSmooth
@@ -964,6 +1024,7 @@
   itemDrop: FloorTileItemConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorGrayConcrete
@@ -983,6 +1044,7 @@
   itemDrop: FloorTileItemGrayConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorGrayConcreteMono
@@ -1002,6 +1064,7 @@
   itemDrop: FloorTileItemGrayConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorGrayConcreteSmooth
@@ -1021,6 +1084,7 @@
   itemDrop: FloorTileItemGrayConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorOldConcrete
@@ -1040,6 +1104,7 @@
   itemDrop: FloorTileItemOldConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorOldConcreteMono
@@ -1059,6 +1124,7 @@
   itemDrop: FloorTileItemOldConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 - type: tile
   id: FloorOldConcreteSmooth
@@ -1078,6 +1144,7 @@
   itemDrop: FloorTileItemOldConcrete
   heatCapacity: 10000
   weather: true
+  tileRipResistance: 300
 
 # Carpets (non smoothing)
 - type: tile
@@ -1094,6 +1161,7 @@
   friction: 0.25
   itemDrop: FloorTileItemArcadeBlue
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorArcadeBlue2
@@ -1109,6 +1177,7 @@
   friction: 0.25
   itemDrop: FloorTileItemArcadeBlue2
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorArcadeRed
@@ -1124,6 +1193,7 @@
   friction: 0.25
   itemDrop: FloorTileItemArcadeRed
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorEighties
@@ -1139,6 +1209,7 @@
   friction: 0.25
   itemDrop: FloorTileItemEighties
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorCarpetClown
@@ -1154,6 +1225,7 @@
   friction: 0.25
   itemDrop: FloorTileItemCarpetClown
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorCarpetOffice
@@ -1169,6 +1241,7 @@
   friction: 0.25
   itemDrop: FloorTileItemCarpetOffice
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorBoxing
@@ -1188,6 +1261,7 @@
   friction: 0.25
   itemDrop: FloorTileItemBoxing
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorGym
@@ -1207,6 +1281,7 @@
   friction: 0.25
   itemDrop: FloorTileItemGym
   heatCapacity: 10000
+  tileRipResistance: 50
 
 # Shuttle
 - type: tile
@@ -1225,6 +1300,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleWhite
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleGrey
@@ -1243,6 +1319,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleGrey
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleBlack
@@ -1261,6 +1338,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleBlack
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleBlue
@@ -1278,6 +1356,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleBlue
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleOrange
@@ -1295,6 +1374,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleOrange
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttlePurple
@@ -1312,6 +1392,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttlePurple
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 - type: tile
   id: FloorShuttleRed
@@ -1329,6 +1410,7 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemShuttleRed
   heatCapacity: 10000
+  tileRipResistance: 4500
 
 
 # Materials
@@ -1343,6 +1425,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemGold
   heatCapacity: 10000
+  tileRipResistance: 600
 
 - type: tile
   id: FloorSilver
@@ -1355,6 +1438,7 @@
     collection: FootstepTile
   itemDrop: FloorTileItemSilver
   heatCapacity: 10000
+  tileRipResistance: 500
 
 - type: tile
   id: FloorGlass
@@ -1367,6 +1451,7 @@
     collection: FootstepTile
   itemDrop: SheetGlass1
   heatCapacity: 10000
+  tileRipResistance: 150
 
 - type: tile
   id: FloorRGlass
@@ -1385,6 +1470,7 @@
     collection: FootstepTile
   itemDrop: SheetRGlass1
   heatCapacity: 10000
+  tileRipResistance: 175
 
 # Circuits
 - type: tile
@@ -1398,6 +1484,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemGCircuit
   heatCapacity: 10000
+  tileRipResistance: 225
 
 - type: tile
   id: FloorBlueCircuit
@@ -1410,6 +1497,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemBCircuit
   heatCapacity: 10000
+  tileRipResistance: 225
 
 # Terrain
 - type: tile
@@ -1695,6 +1783,7 @@
   itemDrop: FloorTileItemFlesh
   friction: 0.05 #slippy
   heatCapacity: 10000
+  tileRipResistance: 80
 
 - type: tile
   id: FloorTechMaint2
@@ -1707,6 +1796,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemSteelMaint
   heatCapacity: 10000
+  tileRipResistance: 225
 
 - type: tile
   id: FloorTechMaint3
@@ -1725,6 +1815,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemGratingMaint
   heatCapacity: 10000
+  tileRipResistance: 225
 
 - type: tile
   id: FloorWoodTile
@@ -1745,6 +1836,7 @@
     collection: BarestepWood
   itemDrop: FloorTileItemWoodPattern
   heatCapacity: 10000
+  tileRipResistance: 75
 
 - type: tile
   id: FloorBrokenWood
@@ -1768,6 +1860,7 @@
     collection: BarestepWood
   itemDrop: MaterialWoodPlank1
   heatCapacity: 10000
+  tileRipResistance: 60
 
 - type: tile
   id: FloorWebTile
@@ -1782,6 +1875,7 @@
     collection: BarestepCarpet
   itemDrop: FloorTileItemWeb
   heatCapacity: 10000
+  tileRipResistance: 30
 
 - type: tile
   id: FloorChromite
@@ -1813,6 +1907,7 @@
     collection: FootstepHull
   itemDrop: FloorTileItemSteel #probably should not be normally obtainable, but the game shits itself and dies when you try to put null here
   heatCapacity: 10000
+  tileRipResistance: 500
 
 - type: tile
   id: FloorHullReinforced
@@ -1825,6 +1920,7 @@
   itemDrop: FloorTileItemSteel
   heatCapacity: 100000 #/tg/ has this set as "INFINITY." I don't know if that exists here so I've just added an extra 0
   indestructible: true
+  reinforced: true
 
 - type: tile
   id: FloorReinforcedHardened
@@ -1835,6 +1931,7 @@
   footstepSounds:
     collection: FootstepHull
   itemDrop: FloorTileItemReinforced #same case as FloorHull
+  reinforced: true
 
 # Faux sci tiles
 
@@ -1866,6 +1963,7 @@
     collection: FootstepGrass
   itemDrop: FloorTileItemAstroGrass
   heatCapacity: 10000
+  tileRipResistance: 50
 
 - type: tile
   id: FloorMowedAstroGrass
@@ -1875,6 +1973,7 @@
   isSubfloor: false
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemMowedAstroGrass
+  tileRipResistance: 50
 
 - type: tile
   id: FloorJungleAstroGrass
@@ -1884,6 +1983,7 @@
   isSubfloor: false
   deconstructTools: [ Cutting ]
   itemDrop: FloorTileItemJungleAstroGrass
+  tileRipResistance: 50
 
 # Ice
 - type: tile
@@ -1899,6 +1999,7 @@
   mobFrictionNoInput: 0.05
   mobAcceleration: 2
   itemDrop: FloorTileItemAstroIce
+  tileRipResistance: 50
 
 - type: tile
   id: FloorAstroSnow
@@ -1908,6 +2009,7 @@
   isSubfloor: false
   deconstructTools: [ Prying ]
   itemDrop: FloorTileItemAstroSnow
+  tileRipResistance: 50
 
 - type: tile
   id: FloorWoodLarge
@@ -1927,4 +2029,5 @@
   barestepSounds:
     collection: BarestepWood
   itemDrop: FloorTileItemWoodLarge
-  heatCapacity: 10000
+  heatCapacity: 10000
+  tileRipResistance: 100

Resources/Prototypes/_White/Actions/changeling.yml

@@ -0,0 +1,12 @@
+- type: entity
+  id: ActionReleaseBees
+  name: changeling-ability-bees
+  description: changeling-ability-bees-desc
+  noSpawn: true
+  components:
+    - type: InstantAction
+      itemIconStyle: NoItem
+      icon: { sprite: White/Clothing/Head/hive.rsi, state: icon }
+      event: !type:ReleaseBeesEvent
+      checkCanInteract: false
+      useDelay: 30

Resources/Prototypes/_White/Entities/Boxes/mindshiled.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: mindshield implanters box
   parent: BoxCardboard
   id: BoxMindshield
+  name: mindshield implanters box
   description: A box full of implants.
   components:
   - type: StorageFill

Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml

@@ -22,26 +22,3 @@
   - type: EyeProtection
   - type: FlashSoundSuppression
   - type: HiveHead
-
-- type: entity
-  id: ActionReleaseBees
-  name: changeling-ability-bees
-  description: changeling-ability-bees-desc
-  noSpawn: true
-  components:
-    - type: InstantAction
-      itemIconStyle: NoItem
-      icon: White/Clothing/Head/hive.rsi/icon.png
-      event: !type:ReleaseBeesEvent
-      checkCanInteract: false
-      useDelay: 30
-
-- type: entity
-  parent: MobAngryBee
-  id: MobTemporaryAngryBee
-  components:
-    - type: TimedDespawn
-      lifetime: 25.0
-    - type: NpcFactionMember
-      factions:
-      - Changeling

Resources/Prototypes/_White/Entities/Effects/effects.yml

@@ -0,0 +1,39 @@
+- type: entity
+  id: ExpSyndicateTeleporterInEffect
+  name: experimental syndicate teleporter in effect
+  components:
+    - type: TimedDespawn
+      lifetime: 0.6
+    - type: EvaporationSparkle
+    - type: Transform
+      noRot: true
+      anchored: true
+    - type: Sprite
+      layers:
+        - sprite: White/Objects/Devices/experimentalsyndicateteleporter.rsi
+          state: in
+          shader: unshaded
+      netsync: false
+      drawdepth: Effects
+    - type: PointLight
+      color: "#008DFE"
+
+- type: entity
+  id: ExpSyndicateTeleporterOutEffect
+  name: experimental syndicate teleporter out effect
+  components:
+    - type: TimedDespawn
+      lifetime: 0.6
+    - type: EvaporationSparkle
+    - type: Transform
+      noRot: true
+      anchored: true
+    - type: Sprite
+      layers:
+        - sprite: White/Objects/Devices/experimentalsyndicateteleporter.rsi
+          state: out
+          shader: unshaded
+      netsync: false
+      drawdepth: Effects
+    - type: PointLight
+      color: "#008DFE"

Resources/Prototypes/_White/Entities/Hampter/barmen.yml

@@ -1,22 +0,0 @@
-- type: entity
-  name: Бармен
-  parent: BasePlushie
-  id: HampterBarmen
-  description: Я бармен!
-  components:
-    - type: Sprite
-      sprite: Objects/Hampter/barmen.rsi
-      state: icon
-    - type: EmitSoundOnUse
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnLand
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnActivate
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: MeleeWeapon
-      soundHit:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-

Resources/Prototypes/_White/Entities/Hampter/cap_hampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Капитан
-  parent: BasePlushie
-  id: HampterCap
-  description: Я капитан!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/caphampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/centcom.yml

@@ -1,22 +0,0 @@
-- type: entity
-  name: ПЦК
-  parent: BasePlushie
-  id: CentcomHampter
-  description: I am the captain!
-  components:
-    - type: Sprite
-      sprite: Objects/Hampter/centcom.rsi
-      state: icon
-    - type: EmitSoundOnUse
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnLand
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnActivate
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: MeleeWeapon
-      soundHit:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-

Resources/Prototypes/_White/Entities/Hampter/clown_humpter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Клоун
-  parent: BasePlushie
-  id: ClownHampter
-  description: Я клоун!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/clownhampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/comisar.yml

@@ -1,23 +0,0 @@
-- type: entity
-  name: Комиссар не радоха
-  parent: BasePlushie
-  id: ComisarHampter
-  description: Я комиссар!
-  components:
-    - type: Sprite
-      sprite: Objects/Hampter/comisar.rsi
-      state: icon
-    - type: EmitSoundOnUse
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnLand
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnActivate
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: MeleeWeapon
-      soundHit:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-
-

Resources/Prototypes/_White/Entities/Hampter/deadth.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Смерть!
-  parent: BasePlushie
-  id: DeadthHampter
-  description: Я сама смерть!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/deadth.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/emergency.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Я слежу за тобой!
-  parent: BasePlushie
-  id: EmergencyHampter
-  description: Я из отряда Медленного Реагирования!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/emergency.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/golden_hampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Золотце
-  parent: BasePlushie
-  id: GoldenHampter
-  description: Золотце!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/goldenhampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/grey.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Ассистент
-  parent: BasePlushie
-  id: GreyHampter
-  description: Серый
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/grey.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/greywave.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Крутой Ассистент
-  parent: BasePlushie
-  id: GreyWave
-  description: It goes honk honk!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/greywave.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/hamhell.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Адский
-  parent: BasePlushie
-  id: Hampterhell
-  description: Палка
-  components:
-    - type: Sprite
-      sprite: Objects/Hampter/hamphell.rsi
-      state: icon
-    - type: EmitSoundOnUse
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnLand
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnActivate
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: MeleeWeapon
-      soundHit:
-        path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/hampter.yml

@@ -0,0 +1,213 @@
+# BASE
+
+- type: entity
+  parent: BasePlushie
+  id: BaseHampterPlushie
+  abstract: true
+  name: хомяк
+  description: Хомячит.
+  components:
+    - type: EmitSoundOnUse
+      sound:
+        path: /Audio/Items/Toys/mousesqueek.ogg
+    - type: EmitSoundOnLand
+      sound:
+        path: /Audio/Items/Toys/mousesqueek.ogg
+    - type: EmitSoundOnActivate
+      sound:
+        path: /Audio/Items/Toys/mousesqueek.ogg
+    - type: MeleeWeapon
+      soundHit:
+        path: /Audio/Items/Toys/mousesqueek.ogg
+
+# HAMPTERS
+
+- type: entity
+  parent: BasePlushie
+  id: HampterBarmen
+  name: хомяк бармен
+  description: Я бармен!
+  components:
+    - type: Sprite
+      sprite: Objects/Hampter/barmen.rsi
+      state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: HampterCap
+  name: хомяк капитан
+  description: Я капитан!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/caphampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: CentcomHampter
+  name: хомяк ПЦК
+  description: Я шишка.
+  components:
+    - type: Sprite
+      sprite: Objects/Hampter/centcom.rsi
+      state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: ClownHampter
+  name: хомяк клоун
+  description: Я клоун!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/clownhampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: ComisarHampter
+  name: хомяк комиссар
+  description: Я комиссар!
+  components:
+    - type: Sprite
+      sprite: Objects/Hampter/comisar.rsi
+      state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: DeadthHampter
+  name: хомяк эскадрон
+  description: Я сама смерть!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/deadth.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: EmergencyHampter
+  name: хомяк ОБР
+  description: Я из Отряда Медленного Реагирования!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/emergency.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: GoldenHampter
+  name: хомяк золотце
+  description: Золотце!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/goldenhampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: GreyHampter
+  name: хомяк ассистент
+  description: Серый.
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/grey.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: GreyWave
+  name: хомяк ассистент в противогазе
+  description: Серый и подозрительный.
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/greywave.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: Hampterhell
+  name: хомяк из ада
+  description: Палка.
+  components:
+    - type: Sprite
+      sprite: Objects/Hampter/hamphell.rsi
+      state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: HampterKrah
+  name: хомяк из КФС
+  description: Люблю курочку из KFC!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/Krah.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: Lgbthampter
+  name: хомяк радужный
+  description: Я за равноправие!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/lgbthampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: HampterMed
+  name: хомяк медик
+  description: Лечу как бог!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/medhampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: Nukehampter
+  name: хомяк оперативник
+  description: Дайте мне уже пульт от ядерки!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/nukehampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: SbHampter
+  name: хомяк офицер
+  description: Люблю бить клоунов!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/sbhampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: HampterShrek
+  name: хомяк шрек
+  description: Я точно не бимба!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/shrek.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: HampterSpu
+  name: хомяк НЕ шпион
+  description: Он вам не Маркус!
+  components:
+  - type: Sprite
+    sprite: Objects/Hampter/spyhampter.rsi
+    state: icon
+
+- type: entity
+  parent: BasePlushie
+  id: VirusologHampter
+  name: хомяк вирусолог
+  description: Болезни? Не слышал!
+  components:
+    - type: Sprite
+      sprite: Objects/Hampter/virusolog.rsi
+      state: icon

Resources/Prototypes/_White/Entities/Hampter/krah.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Курочка из КФС
-  parent: BasePlushie
-  id: HampterKrah
-  description: Люблю курочку из кфс!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/Krah.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/lgbthampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Разноцветный
-  parent: BasePlushie
-  id: Lgbthampter
-  description: Я за равноправие!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/lgbthampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/med_hampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Медик
-  parent: BasePlushie
-  id: HampterMed
-  description: Лечу как бог!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/medhampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/nuke_hampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Ядерный хомяк
-  parent: BasePlushie
-  id: Nukehampter
-  description: Дайте мне уже пульт от ядерки!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/nukehampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/sb_hampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Офицер Хамптер
-  parent: BasePlushie
-  id: SbHampter
-  description: Люблю бить клоунов!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/sbhampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/shrek.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Шрек
-  parent: BasePlushie
-  id: HampterShrek
-  description: Я точно не бимба!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/shrek.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/spu_hampter.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Шпиён
-  parent: BasePlushie
-  id: HampterSpu
-  description: Он вам не маркус!
-  components:
-  - type: Sprite
-    sprite: Objects/Hampter/spyhampter.rsi
-    state: icon
-  - type: EmitSoundOnUse
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnLand
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: EmitSoundOnActivate
-    sound:
-      path: /Audio/Items/Toys/mousesqueek.ogg
-  - type: MeleeWeapon
-    soundHit:
-      path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Hampter/virusolog.yml

@@ -1,21 +0,0 @@
-- type: entity
-  name: Вирусолог
-  parent: BasePlushie
-  id: VirusologHampter
-  description: Болезни? Не слышал!
-  components:
-    - type: Sprite
-      sprite: Objects/Hampter/virusolog.rsi
-      state: icon
-    - type: EmitSoundOnUse
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnLand
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: EmitSoundOnActivate
-      sound:
-        path: /Audio/Items/Toys/mousesqueek.ogg
-    - type: MeleeWeapon
-      soundHit:
-        path: /Audio/Items/Toys/mousesqueek.ogg

Resources/Prototypes/_White/Entities/Markers/Spawners/ERT.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: SpawnPointEventBase
   parent: MarkerBase
+  id: SpawnPointEventBase
   abstract: true
   suffix: Event Spawn
   components:
@@ -9,8 +9,8 @@
       sprite: Markers/jobs.rsi
 
 - type: entity
-  id: SpawnPointERTEventERTLeader
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTLeader
   name: ERTLeader
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -23,8 +23,8 @@
         - state: ertleader
 
 - type: entity
-  id: SpawnPointERTEventERTLeaderEVA
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTLeaderEVA
   name: ERTLeaderEVA
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -37,8 +37,8 @@
         - state: ertleadereva
 
 - type: entity
-  id: SpawnPointERTEventERTJanitor
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTJanitor
   name: ERTJanitor
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -50,8 +50,8 @@
         - state: ertjanitor
 
 - type: entity
-  id: SpawnPointERTEventERTJanitorEVA
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTJanitorEVA
   name: ERTJanitorEVA
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -63,8 +63,8 @@
         - state: ertjanitoreva
 
 - type: entity
-  id: SpawnPointERTEventERTEngineer
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTEngineer
   name: ERTEngineer
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -77,8 +77,8 @@
         - state: ertengineer
 
 - type: entity
-  id: SpawnPointERTEventERTEngineerEVA
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTEngineerEVA
   name: ERTEngineerEVA
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -91,8 +91,8 @@
         - state: ertengineereva
 
 - type: entity
-  id: SpawnPointERTEventERTSecurity
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTSecurity
   name: ERTSecurity
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -105,8 +105,8 @@
         - state: ertsecurity
 
 - type: entity
-  id: SpawnPointERTEventERTSecurityEVA
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTSecurityEVA
   name: ERTSecurityEVA
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -119,8 +119,8 @@
         - state: ertsecurityeva
 
 - type: entity
-  id: SpawnPointERTEventERTMedical
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTMedical
   name: ERTMedical
   components:
     - type: GhostRecruitmentSpawnPoint
@@ -133,8 +133,8 @@
         - state: ertmedical
 
 - type: entity
-  id: SpawnPointERTEventERTMedicalEVA
   parent: SpawnPointEventBase
+  id: SpawnPointERTEventERTMedicalEVA
   name: ERTMedicalEVA
   components:
     - type: GhostRecruitmentSpawnPoint

Resources/Prototypes/_White/Entities/Mobs/Animal/mobs.yml

@@ -0,0 +1,9 @@
+- type: entity
+  parent: MobAngryBee
+  id: MobTemporaryAngryBee
+  components:
+    - type: TimedDespawn
+      lifetime: 25.0
+    - type: NpcFactionMember
+      factions:
+      - Changeling

Resources/Prototypes/_White/Entities/Objects/CargoCrates/materialcrates.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateMaterialBananium
   parent: CrateGenericSteel
+  id: CrateMaterialBananium
   name: ящик с бананиумом
   components:
   - type: StorageFill
@@ -9,8 +9,8 @@
         amount: 3
 
 - type: entity
-  id: CrateMaterialSilver
   parent: CrateGenericSteel
+  id: CrateMaterialSilver
   name: ящик с серебром
   components:
   - type: StorageFill
@@ -19,8 +19,8 @@
         amount: 1
 
 - type: entity
-  id: CrateMaterialGold
   parent: CrateGenericSteel
+  id: CrateMaterialGold
   name: ящик с золотом
   components:
   - type: StorageFill
@@ -29,8 +29,8 @@
         amount: 1
 
 - type: entity
-  id: CrateMaterialUranium
   parent: CrateGenericSteel
+  id: CrateMaterialUranium
   name: ящик урана
   components:
   - type: StorageFill

Resources/Prototypes/_White/Entities/Objects/CargoCrates/weaponcrates.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: CrateSubMachineGunCrateAmmo
   parent: CrateWeaponSecure
+  id: CrateSubMachineGunCrateAmmo
   name: ящик с магазинами для ПП
   components:
   - type: StorageFill
@@ -9,8 +9,8 @@
         amount: 2
 
 - type: entity
-  id: CrateWT550Magazines
   parent: CrateWeaponSecure
+  id: CrateWT550Magazines
   name: ящик с магазинами для WT-550
   components:
   - type: StorageFill
@@ -19,8 +19,8 @@
         amount: 2
 
 - type: entity
-  id: CrateLecterMagazines
   parent: CrateWeaponSecure
+  id: CrateLecterMagazines
   name: ящик с магазинами для Лектера
   components:
   - type: StorageFill
@@ -29,8 +29,8 @@
         amount: 2
 
 - type: entity
-  id: CratePistolMagazines
   parent: CrateWeaponSecure
+  id: CratePistolMagazines
   name: ящик с магазинами для пистолетов
   components:
   - type: StorageFill
@@ -39,8 +39,8 @@
         amount: 3
 
 - type: entity
-  id: CrateAKmagazines
   parent: CrateWeaponSecure
+  id: CrateAKmagazines
   name: ящик с магазинами для CV-47
   components:
   - type: StorageFill
@@ -49,8 +49,8 @@
         amount: 2
 
 - type: entity
-  id: Crate35auto
   parent: CrateWeaponSecure
+  id: Crate35auto
   name: ящик патронов .35 авто
   components:
   - type: StorageFill
@@ -59,8 +59,8 @@
         amount: 2
 
 - type: entity
-  id: Crate30normal
   parent: CrateWeaponSecure
+  id: Crate30normal
   name: ящик патронов .30
   components:
   - type: StorageFill
@@ -69,8 +69,8 @@
         amount: 2
 
 - type: entity
-  id: crate30big
   parent: CrateWeaponSecure
+  id: crate30big
   name: ящик с большой коробкой патронов .30
   components:
   - type: StorageFill
@@ -79,8 +79,8 @@
         amount: 1
 
 - type: entity
-  id: Crate20normal
   parent: CrateWeaponSecure
+  id: Crate20normal
   name: ящик с пачками патронов калибра .20
   components:
   - type: StorageFill
@@ -89,8 +89,8 @@
         amount: 2
 
 - type: entity
-  id: Crate20big
   parent: CrateWeaponSecure
+  id: Crate20big
   name: ящик с большой коробкой патронов .20
   components:
   - type: StorageFill
@@ -99,8 +99,8 @@
         amount: 1
 
 - type: entity
-  id: Crate40magnum
   parent: CrateWeaponSecure
+  id: Crate40magnum
   name: ящик патронов .40 магнум
   components:
   - type: StorageFill
@@ -109,8 +109,8 @@
         amount: 1
 
 - type: entity
-  id: CrateShotgunShell
   parent: CrateWeaponSecure
+  id: CrateShotgunShell
   name: ящик с дробью для дробовика
   components:
   - type: StorageFill
@@ -119,8 +119,8 @@
         amount: 3
 
 - type: entity
-  id: CrateShotgunShellTrauma
   parent: CrateWeaponSecure
+  id: CrateShotgunShellTrauma
   name: ящик с травматическими патронами для дробовика
   components:
   - type: StorageFill
@@ -129,8 +129,8 @@
         amount: 4
 
 - type: entity
-  id: CrateKammerer
   parent: CrateWeaponSecure
+  id: CrateKammerer
   name: ящик с дробовиками Каммерер
   components:
   - type: StorageFill
@@ -139,8 +139,8 @@
         amount: 2
 
 - type: entity
-  id: CrateCV47
   parent: CrateWeaponSecure
+  id: CrateCV47
   name: ящик с CV-47
   components:
   - type: StorageFill
@@ -151,8 +151,8 @@
         amount: 1
 
 - type: entity
-  id: CrateLecter
   parent: CrateWeaponSecure
+  id: CrateLecter
   name: ящик с Лектером
   components:
   - type: StorageFill
@@ -163,8 +163,8 @@
         amount: 1
 
 - type: entity
-  id: CrateMosin
   parent: CrateWeaponSecure
+  id: CrateMosin
   name: ящик с внтовками Мосина
   components:
   - type: StorageFill
@@ -173,8 +173,8 @@
         amount: 2
 
 - type: entity
-  id: CratePistolRubberMagazines
   parent: CrateWeaponSecure
+  id: CratePistolRubberMagazines
   name: ящик с нелетальными магазинами для пистолетов
   components:
   - type: StorageFill
@@ -183,8 +183,8 @@
         amount: 1
 
 - type: entity
-  id: CrateLecterRubberMagazines
   parent: CrateWeaponSecure
+  id: CrateLecterRubberMagazines
   name: ящик с нелетальными магазинами для Лектора
   components:
   - type: StorageFill
@@ -193,8 +193,8 @@
         amount: 1
 
 - type: entity
-  id: CrateSubMachineGunRubberMagazines
   parent: CrateWeaponSecure
+  id: CrateSubMachineGunRubberMagazines
   name: ящик с нелетальными магазинами для ПП
   components:
   - type: StorageFill
@@ -203,8 +203,8 @@
         amount: 1
 
 - type: entity
-  id: CrateRifleRubberMagazines
   parent: CrateWeaponSecure
+  id: CrateRifleRubberMagazines
   name: ящик с нелетальными магазинами для CV-47
   components:
   - type: StorageFill
@@ -213,8 +213,8 @@
         amount: 1
 
 - type: entity
-  id: CrateSecurityVoidsuit
   parent: CrateWeaponSecure
+  id: CrateSecurityVoidsuit
   name: ящик с скафандрами СБ
   components:
   - type: StorageFill

Resources/Prototypes/_White/Entities/Objects/Devices/experimentalsyndicateteleporter.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: ExperimentalSyndicateTeleporter
   parent: BaseItem
-  name: Experimental Syndicate Teleporter
+  name: experimental syndicate teleporter
   description: Syndicate teleporter, when used, moves 3-8 meters forward. In case of teleportation into a wall, uses emergency teleportation. Has 4 charge.
   components:
   - type: Sprite
@@ -9,43 +9,3 @@
     layers:
     - state: icon
   - type: ExperimentalSyndicateTeleporter
-
-- type: entity
-  id: ExpSyndicateTeleporterInEffect
-  name: Experimental Syndicate Teleporter In Effect
-  components:
-    - type: TimedDespawn
-      lifetime: 0.6
-    - type: EvaporationSparkle
-    - type: Transform
-      noRot: true
-      anchored: true
-    - type: Sprite
-      layers:
-        - sprite: White/Objects/Devices/experimentalsyndicateteleporter.rsi
-          state: in
-          shader: unshaded
-      netsync: false
-      drawdepth: Effects
-    - type: PointLight
-      color: "#008DFE"
-
-- type: entity
-  id: ExpSyndicateTeleporterOutEffect
-  name: Experimental Syndicate Teleporter Out Effect
-  components:
-    - type: TimedDespawn
-      lifetime: 0.6
-    - type: EvaporationSparkle
-    - type: Transform
-      noRot: true
-      anchored: true
-    - type: Sprite
-      layers:
-        - sprite: White/Objects/Devices/experimentalsyndicateteleporter.rsi
-          state: out
-          shader: unshaded
-      netsync: false
-      drawdepth: Effects
-    - type: PointLight
-      color: "#008DFE"

Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml

@@ -1,38 +1,6 @@
 - type: entity
-  id: SmokeImplanter
-  parent: BaseImplantOnlyImplanterSyndi
-  suffix: smoke
-  components:
-  - type: Implanter
-    implant: SmokeImplant
-
-- type: entity
-  id: HardlightSpearImplanter
-  parent: BaseImplantOnlyImplanterSyndi
-  suffix: hardlight spear
-  components:
-  - type: Implanter
-    implant: HardlightSpearImplant
-
-- type: entity
-  id: MindSlaveImplanter
-  parent: BaseImplantOnlyImplanterSyndi
-  suffix: mindslave
-  components:
-  - type: Implanter
-    implant: MindslaveImplant
-
-- type: entity
-  id: NeuroStabilizationImplanter
-  parent: BaseImplantOnlyImplanterSyndi
-  suffix: neuro stabilization
-  components:
-  - type: Implanter
-    implant: NeuroStabilizationImplant
-
-- type: entity
-  id: ImplanterSyndi
   parent: Implanter
+  id: ImplanterSyndi
   description: A compact disposable syringe exclusively designed for the injection and extraction of subdermal implants.
   components:
     - type: Item
@@ -42,3 +10,35 @@
     - type: Implanter
       drawTime: 2
       implantTime: 2
+
+- type: entity
+  parent: BaseImplantOnlyImplanterSyndi
+  id: SmokeImplanter
+  suffix: smoke
+  components:
+  - type: Implanter
+    implant: SmokeImplant
+
+- type: entity
+  parent: BaseImplantOnlyImplanterSyndi
+  id: HardlightSpearImplanter
+  suffix: hardlight spear
+  components:
+  - type: Implanter
+    implant: HardlightSpearImplant
+
+- type: entity
+  parent: BaseImplantOnlyImplanterSyndi
+  id: MindSlaveImplanter
+  suffix: mindslave
+  components:
+  - type: Implanter
+    implant: MindslaveImplant
+
+- type: entity
+  parent: BaseImplantOnlyImplanterSyndi
+  id: NeuroStabilizationImplanter
+  suffix: neuro stabilization
+  components:
+  - type: Implanter
+    implant: NeuroStabilizationImplant

Resources/Prototypes/_White/Entities/Objects/Misc/improvised_parts.yml

@@ -1,7 +1,7 @@
 - type: entity
+  parent: BaseItem
   id: PipeCut
   name: часть трубы
-  parent: BaseItem
   components:
   - type: Item
     size: Tiny
@@ -14,8 +14,8 @@
     node: pipe_cut
 
 - type: entity
-  id: PipeCutClosed
   parent: PipeCut
+  id: PipeCutClosed
   components:
   - type: Sprite
     state: pipeCutClosed

Resources/Prototypes/_White/Entities/Objects/Misc/interactiveboard.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: interactive board
   parent: BaseItem
   id: InteractiveBoard
+  name: interactive board
   description: 'Have field for edit. Created special for burocracy!'
   components:
   - type: Sprite
@@ -34,9 +34,9 @@
         damage: 150
 
 - type: entity
-  name: interactive pen
   parent: BaseItem
   id: InteractivePen
+  name: interactive pen
   description: 'Edit interactive board!'
   components:
   - type: Sprite
@@ -46,4 +46,4 @@
     size: Tiny
   - type: Tag
     tags:
-    - InteractivePen
+    - InteractivePen

Resources/Prototypes/_White/Entities/Objects/Misc/paper.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: body scanner printout
   parent: Paper
   id: PaperBodyScannerReport
+  name: body scanner printout
   description: 'The readout of a body scanner'
   components:
   - type: Sprite
@@ -23,4 +23,4 @@
     contentImagePath: "/Textures/White/Interface/BodyScanner/paper_content_dotmatrix_blue.svg.96dpi.png"
     contentImageNumLines: 2
     contentMargin: 16.0, 16.0, 16.0, 0.0
-    maxWritableArea: 400.0, 0.0
+    maxWritableArea: 400.0, 0.0

Resources/Prototypes/_White/Entities/Objects/Misc/time_beacon.yml

@@ -18,8 +18,8 @@
 
 - type: entity
   id: TimeBeaconAnchor
+  noSpawn: true
   name: time beacon anchor
   description: Fuck!
-  noSpawn: true
   components:
   - type: TimeBeaconAnchor

Resources/Prototypes/_White/Entities/Objects/Misc/ziplock.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: ZipBase
   parent: BaseStorageItem
+  id: ZipBase
   abstract: true
   components:
   - type: Item
@@ -11,9 +11,9 @@
     - 0,0,2,2
 
 - type: entity
-  name: zip lock
   parent: ZipBase
   id: ZipLock
+  name: zip lock
   description: Designed for storing evidence.
   components:
   - type: Item

Resources/Prototypes/_White/Entities/Objects/Specific/Medical/expanded_medkit.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: expanded medkit
   parent: Medkit
   id: ExpandedMedkit
+  name: expanded medkit
   components:
     - type: Sprite
       sprite: White/Specific/expmedkit.rsi

Resources/Prototypes/_White/Entities/Objects/Tools/seniors_tools.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: ImprovedCrowbar # OK
   parent: Crowbar
+  id: ImprovedCrowbar # OK
   name: improved crowbar
   components:
     - type: StaticPrice
@@ -18,8 +18,8 @@
       sprite: White/Objects/Tools/impcrowbar.rsi
 
 - type: entity
-  id: ImprovedWrench # OK
   parent: Wrench
+  id: ImprovedWrench # OK
   name: improved wrench
   components:
     - type: StaticPrice
@@ -37,9 +37,9 @@
           Blunt: 9
 
 - type: entity
-  name: improved screwdriver
   parent: BaseItem
   id: ImprovedScrewdriver
+  name: improved screwdriver
   description: "Industrial grade torque in a small screwdriving package."
   components:
     - type: StaticPrice
@@ -74,8 +74,8 @@
         Steel: 100
 
 - type: entity
-  id: ImprovedWirecutter
   parent: BaseItem
+  id: ImprovedWirecutter
   name: improved wirecutter
   description: This kills the wire.
   components:
@@ -112,10 +112,9 @@
         Steel: 100
 
 - type: entity
-  id: ImprovedWelder
   parent: BaseWelder
+  id: ImprovedWelder
   name: improved welder
-  description: ""
   components:
     - type: SolutionContainerManager
       solutions:

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml

@@ -1,6 +1,6 @@
 - type: entity
-  id: BaseHandGuardModule
   parent: BaseItem
+  id: BaseHandGuardModule
   abstract: true
   components:
   - type: Sprite
@@ -16,8 +16,8 @@
   - type: Appearance
 
 - type: entity
-  id: BaseBarrelModule
   parent: BaseItem
+  id: BaseBarrelModule
   abstract: true
   components:
   - type: Sprite
@@ -33,8 +33,8 @@
   - type: Appearance
 
 - type: entity
-  id: BaseAimModule
   parent: BaseItem
+  id: BaseAimModule
   abstract: true
   components:
   - type: Sprite
@@ -51,10 +51,10 @@
 
 # modules
 - type: entity
-  id: LightModule
-  description: Light module for rifles (lecter, CV, drozd, WT).
-  name: "light module"
   parent: BaseHandGuardModule
+  id: LightModule
+  name: "light module"
+  description: Light module for rifles (lecter, CV, drozd, WT).
   components:
   - type: LightModule
     value: "light"
@@ -64,10 +64,10 @@
   - type: Appearance
 
 - type: entity
-  id: LaserModule
-  description: Laser module for rifles (lecter, CV, drozd, WT).
-  name: "laser module"
   parent: BaseHandGuardModule
+  id: LaserModule
+  name: "laser module"
+  description: Laser module for rifles (lecter, CV, drozd, WT).
   components:
   - type: LaserModule
     value: "laser"
@@ -77,10 +77,10 @@
   - type: Appearance
 
 - type: entity
-  id: FlameHiderModule
-  description: Flame Hider module for rifles (lecter, CV, drozd, WT).
-  name: "flamehider module"
   parent: BaseBarrelModule
+  id: FlameHiderModule
+  name: "flamehider module"
+  description: Flame Hider module for rifles (lecter, CV, drozd, WT).
   components:
   - type: FlameHiderModule
     value: "flamehider"
@@ -90,10 +90,10 @@
   - type: Appearance
 
 - type: entity
-  id: SilencerModule
-  description: Silencer module for rifles (lecter, CV, drozd, WT).
-  name: "silencer module"
   parent: BaseBarrelModule
+  id: SilencerModule
+  name: "silencer module"
+  description: Silencer module for rifles (lecter, CV, drozd, WT).
   components:
   - type: SilencerModule
     value: "silencer"
@@ -103,10 +103,10 @@
   - type: Appearance
 
 - type: entity
-  id: AcceleratorModule
-  description: Accelerator module for rifles (lecter, CV, drozd, WT).
-  name: "accelerator module"
   parent: BaseHandGuardModule
+  id: AcceleratorModule
+  name: "accelerator module"
+  description: Accelerator module for rifles (lecter, CV, drozd, WT).
   components:
   - type: AcceleratorModule
     value: "accelerator"
@@ -116,14 +116,14 @@
   - type: Appearance
 
 - type: entity
-  id: EightAimModule
-  description: 8X Aim Module for rifles.
-  name: "aim module"
   parent: BaseAimModule
+  id: EightAimModule
+  name: "aim module"
+  description: 8X Aim Module for rifles.
   components:
   - type: AimModule
     value: "eightaim"
     module_type: "aim_module"
   - type: Sprite
     state: eightaim
-  - type: Appearance
+  - type: Appearance

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/flamethrower_projectile.yml

@@ -1,8 +1,8 @@
 - type: entity
   id: ProjectileFlamethrower
+  noSpawn: true
   name: ProjectileFlamethrower
   description: ProjectileFlamethrower
-  noSpawn: true
   components:
   - type: GasProjectile
     gasUsagePerTile: 0.9375

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: BaseBulletShinanoGranade
-  name: base shinano granade
   abstract: true
+  name: base shinano granade
   components:
   - type: MovedByPressure
   - type: FlyBySound
@@ -30,10 +30,10 @@
   - type: TriggerOnLand
 
 - type: entity
-  id: ShinanoBulletGrenadeFlash
-  name: flash shinano grenade
   parent: BaseBulletShinanoGranade
+  id: ShinanoBulletGrenadeFlash
   noSpawn: true
+  name: flash shinano grenade
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -45,10 +45,10 @@
     proto: GrenadeFlashEffect
 
 - type: entity
-  id: ShinanoBulletGrenadeSmoke
-  name: smoke shinano grenade
   parent: BaseBulletShinanoGranade
+  id: ShinanoBulletGrenadeSmoke
   noSpawn: true
+  name: smoke shinano grenade
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -66,10 +66,10 @@
     sound: /Audio/Items/smoke_grenade_smoke.ogg
 
 - type: entity
-  id: ShinanoBulletGrenadeBeanbag
-  name: beanbag shinano grenade
-  noSpawn: true
   parent: [BaseBullet, BaseBulletTrail]
+  id: ShinanoBulletGrenadeBeanbag
+  noSpawn: true
+  name: beanbag shinano grenade
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi
@@ -81,4 +81,4 @@
         Blunt: 15
   - type: StaminaDamageOnCollide
     ignoreResistances: true
-    damage: 80
+    damage: 80

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/crossbow.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: арбалет
   parent: BaseItem
   id: WeaponPoweredCrossbow
+  name: арбалет
   description: Опасная штука, страшная вещь.
   components:
   - type: Sprite
@@ -66,9 +66,9 @@
     node: crossbow
 
 - type: entity
-  name: часть арбалета
   parent: BaseItem
   id: WeaponPoweredCrossbowUnfinished
+  name: часть арбалета
   description: Недоделанный арбалет.
   components:
   - type: Sprite

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/flamethrower.yml

@@ -1,8 +1,8 @@
 - type: entity
-  name: огнемёт
   parent: BaseWelder
   id: WeaponFlamethrower
-  description: Отлично подходит для сжигания фурри.
+  name: огнемёт
+  description: Отлично подходит для сжигания био-угроз.
   components:
   - type: Sprite
     sprite: White/Objects/Weapons/flamethrower.rsi
@@ -68,9 +68,9 @@
     node: flamethrower
 
 - type: entity
-  name: часть огнемёта
   parent: BaseItem
   id: WeaponFlamethrowerUnfinished
+  name: часть огнемёта
   description: Недоделанный огнемёт.
   components:
   - type: Sprite

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/shinano.yml

@@ -34,4 +34,4 @@
     proto: ShinanoGrenadeFlash
     soundInsert:
       path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg
-    autoCycle: false
+    autoCycle: false

Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/tempgun.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: temperature gun
   parent: WeaponEgun
   id: WeaponTempGun
+  name: temperature gun
   description: A gun that changes temperatures.
   components:
     - type: Sprite

Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: жезл нулификации
   parent: BaseItem
   id: NullRod
+  name: жезл нулификации
   description: Жезл из чистого обсидиана. Само его присутствие разрушает и ослабляет "магические силы". Во всяком случае так написано в путеводителе.
   components:
   - type: Sprite
@@ -46,9 +46,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: божья длань
   parent: BaseItem
   id: GodHand
+  name: божья длань
   description: Эта рука сияет с потрясающей силой!
   components:
   - type: Sprite
@@ -72,9 +72,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: священный клеймор
   parent: Claymore
   id: HolyClaymore
+  name: священный клеймор
   description: Оружие, подходящее для крестового похода!
   components:
   - type: Sprite
@@ -94,9 +94,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: цепной меч
   parent: HolyClaymore
   id: Chainsword
+  name: цепной меч
   description: Не позволь еретику жить.
   components:
   - type: Sprite
@@ -115,9 +115,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: силовой меч
   parent: HolyClaymore
   id: SwordGlowing
+  name: силовой меч
   description: Клинок светится силой веры. Или, возможно, благодаря аккумулятору.
   components:
   - type: Sprite
@@ -133,9 +133,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: лезвие ханзо
   parent: Katana
   id: HolyKatana
+  name: лезвие ханзо
   description: Способен прорезать святой клеймор.
   components:
   - type: Sprite
@@ -151,9 +151,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: внепространственный клинок
   parent: HolyKatana
   id: MultiverseBlade
+  name: внепространственный клинок
   description: Будучи когда-то предвестником межпространственной войны, его острота сильно колеблется. Наносит от 1 до 50 урона.
   components:
   - type: Sprite
@@ -173,9 +173,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: коса жнеца
   parent: HolyClaymore
   id: VorpalScythe
+  name: коса жнеца
   description: И жрец, и жнец, и на дуде игрец! Коса способна пробить броню противника.
   components:
   - type: Sprite
@@ -195,9 +195,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: одержимый клинок
   parent: HolyKatana
   id: PossessedBlade
+  name: одержимый клинок
   description: Когда на станции царит хаос, приятно иметь рядом друга.
   components:
   - type: Sprite
@@ -221,9 +221,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: рука-бензопила
   parent: BaseItem
   id: ChainsawHand
+  name: рука-бензопила
   description: Добро? Зло? Ты парень с бензопилой в руке.
   components:
   - type: Sharp
@@ -254,9 +254,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: священная плеть
   parent: BaseItem
   id: HolyWhip
+  name: священная плеть
   description: Какая ужасная ночь на космической станции 14.
   components:
   - type: Sprite
@@ -280,9 +280,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: посох монаха
   parent: BaseItem
   id: HolyStaff
+  name: посох монаха
   description: Длинный высокий посох из полированного дерева. Традиционно используемый в боевых искусствах древней Земли, теперь он используется для преследования клоуна.
   components:
   - type: Sprite
@@ -312,9 +312,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: нечестивые вилы
   parent: BaseItem
   id: UnholyPitchfork
+  name: нечестивые вилы
   description: Держа это, ты выглядишь абсолютно по дьявольски.
   components:
   - type: EmbeddableProjectile
@@ -371,9 +371,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: реликтовый боевой молот
   parent: BaseItem
   id: WarHammer
+  name: реликтовый боевой молот
   description: Этот боевой молот обошелся священнику в сорок тысяч кредитов.
   components:
   - type: Sprite
@@ -403,9 +403,9 @@
   - type: HolyWeapon
 
 - type: entity
-  name: гиперинструмент
   parent: BaseItem
   id: HyperTool
+  name: гиперинструмент
   description: Инструмент настолько мощный, что даже вы не можете им идеально пользоваться.
   components:
   - type: Sprite

Resources/Prototypes/_White/Entities/Objects/Weapons/energy_axe.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: энергетический боевой топор
   parent: BaseItem
   id: EnergyBattleAxe
+  name: энергетический боевой топор
   description: Гарантирует быструю смерть.
   components:
   - type: Wieldable

Resources/Prototypes/_White/Entities/Objects/Weapons/experimental_stunbaton.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: experimental stun baton
   parent: Stunbaton
   id: ExperimentalStunbaton
+  name: experimental stun baton
   description: Meowk!
   components:
   - type: Clothing

Resources/Prototypes/_White/Entities/Objects/Weapons/hardlight_spear.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: hardlight spear
   parent: Spear
   id: SpearHardlight
+  name: hardlight spear
   description: A spear made out of hardened light.
   components:
   - type: Sprite

Resources/Prototypes/_White/Entities/Objects/Weapons/snatcherprod.yml

@@ -1,7 +1,7 @@
 - type: entity
-  name: хваталка
   parent: BaseItem
   id: Snatcherprod
+  name: хваталка
   description: Искрится жаждой воровства и коварства.
   components:
   - type: Sprite
@@ -77,9 +77,9 @@
     node: snatcherprod
 
 - type: entity
-  name: обмотанный стержень
   parent: BaseItem
   id: ProdUnfinished
+  name: обмотанный стержень
   description: Стержень с проводами.
   components:
   - type: Sprite

Resources/Prototypes/_White/Entities/Structures/Furniture/benches.yml

@@ -1,11 +1,11 @@
 # Base benches
 - type: entity
-  name: bench
-  id: BenchBaseMiddle
-  suffix: Middle
-  abstract: true
   parent: SeatBase
+  id: BenchBaseMiddle
+  abstract: true
+  name: bench
   description: Multiple seats spanning a single object. Truly a marvel of science.
+  suffix: Middle
   components:
   - type: Physics
     bodyType: Static
@@ -17,207 +17,207 @@
 
 # Park benches
 - type: entity
-  name: park bench
-  id: BenchParkMiddle
   parent: BenchBaseMiddle
+  id: BenchParkMiddle
+  name: park bench
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/parkbench_wooden.rsi
 
 - type: entity
+  parent: BenchParkMiddle
   id: BenchParkLeft
   suffix: Left
-  parent: BenchParkMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchParkMiddle
   id: BenchParkRight
   suffix: Right
-  parent: BenchParkMiddle
   components:
   - type: Sprite
     state: right
 
 # Bamboo benches
 - type: entity
-  name: park bench
-  id: BenchParkBambooMiddle
   parent: BenchBaseMiddle
+  id: BenchParkBambooMiddle
+  name: park bench
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/parkbench_bamboo.rsi
 
 - type: entity
+  parent: BenchParkBambooMiddle
   id: BenchParkBambooLeft
   suffix: Left
-  parent: BenchParkBambooMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchParkBambooMiddle
   id: BenchParkBambooRight
   suffix: Right
-  parent: BenchParkBambooMiddle
   components:
   - type: Sprite
     state: right
 
 # Pews
 - type: entity
-  name: pew
-  id: BenchPewMiddle
   parent: BenchBaseMiddle
+  id: BenchPewMiddle
+  name: pew
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/pews.rsi
 
 - type: entity
+  parent: BenchPewMiddle
   id: BenchPewLeft
   suffix: Left
-  parent: BenchPewMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchPewMiddle
   id: BenchPewRight
   suffix: Right
-  parent: BenchPewMiddle
   components:
   - type: Sprite
     state: right
 
 # Steel benches
 - type: entity
-  name: steel bench
-  id: BenchSteelMiddle
   parent: BenchBaseMiddle
+  id: BenchSteelMiddle
+  name: steel bench
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/steel_bench.rsi
 
 - type: entity
+  parent: BenchSteelMiddle
   id: BenchSteelLeft
   suffix: Left
-  parent: BenchSteelMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchSteelMiddle
   id: BenchSteelRight
   suffix: Right
-  parent: BenchSteelMiddle
   components:
   - type: Sprite
     state: right
 
 # White steel benches
 - type: entity
-  name: white steel bench
-  id: BenchSteelWhiteMiddle
   parent: BenchBaseMiddle
+  id: BenchSteelWhiteMiddle
+  name: white steel bench
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/steel_bench_white.rsi
 
 - type: entity
+  parent: BenchSteelWhiteMiddle
   id: BenchSteelWhiteLeft
   suffix: Left
-  parent: BenchSteelWhiteMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchSteelWhiteMiddle
   id: BenchSteelWhiteRight
   suffix: Right
-  parent: BenchSteelWhiteMiddle
   components:
   - type: Sprite
     state: right
 
 # Standard sofa
 - type: entity
-  name: sofa
-  id: BenchSofaMiddle
   parent: BenchBaseMiddle
+  id: BenchSofaMiddle
+  name: sofa
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/sofa.rsi
 
 - type: entity
+  parent: BenchSofaMiddle
   id: BenchSofaLeft
   suffix: Left
-  parent: BenchSofaMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchSofaMiddle
   id: BenchSofaRight
   suffix: Right
-  parent: BenchSofaMiddle
   components:
   - type: Sprite
     state: right
 
 - type: entity
+  parent: BenchSofaMiddle
   id: BenchSofaCorner
   suffix: Corner
-  parent: BenchSofaMiddle
   components:
   - type: Sprite
     state: corner
 
 - type: entity
+  parent: BenchSofaMiddle
   id: BenchSofaCornerOut
   suffix: Corner-Out
-  parent: BenchSofaMiddle
   components:
   - type: Sprite
     state: corner_out
 
 # Corp sofa
 - type: entity
-  name: grey sofa
-  id: BenchSofaCorpMiddle
   parent: BenchBaseMiddle
+  id: BenchSofaCorpMiddle
+  name: grey sofa
   components:
   - type: Sprite
     sprite: White/Structures/Furniture/Benches/sofa_corp.rsi
 
 - type: entity
+  parent: BenchSofaCorpMiddle
   id: BenchSofaCorpLeft
   suffix: Left
-  parent: BenchSofaCorpMiddle
   components:
   - type: Sprite
     state: left
 
 - type: entity
+  parent: BenchSofaCorpMiddle
   id: BenchSofaCorpRight
   suffix: Right
-  parent: BenchSofaCorpMiddle
   components:
   - type: Sprite
     state: right
 
 - type: entity
+  parent: BenchSofaCorpMiddle
   id: BenchSofaCorpCorner
   suffix: Corner
-  parent: BenchSofaCorpMiddle
   components:
   - type: Sprite
     state: corner
 
 - type: entity
+  parent: BenchSofaCorpMiddle
   id: BenchSofaCorpCornerOut
   suffix: Corner-Out
-  parent: BenchSofaCorpMiddle
   components:
   - type: Sprite
     state: corner_out

Resources/Prototypes/_White/Entities/Structures/Machine/gulag_machines.yml

@@ -1,8 +1,8 @@
 - type: entity
+  parent: BaseMachinePowered
   id: GulagOreProcessor
   name: gulagMachine
   description: Shit
-  parent: BaseMachinePowered
   suffix: NoSpawn
   components:
     - type: Sprite

Resources/Prototypes/_White/Entities/Structures/Machines/doc_printer.yml

@@ -1,7 +1,7 @@
 # Base Document Printer
 - type: entity
-  id: BaseDocPrinter
   parent: BaseMachinePowered
+  id: BaseDocPrinter
   abstract: true
   name: принтер
   components:

Resources/Prototypes/_White/Entities/Structures/Wallmounts/consoles.yml

@@ -1,7 +1,7 @@
 # Base structure
 - type: entity
-  id: BaseStructureWallMountConsole
   parent: BaseStructure
+  id: BaseStructureWallMountConsole
   abstract: true
   components:
   - type: Physics
@@ -139,8 +139,8 @@
 
 # Frame
 - type: entity
-  id: ComputerWallFrame
   parent: BaseStructureWallMountConsole
+  id: ComputerWallFrame
   name: рамка настенной консоли
   description: Рамка для сборки настенной консоли.
   components:
@@ -162,8 +162,8 @@
 
 # Salvage console
 - type: entity
-  id: SalvageConsoleWallMount
   parent: BaseWallConsole
+  id: SalvageConsoleWallMount
   name: настенная консоль экспедиций
   description: Настенная версия консоли экспедиций.
   components:
@@ -203,8 +203,8 @@
 
 # Order console
 - type: entity
-  id: OrdersConsoleWallMount
   parent: BaseWallConsole
+  id: OrdersConsoleWallMount
   name: настенная консоль заказа грузов
   description: Настенная консоли заказа грузов.
   components:
@@ -255,8 +255,8 @@
 
 # MassMedia console
 - type: entity
-  id: MassMediaConsoleWallMount
   parent: BaseWallConsole
+  id: MassMediaConsoleWallMount
   name: настенная консоль СМИ
   description: Настенная версия новостной консоли.
   components:
@@ -295,8 +295,8 @@
 
 # Radar console
 - type: entity
-  id: RadarConsoleWallMount
   parent: BaseWallConsole
+  id: RadarConsoleWallMount
   name: настенный сканер масс
   description: Настенная версия консоли сканера массы.
   components:
@@ -333,8 +333,8 @@
 
 # Power console
 - type: entity
-  id: PowerConsoleWallMount
   parent: BaseWallConsole
+  id: PowerConsoleWallMount
   name: настенная консоль контроля питания
   description: Настенная версия консоли контроля питания.
   components:

Resources/Prototypes/_White/tags.yml

@@ -81,3 +81,9 @@
 
 - type: Tag
   id: DoorjackUsable
+
+- type: Tag
+  id: Card
+
+- type: Tag
+  id: UnoCard