фиксы линтера

Content.Server/Vampire/VampireSystem.Abilities.cs

@@ -1,6 +1,4 @@
 using Content.Server.Bible.Components;
-using Content.Server.Body.Components;
-using Content.Server.Flash;
 using Content.Server.Speech.Components;
 using Content.Server.Storage.Components;
 using Content.Server.Objectives.Components;
@@ -569,7 +567,7 @@ public sealed partial class VampireSystem
         if (args.Cancelled)
             return;
 
-        _statusEffects.TryAddStatusEffect<SleepingComponent>(args.Target.Value, VampireComponent.SleepStatusEffectProto, args.Duration ?? TimeSpan.FromSeconds(30), false);
+        _statusEffects.TryAddStatusEffectDuration(args.Target.Value, SleepingSystem.StatusEffectForcedSleeping, args.Duration ?? TimeSpan.FromSeconds(30));
     }
     #endregion
 

Content.Server/Vampire/VampireSystem.cs

@@ -3,7 +3,6 @@ using Content.Server.Atmos.Rotting;
 using Content.Server.Beam;
 using Content.Server.Body.Systems;
 using Content.Server.Chat.Systems;
-using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Polymorph.Systems;
 using Content.Server.Storage.EntitySystems;
 using Content.Server.Mind;
@@ -23,7 +22,6 @@ using Content.Shared.Maps;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;
 using Content.Shared.Prayer;
-using Content.Shared.StatusEffect;
 using Content.Shared.Stunnable;
 using Content.Shared.Vampire;
 using Content.Shared.Vampire.Components;
@@ -36,6 +34,8 @@ using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Content.Shared.Movement.Systems;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.StatusEffectNew;
+using Content.Shared.StatusEffectNew.Components;
 
 namespace Content.Server.Vampire;
 
@@ -65,7 +65,6 @@ public sealed partial class VampireSystem : EntitySystem
     [Dependency] private readonly SharedBodySystem _body = default!;
     [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
     [Dependency] private readonly SharedStunSystem _stun = default!;
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly MobThresholdSystem _mobThreshold = default!;
     [Dependency] private readonly MobStateSystem _mobState = default!;
@@ -76,6 +75,7 @@ public sealed partial class VampireSystem : EntitySystem
     [Dependency] private readonly MovementSpeedModifierSystem _speed = default!;
     [Dependency] private readonly SharedChargesSystem _charges = default!;
     [Dependency] private readonly TurfSystem _turfSystem = default!;
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
 
     public override void Initialize()
     {

Content.Server/_Sunrise/Disease/SleepySystem.cs

@@ -1,6 +1,5 @@
 // © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt
 using Content.Shared.Bed.Sleep;
-using Content.Shared.StatusEffect;
 using Robust.Shared.Random;
 using System.Numerics;
 
@@ -8,10 +7,7 @@ namespace Content.Server.Traits.Assorted;
 
 public sealed class SleepySystem : EntitySystem
 {
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    private const string StatusEffectKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
-
-    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private readonly Shared.StatusEffectNew.StatusEffectsSystem _statusEffects = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
     public override void Initialize()
     {
@@ -61,8 +57,7 @@ public sealed class SleepySystem : EntitySystem
             // Make sure the sleep time doesn't cut into the time to next incident.
             narcolepsy.NextIncidentTime += duration;
 
-            _statusEffects.TryAddStatusEffect<SleepingComponent>(uid, StatusEffectKey,
-                TimeSpan.FromSeconds(duration), false);
+            _statusEffects.TryAddStatusEffectDuration(uid, SleepingSystem.StatusEffectForcedSleeping, TimeSpan.FromSeconds(duration));
         }
     }
 }

Content.Server/_Sunrise/SolutionRegenerationSwitcherSystem/SolutionRegenerationSwitcherSystem.cs

@@ -0,0 +1,80 @@
+using Content.Shared._Sunrise.SolutionRegenerationSwitcher;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Popups;
+
+namespace Content.Server._Sunrise.SolutionRegenerationSwitcherSystem
+{
+    public sealed class SolutionRegenerationSwitcherSystem : SharedSolutionRegenerationSwitcherSystem
+    {
+        [Dependency] private readonly SharedSolutionContainerSystem _solutionSystem = null!;
+        [Dependency] private readonly SharedPopupSystem _popups = null!;
+
+        private ISawmill _sawmill = null!;
+
+        public override void Initialize()
+        {
+            base.Initialize();
+
+            _sawmill = Logger.GetSawmill("chemistry");
+        }
+
+        protected override void SwitchToNextReagent(EntityUid uid,
+            SolutionRegenerationSwitcherComponent component,
+            EntityUid user)
+        {
+            component.CurrentIndex = (component.CurrentIndex + 1) % component.Options.Count;
+            var nextReagent = component.Options[component.CurrentIndex];
+            SwitchReagent(uid, nextReagent, component, user);
+        }
+
+        protected override void SwitchReagent(EntityUid uid,
+            ReagentQuantity reagent,
+            SolutionRegenerationSwitcherComponent component,
+            EntityUid user)
+        {
+            if (!TryComp<SolutionRegenerationComponent>(uid, out var solutionRegenerationComponent))
+            {
+                _sawmill.Warning($"{ToPrettyString(uid)} has no SolutionRegenerationComponent.");
+                return;
+            }
+
+            if (!_solutionSystem.TryGetSolution(uid, solutionRegenerationComponent.SolutionName, out var solution))
+            {
+                _sawmill.Error($"Can't get SolutionRegeneration.Solution for {ToPrettyString(uid)}");
+                return;
+            }
+
+            if (!TryComp<SolutionRegenerationComponent>(uid, out var solutionRegeneration))
+            {
+                _sawmill.Error($"Entity {ToPrettyString(uid)} not have SolutionRegenerationComponent");
+                return;
+            }
+
+            if (solutionRegeneration.Generated.ContainsReagent(reagent.Reagent))
+            {
+                _popups.PopupEntity(Loc.GetString("solution-regeneration-switcher-already-select"), user, user);
+                return;
+            }
+
+            // Empty out the current solution.
+            if (!component.KeepSolution)
+                _solutionSystem.RemoveAllSolution(solution.Value);
+
+            solutionRegeneration.ChangeGenerated(reagent);
+
+            if (!PrototypeManager.TryIndex(reagent.Reagent.Prototype, out ReagentPrototype? proto))
+            {
+                _sawmill.Error(
+                    $"Can't get get reagent prototype {reagent.Reagent.Prototype} for {ToPrettyString(uid)}");
+                return;
+            }
+
+            _popups.PopupEntity(
+                Loc.GetString("solution-regeneration-switcher-switched", ("reagent", proto.LocalizedName)),
+                user,
+                user);
+        }
+    }
+}

Content.Shared/Trigger/Components/StartTimerOnShootComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Explosion.Components;
+namespace Content.Shared.Trigger.Components;
 
 [RegisterComponent]
 public sealed partial class StartTimerOnShootComponent : Component

Content.Shared/Trigger/Systems/TriggerSystem.Condition.cs

@@ -1,6 +1,9 @@
-using Content.Shared.Random.Helpers;
+using Content.Shared.Projectiles;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Trigger.Components;
 using Content.Shared.Trigger.Components.Conditions;
 using Content.Shared.Verbs;
+using Content.Shared.Weapons.Ranged.Events;
 using Robust.Shared.Random;
 
 namespace Content.Shared.Trigger.Systems;
@@ -17,8 +20,17 @@ public sealed partial class TriggerSystem
         SubscribeLocalEvent<ToggleTriggerConditionComponent, GetVerbsEvent<AlternativeVerb>>(OnToggleGetAltVerbs);
 
         SubscribeLocalEvent<RandomChanceTriggerConditionComponent, AttemptTriggerEvent>(OnRandomChanceTriggerAttempt);
+        SubscribeLocalEvent<StartTimerOnShootComponent, ProjectileShotEvent>(StartTimerOnShoot); // Sunrise-Edit
     }
 
