Fix "ыыыы" prototype edition (#3514)

Co-authored-by: iertis <kanopus952@gmail.com> Co-authored-by: Daniel | Orvex07 <d.b.orvex@gmail.com>
2025-12-27 18:23:10 +00:00 · 2025-12-27 18:23:10 +00:00 · 11cca765b8
commit 11cca765b8
parent 2c1aa0341e
453 changed files with 5125 additions and 4804 deletions
--- a/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
+++ b/Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
@ -373,7 +373,7 @@ public sealed partial class AdminLogsControl : Control

        for (var i = 0; i < impacts.Length - 1; i++)
        {
-            LogImpactContainer.GetChild(i).StyleClasses.Add(StyleClass.ButtonSquare);
+            LogImpactContainer.GetChild(i).StyleClasses.Add("ButtonSquare");
        }

        LogImpactContainer.GetChild(LogImpactContainer.ChildCount - 1).StyleClasses.Add("OpenLeft");
--- a/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
+++ b/Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
@ -101,7 +101,7 @@
        ToolTip="{Loc 'ui-options-function-open-a-help'}"
        MinSize="42 64"
        HorizontalExpand="True"
-        AppendStyleClass="{x:Static style:StyleBase.ButtonSquare}"
+        AppendStyleClass="{x:Static style:StyleClass.ButtonSquare}"
        />
    <ui:MenuButton
        Name="MHelpButton"
--- a/Content.Client/_Sunrise/InteractionsPanel/CustomInteractionEditor.xaml.cs
+++ b/Content.Client/_Sunrise/InteractionsPanel/CustomInteractionEditor.xaml.cs
@ -11,6 +11,7 @@ using Robust.Client.Utility;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
+using Content.Client.Stylesheets;

 namespace Content.Client._Sunrise.InteractionsPanel;

--- a/Content.Client/_Sunrise/InteractionsPanel/InteractionsUIWindow.xaml.cs
+++ b/Content.Client/_Sunrise/InteractionsPanel/InteractionsUIWindow.xaml.cs
@ -1,6 +1,7 @@
 using System.Linq;
 using System.Numerics;
 using Content.Client._Sunrise.InteractionsPanel.Models;
+using Content.Client.Stylesheets;
 using Content.Shared._Sunrise.InteractionsPanel.Data.Components;
 using Content.Shared._Sunrise.InteractionsPanel.Data.Prototypes;
 using Content.Shared._Sunrise.InteractionsPanel.Data.UI;
--- a/Content.Server/EnergyDome/EnergyDomeGeneratorComponent.cs
+++ b/Content.Server/EnergyDome/EnergyDomeGeneratorComponent.cs
@ -63,13 +63,13 @@ public sealed partial class EnergyDomeGeneratorComponent : Component
    public SoundSpecifier TurnOnSound = new SoundPathSpecifier("/Audio/Machines/anomaly_sync_connect.ogg");

    [DataField]
-    public SoundSpecifier EnergyOutSound = new SoundPathSpecifier("/Audio/Machines/energyshield_down.ogg");
+    public SoundSpecifier EnergyOutSound = new SoundPathSpecifier("/Audio/_Sunrise/Machines/energyshield_down.ogg");

    [DataField]
    public SoundSpecifier TurnOffSound = new SoundPathSpecifier("/Audio/Machines/button.ogg");

    [DataField]
-    public SoundSpecifier ParrySound = new SoundPathSpecifier("/Audio/Machines/energyshield_parry.ogg")
+    public SoundSpecifier ParrySound = new SoundPathSpecifier("/Audio/_Sunrise/Machines/energyshield_parry.ogg")
    {
        Params = AudioParams.Default.WithVariation(0.05f)
    };
--- a/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
+++ b/Content.Server/Medical/Components/HealthAnalyzerComponent.cs
@ -13,4 +13,10 @@ public sealed partial class HealthAnalyzerComponent : AbstractAnalyzerComponent
    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
    [AutoPausedField]
    public override TimeSpan NextUpdate { get; set; } = TimeSpan.Zero;
+
+    // Sunrise-start
+    [DataField(customTypeSerializer: typeof(PrototypeIdListSerializer<DamageContainerPrototype>))]
+    public List<string>? DamageContainers;
+    // Sunrise-end
 }
+
--- a/Content.Server/Medical/HealthAnalyzerSystem.cs
+++ b/Content.Server/Medical/HealthAnalyzerSystem.cs
@ -38,7 +38,7 @@ public sealed class HealthAnalyzerSystem : AbstractAnalyzerSystem<HealthAnalyzer
        if (!_uiSystem.HasUi(healthAnalyzer, HealthAnalyzerUiKey.Key))
            return;

-        if (!HasComp<DamageableComponent>(target))
+        if (!TryComp<DamageableComponent>(target, out var damageableComponent)) // Sunrise
            return;

        var bodyTemperature = float.NaN;
@ -46,6 +46,16 @@ public sealed class HealthAnalyzerSystem : AbstractAnalyzerSystem<HealthAnalyzer
        if (TryComp<TemperatureComponent>(target, out var temp))
            bodyTemperature = temp.CurrentTemperature;

+        // Sunrise-Start
+        if (!TryComp<HealthAnalyzerComponent>(healthAnalyzer, out var healthAnalyzerComp))
+            return;
+
+        if (healthAnalyzerComp.DamageContainers is not null &&
+            damageableComponent.DamageContainerID is not null &&
+            !healthAnalyzerComp.DamageContainers.Contains(damageableComponent.DamageContainerID))
+            return;
+        // Sunrise-End
+
        var bloodAmount = float.NaN;
        var bleeding = false;
        var unrevivable = false;
--- a/Content.Server/_Starlight/Combat/Ranged/PierceSystem.cs
+++ b/Content.Server/_Starlight/Combat/Ranged/PierceSystem.cs
@ -1,36 +0,0 @@
-using Content.Shared.Actions;
-using Content.Shared.DoAfter;
-using Robust.Shared.Prototypes;
-using Content.Shared.Cuffs.Components;
-using Content.Shared.Damage.Components;
-using Content.Shared.Weapons.Melee.Events;
-using Content.Shared._Starlight.Weapon;
-using Content.Shared._Starlight.Combat.Ranged.Pierce;
-using Content.Shared.Armor;
-using Content.Shared.Damage;
-using Content.Shared.Inventory;
-using Content.Shared.Weapons.Hitscan.Events;
-
-namespace Content.Server._Starlight.Combat.Ranged;
-
-public sealed partial class PierceSystem : EntitySystem
-{
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<PierceableComponent, HitScanPierceAttemptEvent>(OnPierceablePierce);
-        SubscribeLocalEvent<PierceableComponent, InventoryRelayedEvent<HitScanPierceAttemptEvent>>(OnArmorPierce);
-        base.Initialize();
-    }
-
-    private void OnArmorPierce(Entity<PierceableComponent> ent, ref InventoryRelayedEvent<HitScanPierceAttemptEvent> args)
-    {
-        if ((byte)ent.Comp.Level > (byte)args.Args.Level)
-            args.Args.Pierced = false;
-    }
-
-    private void OnPierceablePierce(Entity<PierceableComponent> ent, ref HitScanPierceAttemptEvent args)
-    {
-        if ((byte)ent.Comp.Level > (byte)args.Level)
-            args.Pierced = false;
-    }
-}
--- a/Content.Server/_Starlight/Combat/Ranged/RicochetSystem.cs
+++ b/Content.Server/_Starlight/Combat/Ranged/RicochetSystem.cs
@ -1,133 +0,0 @@
-using Content.Shared._Starlight.Weapon;
-using Content.Shared._Starlight.Combat.Ranged.Pierce;
-using Robust.Shared.Physics;
-using Robust.Shared.Random;
-using System.Linq;
-using Robust.Server.GameObjects;
-using System.Numerics;
-using Robust.Shared.Physics.Collision.Shapes;
-
-namespace Content.Server._Starlight.Combat.Ranged;
-
-public sealed partial class RicochetSystem : EntitySystem
-{
-    [Dependency] private readonly IRobustRandom _rand = default!;
-    [Dependency] private readonly TransformSystem _transform = default!;
-    public override void Initialize()
-    {
-        SubscribeLocalEvent<RicochetableComponent, HitScanRicochetAttemptEvent>(OnRicochetPierce);
-        base.Initialize();
-    }
-
-    private void OnRicochetPierce(Entity<RicochetableComponent> ent, ref HitScanRicochetAttemptEvent args)
-    {
-        if (!TryComp<FixturesComponent>(ent, out var fixtures)
-            || fixtures.Fixtures.Count == 0
-            || fixtures.Fixtures.FirstOrDefault().Value?.Shape is not PolygonShape shape)
-            return;
-
-        var chance = Math.Clamp(args.Chance * ent.Comp.Chance, 0f, 1f);
-        if (chance == 0) return;
-
-        var invMatrix = _transform.GetInvWorldMatrix(ent.Owner);
-
-        var localFrom = Vector2.Transform(args.Pos, invMatrix);
-
-        var invNoTrans = invMatrix;
-        invNoTrans.M31 = 0f;
-        invNoTrans.M32 = 0f;
-
-        var localDir = Vector2.Transform(args.Dir, invNoTrans).Normalized();
-
-        if (!RayCastPolygon(shape, localFrom, localDir,
-                 out var tMin, out var edgeIndex, out var ptLocal)) return;
-
-        var localNormal = shape.Normals[edgeIndex];
-
-        var dot = Vector2.Dot(localDir, localNormal);
-
-        var clampedDot = Math.Clamp(MathF.Abs(dot), 0f, 1f);
-
-        var angleFactor = 2f * (1f - clampedDot);
-
-        chance = Math.Clamp(args.Chance * angleFactor, 0f, 1f);
-        if(!_rand.Prob(chance)) return;
-
-        //    R = D - 2*(D·N)*N
-        var reflectedLocal = localDir - (2f * dot * localNormal);
-
-        var matrix = _transform.GetWorldMatrix(ent.Owner);
-        var matrixNoTrans = matrix;
-        matrixNoTrans.M31 = 0f;
-        matrixNoTrans.M32 = 0f;
-
-        var reflectedWorld = Vector2.Transform(reflectedLocal, matrixNoTrans).Normalized();
-
-        args.Dir = reflectedWorld;
-        args.Ricocheted = true;
-    }
-
-    private bool RayCastPolygon(
-    PolygonShape polygon,
-    Vector2 origin,
-    Vector2 dir,
-    out float tMin,
-    out int edgeIndex,
-    out Vector2 ptLocal,
-    float maxT = float.MaxValue)
-    {
-        tMin = float.MaxValue;
-        edgeIndex = -1;
-        ptLocal = default;
-
-        var verts = polygon.Vertices;
-        var count = polygon.VertexCount;
-
-        for (var i = 0; i < count; i++)
-        {
-            var next = (i + 1) % count;
-            var v0 = verts[i];
-            var v1 = verts[next];
-
-            if (RayCastSegment(origin, dir, v0, v1, out var t) && t >= 0f && t < maxT)
-            {
-                if (t < tMin)
-                {
-                    tMin = t;
-                    edgeIndex = i;
-                }
-            }
-        }
-
-        if (edgeIndex < 0)
-            return false;
-
-        ptLocal = origin + (dir * tMin);
-        return true;
-    }
-    private bool RayCastSegment(Vector2 origin, Vector2 dir, Vector2 v0, Vector2 v1, out float t)
-    {
-        t = 0f;
-
-        var edge = v1 - v0;
-        var denom = Cross2D(edge, dir);
-
-        if (MathF.Abs(denom) < 1e-6f)
-            return false;
-
-        var diff = origin - v0;
-
-        var s = Cross2D(diff, dir) / denom;
-        if (s is < 0f or > 1f)
-            return false;
-
-        var tRay = Cross2D(diff, edge) / denom;
-        if (tRay < 0f)
-            return false;
-
-        t = tRay;
-        return true;
-    }
-
-    private float Cross2D(Vector2 a, Vector2 b) => (a.X * b.Y) - (a.Y * b.X);
-}
--- a/Content.Server/_Sunrise/EnergyShield/EnergyShieldComponent.cs
+++ b/Content.Server/_Sunrise/EnergyShield/EnergyShieldComponent.cs
@ -18,13 +18,13 @@ public sealed partial class EnergyShieldComponent : Component
    /// Звук поглощения урона
    /// </summary>
    [DataField]
