minor changes (#3604)

2026-06-09 13:26:34 +02:00 · 2026-05-26 15:47:32 +07:00
parent b2626ac663
commit 48cdd61d11
36 changed files with 216 additions and 59 deletions
@@ -9,9 +9,9 @@
 ## Технические детали
 <!-- Краткое описание изменений в коде для облегчения проверки. -->

-## Test plan
+## План тестирования
 <!--
-Describe how you tested the pull request, and how someone reviewing this PR can test it themselves.
+Опишите, как вы тестировали пул-реквест и как его можно протестировать самостоятельно.
 -->

 ## Медиа
@@ -21,7 +21,7 @@ Describe how you tested the pull request, and how someone reviewing this PR can
 ## Требования
 <!-- Подтвердите следующее, поставив X в скобках без пробелов [X]: -->
 - [ ] Я прочитал(а) и следую [Рекомендациям по оформлению Pull Request и Changelog](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [ ] I have tested this pull request and written instructions on how to test it
+- [ ] Я протестировал этот пул-реквест и написал инструкции по его проверке.
 - [ ] Я добавил(а) медиафайлы к этому PR или он не требует демонстрации в игре.
 <!-- Вы должны понимать, что несоблюдение вышеуказанного может привести к закрытию вашего PR по усмотрению сопровождающего -->

@@ -30,7 +30,7 @@ public sealed partial class PanicBunkerTab : Control
        MinOverallMinutes.OnFocusExit += args => SendMinOverallMinutes(args.Text);
        _minOverallMinutes = MinOverallMinutes.Text;
        // Corvax-VPNGuard-Start
-        var haveSecrets = IoCManager.Instance!.TryResolveType<ISharedSponsorsManager>(out _); // TODO: Probably need better way to detect Secrets module
+        var haveSecrets = IoCManager.Instance!.TryResolveType<ISharedSponsorsManager>(out _); // TODO-Corvax: Probably need better way to detect Secrets module
        if (haveSecrets)
        {
            VPNContainer.Visible = true;
@@ -74,6 +74,8 @@ public sealed class MenuButtonSheetlet<T> : Sheetlet<T> where T : PalettedStyles
        };

        ButtonSheetlet<T>.MakeButtonRules<MenuButton>(rules, cfg.ButtonPalette, null);
+        ButtonSheetlet<T>.MakeButtonRules<MenuButton>(rules, cfg.PositiveButtonPalette, StyleClass.Positive);
+        ButtonSheetlet<T>.MakeButtonRules<MenuButton>(rules, cfg.NegativeButtonPalette, StyleClass.Negative);

        return rules.ToArray();
    }
@@ -3,6 +3,7 @@ using Content.Server.DeviceLinking.Components;
 using Content.Server.Medical.CrewMonitoring;
 using Content.Server.Pinpointer;
 using Content.Shared.CrewManifest;
+using Content.Shared.GameTicking;
 using Content.Shared.Medical.SuitSensor;
 using Content.Shared.Roles;
 using Content.Shared.SecApartment;
@@ -62,8 +63,9 @@ public sealed partial class SecApartmentSystem : EntitySystem
        SubscribeLocalEvent<SecApartmentComponent, RemoveMemberFromSquadMessage>(OnRemoveMemberFromSquad);
        SubscribeLocalEvent<SecApartmentComponent, ChangeSquadStatusMessage>(OnChangeSquadStatus);
        SubscribeLocalEvent<SecApartmentComponent, RemoveTimerMessage>(OnRemoveTimer);
+        SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRoundRestart);

-        // TODO: I'm too lazy to change this.
+        // TODO-Corvax: I'm too lazy to change this.
        SubscribeLocalEvent<ActiveSignalTimerComponent, ComponentStartup>(OnTimerStartup);
        SubscribeLocalEvent<SignalTimerComponent, ComponentShutdown>(OnTimerComponentShutdown);
    }
@@ -106,10 +108,7 @@ public sealed partial class SecApartmentSystem : EntitySystem

    private void OnPrototypeReload(PrototypesReloadedEventArgs obj)
    {
-        if (obj.WasModified<JobPrototype>())
-            InitializeSecurityJobs();
-
-        if (obj.WasModified<DepartmentPrototype>())
+        if (obj.WasModified<JobPrototype>() || obj.WasModified<DepartmentPrototype>())
            InitializeSecurityJobs();
    }