+    // Sunrise-Start
+    private void StartTimerOnShoot(EntityUid uid, StartTimerOnShootComponent component, ProjectileShotEvent args)
+    {
+        if (TryComp<ProjectileComponent>(uid, out var projectile))
+            ActivateTimerTrigger(uid, projectile.Shooter);
+    }
+    // Sunrise-End
+
     private void OnWhitelistTriggerAttempt(Entity<WhitelistTriggerConditionComponent> ent, ref AttemptTriggerEvent args)
     {
         if (args.Key == null || ent.Comp.Keys.Contains(args.Key))

Content.Shared/Vampire/VampireComponent.cs

@@ -17,13 +17,8 @@ namespace Content.Shared.Vampire.Components;
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class VampireComponent : Component
 {
-    //Static prototype references
-    [ValidatePrototypeId<StatusEffectPrototype>]
-    public static readonly string SleepStatusEffectProto = "ForcedSleep";
-    [ValidatePrototypeId<EmotePrototype>]
-    public static readonly string ScreamEmoteProto = "Scream";
-    [ValidatePrototypeId<CurrencyPrototype>]
-    public static readonly string CurrencyProto = "BloodEssence";
+    public static ProtoId<EmotePrototype> ScreamEmoteProto = "Scream";
+    public static ProtoId<CurrencyPrototype> CurrencyProto = "BloodEssence";
 
     [ViewVariables(VVAccess.ReadOnly), DataField("defaultMutation")]
     public VampireMutationsType DefaultMutation = VampireMutationsType.None;
@@ -67,7 +62,7 @@ public sealed partial class VampireComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite)]
     public EntityUid? MutationsAction;
-    
+
     [ViewVariables(VVAccess.ReadWrite)]
     public bool BloodScaleActive { get; set; }
 

Resources/Locale/en-US/_prototypes/actions/changeling.ftl

@@ -1,58 +0,0 @@
-ent-ActionRetractableItemArmBlade = Arm Blade
-    .desc = Shed your flesh and reform it into a fleshy blade.
-ent-ActionEvolutionMenu = Open evolution menu
-    .desc = Opens the evolution menu.
-ent-ActionAbsorbDNA = Absorb DNA
-    .desc = Absorb the target's DNA, husking them in the process. Costs 25 chemicals.
-ent-ActionStingExtractDNA = Extract DNA sting
-    .desc = Steal your target's genetic information. Costs 25 chemicals.
-ent-ActionChangelingTransformCycle = Cycle DNA
-    .desc = Cycle your available DNA.
-ent-ActionChangelingTransform = Transform
-    .desc = Transform into another humanoid. Doesn't come with clothes. Costs 5 chemicals.
-ent-ActionEnterStasis = Enter regenerative stasis
-    .desc = Fake your death and start regenerating. Drains all your chemicals. Consumes biomass.
-ent-ActionExitStasis = Exit stasis
-    .desc = Rise from the dead with full health. Costs 60 chemicals.
-ent-ActionToggleArmblade = Toggle Arm Blade
-    .desc = Reform one of your arms into a strong blade, composed of bone and flesh. Retract on secondary use. Costs 15 chemicals.
-ent-ActionCreateBoneShard = Form Bone Shard
-    .desc = Break off shards of your bone and shape them into a throwing star. Costs 15 chemicals.
-ent-ActionToggleChitinousArmor = Toggle Armor
-    .desc = Inflate your body into an all-consuming chitinous mass of armor. Costs 25 chemicals.
-ent-ActionToggleOrganicShield = Form Shield
-    .desc = Reform one of your arms into a large, fleshy shield. Costs 20 chemicals.
-ent-ActionShriekDissonant = Dissonant Shriek
-    .desc = Emit an EMP blast, with just your voice. Costs 30 chemicals.
-ent-ActionShriekResonant = Resonant Shriek
-    .desc = Disorient people and break lights, with just your voice. Costs 30 chemicals.
-ent-ActionToggleStrainedMuscles = Strain Muscles
-    .desc = Move at extremely fast speeds. Deals stamina damage.
-ent-ActionStingBlind = Blind Sting
-    .desc = Silently sting your target, blinding them for a short time and rendering them near sighted. Costs 35 chemicals.
-ent-ActionStingCryo = Cryogenic Sting
-    .desc = Silently sting your target, constantly slowing and freezing them. Costs 35 chemicals.
-ent-ActionStingLethargic = Lethargic Sting
-    .desc = Silently inject a cocktail of anesthetics into the target. Costs 35 chemicals.
-ent-ActionStingMute = Mute Sting
-    .desc = Silently sting your target, completely silencing them for a short time. Costs 35 chemicals.
-ent-ActionStingFakeArmblade = Fake Armblade Sting
-    .desc = Silently sting your target, making them grow a dull armblade for a short time. Costs 50 chemicals.
-ent-ActionAnatomicPanacea = Anatomic Panacea
-    .desc = Cure yourself of diseases, disabilities, radiation, toxins, drunkedness and brain damage. Costs 30 chemicals.
-ent-ActionAugmentedEyesight = Augmented Eyesight
-    .desc = Toggle flash protection.
-ent-ActionBiodegrade = Biodegrade
-    .desc = Vomit a caustic substance onto any restraints, or someone's face. Costs 30 chemicals.
-ent-ActionChameleonSkin = Chameleon Skin
-    .desc = Slowly blend in with the environment. Costs 25 chemicals.
-ent-ActionEphedrineOverdose = Ephedrine Overdose
-    .desc = Inject some stimulants into yourself. Costs 30 chemicals.
-ent-ActionFleshmend = Fleshmend
-    .desc = Rapidly heal yourself. Costs 35 chemicals.
-ent-ActionToggleLesserForm = Lesser Form
-    .desc = Abandon your current form and transform into a monkey. Costs 20 chemicals.
-ent-ActionToggleSpacesuit = Toggle Space Suit
-    .desc = Make your body space proof. Costs 20 chemicals.
-ent-ActionHivemindAccess = Hivemind Access
-    .desc = Tune your chemical receptors for hivemind communication.

Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-changeling.ftl

@@ -1,20 +0,0 @@
-changeling-roundend-name = changeling
-
-objective-issuer-hivemind = [color=orange]Hivemind[/color]
-
-roundend-prepend-changeling-absorbed-named = [color=white]{$name}[/color] has absorbed a total of [color=red]{$number}[/color] organics.
-roundend-prepend-changeling-stolen-named = [color=white]{$name}[/color] has extracted a total of [color=orange]{$number}[/color] DNA samples.
-roundend-prepend-changeling-absorbed = Someone has absorbed a total of [color=red]{$number}[/color] organics.
-roundend-prepend-changeling-stolen = Someone had extracted a total of [color=orange]{$number}[/color] DNA samples.
-
-changeling-gamemode-title = Changelings
-changeling-gamemode-description =
-    The changeling hive has boarded the station, ready to take anything it desires - be it your equipment, your faces, or your lives!
-
-changeling-role-greeting =
-    You are a changeling who has absorbed and taken the form of {$name}!
-    Your objectives are listed in the character menu.
-    Absorb, shapeshift and evolve to complete them!
-
-changeling-role-greeting-short =
-    You are a changeling who has absorbed and taken the initial form of {$name}.

Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl

@@ -48,9 +48,6 @@ roles-antag-thief-objective = Add some NT property to your personal collection w
 roles-antag-dragon-name = Space Dragon
 roles-antag-dragon-objective = Create a carp army to take over this quadrant.
 