-    public SoundSpecifier AbsorbSound = new SoundPathSpecifier("/Audio/Machines/energyshield_parry.ogg");
+    public SoundSpecifier AbsorbSound = new SoundPathSpecifier("/Audio/_Sunrise/Machines/energyshield_parry.ogg");

    /// <summary>
    /// Звук отключения щита при нехватке энергии
    /// </summary>
    [DataField]
-    public SoundSpecifier ShutdownSound = new SoundPathSpecifier("/Audio/Machines/energyshield_down.ogg");
+    public SoundSpecifier ShutdownSound = new SoundPathSpecifier("/Audio/_Sunrise/Machines/energyshield_down.ogg");

    /// <summary>
    /// При скольки процентах заряда можно включить щит
--- a/Content.Shared/Botany/Components/PlantAnalyzerComponent.cs
+++ b/Content.Shared/Botany/Components/PlantAnalyzerComponent.cs
--- a/Content.Shared/Fluids/SharedAbsorbentSystem.cs
+++ b/Content.Shared/Fluids/SharedAbsorbentSystem.cs
@ -32,6 +32,7 @@ public abstract class SharedAbsorbentSystem : EntitySystem
    [Dependency] private readonly SharedMapSystem _mapSystem = default!;
    [Dependency] private readonly SharedItemSystem _item = default!;
    [Dependency] private readonly EntityLookupSystem _lookup = default!; // Sunrise-edit
+    [Dependency] private readonly ILocalizationManager _loc = default!; // Sunrise-edit

    public override void Initialize()
    {
@ -68,14 +69,15 @@ public abstract class SharedAbsorbentSystem : EntitySystem
        }

        var coordinates = args.ClickLocation;
-        var footPrints = new HashSet<Entity<FootprintComponent>>();
-
        var gridUid = _transform.GetGrid(coordinates);
        if (!TryComp<MapGridComponent>(gridUid, out var grid))
            return;

        var tileCoordinates = _mapSystem.CoordinatesToTile(gridUid.Value, grid, coordinates);
        var tileRef = _mapSystem.GetTileRef(gridUid.Value, grid, tileCoordinates);
+        var tileCenterPos = _mapSystem.GridTileToLocal(gridUid.Value, grid, tileRef.GridIndices);
+
+        var footPrints = new HashSet<Entity<FootprintComponent>>();
        var entities = _lookup.GetLocalEntitiesIntersecting(tileRef, ent.Comp.FootprintEnlargement);

        foreach (var entity in entities)
@ -91,7 +93,6 @@ public abstract class SharedAbsorbentSystem : EntitySystem
            if (!SolutionContainer.TryGetSolution(args.Used, ent.Comp.SolutionName, out var absorberSoln))
                return;

-            var tileCenterPos = _mapSystem.GridTileToLocal(gridUid.Value, grid, tileRef.GridIndices);
            CleanFootprints(args.User, args.Used, ent.Comp, absorberSoln.Value, footPrints, tileCenterPos);
            args.Handled = true;
            return;
@ -103,7 +104,7 @@ public abstract class SharedAbsorbentSystem : EntitySystem

    // Sunrise-Start
    public void CleanFootprints(EntityUid user, EntityUid used, AbsorbentComponent absorber,
-        Entity<SolutionComponent> absorberSoln, HashSet<Entity<FootprintComponent>> footPrints,
+        Entity<SolutionComponent> absorberSoln, IEnumerable<Entity<FootprintComponent>> footPrints,
        EntityCoordinates targetCoords)
    {
        var soundPlayed = false;
@ -122,7 +123,7 @@ public abstract class SharedAbsorbentSystem : EntitySystem
            // No material
            if (available == FixedPoint2.Zero)
            {
-                _popups.PopupEntity(Loc.GetString("mopping-system-no-water", ("used", used)), user, user);
+                TryPopupNoWater(user, used);
                return;
            }

@ -164,8 +165,24 @@ public abstract class SharedAbsorbentSystem : EntitySystem

        _melee.DoLunge(user, used, Angle.Zero, localPos, null, false);
    }
-    // Sunrise-End