@@ -118,26 +117,30 @@ public sealed partial class SecApartmentSystem : EntitySystem
        if (comp.Station == null)
            return;

-        var securityCrew = GetSecurityCrew(uid, comp.Station.Value);
-        var statusDict = new Dictionary<string, SuitSensorStatus?>();
-        var squadLocations = new Dictionary<string, (string Location, bool HasLocation)>();
-
        var squads = _stationData.TryGetValue(comp.Station.Value, out var stationData)
            ? stationData.Squads : new List<Squad>();

+        var securityCrew = GetSecurityCrew(uid, comp.Station.Value);
+        var isUiOpen = _ui.IsUiOpen(uid, SecApartmentUiKey.Key);
+
+        var statusDict = new Dictionary<string, SuitSensorStatus?>();
+
+        var squadLocations = isUiOpen
+            ? new Dictionary<string, (string Location, bool HasLocation)>()
+            : null;
+
        foreach (var squad in squads)
        {
            UpdateAndCollectSquadData(squad, securityCrew, statusDict);
-
-            var location = GetSquadApproximateLocation(squad, securityCrew);
-            squadLocations[squad.SquadId] = location;
+            if (isUiOpen)
+                squadLocations![squad.SquadId] = GetSquadApproximateLocation(squad, securityCrew);
        }

-        if (!_ui.IsUiOpen(uid, SecApartmentUiKey.Key))
+        if (!isUiOpen)
            return;

-        var statusUpdate = new SensorStatusUpdateState(statusDict, squadLocations);
-        _ui.SetUiState(uid, SecApartmentUiKey.Key, statusUpdate);
+        _ui.SetUiState(uid, SecApartmentUiKey.Key,
+            new SensorStatusUpdateState(statusDict, squadLocations!));
    }

    private void UpdateAndCollectSquadData(Squad squad, List<CrewMemberInfo> securityCrew,
@@ -560,6 +563,11 @@ public sealed partial class SecApartmentSystem : EntitySystem
            sanitized = sanitized[..maxLength];
        return sanitized;
    }