-roles-antag-changeling-name = Changeling
-roles-antag-changeling-description = Use your shapeshifting abilities to complete your objectives.
-
 roles-antag-terminator-name = Exterminator
 roles-antag-terminator-objective = Kill the target at all costs, the future depends on it.
 

Resources/Locale/en-US/changeling/changeling.ftl

@@ -1,4 +1,5 @@
-roles-antag-changeling-objective = A intelligent predator that assumes the identities of its victims.
+roles-antag-changeling-name = Changeling
+roles-antag-changeling-objective = A intelligent predator that assumes the identities of its victims.
 
 changeling-devour-attempt-failed-rotting = This corpse has only rotted biomass.
 changeling-devour-attempt-failed-protected = This victim's biomass is protected.

Resources/Locale/en-US/game-ticking/game-presets/preset-changeling.ftl

@@ -0,0 +1,13 @@
+changeling-role-greeting =
+    You are a Changeling, a highly intelligent predator.
+    Your primary goal is to escape the station alive via assuming the identities of the denizens of this station.
+    You are hungry and will not make it long without sustenance...
+    Kill, consume, hide, survive.
+
+changeling-briefing =
+    You are a changeling.
+    You are able to utilize and assume the identities of those you consume to evade a grim fate.
+
+objective-issuer-changeling = [color=#FA2A55]The Hivemind[/color]
+
+changeling-round-end-agent-name = changeling

Resources/Locale/en-US/name-identifier.ftl

@@ -7,3 +7,10 @@ name-identifier-format-silicon = Si-{$number}
 name-identifier-format-xenoborg = Xi-{$number}
 name-identifier-format-station-ai = AI-{$number}
 name-identifier-format-telepad = TELE-{$number}
+name-identifier-format-boris = BORIS-{$number}
+name-identifier-format-sofia = SOFIA-{$number}
+name-identifier-format-syndie-sec-robot = GRX-ATK-{$number}
+name-identifier-format-syndie-med-robot = GRX-MED-{$number}
+name-identifier-format-syndie-reaper-robot = Reaper-{$number}
+name-identifier-format-inferior-vulpkanin = VP-{$number}
+name-identifier-format-felinid = FE-{$number}

Resources/Locale/en-US/recipes/tags.ftl

@@ -149,3 +149,6 @@ construction-graph-tag-spationaut-hardsuit = spationaut hardsuit
 
 # clothing
 construction-graph-tag-backpack = backpack
+
+construction-graph-tag-paper = paper
+construction-graph-tag-matchstick = matchstick

Resources/Locale/ru-RU/_prototypes/actions/changeling.ftl

@@ -1,60 +0,0 @@
-ent-ActionRetractableItemArmBlade = Рука-клинок
-    .desc = Сбросьте плоть и преобразуйте её в плотоядный клинок.
-ent-ActionEvolutionMenu = Открыть меню эволюции
-    .desc = Открывает меню эволюции.
-ent-ActionAbsorbDNA = Поглотить ДНК
-    .desc = Поглотите ДНК цели, превратив её в мумиеобразное состояние. Стоимость: 5 химикатов.
-ent-ActionStingExtractDNA = Жало для извлечения ДНК
-    .desc = Украдите генетическую информацию у цели. Стоимость: 25 химикатов.
-ent-ActionChangelingTransformCycle = Смена ДНК
-    .desc = Переключение доступных ДНК.
-ent-ActionChangelingTransform = Трансформация
-    .desc = Превратитесь в другого гуманоидного существа. Без одежды. Стоимость: 5 химикатов.
-ent-ActionEnterStasis = Войти в регенеративный стазис
-    .desc = Имитация смерти с началом регенерации. Истощает все химикаты. Потребляет биомассу.
-ent-ActionExitStasis = Выйти из стазиса
-    .desc = Восстание из мёртвых с полным здоровьем. Стоимость: 50 химикатов.
-ent-ActionToggleArmblade = Переключение лезвия руки
-    .desc = Превратите одну из рук в крепкое лезвие из костей и плоти. Уберите при вторичном использовании. Стоимость: 15 химикатов.
-ent-ActionCreateBoneShard = Создание костяного осколка
-    .desc = Сломайте свои кости и сформируйте из них метательный шип. Стоимость: 15 химикатов.
-ent-ActionToggleChitinousArmor = Переключение брони
-    .desc = Надувайте своё тело в огромную хитиновую массу брони. Стоимость: 25 химикатов.
-ent-ActionToggleOrganicShield = Создание щита
-    .desc = Превратите одну из рук в большой, мясистый щит. Стоимость: 20 химикатов.
-ent-ActionShriekDissonant = Диссонантный крик
-    .desc = Излучайте импульс ЭМП с помощью своего голоса. Стоимость: 30 химикатов.
-ent-ActionShriekResonant = Резонансный крик
-    .desc = Дезориентируйте людей и разбейте светильники своим голосом. Стоимость: 30 химикатов.
-ent-ActionToggleStrainedMuscles = Перенапряжение мышц
-    .desc = Двигайтесь с невероятной скоростью. Наносит урон выносливости.
-ent-ActionStingBlind = Жало слепоты
-    .desc = Беззвучно уколите цель, временно ослепив её и вызвав близорукость. Стоимость: 35 химикатов.
-ent-ActionStingCryo = Криогенное жало
-    .desc = Беззвучно уколите цель, замедляя и замораживая её. Стоимость: 35 химикатов.
-ent-ActionStingLethargic = Жало летаргии
-    .desc = Беззвучно впрыскивает коктейль анестетиков в цель. Стоимость: 35 химикатов.
-ent-ActionStingMute = Жало немоты
-    .desc = Беззвучно уколите цель, полностью лишив её голоса на некоторое время. Стоимость: 35 химикатов.
-ent-ActionStingFakeArmblade = Жало фальшивого лезвия руки
-    .desc = Беззвучно уколите цель, заставляя её вырастить тупое лезвие руки на короткое время. Стоимость: 50 химикатов.
-ent-ActionAnatomicPanacea = Анатомическое панацея
-    .desc = Исцелите себя от болезней, увечий, радиации, токсинов, опьянения и повреждений мозга. Стоимость: 30 химикатов.
-ent-ActionAugmentedEyesight = Улучшенное зрение
-    .desc = Переключение защиты от вспышек.
-ent-ActionBiodegrade = Биодеградация
-    .desc = Извергайте едкое вещество на любые оковы или лицо человека. Стоимость: 30 химикатов.
-ent-ActionChameleonSkin = Хамелеоновая кожа
-    .desc = Постепенно сливайтесь с окружающей средой. Стоимость: 25 химикатов.
-ent-ActionEphedrineOverdose = Передозировка эфедрином
-    .desc = Впрыскивайте себе стимуляторы. Стоимость: 30 химикатов.
-ent-ActionFleshmend = Исцеление плоти
-    .desc = Быстро исцелите себя. Стоимость: 35 химикатов.
-ent-ActionToggleLesserForm = Превращение в обезьяну
-    .desc = Оставьте текущую форму и превратитесь в обезьяну. Стоимость: 20 химикатов.
-ent-ActionToggleSpacesuit = Переключение скафандра
-    .desc = Сделайте своё тело устойчивым к космическим условиям. Стоимость: 20 химикатов.
-ent-ActionHivemindAccess = Доступ к коллективному разуму
-    .desc = Настройте свои химические рецепторы для общения с коллективным разумом.
-ent-ActionStingTransform = Жало трансформации
-    .desc = Беззвучно уколите цель, превращая её в выбранного вами человека. Стоимость: 75 химикатов.

Resources/Locale/ru-RU/_prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl

@@ -4,8 +4,6 @@ ent-BaseMagazineCaselessRifleShort = короткий магазин безги
     .desc = { ent-BaseMagazineCaselessRifle.desc }
 ent-BaseMagazinePistolCaselessRifle = пистолетный магазин (.25 безгильзовые)
     .desc = { ent-BaseMagazineCaselessRifle.desc }
-ent-MagazineCaselessRifle10x24 = коробчатый магазин (.25 безгильзовые)
-    .desc = { ent-BaseMagazineCaselessRifle.desc }
 ent-MagazinePistolCaselessRifle = пистолетный магазин (.25 безгильзовые)
     .desc = { ent-BaseMagazinePistolCaselessRifle.desc }
 ent-MagazinePistolCaselessRiflePractice = пистолетный магазин (.25 безгильзовые учебные)

Resources/Locale/ru-RU/_strings/game-ticking/game-presets/preset-changeling.ftl

@@ -1,13 +0,0 @@
-changeling-roundend-name = генокрад
-objective-issuer-hivemind = [color=orange]Коллективный разум[/color]
-roundend-prepend-changeling-absorbed-named = [color=white]{ $name }[/color] поглотил в общей сложности [color=red]{ $number }[/color] органики.
-roundend-prepend-changeling-stolen-named = [color=white]{ $name }[/color] извлек в общей сложности [color=orange]{ $number }[/color] образцов ДНК.
-roundend-prepend-changeling-absorbed = Кто-то поглотил в общей сложности [color=red]{ $number }[/color] органики.
-roundend-prepend-changeling-stolen = Кто-то извлек в общей сложности [color=orange]{ $number }[/color] образцов ДНК.
-changeling-gamemode-title = Генокрады
-changeling-gamemode-description = Улей генокрадов высадился на станцию, готовый забрать все, что пожелает - будь то ваше оборудование, ваши лица или ваши жизни!
-changeling-role-greeting =
-    Вы генокрад, который поглотил и принял форму { $name }!
-        Ваши задачи указаны в меню персонажа.
-        Поглощайте, трансформируйтесь и эволюционируйте, чтобы выполнить их!
-changeling-role-greeting-short = Вы генокрад, который поглотил и принял первоначальную форму { $name }.

Resources/Prototypes/Catalog/changeling_catalog.yml

@@ -1,341 +0,0 @@
-# combat
-
-- type: listing
-  id: EvolutionMenuCombatArmblade
-  name: evolutionmenu-combat-armblade-name
-  description: evolutionmenu-combat-armblade-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: armblade }
-  productAction: ActionToggleArmblade
-  cost:
-    EvolutionPoint: 4
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuCombatBoneShard
-  name: evolutionmenu-combat-boneshard-name
-  description: evolutionmenu-combat-boneshard-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: bone_shard }
-  productAction: ActionCreateBoneShard
-  cost:
-    EvolutionPoint: 3
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuCombatChitinousArmor
-  name: evolutionmenu-combat-armor-name
-  description: evolutionmenu-combat-armor-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: chitinous_armor }
-  productAction: ActionToggleChitinousArmor
-  cost:
-    EvolutionPoint: 4
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuCombatOrganicShield
-  name: evolutionmenu-combat-shield-name
-  description: evolutionmenu-combat-shield-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: organic_shield }
-  productAction: ActionToggleOrganicShield
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuCombatShriekDissonant
-  name: evolutionmenu-combat-shriek-dissonant-name
-  description: evolutionmenu-combat-shriek-dissonant-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: shriek_dissonant }
-  productAction: ActionShriekDissonant
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuCombatShriekResonant
-  name: evolutionmenu-combat-shriek-resonant-name
-  description: evolutionmenu-combat-shriek-resonant-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: shriek_resonant }
-  productAction: ActionShriekResonant
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuCombatMuscles
-  name: evolutionmenu-combat-strainedmuscles-name
-  description: evolutionmenu-combat-strainedmuscles-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: strained_muscles }
-  productAction: ActionToggleStrainedMuscles
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilityCombat
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-#- type: listing
-#  id: EvolutionMenuCombatSpiders
-#  name: evolutionmenu-combat-spiders-name
-#  description: evolutionmenu-combat-spiders-desc
-#  icon: { sprite: Changeling/changeling_abilities.rsi, state: spiders_spawn }
-#  productAction: ActionSpawnChangelingSpider
-#  cost:
-#    EvolutionPoint: 6
-#  categories:
-#  - ChangelingAbilityCombat
-#  consitions:
-#  - !type:ListingLimitedStockCondition
-#    stock: 1
-
-# sting
-
-- type: listing
-  id: EvolutionMenuStingBlind
-  name: evolutionmenu-sting-blind-name
-  description: evolutionmenu-sting-blind-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: sting_blind }
-  productAction: ActionStingBlind
-  cost:
-    EvolutionPoint: 3
-  categories:
-  - ChangelingAbilitySting
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuStingCryo
-  name: evolutionmenu-sting-cryo-name
-  description: evolutionmenu-sting-cryo-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: sting_cryo }
-  productAction: ActionStingCryo
-  cost:
-    EvolutionPoint: 5
-  categories:
-  - ChangelingAbilitySting
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuStingLethargic
-  name: evolutionmenu-sting-lethargic-name
-  description: evolutionmenu-sting-lethargic-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: sting_lethargic }
-  productAction: ActionStingLethargic
-  cost:
-    EvolutionPoint: 5
-  categories:
-  - ChangelingAbilitySting
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuStingMute
-  name: evolutionmenu-sting-mute-name
-  description: evolutionmenu-sting-mute-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: sting_mute }
-  productAction: ActionStingMute
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilitySting
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuStingFakeArmblade
-  name: evolutionmenu-sting-armblade-name
-  description: evolutionmenu-sting-armblade-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: sting_armblade }
-  productAction: ActionStingFakeArmblade
-  cost:
-    EvolutionPoint: 3
-  categories:
-  - ChangelingAbilitySting
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-#- type: listing
-#  id: EvolutionMenuStingTransform
-#  name: evolutionmenu-sting-transform-name
-#  description: evolutionmenu-sting-transform-desc
-#  icon: { sprite: Changeling/changeling_abilities.rsi, state: sting_transform }
-#  productAction: ActionStingTransform
-#  cost:
-#    EvolutionPoint: 6
-#  categories:
-#  - ChangelingAbilitySting
-#  conditions:
-#  - !type:ListingLimitedStockCondition
-#    stock: 1
-
-# utility
-
-- type: listing
-  id: EvolutionMenuUtilityPanacea
-  name: evolutionmenu-utility-panacea-name
-  description: evolutionmenu-utility-panacea-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: anatomic_panacea }
-  productAction: ActionAnatomicPanacea
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityEyesight
-  name: evolutionmenu-utility-eyesight-name
-  description: evolutionmenu-utility-eyesight-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: augmented_eyesight }
-  productAction: ActionAugmentedEyesight
-  cost:
-    EvolutionPoint: 2
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityBiodegrade
-  name: evolutionmenu-utility-biodegrade-name
-  description: evolutionmenu-utility-biodegrade-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: biodegrade }
-  productAction: ActionBiodegrade
-  cost:
-    EvolutionPoint: 3
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityChameleon
-  name: evolutionmenu-utility-chameleon-name
-  description: evolutionmenu-utility-chameleon-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: chameleon_skin }
-  productAction: ActionChameleonSkin
-  cost:
-    EvolutionPoint: 5
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityOverdose
-  name: evolutionmenu-utility-stims-name
-  description: evolutionmenu-utility-stims-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: epinephrine_overdose }
-  productAction: ActionEphedrineOverdose
-  cost:
-    EvolutionPoint: 4
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityFleshmend
-  name: evolutionmenu-utility-fleshmend-name
-  description: evolutionmenu-utility-fleshmend-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: fleshmend }
-  productAction: ActionFleshmend
-  cost:
-    EvolutionPoint: 5
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-#- type: listing
-#  id: EvolutionMenuUtilityLastResort
-#  name: evolutionmenu-utility-lastresort-name
-#  description: evolutionmenu-utility-lastresort-desc
-#  icon: { sprite: Changeling/changeling_abilities.rsi, state: last_resort }
-#  productAction: ActionLastResort
-#  cost:
-#    EvolutionPoint: 2
-#  categories:
-#  - ChangelingAbilityUtility
-#  conditions:
-#  - !type:ListingLimitedStockCondition
-#    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityLesserForm
-  name: evolutionmenu-utility-lesserform-name
-  description: evolutionmenu-utility-lesserform-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: lesser_form }
-  productAction: ActionToggleLesserForm
-  cost:
-    EvolutionPoint: 1
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilitySpacesuit
-  name: evolutionmenu-utility-spacesuit-name
-  description: evolutionmenu-utility-spacesuit-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: space_adaptation }
-  productAction: ActionToggleSpacesuit
-  cost:
-    EvolutionPoint: 3
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1
-
-- type: listing
-  id: EvolutionMenuUtilityHivemindAccess
-  name: evolutionmenu-utility-hivemindaccess-name
-  description: evolutionmenu-utility-hivemindaccess-desc
-  icon: { sprite: Changeling/changeling_abilities.rsi, state: hivemind_access }
-  productAction: ActionHivemindAccess
-  cost:
-    EvolutionPoint: 1
-  categories:
-  - ChangelingAbilityUtility
-  conditions:
-  - !type:ListingLimitedStockCondition
-    stock: 1

Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml

@@ -250,24 +250,6 @@
     energyConsumption: 50000
     disableDuration: 10
 
-#Sunrise-start #PR Wiz #31782
-- type: entity
-  parent: BaseSubdermalImplant
-  id: SmokeScreenImplant
-  name: smoke screen implant
-  description: This implant creates a cloud of smoke when activated.
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: SubdermalImplant
-    implantAction: ActionActivateSmokeGrenadeImplant
-  - type: TriggerOnActivateImplant
-  - type: SmokeOnTrigger
-    duration: 20
-    spreadAmount: 30
-  - type: EmitSoundOnTrigger
-    sound: /Audio/Items/smoke_grenade_smoke.ogg
-#Sunrise-end
-
 - type: entity
   parent: BaseSubdermalImplant
   id: ScramImplant

Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -262,7 +262,7 @@
         whitelistFailPopup: gun-magazine-whitelist-fail
       gun_chamber:
         name: Chamber
-        startingItem: CartridgeRifle
+        startingItem: CartridgeRifleSP
         priority: 1
         whitelist:
           tags:

Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml

@@ -191,7 +191,6 @@
       map: [ "enum.FaxMachineVisuals.VisualState" ]
     - state: scanner
       shader: unshaded
-    verbImage: null
   - type: Tag
     tags:
     - HighRiskItem

Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