+    private void TryPopupNoWater(EntityUid user, EntityUid used)
+    {
+        if (TryComp(used, out UseDelayComponent? useDelay) && _useDelay.IsDelayed((used, useDelay)))
+            return;
+
+        var message = _loc.GetString("mopping-system-no-water", ("used", used));
+
+        if (HasComp<ItemComponent>(used))
+            _popups.PopupClient(message, user, user);
+
+        else
+            _popups.PopupEntity(message, user, user);
+
+        if (useDelay != null)
+            _useDelay.TryResetDelay((used, useDelay));
+    }
+    // Sunrise-End
    private void OnAbsorbentSolutionChange(Entity<AbsorbentComponent> ent, ref SolutionContainerChangedEvent args)
    {
        if (!SolutionContainer.TryGetSolution(ent.Owner, ent.Comp.SolutionName, out _, out var solution))
--- a/Content.Shared/Fluids/SharedPuddleSystem.cs
+++ b/Content.Shared/Fluids/SharedPuddleSystem.cs
@ -320,6 +320,14 @@ public abstract partial class SharedPuddleSystem : EntitySystem

    private void UpdateSlow(EntityUid uid, Solution solution)
    {
+        // Sunrise: footprint/drag-mark "puddles" (e.g. slime on shoes) are visual traces and should not apply slowdown.
+        // They also do not have physics, so adding contact slowdowns causes physics queries to error.
+        if (TryComp(uid, out PuddleComponent? puddle) && !puddle.CanSlow)
+        {
+            RemComp<SpeedModifierContactsComponent>(uid);
+            return;
+        }
+
        var maxViscosity = 0f;
        foreach (var (reagent, _) in solution.Contents)
        {
--- a/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
@ -493,6 +493,19 @@ public sealed partial class HumanoidCharacterAppearance : ICharacterAppearance,
        var newHairStyle = HairStyles.DefaultHairStyle;
        List<Marking> newMarkings = [];

+        // Sunrise - Start
+        var hairStyles = markingManager.MarkingsByCategoryAndSpeciesAndSex(MarkingCategories.Hair, species, sex);
+        if (hairStyles.Count > 0)
+            newHairStyle = random.Pick(hairStyles.Keys.ToArray());
+
+        if (sex != Sex.Female)
+        {
+            var facialHairStyles = markingManager.MarkingsByCategoryAndSpeciesAndSex(MarkingCategories.FacialHair, species, sex);
+            if (facialHairStyles.Count > 0)
+                newFacialHairStyle = random.Pick(facialHairStyles.Keys.ToArray());
+        }
+        // Sunrise - End
+
        // grab a completely random color.
        var baseColor = new Color(random.NextFloat(1), random.NextFloat(1), random.NextFloat(1), 1);

--- a/Resources/Audio/Ambience/Temporary/attributions.yml
+++ b/Resources/Audio/Ambience/Temporary/attributions.yml
@ -1,4 +1,4 @@
 - files: ["flies.ogg"]
  license: "CC0-1.0"
  copyright: "Taken from source"
-  source: "https://freesound.org/people/telezon/sounds/321870/"
+  source: "https://freesound.org/people/telezon/sounds/321870/"
--- a/Resources/Audio/Effects/Changeling/attributions.yml
+++ b/Resources/Audio/Effects/Changeling/attributions.yml
@ -1,4 +1,4 @@
- files: ["devour_suck.ogg"]
+- files: ["devour_suck.ogg"]
  license: "CC0-1.0"
  copyright: "4Cairnz on Freesound: June 5th 2023"
  source: "https://freesound.org/people/4Cairnz/sounds/689640/"
--- a/Resources/Audio/Effects/Shuttle/attributions.yml
+++ b/Resources/Audio/Effects/Shuttle/attributions.yml
@ -14,4 +14,4 @@
  - radar_ping.ogg
  copyright: User unfa from freesound.org Remixed to mono and .ogg by metalgearsloth.
  license: CC0-1.0
-  source: https://freesound.org/people/unfa/sounds/215415/
+  source: https://freesound.org/people/unfa/sounds/215415/
--- a/Resources/Audio/Items/Anomaly/attributions.yml
+++ b/Resources/Audio/Items/Anomaly/attributions.yml
@ -1,4 +1,4 @@
- files: ["flesh_crit.ogg"]
+- files: ["flesh_crit.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Mashup by GonTar Quantumcross of malescream_1.ogg, malescream_2.ogg, femalescream_4.ogg, femalescream_5.ogg, alien_claw_flesh_2.ogg, alien_claw_flesh_3.ogg"
  source: "https://github.com/tgstation/tgstation/commit/3d049e69fe71a0be2133005e65ea469135d648c8"
--- a/Resources/Audio/Items/Handcuffs/attributions.yml
+++ b/Resources/Audio/Items/Handcuffs/attributions.yml
@ -1,4 +1,4 @@
 - files: ["ziptie_end.ogg"]
  license: "CC-BY-3.0"
  copyright: "Taken from cable tie.wav by THE_bizniss on Freesound.org"
-  source: "https://freesound.org/people/THE_bizniss/sounds/39318/"
+  source: "https://freesound.org/people/THE_bizniss/sounds/39318/"
--- a/Resources/Audio/Items/Medical/attributions.yml
+++ b/Resources/Audio/Items/Medical/attributions.yml
@ -1,4 +1,4 @@
 - files: ["healthscanner.ogg"]
  license: "CC-BY-4.0"
  copyright: "Taken from FM Synthesis on freesound.org"
-  source: "https://freesound.org/people/FreqMan/sounds/32683/"
+  source: "https://freesound.org/people/FreqMan/sounds/32683/"
--- a/Resources/Audio/Jukebox/attributions.yml
+++ b/Resources/Audio/Jukebox/attributions.yml
@ -24,4 +24,4 @@
 - files: ["sunset.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Sunset by PigeonBeans. Exported in Mono OGG."
-  source: "https://soundcloud.com/pigeonbeans/sunset"
+  source: "https://soundcloud.com/pigeonbeans/sunset"
--- a/Resources/Audio/Lobby/attributions.yml
+++ b/Resources/Audio/Lobby/attributions.yml
@ -1,4 +1,4 @@
- files: ["thunderdome.ogg"]
+- files: ["thunderdome.ogg"]
  license: "CC-BY-NC-SA-3.0"
  copyright: "-Sector11 by MashedByMachines. Converted from MP3 to OGG."
  source: "https://www.newgrounds.com/audio/listen/312622"
--- a/Resources/Audio/Magic/Cults/ClockCult/attributions.yml
+++ b/Resources/Audio/Magic/Cults/ClockCult/attributions.yml
@ -1,4 +1,4 @@
 - files: ["steam_woosh.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from Citadel Station"
-  source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e575bd66854786eb9455eae6954d976cf13c66ea"
+  source: "https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e575bd66854786eb9455eae6954d976cf13c66ea"
--- a/Resources/Audio/Mecha/attributions.yml
+++ b/Resources/Audio/Mecha/attributions.yml
@ -9,4 +9,4 @@
 - files: ["sound_mecha_powerloader_step.ogg"]
  license: "CC-BY-NC-SA-3.0"
  copyright: "Taken from TG station."
-  source: "https://github.com/tgstation/tgstation/commit/45123dd06cb6dc7c56e8004c528230682ea559b2"
+  source: "https://github.com/tgstation/tgstation/commit/45123dd06cb6dc7c56e8004c528230682ea559b2"
--- a/Resources/Audio/UserInterface/attributions.yml
+++ b/Resources/Audio/UserInterface/attributions.yml
@ -8,4 +8,4 @@
  - hover.ogg
  license: "CC0-1.0"
  copyright: "Made by MATRIXXX_, edited by metalgearsloth"
-  source: "https://freesound.org/people/MATRIXXX_/sounds/703884/"
+  source: "https://freesound.org/people/MATRIXXX_/sounds/703884/"
--- a/Resources/Audio/Voice/Arachnid/attributions.yml
+++ b/Resources/Audio/Voice/Arachnid/attributions.yml
@ -5,4 +5,4 @@
 - files: ["arachnid_chitter.ogg", "arachnid_click.ogg"]
  license: "CC-BY-4.0"
  copyright: "Recorded by https://github.com/PixelTheKermit, modified by Dutch-VanDerLinde"
-  source: "https://github.com/space-wizards/space-station-14/pull/23548"
+  source: "https://github.com/space-wizards/space-station-14/pull/23548"
--- a/Resources/Audio/Voice/Diona/attributions.yml
+++ b/Resources/Audio/Voice/Diona/attributions.yml
@ -1,4 +1,4 @@
- files: ["diona_scream.ogg"]
+- files: ["diona_scream.ogg"]
  license: "CC-BY-4.0"
  copyright: "Made by InspectorJ (http://www.jshaw.co.uk/) of freesound.org. Modified by Morb0 for SS14 with the following modifications: Noise reduced, cropped, converted to mono"
  source: "https://freesound.org/people/InspectorJ/sounds/352201/"
@ -17,4 +17,4 @@
 - files: ["diona_salute.ogg"]
  license: "CC-BY-3.0"
  copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/tgstation/tree/943f38bf7c5f9c048cc785deb0c537d57ee6ba77/sound/creatures/venus_trap_hurt.ogg"
+  source: "https://github.com/tgstation/tgstation/tree/943f38bf7c5f9c048cc785deb0c537d57ee6ba77/sound/creatures/venus_trap_hurt.ogg"
--- a/Resources/Audio/Voice/Moth/attributions.yml
+++ b/Resources/Audio/Voice/Moth/attributions.yml
@ -6,4 +6,4 @@
 - files: ["moth_laugh.ogg, moth_chitter.ogg, moth_squeak.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from https://github.com/BeeStation/BeeStation-Hornet/commit/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d"
-  source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/"
+  source: "https://github.com/BeeStation/BeeStation-Hornet/blob/11ba3fa04105c93dd96a63ad4afaef4b20c02d0d/sound/emotes/"
--- a/Resources/Audio/Voice/Reptilian/attritbutions.yml
+++ b/Resources/Audio/Voice/Reptilian/attritbutions.yml
@ -6,4 +6,4 @@
 - files: [reptilian_tailthump.ogg]
  copyright: "Taken from https://freesound.org/"
  license: "CC0-1.0"
-  source: https://freesound.org/people/TylerAM/sounds/389665/
+  source: https://freesound.org/people/TylerAM/sounds/389665/
--- a/Resources/Audio/Voice/Zombie/attributions.yml
+++ b/Resources/Audio/Voice/Zombie/attributions.yml
@ -9,4 +9,4 @@
 - files: ["zombie-3.ogg"]
  license: "CC-BY-NC-SA-3.0"
  copyright: "Zombie Snarl by gneube. Converted from MP3 to OGG."
-  source: "https://freesound.org/people/gneube/sounds/315844/"
+  source: "https://freesound.org/people/gneube/sounds/315844/"
--- a/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Gunshots/Magic/attributions.yml
@ -4,4 +4,4 @@
 - files: [ "staff_animation.ogg", "staff_change.ogg", "staff_chaos.ogg", "staff_door.ogg", "staff_healing.ogg" ]
  license: "CC-BY-SA-3.0"
  copyright: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7"
-  source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7"
+  source: "https://github.com/tgstation/tgstation/commit/906fb0682bab6a0975b45036001c54f021f58ae7"
--- a/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Gunshots/attributions.yml
@ -1,4 +1,4 @@
- files: ["water_spray.ogg"]
+- files: ["water_spray.ogg"]
  license: "CC0-1.0"
  copyright: "Watering by elittle13. Converted to .OGG and MONO by EmoGarbage404 (github)"
  source: "https://freesound.org/people/elittle13/sounds/568558"
--- a/Resources/Audio/Weapons/Guns/Hits/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Hits/attributions.yml
@ -6,4 +6,4 @@
 - files: ["ric1.ogg", "ric2.ogg", "ric3.ogg", "ric3.ogg", "ric5.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/tgstation/tree/7501504b0ea029d2cf1c0336d09db5c0959aa412/sound/weapons/effects"
+  source: "https://github.com/tgstation/tgstation/tree/7501504b0ea029d2cf1c0336d09db5c0959aa412/sound/weapons/effects"
--- a/Resources/Audio/Weapons/Guns/Misc/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Misc/attributions.yml
@ -6,4 +6,4 @@
 - files: ["selector.ogg"]
  license: "CC-BY-NC-SA-3.0"
  copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg"
+  source: "https://github.com/tgstation/TerraGov-Marine-Corps/blob/0d97ec86c49e2a89409bd3ddf0b7451b3f1c9a0e/sound/weapons/guns/interact/selector.ogg"
--- a/Resources/Audio/Weapons/Guns/Miss/attributions.yml
+++ b/Resources/Audio/Weapons/Guns/Miss/attributions.yml
@ -6,4 +6,4 @@
 - files: ["energy_miss1.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from CM-SS13"
-  source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets"
+  source: "https://github.com/cmss13-devs/cmss13/tree/0535055a7abcd3016123f2be2cd3db428c122dac/sound/bullets"
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_DE50.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_DE50.ogg
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_cmb_1.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_cmb_1.ogg
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_1.ogg
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_2.ogg
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_3.ogg
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_4.ogg
--- a/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg
+++ b/Resources/Audio/_RMC14/Weapons/Guns/Gunshots/gun_m1984_5.ogg
--- a/Resources/Audio/_Starlight/Armor/Ricochet/Cyborg/attributions.yml
+++ b/Resources/Audio/_Starlight/Armor/Ricochet/Cyborg/attributions.yml
@ -1,4 +1,4 @@
 - files: ["ricochet1b.ogg", "ricochet2b.ogg", "ricochet3b.ogg", "ricochet4b.ogg"]
  license: "CC-BY-3.0"
  copyright: "Made by JustAdler for https://github.com/ss14Starlight/space-station-14"
-  source: "https://github.com/ss14Starlight/space-station-14"
+  source: "https://github.com/ss14Starlight/space-station-14"
--- a/Resources/Audio/_Starlight/Armor/Ricochet/attributions.yml
+++ b/Resources/Audio/_Starlight/Armor/Ricochet/attributions.yml
@ -1,4 +1,4 @@
 - files: ["ricochet1_1.ogg", "ricochet2_2.ogg", "ricochet3_3.ogg", "ricochet4_4.ogg"]
  license: "CC-BY-3.0"
  copyright: "Made by JustAdler for https://github.com/ss14Starlight/space-station-14"
-  source: "https://github.com/ss14Starlight/space-station-14"
+  source: "https://github.com/ss14Starlight/space-station-14"
--- a/Resources/Audio/_Starlight/Effects/supermatter/attributions.yml
+++ b/Resources/Audio/_Starlight/Effects/supermatter/attributions.yml
@ -6,4 +6,4 @@
 - files: ["emitter2.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from tgstation"
-  source: "https://github.com/tgstation/tgstation/blob/master/sound/weapons/emitter2.ogg"
+  source: "https://github.com/tgstation/tgstation/blob/master/sound/weapons/emitter2.ogg"
--- a/Resources/Audio/_Starlight/Items/Medical/attributions.yml
+++ b/Resources/Audio/_Starlight/Items/Medical/attributions.yml
@ -6,4 +6,4 @@
 - files: ["medical2.ogg"]
  license: "CC-BY-NC-SA-3.0"
  copyright: "Goonstation"
-  source: "https://github.com/goonstation/goonstation/blob/master/sound/items/mender2.ogg"
+  source: "https://github.com/goonstation/goonstation/blob/master/sound/items/mender2.ogg"
--- a/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/attributions.yml
+++ b/Resources/Audio/_Starlight/Weapons/Guns/Gunshots/attributions.yml
@ -21,4 +21,4 @@
 - files: ["1sp_91.ogg"]
  license: "CC-BY-SA-3.0"
  copyright: "Taken from RU Paradise Station"
-  source: "https://github.com/ss220-space/Paradise/commit/7fb130eac5c2c645fc841769c69f7b7a50dfe854"
+  source: "https://github.com/ss220-space/Paradise/commit/7fb130eac5c2c645fc841769c69f7b7a50dfe854"
--- a/Resources/Audio/_Starlight/Weapons/attributions.yml
+++ b/Resources/Audio/_Starlight/Weapons/attributions.yml
@ -1,4 +1,4 @@
 - files: ["knuckle1.ogg", "knuckle2.ogg", "knuckle3.ogg", "knuckle4.ogg", "knuckle5.ogg"]
  license: "CC-BY-3.0"
  copyright: "Made by JustAdler for https://github.com/ss14Starlight/space-station-14"
-  source: "https://github.com/ss14Starlight/space-station-14"
+  source: "https://github.com/ss14Starlight/space-station-14"
--- a/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg
+++ b/Resources/Audio/_Sunrise/Items/Equip/Gloves/sound1.ogg
--- a/Resources/Changelog/Admin.yml
+++ b/Resources/Changelog/Admin.yml
@ -1,4 +1,4 @@
-AdminOnly: true
+AdminOnly: true
 Entries:
 - author: DrSmugleaf
  changes:
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@ -1,4 +1,4 @@
-Entries:
+Entries:
 - author: ScarKy0, beck-thompson
  changes:
  - message: Various canines will now sometimes clumsily spill things they drink.
--- a/Resources/Changelog/ChangelogSunrise.yml
+++ b/Resources/Changelog/ChangelogSunrise.yml
@ -1,4 +1,4 @@
-Entries:
+Entries:
 - author: VigersRay
  changes:
  - message: "\u0414\u043E\u0431\u0430\u0432\u0438\u043B \u0432\u0443\u043B\u044C\u043F\
@ -23883,12 +23883,12 @@
      \ \u043C\u043E\u0436\u043D\u043E \u043D\u0430\u0439\u0442\u0438 \u043C\u0430\
      \u0441\u043A\u0443."
    type: Add
-  - message: "\u043C\u043E\u0439 \u043A\u0443\u043C\u0438\u0440 Tec-9, \u043E\u043D\
+  - message: "\u043C\u043E\u0439 \u043A\u0443\u043C\u0438\u0440 Tac-Tec, \u043E\u043D\
      \ \u0434\u0435\u043B\u0430\u0435\u0442 \u0440\u0435\u0430\u043B\u044C\u043D\u044B\
      \u0439 \u0437\u0432\u0443\u043A"
    type: Add
  - message: "\u0432 \u0430\u043F\u043B\u0438\u043D\u043A\u0435 \u043C\u043E\u0436\
-      \u043D\u043E \u043A\u0443\u043F\u0438\u0442\u044C Tec-9"
+      \u043D\u043E \u043A\u0443\u043F\u0438\u0442\u044C Tac-Tec"
    type: Add
  - message: "\u043F\u0435\u0440\u0447\u0430\u0442\u043A\u0438 \u044F\u0434\u0435\u0440\
      \u043D\u044B\u0445 \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\u0438\
--- a/Resources/Changelog/Maps.yml
+++ b/Resources/Changelog/Maps.yml
@ -1,4 +1,4 @@
-Entries:
+Entries:
 - author: ArtisticRoomba
  changes:
  - message: The mapping changelog has been added! This primarily serves as a way
--- a/Resources/Changelog/Rules.yml
+++ b/Resources/Changelog/Rules.yml
@ -1,4 +1,4 @@
-Entries:
+Entries:
 - author: Errant
  changes:
  - message: Tab created.
--- a/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl
+++ b/Resources/Locale/en-US/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl
@ -1,4 +1,4 @@
-ent-WeaponEnergyCrossbow = energy crossbow
+ent-WeaponEnergyCrossbowLarge = energy crossbow
    .desc = Fires low-damage kinetic bolts at a short range.
-ent-WeaponMiniEnergyCrossbow = mini energy crossbow
+ent-WeaponEnergyCrossbow = mini energy crossbow
    .desc = Fires low-damage kinetic bolts at a short range.
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
@ -2,11 +2,6 @@ ent-MedipenCombatInjector = Combat medi-injector
    .desc = A sterile injector for 4-use. Containing chemicals that regenerate most types of damage.
 ent-HyposprayERT = ERT hypospray
    .desc = A sterile injector for rapid administration of drugs to patients.
-ent-HyposprayMedical = medical hypospray
-    .desc = A sterile injector for rapid administration of drugs to patients. It contains an internal Toxin filter.
-ent-HyposprayMedicalNoFilter = medical hypospray
-    .suffix = no filter
-    .desc = A sterile injector for rapid administration of drugs to patients. It contains an internal Toxin filter.
 ent-StimpackNT = ephedrine injector
    .desc = Contains enough ephedrine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down.
 ent-StimpackMiniNT = ephedrine microinjector
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
@ -1,4 +1,4 @@
 ent-BaseMagazinePistolCaselessRifleExtended = { ent-BaseMagazinePistolCaselessRifle }
    .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
-ent-BaseMagazinePistolCaselessRifleTec9 = { ent-BaseMagazinePistolCaselessRifleTec9 }
-    .desc = { ent-BaseMagazinePistolCaselessRifleTec9.desc }
+ent-MagazinePistolSubMachineGunCaseless = { ent-MagazinePistolSubMachineGunCaseless }
+    .desc = { ent-MagazinePistolSubMachineGunCaseless.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@ -1,7 +1,3 @@
-ent-MagazineAK = Universal AK magazne
-    .desc = { ent-BaseItem.desc }
-ent-MagazineMP38 = MP38 magazine
-    .desc = { ent-BaseItem.desc }
 ent-MagazineScorpion = Scorpion magazine
    .desc = { ent-BaseItem.desc }
 ent-MagazineNewVector = New Vector magazine
@ -20,7 +16,5 @@ ent-MagazineACP14 = ACP14 magazine
    .desc = { ent-BaseItem.desc }
 ent-MagazineDl6902 = box-magazine DL6902
    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazinePistolSubMachineGunSIAR52 = extended magazine (caseless)
+ent-MagazinePistolSubMachineGunCaselessExtended = extended magazine (caseless)
    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazineScarH = scar-h magazine
-    .desc = { ent-BaseItem.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl
@ -1,9 +1,6 @@
 ent-WeaponRevolverPythonAPBiocode = { ent-WeaponRevolverPythonAP }
    .suffix = BIOCODE
    .desc = { ent-WeaponRevolverPythonAP.desc }
-ent-WeaponRevolverPythonBiocode = { ent-WeaponRevolverPython }
-    .suffix = BIOCODE
-    .desc = { ent-WeaponRevolverPython.desc }
 ent-WeaponShotgunBulldogBiocode = { ent-WeaponShotgunBulldog }
    .suffix = BIOCODE
    .desc = { ent-WeaponShotgunBulldog.desc }
@ -25,12 +22,6 @@ ent-WeaponLauncherM79Biocode = { ent-WeaponLauncherM79 }
 ent-WeaponSniperHristovBiocode = { ent-WeaponSniperHristov }
    .suffix = BIOCODE
    .desc = { ent-WeaponSniperHristov.desc }
-ent-WeaponPistolCobraBiocode = { ent-WeaponPistolCobra }
-    .suffix = BIOCODE
-    .desc = { ent-WeaponPistolCobra.desc }
-ent-WeaponPistolViperBiocode = { ent-WeaponPistolViper }
-    .suffix = BIOCODE
-    .desc = { ent-WeaponPistolViper.desc }
 ent-WeaponRifleM90GrenadeLauncherBiocode = { ent-WeaponRifleM90GrenadeLauncher }
    .suffix = BIOCODE
    .desc = { ent-WeaponRifleM90GrenadeLauncher.desc }
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl
@ -32,8 +32,5 @@ ent-WeaponPistolM1984 = D1984
 ent-WeaponPistolDeagleGolden = Golden Desert Eagle
    .desc = Fires a .45 magnum cartridge. Engraved: All I remember of him are two gold-plated .45 Desert Eagles.

-ent-WeaponPistolTec9 = Tec-9 Tactical
-    .desc = Very cheap to produce and very easy to use, as reliable as the Egyptian AK-47.
-ent-WeaponPistolTec9Biocode = { ent-WeaponPistolTec9 }
-    .suffix = BIOCODE
-    .desc = { ent-WeaponPistolTec9.desc }
+ent-WeaponPistolTec9 = Tac-Tec
+    .desc = Very cheap to produce and very easy to use, as reliable as the SKM-24.
--- a/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/en-US/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
@ -10,8 +10,6 @@ ent-WeaponRifleG36 = G-36
    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleM16A4 = M16A4
    .desc = { ent-BaseWeaponRifle.desc }
-ent-WeaponRifleScarH = scar-h
-    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleLecterMk2 = Lecter Mk2
    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleLecterMk2Empty = Lecter Mk2
--- a/Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl
+++ b/Resources/Locale/en-US/_prototypes/catalog/fills/crates/syndicate.ftl
@ -1,7 +1,7 @@
-ent-CrateSyndicateSurplusBundleAgent = Syndicate surplus crate
+ent-CrateSyndicateSurplusBundle = Syndicate surplus crate
    .desc = Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good.
    .suffix = Agent
-ent-CrateSyndicateSuperSurplusBundleAgent = Syndicate super surplus crate
+ent-CrateSyndicateSuperSurplusBundle = Syndicate super surplus crate
    .desc = Contains 125 telecrystals worth of completely random Syndicate items.
    .suffix = Agent
 ent-CrateSyndicateSurplusBundleNuke = Syndicate surplus crate
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl
@ -1,4 +1,4 @@
-ent-CartridgeAntiMateriel = cartridge (15mm armor-pierce)
+ent-CartridgeAntiMaterielPenetrator = cartridge (15mm armor-pierce)
    .desc = { ent-BaseCartridge.desc }
 ent-CartridgeAntiMateriel = cartridge (15mm anti-materiel)
    .desc = { ent-BaseCartridge.desc }
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl
@ -6,15 +6,15 @@ ent-BaseGrenade = base grenade
    .desc = { ent-BaseItem.desc }
 ent-GrenadeBaton = baton grenade
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeBlastContact = contact blast grenade
+ent-GrenadeBlast = contact blast grenade
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeFlashContact = contact flash grenade
+ent-GrenadeFlash = contact flash grenade
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeFragContact = contact frag grenade
+ent-GrenadeFrag = contact frag grenade
    .desc = { ent-BaseGrenade.desc }
 ent-GrenadeCleanade = cleanade grenade round
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeEMPContact = contact EMP grenade
+ent-GrenadeEMP = contact EMP grenade
    .desc = { ent-BaseGrenade.desc }
 ent-BaseCannonBall = base cannon ball
    .desc = { ent-BaseItem.desc }
--- a/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
@ -68,15 +68,15 @@ ent-BulletWeakRocket = weak rocket
    .desc = { ent-BaseBulletTrigger.desc }
 ent-BulletGrenadeBaton = baton grenade
    .desc = { ent-BaseBullet.desc }
-ent-BulletGrenadeBlastContact = contact blast grenade
+ent-BulletGrenadeBlast = contact blast grenade
    .desc = { ent-BaseBulletTrigger.desc }
-ent-BulletGrenadeFlashContact = contact flash grenade
+ent-BulletGrenadeFlash = contact flash grenade
    .desc = { ent-BaseBulletTrigger.desc }
-ent-BulletGrenadeFragContact = contact frag grenade
+ent-BulletGrenadeFrag = contact frag grenade
    .desc = { ent-BaseBulletTrigger.desc }
 ent-BulletGrenadeCleanade = cleanade grenade round
    .desc = { ent-BaseBulletTrigger.desc }
-ent-BulletGrenadeEMPContact = contact EMP grenade
+ent-BulletGrenadeEMP = contact EMP grenade
    .desc = { ent-BaseBulletTrigger.desc }
 ent-BulletCap = cap bullet
    .desc = { ent-BaseBullet.desc }
--- a/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl
+++ b/Resources/Locale/en-US/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl
@ -1,2 +0,0 @@
-ent-TearGasDispenser = tear gas dispenser
-    .desc = Wallmount reagent dispenser.
--- a/Resources/Locale/en-US/_strings/_sunrise/modsuits/modsuits.ftl
+++ b/Resources/Locale/en-US/_strings/_sunrise/modsuits/modsuits.ftl
@ -1,48 +0,0 @@
-research-technology-modsuits = Modsuit core
-
-ent-ModsuitCore = Modsuit core
-    .desc = A core designed for activation mod-costumes.
-
-
-ent-ClothingModsuitNanoTrasenRepresentative = NT representative modsuit
-    .desc = Superior
-ent-ClothingBlueShieldModsuit = officer «blue shield» modsuit
-    .desc = Superior
-ent-ClothingModsuitComMaid = com maid modsuit
-    .desc = Superior.
-ent-ClothingCommonModsuit = passenger modsuit
-    .desc = Superior.
-ent-ClothingModsuitERTJanitor = janitorERT modsuit
-    .desc = Superior.
-ent-ClothingModsuitERTSecurity = securityERT modsuit
-    .desc = Superior.
-ent-ClothingModsuitERTMedical = medicalERT modsuit
-    .desc = Superior.
-ent-ClothingModsuitERTLeader = leaderERT modsuit
-    .desc = Superior.
-ent-ClothingModsuitERTEngineer = engineerERT modsuit
-    .desc = Superior.
-ent-ClothingModsuitERTChaplain = chaplainERT modsuit
-    .desc = Superior.
-
-
-ent-ClothingHeadHelmetBlueshieldModsuit = blueshield hardsuit helmet
-    .desc = A robust helmet for special operations.
-ent-ClothingHeadHelmetRepresentativeModsuit = representative hardsuit helmet
-    .decs = A robust helmet for special operations.
-ent-ClothingHeadHelmetModsuitCommaid = commaid hardsuit helmet
-    .desc = A robust helmet for special operations.
-ent-ClothingHeadHelmetCommonModsuit = passenger hardsuit helmet
-    .desc = A robust helmet for special operations.
-
-
-ent-ClothingModsuitBlueshield = blueshield hardsuit
-    .desc = An advanced hardsuit favored by commandos for use in special operations.
-ent-ClothingModsuitRepresentative = representative hardsuit
-    .decs = An advanced hardsuit favored by commandos for use in special operations.
-ent-ClothingModsuitCommaid = commaid hardsuit
-    .desc = An advanced hardsuit favored by commandos for use in special operations.
-ent-ClothingModsuitCommon = common hardsuit
-    .desc = An advanced hardsuit favored by commandos for use in special operations.
-
-modsuit-equip-failure = You need the modsuit core to expand hardsuit
--- a/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/_strings/_sunrise/store/uplink-catalog.ftl
@ -20,7 +20,7 @@ uplink-magazine-bulldog-uraniumslug-desc = Shotgun magazine with 8 shells filled
 uplink-magazine-bulldog-uranium-desc = Shotgun magazine with 8 shells filled with uranium pellet. Compatible with the Bulldog.
 uplink-pistol-magnum-magazine-name = Магазин для Deagle
 uplink-pistol-magnum-magazine-desc = 7-зарядный однорядный магазин для пистолета. Содержит патроны SP. Совместим с "Диглом".
-uplink-pistoltec9-magazine-name = пистолетный магазин tec-9 (.20 безгильзовый)
+uplink-pistoltec9-magazine-name = магазин Tac-Tec (.20 безгильзовый)
 uplink-pistoltec9-magazine-desc = Кустарный пистолетный магазин на 20 патронов,под калибр, используемый агентами синдиката.
 ## Misc

--- a/Resources/Locale/en-US/_strings/clothing/components/toggleable-clothing-component.ftl
+++ b/Resources/Locale/en-US/_strings/clothing/components/toggleable-clothing-component.ftl
@ -1,3 +1,3 @@
 toggle-clothing-verb-text = Toggle {CAPITALIZE($entity)}
-
 toggleable-clothing-remove-first = You have to unequip {$entity} first.
+modsuit-equip-failure = Вам необходимо ядро для раскрытия скафандра Р.И.Г-а.
--- a/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_starlight/entities/objects/weapons/guns/basic/crossbow.ftl
@ -1,4 +1,4 @@
-ent-WeaponEnergyCrossbow = энергетический арбалет
+ent-WeaponEnergyCrossbowLarge = энергетический арбалет
+    .desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции.
+ent-WeaponEnergyCrossbow = малый энергетический арбалет
    .desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции.
-ent-WeaponMiniEnergyCrossbow = малый энергетический арбалет
-    .desc = Выстреливает кинетическими болтами с низким уроном на короткой дистанции.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/items/toolboxes.ftl
@ -1,6 +1,6 @@
 ent-ToolboxSyndicateFilledCoreExtraction = { ent-ToolboxSyndicate }
    .desc = { ent-ToolboxSyndicate.desc }
    .suffix = Заполнен, Извлечение ядра
-ent-ToolboxSyndicateMechRepair = { ent-ToolboxSyndicate }
+ent-ToolboxSyndicateFilledRepair = { ent-ToolboxSyndicate }
    .desc = { ent-ToolboxSyndicate.desc }
    .suffix = Заполнен, Ремонт мехов
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/specific/medical/hypospray.ftl
@ -2,11 +2,6 @@ ent-MedipenCombatInjector = Боевой медипен
    .desc = Стерильный инъектор на 4 применения. Содержит химикаты, которые регенерируют большинство типов повреждений.
 ent-HyposprayERT = гипоспрей ОБР
    .desc = Стерильный инжектор для быстрого введения лекарств пациентам.
-ent-HyposprayMedical = медицинский гипоспрей
-    .desc = Стерильный инжектор для быстрого введения лекарств пациентам. Содержит внутренний фильтр токсинов.
-ent-HyposprayMedicalNoFilter = медицинский гипоспрей
-    .suffix = без фильтра
-    .desc = Стерильный инжектор для быстрого введения лекарств пациентам. Содержит внутренний фильтр токсинов.
 ent-HyposprayMedicalNoFilterBox = взломанный медицинский гипоспрей
    .desc = Коробка со стерильным инъектором для быстрого введения препаратов пациентам. Внутренний токсиновый фильтр был удалён во время взлома. Упаковка дезинтегрируется при вскрытии, не оставляя следов.
 ent-StimpackNT = стимпак
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl
@ -1,6 +1,8 @@
 ent-BaseMagazinePistolCaselessRifleExtended = расширенный пистолетный магазин (.20 безгильзовый)
    .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
-ent-BaseMagazinePistolCaselessRifleTec9 = пистолетный магазин tec-9 (.20 безгильзовый)
-    .desc = Кустарный пистолетный магазин под распостранённый патрон, используемый агентами синдиката.
+ent-MagazinePistolSubMachineGunCaseless = магазин Tac-Tec (.20 безгильзовый)
+    .desc = Магазин под особый патрон, используемый агентами синдиката.
 ent-MagazineCannonBallMini = чемодан с ядрами
    .desc = Чемодан для аккуратного хранения ядер от пиратской пушки с ленточной подачей.
+ent-MagazinePistolSubMachineGunCaselessExtended = Расширенный магазин (.20 безгильзовые)
+    .desc = { ent-BaseMagazineLightRifle.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl
@ -1,7 +1,3 @@
-ent-MagazineAK = универсальный магазин автомата калашникова
-    .desc = Использует патроны калибра 7,62x39мм.
-ent-MagazineMP38 = магазин ПП MP-38
-    .desc = Использует патроны калибра .35 Авто.
 ent-MagazineScorpion = магазин ПП Скорпион
    .desc = Использует патроны калибра .35 Авто.
 ent-MagazineNewVector = магазин Вектора
@ -20,7 +16,3 @@ ent-MagazineACP14 = магазин пистолета ACP-14
    .desc = Использует патроны калибра .40.
 ent-MagazineDl6902 = короб-магазин DL6902
    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazinePistolSubMachineGunSIAR52 = Расширенный магазин (безгильзовые)
-    .desc = { ent-BaseMagazineLightRifle.desc }
-ent-MagazineScarH = магазин scar-h
-    .desc = { ent-BaseItem.desc }
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/biocode/biocode.ftl
@ -1,9 +1,6 @@
 ent-WeaponRevolverPythonAPBiocode = { ent-WeaponRevolverPythonAP }
-    .desc = { ent-WeaponRevolverPythonAP.desc }
-    .suffix = БИОКОД
-ent-WeaponRevolverPythonBiocode = { ent-WeaponRevolverPython }
    .desc = { ent-WeaponRevolverPython.desc }
-    .suffix = БИОКОД
+    .suffix = БИОКОД, Бронебойный
 ent-WeaponShotgunBulldogBiocode = { ent-WeaponShotgunBulldog }
    .desc = { ent-WeaponShotgunBulldog.desc }
    .suffix = БИОКОД
@ -25,12 +22,6 @@ ent-WeaponLauncherM79Biocode = { ent-WeaponLauncherM79 }
 ent-WeaponSniperHristovBiocode = { ent-WeaponSniperHristov }
    .desc = { ent-WeaponSniperHristov.desc }
    .suffix = БИОКОД
-ent-WeaponPistolCobraBiocode = { ent-WeaponPistolCobra }
-    .desc = { ent-WeaponPistolCobra.desc }
-    .suffix = БИОКОД
-ent-WeaponPistolViperBiocode = { ent-WeaponPistolViper }
-    .desc = { ent-WeaponPistolViper.desc }
-    .suffix = БИОКОД
 ent-WeaponRifleM90GrenadeLauncherBiocode = { ent-WeaponRifleM90GrenadeLauncher }
    .desc = { ent-WeaponRifleM90GrenadeLauncher.desc }
    .suffix = БИОКОД
@ -64,9 +55,9 @@ ent-WeaponGrenadeLauncherGL70Biocode = { ent-WeaponGrenadeLauncherGL70 }
 ent-WeaponShotgunMinotaurBiocode = { ent-WeaponShotgunMinotaur }
    .suffix = БИОКОД
    .desc = { ent-WeaponShotgunMinotaur.desc }
-ent-WeaponMiniEnergyCrossbowBiocode = { ent-WeaponMiniEnergyCrossbow }
+ent-WeaponEnergyCrossbowBiocode = { ent-WeaponEnergyCrossbow }
    .suffix = БИОКОД
-    .desc = { ent-WeaponMiniEnergyCrossbow.desc }
+    .desc = { ent-WeaponEnergyCrossbow.desc }
 ent-WeaponSubMachineGunC40rBiocode  = { ent-WeaponSubMachineGunC40r }
    .desc = { ent-WeaponSubMachineGunC40r.desc }
    .suffix = БИОКОД
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/pistols/pistols.ftl
@ -37,8 +37,5 @@ ent-WeaponPistolDeagleGolden = Золотой Десерт Игл
 ent-WeaponPistolDeagleGoldenBiocode = { ent-WeaponPistolDeagleGolden }
    .suffix = БИОКОД
    .desc = { ent-WeaponPistolDeagleGolden.desc }
-ent-WeaponPistolTec9 = Тек-9 тактикал
-    .desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как Египетский  АК-47.
-ent-WeaponPistolTec9Biocode = { ent-WeaponPistolTec9 }
-    .suffix = БИОКОД
-    .desc = { ent-WeaponPistolTec9.desc }
+ent-WeaponPistolTec9 = Tac-Tec
+    .desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как СКМ-24.
--- a/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/entities/objects/weapons/guns/rifles/rifles.ftl
@ -10,8 +10,6 @@ ent-WeaponRifleG36 = G-36
    .desc = Бывшая штурмовая винтовка армий Земного правительства. Оснащена встроенным оптическим прицелом, обеспечивающим повышенную точность на средней дистанции. Всё ещё находит применение в вооружённых силах колоний и у частных охранных структур. Использует стандартные патроны калибра 5,56×45мм.
 ent-WeaponRifleM16A4 = M16A4
    .desc = Легкая, универсальная штурмовая винтовка. До сих пор сохраняет актуальность среди наемников и ополченцев. Заряжается патронами калибра 5,56х45мм.
-ent-WeaponRifleScarH = scar-h
-    .desc = { ent-BaseWeaponRifle.desc }
 ent-WeaponRifleLecterMk2 = Лектер Мк2
    .desc = Улучшенный вариант армейской штурмовой винтовки. Встроенна новейшая система автоматического сброса пустого магазина. Использует патроны калибра .20 винтовочный.
 ent-WeaponRifleLecterMk2Empty = Лектер Мк2
--- a/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/catalog/fills/crates/syndicate.ftl
@ -1,9 +1,3 @@
-ent-CrateSyndicateSurplusBundleAgent = ящик с избытками синдиката
-    .desc = Содержит предметы синдиката на 50 телекристаллов. Может содержать как бесполезный хлам, так и действительно полезные вещи.
-    .suffix = Синдикат
-ent-CrateSyndicateSuperSurplusBundleAgent = ящик с супер-избытками синдиката
-    .desc = Содержит предметы синдиката на 125 телекристаллов. Может содержать как бесполезный хлам, так и действительно полезные вещи.
-    .suffix = Синдикат
 ent-CrateSyndicateSurplusBundleNuke = ящик с избытками синдиката
    .desc = Содержит предметы синдиката на 50 телекристаллов. Может содержать как бесполезный хлам, так и действительно полезные вещи.
    .suffix = Ядерные оперативники
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl
@ -6,15 +6,15 @@ ent-BaseGrenade = базовая граната
    .desc = { ent-BaseItem.desc }
 ent-GrenadeBaton = резиновая граната
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeBlastContact = фугасная граната контактная
+ent-GrenadeBlast = фугасная граната контактная
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeFlashContact = светошумовая граната контактная
+ent-GrenadeFlash = светошумовая граната контактная
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeFragContact = осколочная граната контактная
+ent-GrenadeFrag = осколочная граната контактная
    .desc = { ent-BaseGrenade.desc }
 ent-GrenadeCleanade = граната с очищающим газом
    .desc = { ent-BaseGrenade.desc }
-ent-GrenadeEMPContact = ЭМИ граната контактная
+ent-GrenadeEMP = ЭМИ граната контактная
    .desc = { ent-BaseGrenade.desc }
 ent-BaseCannonBall = базовое пушечное ядро
    .desc = { ent-BaseItem.desc }
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl
@ -1,2 +1,2 @@
-ent-SpeedLoaderLightRifle = спидлоадер (7.62ммR)
-    .desc = Пятизарядная "Клипса Обойма" для быстрой перезарядки Карадашев-Мосина. Вмещает 5 патронов калибра 7,62×54 ммR.
+ent-SpeedLoaderLightRifle = спидлоадер (7.62мм)
+    .desc = Пятизарядная "Клипса Обойма" для быстрой перезарядки оружия. Вмещает 5 патронов калибра 7,62х39мм.
--- a/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl
@ -68,15 +68,15 @@ ent-BulletWeakRocket = слабая ракета
    .desc = { ent-BaseBulletTrigger.desc }
 ent-BulletGrenadeBaton = шоковая граната
    .desc = { ent-BaseBullet.desc }
-ent-BulletGrenadeBlastContact = контактная фугасная граната
+ent-BulletGrenadeBlast = контактная фугасная граната
    .desc = { ent-BaseBulletTrigger.desc }
-ent-BulletGrenadeFlashContact = контактная светошумовая граната
+ent-BulletGrenadeFlash = контактная светошумовая граната
    .desc = { ent-BaseBulletTrigger.desc }
-ent-BulletGrenadeFragContact = контактная осколочная граната
+ent-BulletGrenadeFrag = контактная осколочная граната
    .desc = { ent-BaseBulletTrigger.desc }
 ent-BulletGrenadeCleanade = чистящая граната
    .desc = { ent-BaseBulletTrigger.desc }
-ent-BulletGrenadeEMPContact = контактная ЭМИ граната
+ent-BulletGrenadeEMP = контактная ЭМИ граната
    .desc = { ent-BaseBulletTrigger.desc }
 ent-BulletCap = фальшивая пуля
    .desc = { ent-BaseBullet.desc }
@ -127,4 +127,4 @@ ent-BaseBulletGrenade = { ent-BaseItem }
 ent-BulletLaserHeavy = тяжёлый лазерный болт
    .desc = { "" }
 ent-BulletLaserHeavySpread = узкий лазерный обстрел
-    .desc = { "" }
+    .desc = { "" }
--- a/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl
+++ b/Resources/Locale/ru-RU/_prototypes/entities/structures/wallmounts/tear_gas_walldispenser.ftl
@ -1,2 +0,0 @@
-ent-TearGasDispenser = распылитель слезоточивого газа
-    .desc = Настенный распылитель реагентов.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits.ftl
@ -1,46 +0,0 @@
-research-technology-modsuits = Ядро Р.И.Г-а
-
-ent-ModsuitCore = ядро Р.И.Г-а
-    .desc = Предназначено для активации Р.И.Г-ов.
-
-ent-ClothingModsuitNanoTrasenRepresentative = Р.И.Г. представителя
-    .desc = Роскошный Р.И.Г, созданный специально под представителя корпорации на станции.
-ent-ClothingBlueShieldModsuit = Р.И.Г. офицера «Синий щит»
-    .desc = Крепкий и надёжный Р.И.Г, как и его владелец
-ent-ClothingModsuitComMaid = Р.И.Г. горничной командования
-    .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а и украшенный для удовлетворения эстетических нужд командования.
-ent-ClothingCommonModsuit = пассажиский Р.И.Г.
-    .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а.
-ent-ClothingModsuitERTJanitor = Р.И.Г. уборщика ОБР
-    .desc = Р.И.Г, произведённый для обеспечения защиты как в условиях боя, так и при критической загрязнённости станции.
-ent-ClothingModsuitERTSecurity = Р.И.Г. офицера ОБР
-    .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения.
-ent-ClothingModsuitERTMedical = Р.И.Г. медика ОБР
-    .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения.
-ent-ClothingModsuitERTLeader = Р.И.Г. лидера ОБР
-    .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения.
-ent-ClothingModsuitERTEngineer = Р.И.Г. инженера ОБР
-    .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения.
-ent-ClothingModsuitERTChaplain = Р.И.Г. священика ОБР
-    .desc = Бронированный Р.И.Г ОБР. Обеспечивает защиту от большинства угроз, что можно встретить в открытом космосею, при этом почти не ограничивая движения.
-
-
-ent-ClothingHeadHelmetBlueshieldModsuit = шлем Р.И.Г-а офицера «Синий щит»
-    .desc = Синий
-ent-ClothingHeadHelmetRepresentativeModsuit = шлем Р.И.Г-а представителя корпорации
-    .decs = Шлем, призванный своим видом являть величие и значимость представителя корпорации
-ent-ClothingHeadHelmetModsuitCommaid = шлем Р.И.Г-а горничной командования
-    .desc = Прочный шлем горничной, предназначенный для специальных операций.
-ent-ClothingHeadHelmetCommonModsuit = шлем пассажирского Р.И.Г-а
-    .desc = Шлем базового скафандра, воплощённый в виде Р.И.Г-а.
-
-ent-ClothingModsuitBlueshield = скафандр Р.И.Г-а офицера «Синий щит»
-    .desc = Крепкий и надёжный, как и его владелец.
-ent-ClothingModsuitRepresentative = скафандр Р.И.Г-а представителя корпорации
-    .decs = Призван своим видом являть величие и значимость представителя корпорации
-ent-ClothingModsuitCommaid = скафандр Р.И.Г-а горничной командования
-    .desc = Прочный скафандр горничной, предназначенный для специальных операций.
-ent-ClothingModsuitCommon = скафандр пассажирского Р.И.Г-а
-    .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а
-
-modsuit-equip-failure = Вам необходимо ядро для раскрытия скафандра Р.И.Г-а.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_core.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_core.ftl
@ -0,0 +1,2 @@
+ent-ModsuitCore = ядро Р.И.Г-а
+    .desc = Предназначено для активации Р.И.Г-ов.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_helmets.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_helmets.ftl
@ -0,0 +1,8 @@
+ent-ClothingHeadHelmetBlueshieldModsuit = шлем Р.И.Г-а офицера «Синий щит»
+    .desc = Синий
+ent-ClothingHeadHelmetRepresentativeModsuit = шлем Р.И.Г-а представителя корпорации
+    .desc = Шлем, призванный своим видом являть величие и значимость представителя корпорации.
+ent-ClothingHeadHelmetModsuitCommaid = шлем Р.И.Г-а горничной командования
+    .desc = Прочный шлем горничной, предназначенный для специальных операций.
+ent-ClothingHeadHelmetCommonModsuit = шлем пассажирского Р.И.Г-а
+    .desc = Шлем базового скафандра, воплощённый в виде Р.И.Г-а.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_suits.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/modsuits/modsuits_suits.ftl
@ -0,0 +1,29 @@
+ent-ClothingModsuitNanoTrasenRepresentative = Р.И.Г. представителя
+    .desc = Роскошный Р.И.Г, созданный специально под представителя корпорации на станции.
+ent-ClothingBlueShieldModsuit = Р.И.Г. офицера «Синий щит»
+    .desc = Крепкий и надёжный Р.И.Г, как и его владелец.
+ent-ClothingModsuitComMaid = Р.И.Г. горничной командования
+    .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а и украшенный для удовлетворения эстетических нужд командования.
+ent-ClothingCommonModsuit = Р.И.Г. пассажиский
+    .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а.
+ent-ClothingModsuitERTJanitor = Р.И.Г. ОБР
+    .desc = Бронированный Р.И.Г военной модели, разработанный для уборщика отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач.
+ent-ClothingModsuitERTSecurity = Р.И.Г. ОБР
+    .desc = Бронированный Р.И.Г военной модели, разработанный для офицера отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач.
+ent-ClothingModsuitERTMedical = Р.И.Г. ОБР
+    .desc = Бронированный Р.И.Г военной модели, разработанный для медика отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач.
+ent-ClothingModsuitERTLeader = Р.И.Г. ОБР
+    .desc = Бронированный Р.И.Г военной модели, разработанный для лидера отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач.
+ent-ClothingModsuitERTEngineer = Р.И.Г. ОБР
+    .desc = Бронированный Р.И.Г военной модели, разработанный для инженера отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач.
+ent-ClothingModsuitERTChaplain = Р.И.Г. ОБР
+    .desc = Бронированный Р.И.Г военной модели, разработанный для священника отряда центрального командования. Обеспечивает защиту от большинства угроз, встречающихся в открытом космосе и при выполнении оперативных задач.
+
+ent-ClothingModsuitBlueshield = Р.И.Г офицера «Синий щит»
+    .desc = Крепкий и надёжный, как и его владелец.
+ent-ClothingModsuitRepresentative = Р.И.Г представителя корпорации
+    .desc = Призван своим видом являть величие и значимость представителя корпорации.
+ent-ClothingModsuitCommaid = Р.И.Г горничной командования
+    .desc = Прочный скафандр горничной, предназначенный для специальных операций.
+ent-ClothingModsuitCommon = Р.И.Г пассажирский
+    .desc = Базовый скафандр, воплощённый в виде Р.И.Г-а.
--- a/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/research/technologies.ftl
@ -8,6 +8,7 @@ research-technology-mechanized-medical-treatment = Механизированн
 research-technology-handcraft-nvd = Кустарные ПНВ
 research-technology-basic-nvd = Продвинутое ПНВ
 research-technology-basic-thermals = Термальные Сканеры
+research-technology-modsuits = Ядра Р.И.Г-ов
 research-technology-extended-amunitions = Расширенные магазины
 research-technology-phazon = Фазон
 research-technology-cargo-bluespace-equipment = Блюспейс экипировка карго
--- a/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/store/uplink-catalog.ftl
@ -37,7 +37,7 @@ uplink-pistol-magnum-magazine-name = Магазин (.45 магнум SP)
 uplink-pistol-magnum-magazine-desc = 7-зарядный однорядный магазин для пистолета. Содержит патроны SP. Совместим с "Диглом".
 uplink-pistol-magnum-magazine-ap-name = Магазин (.45 магнум бронебойные)
 uplink-pistol-magnum-magazine-ap-desc = 7-зарядный однорядный магазин для пистолета. Содержит бронебойные патроны. Совместим с "Диглом".
-uplink-pistoltec9-magazine-name = пистолетный магазин tec-9 (.20 безгильзовый)
+uplink-pistoltec9-magazine-name = Tac-Tec (.20 безгильзовый)
 uplink-pistoltec9-magazine-desc = Кустарный пистолетный магазин под распространённый патрон, используемый агентами синдиката.


@ -93,6 +93,8 @@ uplink-clothing-backpack-syndie-aj100-desc = Включает в себя пис
 uplink-weapon-syndie-laser-pistol-name = SAM-300
 uplink-clothing-backpack-syndie-dl6902-name = Набор DL6902
 uplink-clothing-backpack-syndie-dl6902-desc = Включает в себя пулемёт DL6902 и один дополнительный короб.
+uplink-power-backpack-dl6902-name = DL6902 с патронным рюкзаком
+uplink-power-backpack-dl6902-desc = DL6902 переделанный под питание длинной лентой прямиком из рюкзака, рюкзак содержит 1200 патронов 7,62х39мм FMJ.
 uplink-clothing-backpack-syndie-siar52-name = Набор SIAR-52
 uplink-clothing-backpack-syndie-siar52-desc = Включает в себя SIAR-52 что оборудован интегрированым глушителем. и два магазина безгильзовых патрон.
 uplink-weapon-syndie-laser-minigun-name = UVL-21 «Виверна»
@ -104,8 +106,8 @@ uplink-goldendeagle-name = Золотой Десерт Игл
 uplink-goldendeagle-desc = Использует патрон «магнум» 45-го калибра. Выгравировано: "Все, что у меня осталось от него в памяти — это два позолоченных Desert Eagle 45-го калибра".
 uplink-mini-energy-crossbow-name = Мини энерго-арбалет
 uplink-mini-energy-crossbow-desc =  Компактное оружие скрытного действия. Выпускает маломощные кинетические болты, вызывающие паралич и малое отравление. Эффективен на близком расстоянии.
-uplink-pistoltec9-name = Тек-9 тактикал
-uplink-pistoltec9-desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как Египесткий  АК-47.
+uplink-pistoltec9-name = Tac-Tec 9
+uplink-pistoltec9-desc = Очень дешёвый в производстве и очень простой в использовании, надёжный как SKM-24.

 ## Cyborgs

--- a/Resources/Locale/ru-RU/_strings/clothing/components/toggleable-clothing-component.ftl
+++ b/Resources/Locale/ru-RU/_strings/clothing/components/toggleable-clothing-component.ftl
@ -1,2 +1,3 @@
 toggle-clothing-verb-text = Переключить { CAPITALIZE($entity) }
 toggleable-clothing-remove-first = Сперва снимите { $entity }.
+modsuit-equip-failure = Вам необходимо ядро для раскрытия скафандра Р.И.Г-а.
--- a/Resources/Maps/_Sunrise/Shuttles/dso/ert/alt_ert_big.yml
+++ b/Resources/Maps/_Sunrise/Shuttles/dso/ert/alt_ert_big.yml
@ -20544,15 +20544,6 @@ entities:
      parent: 379
    - type: Physics
      canCollide: False
- proto: WeaponPistolViperBiocode
-  entities:
-  - uid: 1133
-    components:
-    - type: Transform
-      parent: 1127
-    - type: Physics
-      canCollide: False
-    - type: InsideEntityStorage
 - proto: WeaponPulsePistol
  entities:
  - uid: 1932
--- a/Resources/Maps/_Sunrise/Station/bagel.yml
+++ b/Resources/Maps/_Sunrise/Station/bagel.yml
@ -25150,7 +25150,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 50000
-      autoRecharge: True
  - uid: 4400
    components:
    - type: Transform
@ -25385,7 +25384,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 538
    components:
    - type: MetaData
@ -25398,7 +25396,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 539
    components:
    - type: MetaData
@ -25411,7 +25408,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 541
    components:
    - type: MetaData
@ -25423,7 +25419,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 543
    components:
    - type: MetaData
@ -25438,7 +25433,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 544
    components:
    - type: MetaData
@ -25454,7 +25448,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 545
    components:
    - type: MetaData
@ -25469,7 +25462,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 547
    components:
    - type: MetaData
@ -25482,7 +25474,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 548
    components:
    - type: MetaData
@ -25495,7 +25486,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 549
    components:
    - type: MetaData
@ -25514,7 +25504,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 553
    components:
    - type: MetaData
@ -25526,7 +25515,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 554
    components:
    - type: MetaData
@ -25538,7 +25526,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 555
    components:
    - type: Transform
@ -25551,7 +25538,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 556
    components:
    - type: MetaData
@ -25567,7 +25553,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 557
    components:
    - type: MetaData
@ -25585,7 +25570,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 558
    components:
    - type: Transform
@ -25605,7 +25589,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 562
    components:
    - type: MetaData
@ -25618,7 +25601,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 563
    components:
    - type: MetaData
@ -25631,7 +25613,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 567
    components:
    - type: MetaData
@ -25643,7 +25624,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 568
    components:
    - type: MetaData
@ -25655,7 +25635,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 570
    components:
    - type: MetaData
@ -25668,7 +25647,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 571
    components:
    - type: MetaData
@ -25680,7 +25658,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 572
    components:
    - type: MetaData
@ -25696,7 +25673,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 574
    components:
    - type: MetaData
@ -25708,7 +25684,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 575
    components:
    - type: MetaData
@ -25720,7 +25695,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 576
    components:
    - type: MetaData
@ -25732,7 +25706,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 578
    components:
    - type: MetaData
@ -25747,7 +25720,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 579
    components:
    - type: MetaData
@ -25759,7 +25731,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 580
    components:
    - type: MetaData
@ -25774,7 +25745,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 581
    components:
    - type: MetaData
@ -25786,7 +25756,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 583
    components:
    - type: MetaData
@ -25799,7 +25768,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 584
    components:
    - type: MetaData
@ -25811,7 +25779,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 585
    components:
    - type: MetaData
@ -25823,7 +25790,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 586
    components:
    - type: MetaData
@ -25835,7 +25801,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 587
    components:
    - type: MetaData
@ -25847,7 +25812,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 588
    components:
    - type: Transform
@ -25858,7 +25822,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 589
    components:
    - type: MetaData
@ -25870,7 +25833,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 590
    components:
    - type: Transform
@ -25881,7 +25843,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 591
    components:
    - type: MetaData
@ -25894,7 +25855,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 592
    components:
    - type: MetaData
@ -25907,7 +25867,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 593
    components:
    - type: MetaData
@ -25919,7 +25878,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 594
    components:
    - type: MetaData
@ -25932,7 +25890,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 595
    components:
    - type: MetaData
@ -25945,7 +25902,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 596
    components:
    - type: Transform
@ -25955,7 +25911,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 597
    components:
    - type: Transform
@ -25976,7 +25931,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 648
    components:
    - type: Transform
@ -26003,7 +25957,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 4235
    components:
    - type: Transform
@ -26027,7 +25980,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 6818
    components:
    - type: Transform
@ -26045,7 +25997,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 8061
    components:
    - type: Transform
@ -26056,7 +26007,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 8243
    components:
    - type: MetaData
@ -26093,7 +26043,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 17989
    components:
    - type: MetaData
@ -26106,7 +26055,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 100000
-      autoRecharge: True
  - uid: 18676
    components:
    - type: Transform
@ -26211,7 +26159,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 200000
-      autoRecharge: True
  - uid: 604
    components:
    - type: MetaData
@ -26224,7 +26171,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 200000
-      autoRecharge: True
  - uid: 605
    components:
    - type: MetaData
@ -26237,7 +26183,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 200000
-      autoRecharge: True
  - uid: 606
    components:
    - type: MetaData
@ -26249,7 +26194,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 200000
-      autoRecharge: True
  - uid: 607
    components:
    - type: MetaData
@ -26261,7 +26205,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 200000
-      autoRecharge: True
  - uid: 608
    components:
    - type: MetaData
@ -26274,7 +26217,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 200000
-      autoRecharge: True
  - uid: 13094
    components:
    - type: Transform
@ -26295,7 +26237,6 @@ entities:
      fixtures: {}
    - type: BatterySelfRecharger
      autoRechargeRate: 150000
-      autoRecharge: True
  - uid: 28694
    components:
    - type: Transform
@ -68757,7 +68698,7 @@ entities:
    - type: Transform
      pos: -10.889593,0.11666772
      parent: 2
-    - type: HitScanCartridgeAmmo
+    - type: CartridgeAmmo
      spent: True
    - type: EmitSoundOnCollide
      nextSound: -16780.9
@ -142491,7 +142432,7 @@ entities:



-        [italic]Ты, наверно, думаешь, 
+        [italic]Ты, наверно, думаешь,
              Что тебе выпало 18 карат невезения?[/italic]


@ -164029,7 +163970,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21049
    components:
    - type: Transform
@ -164037,7 +163977,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21051
    components:
    - type: MetaData
@ -164047,7 +163986,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21052
    components:
    - type: Transform
@ -164055,7 +163993,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21054
    components:
    - type: MetaData
@ -164065,7 +164002,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21055
    components:
    - type: MetaData
@ -164075,7 +164011,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21057
    components:
    - type: MetaData
@ -164085,7 +164020,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
  - uid: 21058
    components:
    - type: MetaData
@ -164095,7 +164029,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 16000000
-      autoRecharge: True
 - proto: SMESBasic
  entities:
  - uid: 6878
@ -164117,7 +164050,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 30000000
-      autoRecharge: True
  - uid: 21060
    components:
    - type: Transform
@ -164125,7 +164057,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 30000000
-      autoRecharge: True
  - uid: 21061
    components:
    - type: Transform
@ -164133,7 +164064,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 30000000
-      autoRecharge: True
  - uid: 21062
    components:
    - type: Transform
@ -164141,7 +164071,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 30000000
-      autoRecharge: True
  - uid: 21063
    components:
    - type: Transform
@ -164149,7 +164078,6 @@ entities:
      parent: 2
    - type: BatterySelfRecharger
      autoRechargeRate: 30000000
-      autoRecharge: True
 - proto: SmokingPipeFilledTobacco
  entities:
  - uid: 21064
@ -167512,7 +167440,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 13244
    components:
    - type: Transform
@ -167539,7 +167466,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21684
    components:
    - type: MetaData
@ -167550,7 +167476,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21687
    components:
    - type: MetaData
@ -167561,7 +167486,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21689
    components:
    - type: MetaData
@ -167572,7 +167496,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21690
    components:
    - type: Transform
@ -167581,7 +167504,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21691
    components:
    - type: MetaData
@ -167592,7 +167514,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21695
    components:
    - type: MetaData
@ -167603,7 +167524,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21696
    components:
    - type: MetaData
@ -167614,7 +167534,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21697
    components:
    - type: MetaData
@ -167625,7 +167544,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21699
    components:
    - type: MetaData
@ -167636,7 +167554,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21701
    components:
    - type: Transform
@ -167645,7 +167562,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21702
    components:
    - type: MetaData
@ -167656,7 +167572,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21703
    components:
    - type: MetaData
@ -167667,7 +167582,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21704
    components:
    - type: MetaData
@ -167678,7 +167592,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21705
    components:
    - type: MetaData
@ -167689,7 +167602,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21706
    components:
    - type: MetaData
@ -167700,7 +167612,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 21707
    components:
    - type: Transform
@ -167709,7 +167620,6 @@ entities:
    - type: CMExplosionEffect
    - type: BatterySelfRecharger
      autoRechargeRate: 7500000
-      autoRecharge: True
  - uid: 22074
    components:
    - type: Transform
--- a/Resources/Maps/_Sunrise/Station/delta.yml
+++ b/Resources/Maps/_Sunrise/Station/delta.yml
@ -212067,13 +212067,6 @@ entities:
    - type: Transform
      pos: -123.5,36.5
      parent: 2
- proto: MobCatCake
-  entities:
-  - uid: 29354
-    components:
-    - type: Transform
-      pos: -57.5018,-50.305336
-      parent: 2
 - proto: ModularGrenade
  entities:
  - uid: 29355
--- a/Resources/Maps/_Sunrise/event/hatle_prib_final_1.yml
+++ b/Resources/Maps/_Sunrise/event/hatle_prib_final_1.yml
@ -3698,7 +3698,6 @@ entities:
      parent: 1
    - type: BatterySelfRecharger
      autoRechargeRate: 50000
-      autoRecharge: True
  - uid: 285
    components:
    - type: Transform
@ -3707,7 +3706,6 @@ entities:
      parent: 1
    - type: BatterySelfRecharger
      autoRechargeRate: 50000
-      autoRecharge: True
  - uid: 286
    components:
    - type: Transform
@ -3715,7 +3713,6 @@ entities:
      parent: 1
    - type: BatterySelfRecharger
      autoRechargeRate: 50000
-      autoRecharge: True
  - uid: 287
    components:
    - type: Transform
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@ -14,8 +14,8 @@
        - id: Cautery
        - id: Retractor
        - id: Scalpel
-      - id: BoneGel
-      - id: BoneSetter
+        - id: BoneGel
+        - id: BoneSetter

 - type: entity
  parent: ClothingBackpackDuffelSyndicateMedicalBundle
@ -35,8 +35,8 @@
        - id: ScalpelAdvanced
        - id: ClothingHandsGlovesNitrile
        - id: EmergencyRollerBedSpawnFolded
-      - id: BoneGel
-      - id: BoneSetterAdvanced
+        - id: BoneGel
+        - id: BoneSetterAdvanced

 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
@ -49,9 +49,9 @@
      storagebase: !type:AllSelector
        children:
        - id: WeaponShotgunBulldogBiocode # Sunrise-edit
-      - id: MagazineShotgun
-        amount: 3
-      - id: MagazineShotgunSlug
+        - id: MagazineShotgun
+          amount: 3
+        - id: MagazineShotgunSlug
        - id: ClothingEyesGlassesThermalSyndie # Sunrise-edit

 - type: entity
@ -67,9 +67,9 @@
        - id: WeaponSubMachineGunC20rBiocode # Sunrise-edit
        - id: MagazinePistolSubMachineGun
          amount: 2
-      - id: MagazinePistolSubMachineGunFMJ  # Sunrise-edit
-        amount: 2
-      - id: MagazinePistolSubMachineGunHP # Sunrise-add
+        - id: MagazinePistolSubMachineGunFMJ  # Sunrise-edit
+          amount: 2
+        - id: MagazinePistolSubMachineGunHP # Sunrise-add
 #       - id: SMGSuppressor

 - type: entity
@ -85,9 +85,9 @@
        - id: WeaponRifleEstocBiocode # Sunrise-edit
        - id: MagazineRifle
          amount: 2
-    - id: MagazineRifleFMJ  # Sunrise-edit
-      amount: 2
-    - id: MagazineRifleAP # Sunrise-edit
+        - id: MagazineRifleFMJ  # Sunrise-edit
+          amount: 2
+        - id: MagazineRifleAP # Sunrise-edit

 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
@ -99,7 +99,7 @@
    containers:
      storagebase: !type:AllSelector
        children:
-        - id: WeaponRevolverPythonAPBiocode # Sunrise-edit
+        - id: WeaponRevolverPythonAP
        - id: SpeedLoaderMagnumAP
          amount: 2

@ -115,8 +115,8 @@
        children:
        - id: WeaponLightMachineGunL6Biocode # Sunrise-edit
        - id: MagazineRifleBoxSP
-        amount: 2 #Sunrise-add
-      - id: MagazineRifleBoxFMJ #Sunrise-add
+          amount: 2 #Sunrise-add
+        - id: MagazineRifleBoxFMJ #Sunrise-add

 - type: entity
  parent: ClothingBackpackDuffelSyndicateBundle
@ -129,18 +129,18 @@
      storagebase: !type:AllSelector
        children:
        - id: WeaponLauncherChinaLakeBiocode # Sunrise-edit
-      - id: GrenadeBlastContact # Sunrise-edit
-        amount: 1
-      - id: GrenadeFragContact # Sunrise-edit
-        amount: 1
-      - id: GrenadeEMPContact # Sunrise-edit
-        amount: 1
-      - id: GrenadeBlastTimer
-        amount: 2
-      - id: GrenadeFragTimer
-        amount: 2
-      - id: GrenadeEMPTimer
-        amount: 2
+        - id: GrenadeBlast
+          amount: 1
+        - id: GrenadeFrag
+          amount: 1
+        - id: GrenadeEMP
+          amount: 1
+        - id: GrenadeBlastTimer
+          amount: 2
+        - id: GrenadeFragTimer
+          amount: 2
+        - id: GrenadeEMPTimer
+          amount: 2

 # Sunrise-start
 - type: entity
@ -152,11 +152,11 @@
  - type: StorageFill
    contents:
      - id: WeaponLauncherM79Biocode # Sunrise-edit
-      - id: GrenadeBlastContact # Sunrise-edit
+      - id: GrenadeBlast
        amount: 1
-      - id: GrenadeFragContact # Sunrise-edit
+      - id: GrenadeFrag
        amount: 1
-      - id: GrenadeEMPContact # Sunrise-edit
+      - id: GrenadeEMP
        amount: 1
      - id: GrenadeBlastTimer
        amount: 2
@ -174,11 +174,11 @@
  - type: StorageFill
    contents:
      - id: WeaponGrenadeLauncherGL70Biocode # Sunrise-edit
-      - id: GrenadeBlastContact # Sunrise-edit
+      - id: GrenadeBlast
        amount: 1
-      - id: GrenadeFragContact # Sunrise-edit
+      - id: GrenadeFrag
        amount: 1
-      - id: GrenadeEMPContact # Sunrise-edit
+      - id: GrenadeEMP
        amount: 1
      - id: GrenadeBlastTimer
        amount: 2
@ -196,10 +196,10 @@
  - type: StorageFill
    contents:
      - id: WeaponSubMachineGunC40rBiocode
-        - id: MagazinePistol40SubMachineGunSP
-          amount: 2
-        - id: MagazinePistol40SubMachineGunFMJ
-          amount: 2
+      - id: MagazinePistol40SubMachineGunSP
+        amount: 2
+      - id: MagazinePistol40SubMachineGunFMJ
+        amount: 2
      - id: MagazinePistol40SubMachineGunHP
 # Sunrise-end

@ -218,7 +218,7 @@
          amount: 2
        - id: GrenadeBlastTimer # Sunrise-edit
          amount: 2
-        - id: GrenadeFlashContact # Sunrise-edit
+        - id: GrenadeFlash # Sunrise-edit
          amount: 2
        - id: GrenadeFragTimer # Sunrise-edit
          amount: 2
@ -412,7 +412,7 @@
      storagebase: !type:AllSelector
        children:
        - id: SyringeRomerol
-        - id: WeaponRevolverPythonBiocode # Sunrise-edit
+        - id: WeaponRevolverPython
        - id: MagazineBoxMagnumIncendiary
        - id: PillAmbuzolPlus
        - id: PillAmbuzol
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@ -44,15 +44,16 @@
  components:
  - type: EntityTableContainerFill
    containers:
-      storagebase:
-     id: MagazineLightRifleSP
-      amount: 1
-    - id: MagazineLightRifleHP
-      amount: 1
-    - id: MagazineLightRifleFMJ
-      amount: 1
-    - id: MagazineLightRifleAP
-      amount: 1
+      storagebase: !type:AllSelector
+        children:
+        - id: MagazineLightRifleSP
+          amount: 1
+        - id: MagazineLightRifleHP
+          amount: 1
+        - id: MagazineLightRifleFMJ
+          amount: 1
+        - id: MagazineLightRifleAP
+          amount: 1

 - type: entity
  name: box of .30 rifle (practice) magazines
--- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml
@ -12,17 +12,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -42,17 +33,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyNitrogenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -76,17 +58,8 @@
        - id: ClothingMaskBreath
        - id: ExtendedEmergencyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -106,17 +79,8 @@
        - id: ClothingMaskBreath
        - id: ExtendedEmergencyNitrogenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -127,7 +91,8 @@
    currentLabel: reagent-name-nitrogen

 - type: entity
-  parent: BoxSurvivalBase # Sunrise-Edit
+
+  parent: BoxSurvivalBase  # sunrise-edit
  id: BoxSurvivalSecurity
  name: survival box
  description: It's a box with basic internals inside.
@ -140,17 +105,8 @@
        - id: ClothingMaskGasSecurity
        - id: ExtendedEmergencyOxygenTankFilled #Sunrise-Edit
        - id: EmergencyMedipen
-    # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-        - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -168,19 +124,10 @@
      storagebase: !type:AllSelector
        children:
        - id: ClothingMaskGasSecurity
-        - id: ExtendedEmergencyNitrogenTankFilled #Sunrise-Edit
+        - id: EmergencyNitrogenTankFilled
        - id: EmergencyMedipen
-    # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-        - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -191,7 +138,8 @@
    currentLabel: reagent-name-nitrogen

 - type: entity
-  parent: BoxSurvivalBase # Sunrise-Edit
+
+  parent: BoxSurvivalBase  # sunrise-edit
  id: BoxSurvivalMedical
  name: survival box
  description: It's a box with basic internals inside.
@ -204,17 +152,8 @@
        - id: ClothingMaskBreathMedical
        - id: EmergencyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -234,17 +173,8 @@
        - id: ClothingMaskBreathMedical
        - id: EmergencyNitrogenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -274,17 +204,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyFunnyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Tag
@ -304,17 +225,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyNitrogenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
        - id: DrinkWaterBottleFull
  - type: Label
@ -332,17 +244,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodBreadNutriBatard
        - id: DrinkWaterBottleFull

@ -358,17 +261,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyNitrogenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodBreadNutriBatard
        - id: DrinkWaterBottleFull
  - type: Sprite
@ -390,17 +284,8 @@
        - id: ClothingMaskBreath
        - id: EmergencyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodBreadCottonNutriBatard
        - id: DrinkWaterBottleFull

@ -418,17 +303,8 @@
        - id: ClothingMaskGasSyndicate
        - id: ExtendedEmergencyOxygenTankFilled
        - id: EmergencyMedipen
-        # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
+
+        - id: Flare
        - id: FoodSnackNutribrick
  - type: Sprite
    layers:
@ -447,6 +323,7 @@
        - id: ClothingMaskGasSyndicate
        - id: ExtendedEmergencyNitrogenTankFilled
        - id: EmergencyMedipen
+
        - id: Flare
        - id: FoodSnackNutribrick
  - type: Sprite
@ -458,19 +335,16 @@


 - type: entity
-  parent: BoxCardboard
+  parent: BoxCardboardSmall # Cannot fit 3x3 boxes into already-filled ERT backpacks.
  id: BoxSurvivalMilitaryDouble
  suffix: Military O2
  description: It's a box with basic internals inside. This one is labelled to contain an double extended-capacity tank.
  components:
  - type: StorageFill
    contents:
-    - id: ClothingMaskBreath
    - id: DoubleEmergencyOxygenTankFilled
    - id: EmergencyMedipen
    - id: Flare
-    - id: FoodSnackNutribrick
-    - id: DrinkWaterBottleFull
  - type: Sprite
    layers:
    - state: internals
@ -483,22 +357,9 @@
  components:
  - type: StorageFill
    contents:
-    - id: ClothingMaskBreath
    - id: DoubleEmergencyNitrogenTankFilled
    - id: EmergencyMedipen
-    # Sunrise-Start
-    - id: SpaceMedipen
-    - id: GlowstickRed
-      orGroup: Glowstick
-    - id: GlowstickPurple
-      orGroup: Glowstick
-    - id: GlowstickYellow
-      orGroup: Glowstick
-    - id: GlowstickBlue
-      orGroup: Glowstick
-    # Sunrise-End
-    - id: FoodSnackNutribrick
-    - id: DrinkWaterBottleFull
+    - id: Flare
  - type: Sprite
    layers:
    - state: internals
--- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@ -65,7 +65,7 @@
  - type: Storage
    maxItemSize: Small
    grid:
-    - 0,0,2,3
+    - 0,0,2,2

 - type: entity
  name: mousetrap box
--- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml
@ -210,4 +210,16 @@
      - id: ClothingOuterEVASuitPirate
      - id: DoubleEmergencyNitrogenTankFilled
      - id: DoubleEmergencyOxygenTankFilled
-#SUNRISE-End
+
+- type: entity
+  id: CrateSyndicateSuperSurplusBundleAgent
+  parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ]
+  name: Syndicate super surplus crate
+  description: Contains 125 telecrystals worth of completely random Syndicate items.
+  suffix: Agent
+  components:
+  - type: SurplusBundle
+    totalPrice: 125
+  - type: Tag
+    tags:
+    - SyndieAgentUplink
--- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml
@ -22,8 +22,8 @@
          amount: 2
        - id: BungoSeeds
          amount: 2
-      - id: LanternfruitSeeds #Sunrise-add
-        amount: 2
+        - id: LanternfruitSeeds #Sunrise-add
+          amount: 2

 - type: entity
  parent: CrateHydroSecure
--- a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@ -76,8 +76,8 @@
        - id: Saw
        - id: Hemostat
        - id: ClothingMaskSterile
-      - id: BoneGel
-      - id: BoneSetter
+        - id: BoneGel
+        - id: BoneSetter
 - type: entity
  parent: CrateMedical
  id: CrateMedicalScrubs
--- a/Show more
+++ b/Show more