+    private void OnRoundRestart(RoundRestartCleanupEvent ev)
+    {
+        _stationData.Clear();
+        _finishedTimers.Clear();
+    }
    #region Timers
    private void OnTimerStartup(EntityUid uid, ActiveSignalTimerComponent component, ComponentStartup args)
    {
@@ -9,14 +9,14 @@ public sealed partial class GrowlingAccentSystem : EntitySystem
 {
    [Dependency] private IRobustRandom _random = default!;

-    private static readonly Regex _regexLowerR = new Regex("r+");
-    private static readonly Regex _regexUpperR = new Regex("R+");
-    private static readonly Regex _regexLowerRp = new Regex("р+");
-    private static readonly Regex _regexUpperRp = new Regex("Р+");
-    private static readonly List<string> _replacementsR = new List<string> { "rr", "rrr" };
-    private static readonly List<string> _replacementsRUpper = new List<string> { "RR", "RRR" };
-    private static readonly List<string> _replacementsRp = new List<string> { "рр", "ррр" };
-    private static readonly List<string> _replacementsRpUpper = new List<string> { "РР", "РРР" };
+    private static readonly Regex _regexLowerR = new Regex("r+", RegexOptions.Compiled);
+    private static readonly Regex _regexUpperR = new Regex("R+", RegexOptions.Compiled);
+    private static readonly Regex _regexLowerRp = new Regex("р+", RegexOptions.Compiled);
+    private static readonly Regex _regexUpperRp = new Regex("Р+", RegexOptions.Compiled);
+    private static readonly string[] _replacementsR = { "rr", "rrr" };
+    private static readonly string[] _replacementsRUpper = { "RR", "RRR" };
+    private static readonly string[] _replacementsRp = { "рр", "ррр" };
+    private static readonly string[] _replacementsRpUpper = { "РР", "РРР" };

    public override void Initialize()
    {
@@ -152,9 +152,7 @@ public sealed partial class TTSManager
    private string GenerateCacheKey(string speaker, string text)
    {
        var key = $"{speaker}/{text}";
-        byte[] keyData = Encoding.UTF8.GetBytes(key);
-        var sha256 = System.Security.Cryptography.SHA256.Create();
-        var bytes = sha256.ComputeHash(keyData);
+        var bytes = System.Security.Cryptography.SHA256.HashData(Encoding.UTF8.GetBytes(key));
        return Convert.ToHexString(bytes);
    }

@@ -1,3 +0,0 @@
-using Content.Shared.Corvax.TTS;
-
-namespace Content.Shared.Humanoid;
@@ -0,0 +1,15 @@
+- files: ["space_asshole.ogg"]
+  license: "Custom"
+  copyright: "Space Asshole by Chris Remo is used with special permission from the author, under the condition that the project remains non-commercial and open source. The author also requested that a link to his bandcamp be included: https://chrisremo.bandcamp.com/"
+  source: "https://idlethumbs.bandcamp.com/track/space-asshole"
+  # The source is a direct link to the track, but not the "main" bandcamp of the author. Hence the link is also included separately in the copyright.
+
+- files: ["singuloose.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "Singuloose by Janis Schiedková. Converted from MP3 to OGG."
+  source: "https://soundcloud.com/js_m/singuloose"
+
+- files: ["pwmur.ogg"]
+  license: "CC-BY-NC-SA-3.0"
+  copyright: "phoron will make us rich by Sunbeamstress/Lauren Loveless."
+  source: "https://soundcloud.com/sunbeamstress/phoron-will-make-us-rich"
@@ -1,8 +1,3 @@
- files: ["title2.ogg"]
-  license: "CC-BY-NC-SA-3.0"
-  copyright: "https://github.com/tgstation/tgstation/blob/44db038c2cf7c6dade4300bea54cff06e98caf6a/sound/ambience/title2.ogg"
-  source: "https://www.youtube.com/watch?v=vHo7npmGcHU"
-
 - files: ["service.ogg"]
  license: "CC-BY-NC-SA-3.0"
  copyright: "Service by Seeitsthem."
@@ -12,4 +7,3 @@
  license: "CC-BY-NC-SA-3.0"
  copyright: "No decision by cobber3 (434996476964372481)."
  source: "https://www.youtube.com/watch?v=36yiUgdwul4"
-  
@@ -0,0 +1,14 @@
+command-description-container-contents =
+    Gets all entities inside a container on an entity via the container's ID.
+command-description-container-get =
+    Gets a container on an entity via the container's ID.
+command-description-container-insert =
+    Puts an entity inside the piped container.
+command-description-container-insertmultiple =
+    Put multiple entities inside the piped container.
+command-description-container-list =
+    Gets the IDs of all containers in an entity.
+command-description-container-getall =
+    Gets all containers in an entity.
+command-description-container-id =
+    Gets the string id of the piped in containers.
@@ -353,6 +353,7 @@ figurines-thief-5 = Хм, я не знал, что эта стена может

 figurines-wizard-1 = EI NATH!!
 figurines-wizard-2 = ONI'SOMA!!
+figurines-wizard-3 = Skidaddle skadoodle!
 figurines-wizard-4 = Настоящие волшебники поддерживают права меньшинств.
 figurines-wizard-5 = Кто из вас БОТАНОВ готов попасть в шкафчик?
 figurines-wizard-6 = Я не волшебник! Я капитан! Мне поменяли разум!
@@ -1 +1 @@
-gas-max-pressure-alert = Клапан сброса давления не выдержал!
+gas-max-pressure-alert = Клапан сброса давления не выдержал!
@@ -1,7 +1,7 @@
 # TODO: Make this a fluent function in RT
 photograph-name-text = Это фотография { PROPER($entity) ->
    *[false] { INDEFINITE($entity) } { $entity }
-     [true] { $entity }
+    [true] { $entity }
    }.
 photograph-name-text-empty = Это фотография.
 photograph-name-text-photograph = Это фотография другой фотографии.
@@ -34,3 +34,21 @@ ent-NitrousOxideTankFilled = баллон оксида азота
 ent-PlasmaTankFilled = баллон плазмы
    .desc = { ent-PlasmaTank.desc }
    .suffix = Заполненный
+ent-MaxCap = { ent-AirTank }
+    .desc = { ent-AirTank.desc }
+    .suffix = DEBUG, Max Cap
+ent-MaxCapSmall = { ent-EmergencyOxygenTank }
+    .desc = { ent-EmergencyOxygenTank.desc }
+    .suffix = DEBUG, Max Cap
+ent-MaxCapSmallEx = { ent-ExtendedEmergencyOxygenTank }
+    .desc = { ent-ExtendedEmergencyOxygenTank.desc }
+    .suffix = DEBUG, Max Cap
+ent-MaxCapSmallDouble = { ent-DoubleEmergencyOxygenTank }
+    .desc = { ent-DoubleEmergencyOxygenTank.desc }
+    .suffix = DEBUG, Max Cap
+ent-MaxCapSilly = max cap
+    .desc = { ent-AirTank.desc }
+    .suffix = DEBUG, Max Cap, Impossible
+ent-MaxCapBluespace = max cap
+    .desc = { ent-AirTank.desc }
+    .suffix = DEBUG, Max Cap, Canister
@@ -16,6 +16,3 @@ ent-SpawnPointSeniorResearcher = ведущий учёный
 ent-SpawnPointSeniorOfficer = инструктор СБ
    .desc = { ent-SpawnPointJobBase.desc }
    .suffix = { ent-SpawnPointJobBase.suffix }
-ent-SpawnPointMagistrate = магистрат
-    .desc = { ent-SpawnPointJobBase.desc }
-    .suffix = { ent-SpawnPointJobBase.suffix }
@@ -2,5 +2,4 @@ ent-RubberStampIAA = печать агента внутренних дел
    .desc = { ent-RubberStampBase.desc }
    .suffix = НЕ МАППИТЬ
 ent-RubberStampMagistrate = печать магистрата
-    .desc = { ent-RubberStampMime.desc }
-    .suffix = НЕ МАППИТЬ
+    .desc = { ent-RubberStampBase.desc }
@@ -1,3 +1,3 @@
 ent-TelecomServerFilledLegal = { ent-TelecomServer }
-    .suffix = Юридический
    .desc = { ent-TelecomServer.desc }
+    .suffix = Юридический
@@ -0,0 +1,3 @@
+ent-SpawnPointMagistrate = магистрат
+    .desc = { ent-SpawnPointJobBase.desc }
+    .suffix = { ent-SpawnPointJobBase.suffix }
@@ -0,0 +1,39 @@
+ent-ChangelingFleshClothingBase = { ent-Clothing }
+    .desc = { ent-Clothing.desc }
+    .suffix = Changeling
+ent-ChangelingFleshClothingBack = changeling flesh backpack
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingBelt = changeling flesh belt
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingEars = changeling flesh headset
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingEyes = changeling flesh glasses
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingGloves = changeling flesh gloves
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingHead = changeling flesh hat
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingMask = changeling flesh mask
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingNeck = changeling flesh tie
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingInner = changeling flesh jumpsuit
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingOuter = changeling flesh vest
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingFeet = changeling flesh shoes
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
+ent-ChangelingFleshClothingSuitStorage = changeling flesh gas tank
+    .desc = { ent-ChangelingFleshClothingBase.desc }
+    .suffix = { ent-ChangelingFleshClothingBase.suffix }
@@ -1,3 +1,5 @@
 ent-MobLing = Урист МакКрад
    .desc = { ent-MobHuman.desc }
    .suffix = Неантаг
+ent-ChangelingFleshClothingAbilityStoreDummy = { "" }
+    .desc = { "" }
@@ -14,3 +14,5 @@ ent-ActionDevour = [color=red]Поглотить[/color]
    .desc = Попытаться разрушить конструкцию своими челюстями или проглотить существо.
 ent-ActionDragonsBreath = [color=orange]Дыхание дракона[/color]
    .desc = Извергайте пламя на всех, кто поимеет глупость напасть на вас!
+ent-BloodSmoke = smoke
+    .desc = { ent-Smoke.desc }
@@ -1,10 +1,18 @@
 ent-TravelCamera = фотоаппарат для путешествий
    .desc = Одна картинка стоит тысячи слов. В комплекте сверхяркая вспышка и встроенная перезаряжаемая фотопленка.
 ent-BasePhotograph = фотография
+    .desc = { ent-BasePaper.desc }
 ent-PhotographBlack = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
 ent-PhotographRed = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
 ent-PhotographBlue = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
 ent-PhotographGreen = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
 ent-PhotographYellow = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
 ent-PhotographPurple = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
 ent-PhotographRainbow = { ent-BasePhotograph }
+    .desc = { ent-BasePhotograph.desc }
@@ -4,19 +4,21 @@ ent-BloodstreamStatusEffectDebuff = { ent-BloodstreamStatusEffectBase }
    .desc = { ent-BloodstreamStatusEffectBase.desc }
 ent-StatusEffectBloodloss = кровопотеря
    .desc = { ent-BloodstreamStatusEffectDebuff.desc }
-ent-PainNumbnessTraitStatusEffect = { ent-MobStatusEffectBase }
+ent-PainNumbnessStatusEffectBase = { ent-MobStatusEffectBase }
    .desc = { ent-MobStatusEffectBase.desc }
-ent-StatusEffectHemophiliaTrait = { ent-BloodstreamStatusEffectBase }
-    .desc = { ent-BloodstreamStatusEffectBase.desc }
 ent-StatusEffectAnticoagulant = разжиженная кровь
    .desc = { ent-BloodstreamStatusEffectDebuff.desc }
 ent-StatusEffectHemorrhage = кровоизлияние
    .desc = { ent-BloodstreamStatusEffectDebuff.desc }
 ent-StatusEffectPainNumbness = невосприимчивость к боли
-    .desc = { ent-PainNumbnessTraitStatusEffect.desc }
+    .desc = { ent-PainNumbnessStatusEffectBase.desc }
 ent-StaminaModifierStatusEffect = { ent-MobStatusEffectBase }
    .desc = { ent-MobStatusEffectBase.desc }
 ent-StatusEffectDesoxyStamina = 2x макс. выносливость
    .desc = { ent-StaminaModifierStatusEffect.desc }
 ent-StatusEffectStimulantsStamina = 1.5x макс. выносливость
    .desc = { ent-StaminaModifierStatusEffect.desc }
+ent-PainNumbnessTraitStatusEffect = { ent-MobStatusEffectBase }
+    .desc = { ent-MobStatusEffectBase.desc }
+ent-StatusEffectHemophiliaTrait = { ent-BloodstreamStatusEffectBase }
+    .desc = { ent-BloodstreamStatusEffectBase.desc }
@@ -1 +1,4 @@
+ent-StatusEffectDamageModifierBase = { ent-StatusEffectBase }
+    .desc = Status effect for modifying incoming sources of damage. You shouldn't be seeing this.
 ent-StatusEffectRadiationProtection = защита от радиации
+    .desc = { ent-StatusEffectDamageModifierBase.desc }
@@ -0,0 +1,6 @@
+ent-TraitStatusEffectBase = { ent-StatusEffectBase }
+    .desc = { ent-StatusEffectBase.desc }
+ent-TraitStatusEffectHemophilia = { ent-BloodstreamStatusEffectBase }
+    .desc = { ent-BloodstreamStatusEffectBase.desc }
+ent-TraitStatusEffectPainNumbness = pain numbness
+    .desc = { ent-PainNumbnessStatusEffectBase.desc }
@@ -28,6 +28,9 @@ ent-NitrousOxideCanister = канистра оксида азота
    .desc = Канистра, в которой может содержаться газ любого вида. В этой, предположительно, содержится оксид азота. Можно прикрепить к порту коннектора с помощью гаечного ключа.
 ent-FrezonCanister = канистра фрезона
    .desc = Хладагент с лёгкими галлюциногенными свойствами. Развлекайтесь.
+ent-MaxCapCanister = max cap in a can
+    .desc = { ent-GasCanister.desc }
+    .suffix = DEBUG, Max Cap
 ent-GasCanisterBrokenBase = разбитая канистра для газа
    .desc = Разбитая канистра для газа. Не совсем бесполезна, так как может быть разобрана для получения высококачественных материалов.
 ent-StorageCanisterBroken = { ent-GasCanisterBrokenBase }
@@ -4,6 +4,30 @@ ent-MeteorSwarmMildScheduler = { ent-BaseGameRule }
    .desc = { ent-BaseGameRule.desc }
 ent-KesslerSyndromeScheduler = { ent-BaseGameRule }
    .desc = { ent-BaseGameRule.desc }
+ent-MeteorSwarm = { ent-BaseGameRule }
+    .desc = { ent-BaseGameRule.desc }
+ent-SpaceDustMinor = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-SpaceDustMajor = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-MeteorSwarmSmall = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-MeteorSwarmMedium = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-MeteorSwarmLarge = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-UristSwarm = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-ImmovableRodSpawn = { ent-BaseGameRule }
+    .desc = { ent-BaseGameRule.desc }
+ent-CowSwarm = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-ClownSwarm = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-PotatoSwarm = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
+ent-FunSwarm = { ent-MeteorSwarm }
+    .desc = { ent-MeteorSwarm.desc }
 ent-GameRuleMeteorSwarm = { ent-BaseGameRule }
    .desc = { ent-BaseGameRule.desc }
 ent-GameRuleSpaceDustMinor = { ent-GameRuleMeteorSwarm }
@@ -18,8 +42,6 @@ ent-GameRuleMeteorSwarmLarge = { ent-GameRuleMeteorSwarm }
    .desc = { ent-GameRuleMeteorSwarm.desc }
 ent-GameRuleUristSwarm = { ent-GameRuleMeteorSwarm }
    .desc = { ent-GameRuleMeteorSwarm.desc }
-ent-ImmovableRodSpawn = { ent-BaseGameRule }
-    .desc = { ent-BaseGameRule.desc }
 ent-GameRuleCowSwarm = { ent-GameRuleMeteorSwarm }
    .desc = { ent-GameRuleMeteorSwarm.desc }
 ent-GameRuleClownSwarm = { ent-GameRuleMeteorSwarm }
@@ -4,3 +4,5 @@ ent-StorePresetSpellbook = { "" }
    .desc = { "" }
 ent-StorePresetChangeling = { "" }
    .desc = { "" }
+ent-StorePresetRemoteUplink = { ent-StorePresetUplink }
+    .desc = { ent-StorePresetUplink.desc }
@@ -147,7 +147,7 @@
    messagePerceivedByOthers: hugging-success-generic-others
  - type: BodyEmotes
    soundsId: IpcEmotes
-    ############################# это работает?
+###
  - type: ItemTogglePointLight
  - type: ToggleableVisuals
    spriteLayer: light
@@ -178,7 +178,7 @@
      startValue: 0.1
      endValue: 2.0
      isLooped: true
-    #############################
+###
  - type: TypingIndicator
    proto: robot
  - type: PowerCellSlot
@@ -232,7 +232,6 @@
      Critical: BorgCrit
      Dead: BorgDead
  - type: Fingerprint
-  - type: Blindable
  - type: Tag
    tags:
    - CanPilot
@@ -240,7 +239,7 @@
    - DoorBumpOpener
    - AnomalyHost
    - Ipc
-  ############ хз зачем было
+###
  - type: Temperature
    currentTemperature: 310.15
    specificHeat: 42
@@ -0,0 +1,23 @@
+- type: jukebox
+  id: space_asshole
+  name: Chris Remo - Space Asshole
+  path:
+    path: /Audio/Corvax/Jukebox/space_asshole.ogg
+
+- type: jukebox
+  id: Singuloose
+  name: Janis Schiedková - Singuloose
+  path:
+    path: /Audio/Corvax/Jukebox/singuloose.ogg
+
+- type: jukebox
+  id: pwmur
+  name: Sunbeamstress - phoron will make us rich
+  path:
+    path: /Audio/Corvax/Jukebox/pwmur.ogg
+
+- type: jukebox
+  id: nodecision
+  name: cobber3 - No decision
+  path:
+    path: /Audio/Corvax/Lobby/nodecision.ogg
@@ -61,6 +61,7 @@
  - SouthernAccent
  - SpanishAccent
  - StutteringAccent
+  - GrowlingAccent # Corvax
  - TTS # Corvax-TTS
  eventComponents:
  - Puller
@@ -15,7 +15,6 @@
    - /Audio/Lobby/pwmur.ogg
    - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg
    - /Audio/Lobby/every_light_is_blinking_at_once.ogg
-    - /Audio/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic
    - /Audio/Lobby/atomicamnesiammx.ogg
    - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic
    - /Audio/Corvax/Lobby/nodecision.ogg # Corvax-LobbyMusic