@@ -917,14 +917,14 @@
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: AccessReader
     access: [["Janitor"]]
-  - type: Paintable
-    group: null
     # Sunrise-start
     alertAccesses:
       red: RedAlertAccesses
       blue: BlueAlertAccessesHOS
       gamma: GammaAlertAccesses
     # Sunrise-end
+  - type: Paintable
+    group: null
 
 - type: entity
   parent: CrateBaseWeldable

Resources/Prototypes/GameRules/roundstart.yml

@@ -21,7 +21,7 @@
   - type: SubGamemodes
     rules:
     - id: Thief
-      prob: 0.3
+      prob: 0.5
     - id: Vampire
       prob: 0.3
     - id: SubWizard
@@ -34,7 +34,7 @@
   - type: SubGamemodes
     rules:
     - id: Thief
-      prob: 0.3
+      prob: 0.5
     - id: Vampire
       prob: 0.3
 
@@ -123,7 +123,7 @@
   id: Nukeops
   components:
   - type: GameRule
-    minPlayers: 50 # НЕ ТРОГАТЬ БЕЗ МОЕГО РАЗРЕШЕНИЯ!!! SplikZerys
+    minPlayers: 50
   - type: LoadMapRule
     mapPath: /Maps/_Sunrise/Nonstations/nukieplanet.yml
   - type: AntagSelection
@@ -178,8 +178,8 @@
     - prefRoles: [ Nukeops ]
       fallbackRoles: [ NukeopsCommander, NukeopsMedic ]
       spawnerPrototype: SpawnPointNukeopsOperative
-      max: 4
-      playerRatio: 15
+      max: 3
+      playerRatio: 10
       startingGear: SyndicateOperativeGearFull
       roleLoadout:
       - RoleSurvivalNukie
@@ -212,7 +212,7 @@
   - type: AntagRandomObjectives
     sets:
     - groups: TraitorObjectiveGroups
-    maxDifficulty: 7
+    maxDifficulty: 5
   - type: AntagSelection
     agentName: traitor-round-end-agent-name
 
@@ -221,7 +221,7 @@
   id: Traitor
   components:
   - type: GameRule
-    minPlayers: 50 # НЕ ТРОГАТЬ БЕЗ МОЕГО РАЗРЕШЕНИЯ!!! SplikZerys
+    minPlayers: 5
     delay:
       min: 600 # Sunrise-Edit
       max: 900 # Sunrise-Edit
@@ -230,7 +230,7 @@
     definitions:
     - prefRoles: [ Traitor ]
       max: 8
-      playerRatio: 15 # Sunrise-Edit
+      playerRatio: 10
       pickCommandStaff: true # Sunrise-Edit
       maxCommandStaff: 1 # Sunrise-Edit
       blacklist:
@@ -289,7 +289,7 @@
   parent: BaseGameRule
   components:
   - type: GameRule
-    minPlayers: 50 # НЕ ТРОГАТЬ БЕЗ МОЕГО РАЗРЕШЕНИЯ!!! SplikZerys
+    minPlayers: 15
     # Sunrise-Start
     delay:
       min: 900
@@ -359,7 +359,7 @@
   id: Wizard
   components:
   - type: GameRule
-    minPlayers: 50 # НЕ ТРОГАТЬ БЕЗ МОЕГО РАЗРЕШЕНИЯ!!! SplikZerys
+    minPlayers: 10
   - type: AntagSelection
     agentName: wizard-round-end-name
     selectionTime: PrePlayerSpawn
@@ -400,7 +400,7 @@
   parent: BaseGameRule
   components:
   - type: GameRule
-    minPlayers: 50 # НЕ ТРОГАТЬ БЕЗ МОЕГО РАЗРЕШЕНИЯ!!! SplikZerys
+    minPlayers: 20
     delay:
       min: 600
       max: 900
@@ -479,10 +479,10 @@
   components:
   - type: BasicStationEventScheduler
     # Sunrise-Start
-    minimumTimeUntilFirstEvent: 480 # 8 mins
+    minimumTimeUntilFirstEvent: 600 # 10 mins
     minMaxEventTiming:
-      min: 360 # 6 mins
-      max: 720 # 12 mins
+      min: 600 # 10 mins
+      max: 900 # 15 mins
     # Sunrise-End
     scheduledGameRules: !type:NestedSelector
       tableId: BasicGameRulesTable
@@ -529,17 +529,15 @@
   - type: RoundstartStationVariationRule
     rules:
     - id: BasicPoweredLightVariationPass
-    # Sunrise-Edit
-    #- id: BasicTrashVariationPass
+    - id: BasicTrashVariationPass
     - id: SolidWallRustingVariationPass
     - id: ReinforcedWallRustingVariationPass
-    # Sunrise-Edit
-    #- id: BasicPuddleMessVariationPass
-    #  prob: 0.99
-    #  orGroup: puddleMess
-    #- id: BloodbathPuddleMessVariationPass
-    #  prob: 0.01
-    #  orGroup: puddleMess
+    - id: BasicPuddleMessVariationPass
+      prob: 0.99
+      orGroup: puddleMess
+    - id: BloodbathPuddleMessVariationPass
+      prob: 0.01
+      orGroup: puddleMess
     - id: SmugglerStashVariationPass
       prob: 0.90
     - id: SolarPanelDamageVariationPass

Resources/Prototypes/Objectives/changeling.yml

@@ -0,0 +1,23 @@
+- type: entity
+  abstract: true
+  parent: BaseObjective
+  id: BaseChangelingObjective
+  components:
+  - type: Objective
+    issuer: objective-issuer-changeling
+    difficulty: 1
+  - type: RoleRequirement
+    roles:
+    - ChangelingRole
+
+- type: entity
+  parent: [BaseChangelingObjective, BaseSurviveObjective]
+  id: ChangelingSurviveObjective
+  name: Survive.
+  description: We must stay alive at all cost.
+  components:
+  - type: Objective
+    difficulty: 1
+    icon:
+      sprite: Mobs/Species/Human/organs.rsi
+      state: heart-on

Resources/Prototypes/_Starlight/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -110,8 +110,6 @@
       id: blinking
       interpolate: Nearest
       maxDuration: 1.0
-      minValue: 0.1
-      maxValue: 2.0
       isLooped: true
   - type: ToggleableLightVisuals
     spriteLayer: light

Resources/Prototypes/_Starlight/Entities/Structures/Specific/supermatter.yml

@@ -30,8 +30,9 @@
   - type: Pullable
   - type: Sprite
     sprite: _Starlight/Objects/Specific/supermatter.rsi
-    state: supermatter
-    shader: unshaded
+    layers:
+    - state: supermatter
+      shader: unshaded
   - type: Icon
     sprite: _Starlight/Objects/Specific/supermatter.rsi
     state: supermatter
@@ -88,7 +89,7 @@
 - type: entity
   id: Cascad2
   parent: Cascad1
-  components: 
+  components:
     - type: Sprite
       layers:
         - state: cascade_2
@@ -99,7 +100,7 @@
 - type: entity
   id: Cascad3
   parent: Cascad1
-  components: 
+  components:
     - type: Sprite
       layers:
         - state: cascade_3
@@ -110,7 +111,7 @@
 - type: entity
   id: Cascad4
   parent: Cascad1
-  components: 
+  components:
     - type: Sprite
       layers:
         - state: cascade_4
@@ -121,7 +122,7 @@
 - type: entity
   id: Cascad5
   parent: Cascad1
-  components: 
+  components:
     - type: Sprite
       layers:
         - state: cascade_5
@@ -132,10 +133,10 @@
 - type: entity
   id: Cascad6
   parent: Cascad1
-  components: 
+  components:
     - type: Sprite
       layers:
         - state: cascade_6
     - type: Icon
       sprite: _Starlight/Objects/Specific/supermatter_cascade.rsi
-      state: cascade_6
+      state: cascade_6

Resources/Prototypes/_Sunrise/BloodCult/ai_faction.yml

@@ -8,7 +8,6 @@
   - Thief
   - Zombie
   - Revolutionary
-  - Changeling
   - Vampire
   - Xeno
   - Flesh

Resources/Prototypes/_Sunrise/Catalog/Fills/Boxes/syndicate.yml

@@ -53,8 +53,8 @@
     - 0,0,2,3
   - type: StorageFill
     contents:
-    - id: MagazineCaselessRifle10x24
-    - id: MagazineCaselessRifle10x24
+    - id: MagazinePistolSubMachineGunSIAR52
+    - id: MagazinePistolSubMachineGunSIAR52
     - id: MagazinePistolSubMachineGunSIAR52
     - id: MagazinePistolSubMachineGunSIAR52
     - id: MagazinePistolSubMachineGunSIAR52

Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/ussp.yml

@@ -99,10 +99,8 @@
       - id: WrappedMosin
         amount: 4
   - type: EntityStorageVisuals
-    stateBase: base
     stateDoorOpen: open
     stateDoorClosed: closed
-    stateWelded: welded
   - type: EntityStorage
     isWeldable: true
   - type: UserInterface

Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml

@@ -169,8 +169,6 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600
@@ -228,8 +226,6 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600
@@ -287,8 +283,6 @@
         id: blinking
         interpolate: Nearest
         maxDuration: 1.0
-        minValue: 0.1
-        maxValue: 2.0
         isLooped: true
   - type: Battery
     maxCharge: 600

Resources/Prototypes/_Sunrise/Entities/Effects/abductor_glands.yml

@@ -17,10 +17,8 @@
   parent: GlandEffectBase
   components:
   - type: EmitSoundOnTrigger
-    removeOnTrigger: true
     sound:
       path: /Audio/Effects/Grenades/Supermatter/supermatter_start.ogg
-      volume: 5
   - type: AmbientSound
     enabled: true
     volume: -5

Resources/Prototypes/_Sunrise/Entities/Effects/explosion.yml

@@ -4,8 +4,9 @@
   - type: Sprite
     drawdepth: Effects
     sprite: _Sunrise/Effects/explosion_smoke.rsi
-    state: smoke
-    shader: unshaded
+    layers:
+    - state: smoke
+      shader: unshaded
   - type: ExplosionSmokeEffect
   - type: TimedDespawn
     lifetime: 5

Resources/Prototypes/_Sunrise/Entities/Objects/Devices/pda.yml

@@ -113,9 +113,6 @@
   - type: Icon
     sprite: _Sunrise/Objects/Devices/pda.rsi
     state: pda-patologoanatom
-  - type: GuideHelp
-    guides:
-    - Medical Doctor
 
 - type: entity
   parent: BasePDA

Resources/Prototypes/_Sunrise/Entities/Objects/Fun/prunks.yml

@@ -17,7 +17,6 @@
       path: /Audio/Effects/Grenades/Supermatter/smbeep.ogg
       params:
         volume: -5
-    beepInterval: 2 # 2 beeps total (at 0 and 2)
   - type: TwoStageTrigger
     triggerDelay: 3
     components:

Resources/Prototypes/_Sunrise/Entities/Objects/Misc/subdermal_implants.yml

@@ -0,0 +1,31 @@
+- type: entity
+  parent: BaseSubdermalImplant
+  id: SmokeScreenImplant
+  name: smoke screen implant
+  description: This implant creates a cloud of smoke when activated.
+  components:
+  - type: SubdermalImplant
+    implantAction: ActionActivateSmokeGrenadeImplant
+  - type: TriggerOnActivateImplant
+  - type: SmokeOnTrigger
+    duration: 20
+    spreadAmount: 30
+  - type: EmitSoundOnTrigger
+    sound: /Audio/Items/smoke_grenade_smoke.ogg
+
+- type: entity
+  parent: BaseSubdermalImplant
+  id: CreepyLaughImplant
+  name: creepy laugh implant
+  description: This implant lets the user laugh like borg anywhere at any time.
+  components:
+  - type: SubdermalImplant
+    implantAction: ActionActivateBorgLaughImplant
+  - type: TriggerOnActivateImplant
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Voice/Silicon/syndieborg_laugh.ogg
+  - type: Tag
+    tags:
+    - CreepyLaugh
+    - SubdermalImplant

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -185,9 +185,11 @@
   - type: FlashOnTrigger
     range: 7
   - type: SpawnOnTrigger
+    keysIn:
+    - timer
     proto: GrenadeFlashEffect
+    predicted: true
   - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: DeleteOnTrigger
 
 - type: entity
@@ -542,7 +544,6 @@
   - type: SpawnOnTrigger
     proto: GrenadeFlashEffect
   - type: ActiveTimerTrigger
-    timeRemaining: 0.3
   - type: DeleteOnTrigger
 
 # This is supposed to spawn shrapnel and stuff so uhh... TODO?

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml

@@ -248,7 +248,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineCaselessRifleShort
+        startingItem: MagazineCaselessRifle
         insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_reload.ogg
         ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_unload.ogg
         priority: 2

Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -592,7 +592,6 @@
           - MagazinePistol
           - MagazinePistolHighCapacity
           - MagazinePistolCaselessRifle
-          - MagazineMagnumSubMachineGun
       gun_chamber:
         name: Chamber
         startingItem: CartridgePistolSP
@@ -648,7 +647,7 @@
     slots:
       gun_magazine:
         name: Magazine
-        startingItem: MagazineCaselessRifle10x24
+        startingItem: MagazineCaselessRifle
         insertSound: /Audio/Weapons/Guns/MagIn/lmg_magin.ogg
         ejectSound: /Audio/Weapons/Guns/MagOut/lmg_magout.ogg
         priority: 2

Resources/Prototypes/_Sunrise/FleshCult/ai_factions.yml

@@ -12,7 +12,6 @@
     - Revolutionary
     - PetsNT
     - Vampire
-    - Changeling
     - Thief
     - BloodCult
 

Resources/Prototypes/_Sunrise/Guidebook/rulesSunrise.yml

@@ -181,42 +181,42 @@
   text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER4.xml"
 
 - type: guideEntry
-  id: PER3.1
+  id: PER3_1
   name: guide-entry-sr-rule-excep-3-1
   ruleEntry: true
   priority: 5
   text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.1.xml"
 
 - type: guideEntry
-  id: PER3.2
+  id: PER3_2
   name: guide-entry-sr-rule-excep-3-2
   ruleEntry: true
   priority: 6
   text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.2.xml"
 
 - type: guideEntry
-  id: PER3.3
+  id: PER3_3
   name: guide-entry-sr-rule-excep-3-3
   ruleEntry: true
   priority: 6
   text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.3.xml"
 
 - type: guideEntry
-  id: PER3.4
+  id: PER3_4
   name: guide-entry-sr-rule-excep-3-4
   ruleEntry: true
   priority: 6
   text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.4.xml"
 
 - type: guideEntry
-  id: PER3.6
+  id: PER3_6
   name: guide-entry-sr-rule-excep-3-6
   ruleEntry: true
   priority: 7
   text: "/ServerInfo/Guidebook/ServerRules/RulesSR/PrecedentExceptionRules/PER3.6.xml"
 
 - type: guideEntry
-  id: PER3.7
+  id: PER3_7
   name: guide-entry-sr-rule-excep-3-7
   ruleEntry: true
   priority: 7

Resources/Prototypes/_Sunrise/Lobby/parallaxes.yml

@@ -61,3 +61,28 @@
 - type: lobbyParallax
   id: Box
   parallax: BoxStation
+
+- type: lobbyParallax
+  id: AsteroidParallax
+  parallax: AsteroidParallax
+
+- type: lobbyParallax
+  id: Earth
+  parallax: Earth
+
+- type: lobbyParallax
+  id: MirStation
+  parallax: MirStation
+
+- type: lobbyParallax
+  id: Purple
+  parallax: Purple
+
+- type: lobbyParallax
+  id: PilgrimAiur
+  parallax: PilgrimAiur
+
+- type: lobbyParallax
+  id: SillyIsland
+  parallax: SillyIsland
+

Resources/Prototypes/_Sunrise/Parallaxes/NES/asteroids.yml

@@ -36,5 +36,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/NES/earth.yml

@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/NES/mirstation.yml

@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/NES/purple.yml

@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/angle.yml

@@ -0,0 +1,18 @@
+- type: parallax
+  id: AngleStation
+  layers:
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
+      slowness: 0.95
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
+      slowness: 0.94
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_Sunrise/Parallaxes/Angle.png"
+      slowness: 0.93
+      scale: 1,1

Resources/Prototypes/_Sunrise/Parallaxes/avrite.yml

@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/box.yml

@@ -35,5 +35,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/delta.yml

@@ -37,5 +37,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
-  layersLQUseHQ: false
+      slowness: 0.875
+  layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/lighthouse.yml

@@ -0,0 +1,9 @@
+- type: parallax
+  id: LighthouseStation
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_Sunrise/Parallaxes/Lighthouse.png"
+      slowness: 0.94
+      scale: 1,1
+      scrolling: "-0.006, -0.004"

Resources/Prototypes/_Sunrise/Parallaxes/outpost.yml

@@ -48,5 +48,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/pebble.yml

@@ -0,0 +1,18 @@
+- type: parallax
+  id: PebbleStation
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_Sunrise/Parallaxes/Pebble.png"
+      slowness: 0.98
+      scale: 0.5,0.5
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars_dim"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
+      slowness: 0.97
+    - texture:
+        !type:GeneratedParallaxTextureSource
+        id: "hq_wizard_stars"
+        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
+      slowness: 0.96

Resources/Prototypes/_Sunrise/Parallaxes/shipwrecked.yml

@@ -0,0 +1,9 @@
+- type: parallax
+  id: ShipwreckedTurbulence
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_Sunrise/Parallaxes/Vaitarna.png"
+      slowness: 0.93
+      scale: 1,1
+      scrolling: "-0.006, -0.066"

Resources/Prototypes/_Sunrise/Parallaxes/silly_island.yml

@@ -24,5 +24,5 @@
         !type:GeneratedParallaxTextureSource
         id: ""
         configPath: "/Prototypes/Parallaxes/parallax_config.toml"
-        slowness: 0.875
+      slowness: 0.875
   layersLQUseHQ: false

Resources/Prototypes/_Sunrise/Parallaxes/space.yml

@@ -1,67 +0,0 @@
-- type: parallax
-  id: AngleStation
-  layers:
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
-      slowness: 0.95
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
-      slowness: 0.94
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/_Sunrise/Parallaxes/Angle.png"
-      slowness: 0.93
-      scale: 1,1
-
-- type: parallax
-  id: LighthouseStation
-  layers:
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/_Sunrise/Parallaxes/Lighthouse.png"
-      slowness: 0.94
-      scale: 1,1
-      scrolling: "-0.006, -0.004"
-
-- type: parallax
-  id: PebbleStation
-  layers:
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/_Sunrise/Parallaxes/Pebble.png"
-      slowness: 0.98
-      scale: 0.5,0.5
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars_dim"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars_dim.toml"
-      slowness: 0.97
-    - texture:
-        !type:GeneratedParallaxTextureSource
-        id: "hq_wizard_stars"
-        configPath: "/Prototypes/Parallaxes/parallax_config_stars.toml"
-      slowness: 0.96
-
-- type: parallax
-  id: TortugaStation
-  layers:
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/_Sunrise/Parallaxes/Tortuga.png"
-      slowness: 0.94
-      scale: 0.5,0.5
-      scrolling: "-0.004,  0.002"
-
-- type: parallax
-  id: ShipwreckedTurbulence
-  layers:
-    - texture:
-        !type:ImageParallaxTextureSource
-        path: "/Textures/_Sunrise/Parallaxes/Vaitarna.png"
-      slowness: 0.93
-      scale: 1,1
-      scrolling: "-0.006, -0.066"

Resources/Prototypes/_Sunrise/Parallaxes/tortuga.yml

@@ -0,0 +1,9 @@
+- type: parallax
+  id: TortugaStation
+  layers:
+    - texture:
+        !type:ImageParallaxTextureSource
+        path: "/Textures/_Sunrise/Parallaxes/Tortuga.png"
+      slowness: 0.94
+      scale: 0.5,0.5
+      scrolling: "-0.004,  0.002"

Resources/Prototypes/_Sunrise/Research/arsenal.yml

@@ -159,8 +159,8 @@
   - Security
 
 - type: technology
-  id: Advanced Laser Manipulation
-  name: research-technology-advance-laser #
+  id: AdvancedLaserManipulation
+  name: research-technology-advance-laser
   icon:
     sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_carbine.rsi
     state: icon

Resources/Prototypes/_Sunrise/Structures/Computers/atm.yml

@@ -96,8 +96,6 @@
   - type: Vocalizer
   - type: DatasetVocalizer
     dataset: ATMAds
-    minimumWait: 120
-    maximumWait: 240
   - type: SpeakOnUIClosed
     pack: BlockGameGoodbyes
   - type: Damageable

Resources/Prototypes/_Sunrise/name_identifier_groups.yml

@@ -1,39 +1,39 @@
 - type: nameIdentifierGroup
   id: Boris
-  prefix: БОРИС
+  format: name-identifier-format-boris
   minValue: 10
   maxValue: 99
 
 - type: nameIdentifierGroup
   id: Sofia
-  prefix: СОФИЯ
+  format: name-identifier-format-sofia
   minValue: 10
   maxValue: 99
 
 - type: nameIdentifierGroup
   id: SyndieSecRobot
-  prefix: GRX-ATK
+  format: name-identifier-format-syndie-sec-robot
   fullName: true
   minValue: 10000
   maxValue: 99999
 
 - type: nameIdentifierGroup
   id: SyndieMedRobot
-  prefix: GRX-MED
+  format: name-identifier-format-syndie-med-robot
   fullName: true
   minValue: 10000
   maxValue: 99999
 
 - type: nameIdentifierGroup
   id: SyndieReaperRobot
-  prefix: Жнец
+  format: name-identifier-format-syndie-reaper-robot
   minValue: 10000
   maxValue: 99999
 
 - type: nameIdentifierGroup
   id: InferiorVulpkanin
-  prefix: НВ
+  format: name-identifier-format-inferior-vulpkanin
 
 - type: nameIdentifierGroup
   id: Felinid
-  prefix: ФЕ
+  format: name-identifier-format-felinid

Resources/Prototypes/_Sunrise/secret_weights.yml

@@ -1,53 +1,51 @@
-# БЕЗ МОЕГО ОДОБРЕНИЯ НЕ ТРОГАТЬ!!! SplikZerys
-
 - type: weightedRandom
   id: SunriseSecret
   weights:
-    Traitor: 0.2
+    Traitor: 0.4
     BloodCult: 0.1
     AssaultOps: 0.1
     Revolutionary: 0.1
     Nukeops: 0.1
     Changeling: 0.1
-    FleshCult: 0.1
     Wizard: 0.1
-    Zombie: 0.1
+    #Zombie: 0.1
+    #FleshCult: 0.1
 
 - type: weightedRandom
   id: FishSecret
   weights:
-    Traitor: 0.2
+    Traitor: 0.4
     BloodCult: 0.1
     AssaultOps: 0.1
     Revolutionary: 0.1
     Nukeops: 0.1
     Changeling: 0.1
-    FleshCult: 0.1
     Wizard: 0.1
-    Zombie: 0.1
+    #Zombie: 0.1
+    #FleshCult: 0.1
 
 - type: weightedRandom
   id: LustSpectralSecret
   weights:
-    Traitor: 0.2
+    Traitor: 0.4
     BloodCult: 0.1
     AssaultOps: 0.1
     Revolutionary: 0.1
     Nukeops: 0.1
     Changeling: 0.1
-    FleshCult: 0.1
     Wizard: 0.1
-    Zombie: 0.1
+    #Zombie: 0.1
+    #FleshCult: 0.1
 
 - type: weightedRandom
   id: LustVenusSecret
   weights:
-    Traitor: 0.2
+    Traitor: 0.4
     BloodCult: 0.1
     AssaultOps: 0.1
     Revolutionary: 0.1
     Nukeops: 0.1
     Changeling: 0.1
-    FleshCult: 0.1
     Wizard: 0.1
-    Zombie: 0.1
+    #Zombie: 0.1
+    #FleshCult: 0.1

Resources/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP1PG.xml

@@ -3,5 +3,5 @@
  Проявление действий, которые выходят за рамки физических и психологических возможностей вашего персонажа. Ваш персонаж обычный человек, которому свойственно бояться и испытывать боль, не забывайте об этом. Вы также не должны прятать вещи “на всякий случай” и болтировать двери, будучи главой отдела, если вас до этого не взламывали в этом же раунде.
  Данное правило не распространяется на крупных антагонистов.
 
- [textlink="Прецеденты\исключения" link="PER3.1"]
-</Document>
+ [textlink="Прецеденты\исключения" link="PER3_1"]
+</Document>

Resources/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP2MG.xml

@@ -2,5 +2,5 @@
  # Правило 3.2. - Метагейминг.
  Использование и распространение игровой информации посредством сторонних средств связи. КООП запрещен. В случае, если вы обучаете друга, вы обязаны сообщить об этом в АХ.
 
- [textlink="Прецеденты\исключения" link="PER3.2"]
-</Document>
+ [textlink="Прецеденты\исключения" link="PER3_2"]
+</Document>

Resources/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP3MK.xml

@@ -2,6 +2,6 @@
  # Правило 3.3. - Метазнания.
  Использование знаний, не присущих вашему персонажу по должности. Для полного понимания рамок вашей должности зайдите в раздел “таблица навыков” на нашей вики.
 
- [textlink="Прецеденты\исключения" link="PER3.3"]
+ [textlink="Прецеденты\исключения" link="PER3_3"]
 </Document>
 

Resources/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP4ICinOOC.xml

@@ -2,5 +2,5 @@
  # Правило 3.4. - IC в OOC.
  Злоупотребление ООС и LOOC чатами. Обсуждение или упоминание событий текущего раунда в канале OOC запрещено. Особенно наказуемы сообщения в духе "X меня убил" или "клонируйте меня".
 
- [textlink="Прецеденты\исключения" link="PER3.4"]
-</Document> 
+ [textlink="Прецеденты\исключения" link="PER3_4"]
+</Document>

Resources/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP6SK.xml

@@ -2,5 +2,5 @@
  # Правило 3.6 - Самоубийство.
  Злоупотребление возможностью суицида или его совершение без веских причин. Даже если вас раскрыли и поймали.
 
- [textlink="Прецеденты\исключения" link="PER3.6"]
-</Document>
+ [textlink="Прецеденты\исключения" link="PER3_6"]
+</Document>

Resources/ServerInfo/Guidebook/ServerRules/RulesSR/RolePlayRules/RuleSRRP7ORL.xml

@@ -2,5 +2,5 @@
  # Правило 3.7 - Безграмотность.
  Чистота речи и соблюдение грамматических норм русского языка.
 
- [textlink="Прецеденты\исключения" link="PER3.7"]
-</Document>
+ [textlink="Прецеденты\исключения" link="PER3_7"]
+</Document>

Resources/Textures/_Sunrise/Parallaxes/Angle.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/AvriteParallaxBG.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/AvriteParallaxNeb.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/BoxParallax.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/DeltaParallaxBG.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/DeltaParallaxNeb.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/Lighthouse.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/Asteroids.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/BlueParallax.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/GreenParallax.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/MirStationParallaxBG.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/OrbitEarth.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/PixelGreenParallax.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/PixelPurpleParallax.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/PurpleParallax.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/planet2.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/planet3.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/NES/planet4.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/Pebble.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/PilgrimAiurWaterTile.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/SillyOcean.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/SillyOcean_Overlay.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/SillyOcean_Overlay2.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/Tortuga.png.yml

@@ -0,0 +1 @@
+preload: false

Resources/Textures/_Sunrise/Parallaxes/Vaitarna.png.yml

@@ -0,0 +1 @@
+preload: false