Merge remote-tracking branch 'upstream/master'

Content.Client/Drowsiness/DrowsinessOverlay.cs

@@ -0,0 +1,79 @@
+using Content.Shared.Drowsiness;
+using Content.Shared.StatusEffect;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Enums;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessOverlay : Overlay
+{
+    [Dependency] private readonly IEntityManager _entityManager = default!;
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+    [Dependency] private readonly IPlayerManager _playerManager = default!;
+    [Dependency] private readonly IEntitySystemManager _sysMan = default!;
+    [Dependency] private readonly IGameTiming _timing = default!;
+
+    public override OverlaySpace Space => OverlaySpace.WorldSpace;
+    public override bool RequestScreenTexture => true;
+    private readonly ShaderInstance _drowsinessShader;
+
+    public float CurrentPower = 0.0f;
+
+    private const float PowerDivisor = 250.0f;
+    private float _visualScale = 0;
+
+    public DrowsinessOverlay()
+    {
+        IoCManager.InjectDependencies(this);
+        _drowsinessShader = _prototypeManager.Index<ShaderPrototype>("Drowsiness").InstanceUnique();
+    }
+
+    protected override void FrameUpdate(FrameEventArgs args)
+    {
+        var playerEntity = _playerManager.LocalEntity;
+
+        if (playerEntity == null)
+            return;
+
+        if (!_entityManager.HasComponent<DrowsinessComponent>(playerEntity)
+            || !_entityManager.TryGetComponent<StatusEffectsComponent>(playerEntity, out var status))
+            return;
+
+        var statusSys = _sysMan.GetEntitySystem<StatusEffectsSystem>();
+        if (!statusSys.TryGetTime(playerEntity.Value, SharedDrowsinessSystem.DrowsinessKey, out var time, status))
+            return;
+
+        var curTime = _timing.CurTime;
+        var timeLeft = (float) (time.Value.Item2 - curTime).TotalSeconds;
+
+        CurrentPower += 8f * (0.5f * timeLeft - CurrentPower) * args.DeltaSeconds / (timeLeft + 1);
+    }
+
+    protected override bool BeforeDraw(in OverlayDrawArgs args)
+    {
+        if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp))
+            return false;
+
+        if (args.Viewport.Eye != eyeComp.Eye)
+            return false;
+
+        _visualScale = Math.Clamp(CurrentPower / PowerDivisor, 0.0f, 1.0f);
+        return _visualScale > 0;
+    }
+
+    protected override void Draw(in OverlayDrawArgs args)
+    {
+        if (ScreenTexture == null)
+            return;
+
+        var handle = args.WorldHandle;
+        _drowsinessShader.SetParameter("SCREEN_TEXTURE", ScreenTexture);
+        _drowsinessShader.SetParameter("VisualScale", _visualScale);
+        handle.UseShader(_drowsinessShader);
+        handle.DrawRect(args.WorldBounds, Color.White);
+        handle.UseShader(null);
+    }
+}

Content.Client/Drowsiness/DrowsinessSystem.cs

@@ -0,0 +1,53 @@
+using Content.Shared.Drowsiness;
+using Robust.Client.Graphics;
+using Robust.Client.Player;
+using Robust.Shared.Player;
+
+namespace Content.Client.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly IOverlayManager _overlayMan = default!;
+
+    private DrowsinessOverlay _overlay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DrowsinessComponent, ComponentInit>(OnDrowsinessInit);
+        SubscribeLocalEvent<DrowsinessComponent, ComponentShutdown>(OnDrowsinessShutdown);
+
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerAttachedEvent>(OnPlayerAttached);
+        SubscribeLocalEvent<DrowsinessComponent, LocalPlayerDetachedEvent>(OnPlayerDetached);
+
+        _overlay = new();
+    }
+
+    private void OnPlayerAttached(EntityUid uid, DrowsinessComponent component, LocalPlayerAttachedEvent args)
+    {
+        _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnPlayerDetached(EntityUid uid, DrowsinessComponent component, LocalPlayerDetachedEvent args)
+    {
+        _overlay.CurrentPower = 0;
+        _overlayMan.RemoveOverlay(_overlay);
+    }
+
+    private void OnDrowsinessInit(EntityUid uid, DrowsinessComponent component, ComponentInit args)
+    {
+        if (_player.LocalEntity == uid)
+            _overlayMan.AddOverlay(_overlay);
+    }
+
+    private void OnDrowsinessShutdown(EntityUid uid, DrowsinessComponent component, ComponentShutdown args)
+    {
+        if (_player.LocalEntity == uid)
+        {
+            _overlay.CurrentPower = 0;
+            _overlayMan.RemoveOverlay(_overlay);
+        }
+    }
+}

Content.Client/_White/Cult/HellComponent.cs

@@ -0,0 +1,7 @@
+using Content.Shared._White.Cult.Pentagram;
+using Robust.Shared.GameStates;
+
+namespace Content.Client._White.Cult;
+
+[NetworkedComponent, RegisterComponent]
+public sealed partial class HellComponent : SharedHellComponent;

Content.Client/_White/Cult/HellSystem.cs

@@ -0,0 +1,50 @@
+using System.Numerics;
+using Robust.Client.GameObjects;
+using Robust.Shared.Utility;
+
+namespace Content.Client._White.Cult;
+
+public sealed class HellSystem : EntitySystem
+{
+    private const string Rsi = "White/Cult/hell.rsi";
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<HellComponent, ComponentStartup>(PentagramAdded);
+        SubscribeLocalEvent<HellComponent, ComponentShutdown>(PentagramRemoved);
+    }
+
+    private void PentagramAdded(EntityUid uid, HellComponent component, ComponentStartup args)
+    {
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
+            return;
+
+        if (sprite.LayerMapTryGet(HellKey.Key, out _))
+            return;
+
+        var adj = sprite.Bounds.Height / 2 + 1.0f/32 * 6.0f;
+
+        var layer = sprite.AddLayer(new SpriteSpecifier.Rsi(new ResPath(Rsi), "animated"));
+
+        sprite.LayerMapSet(HellKey.Key, layer);
+        sprite.LayerSetOffset(layer, new Vector2(0.0f, adj));
+        sprite.LayerSetShader(layer, "unshaded");
+    }
+
+    private void PentagramRemoved(EntityUid uid, HellComponent component, ComponentShutdown args)
+    {
+        if (!TryComp<SpriteComponent>(uid, out var sprite))
+            return;
+
+        if (!sprite.LayerMapTryGet(HellKey.Key, out var layer))
+            return;
+
+        sprite.RemoveLayer(layer);
+    }
+
+    private enum HellKey
+    {
+        Key
+    }
+}

Content.Server/Botany/Components/SeedComponent.cs

@@ -15,6 +15,12 @@ namespace Content.Server.Botany.Components
         [DataField("seed")]
         public SeedData? Seed;
 
+        /// <summary>
+        ///     If not null, overrides the plant's initial health. Otherwise, the plant's initial health is set to the Endurance value.
+        /// </summary>
+        [DataField]
+        public float? HealthOverride = null;
+
         /// <summary>
         ///     Name of a base seed prototype that is used if <see cref="Seed"/> is null.
         /// </summary>

Content.Server/Botany/Systems/BotanySystem.Seed.cs

@@ -104,11 +104,12 @@ public sealed partial class BotanySystem : EntitySystem
     /// <summary>
     /// Spawns a new seed packet on the floor at a position, then tries to put it in the user's hands if possible.
     /// </summary>
-    public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user)
+    public EntityUid SpawnSeedPacket(SeedData proto, EntityCoordinates coords, EntityUid user, float? healthOverride = null)
     {
         var seed = Spawn(proto.PacketPrototype, coords);
         var seedComp = EnsureComp<SeedComponent>(seed);
         seedComp.Seed = proto;
+        seedComp.HealthOverride = healthOverride;
 
         var name = Loc.GetString(proto.Name);
         var noun = Loc.GetString(proto.Noun);

Content.Server/Botany/Systems/PlantHolderSystem.cs

@@ -71,6 +71,17 @@ public sealed class PlantHolderSystem : EntitySystem
         }
     }
 
+    private int GetCurrentGrowthStage(Entity<PlantHolderComponent> entity)
+    {
+        var (uid, component) = entity;
+
+        if (component.Seed == null)
+            return 0;
+
+        var result = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
+        return result;
+    }
+
     private void OnExamine(Entity<PlantHolderComponent> entity, ref ExaminedEvent args)
     {
         if (!args.IsInDetailsRange)
@@ -157,7 +168,14 @@ public sealed class PlantHolderSystem : EntitySystem
                 component.Seed = seed;
                 component.Dead = false;
                 component.Age = 1;
-                component.Health = component.Seed.Endurance;
+                if (seeds.HealthOverride != null)
+                {
+                    component.Health = seeds.HealthOverride.Value;
+                }
+                else
+                {
+                    component.Health = component.Seed.Endurance;
+                }
                 component.LastCycle = _gameTiming.CurTime;
 
                 QueueDel(args.Used);
@@ -265,9 +283,25 @@ public sealed class PlantHolderSystem : EntitySystem
                 return;
             }
 
+            if (GetCurrentGrowthStage(entity) <= 1)
+            {
+                _popup.PopupCursor(Loc.GetString("plant-holder-component-early-sample-message"), args.User);
+                return;
+            }
+
             component.Health -= (_random.Next(3, 5) * 10);
+
+            float? healthOverride;
+            if (component.Harvest)
+            {
+                healthOverride = null;
+            }
+            else
+            {
+                healthOverride = component.Health;
+            }
             component.Seed.Unique = false;
-            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User);
+            var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, healthOverride);
             _randomHelper.RandomOffset(seed, 0.25f);
             var displayName = Loc.GetString(component.Seed.DisplayName);
             _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message",
@@ -901,7 +935,7 @@ public sealed class PlantHolderSystem : EntitySystem
             }
             else if (component.Age < component.Seed.Maturation)
             {
-                var growthStage = Math.Max(1, (int) (component.Age * component.Seed.GrowthStages / component.Seed.Maturation));
+                var growthStage = GetCurrentGrowthStage((uid, component));
 
                 _appearance.SetData(uid, PlantHolderVisuals.PlantRsi, component.Seed.PlantRsi.ToString(), app);
                 _appearance.SetData(uid, PlantHolderVisuals.PlantState, $"stage-{growthStage}", app);

Content.Server/Chemistry/EntitySystems/TransformableContainerSystem.cs

@@ -58,7 +58,7 @@ public sealed class TransformableContainerSystem : EntitySystem
             && _prototypeManager.TryIndex(reagentId.Value.Prototype, out ReagentPrototype? proto))
         {
             var metadata = MetaData(entity.Owner);
-            var val = Loc.GetString("transformable-container-component-glass", ("name", proto.LocalizedName));
+            var val = Loc.GetString("transformable-container-component-glass", ("reagent", proto.LocalizedName));
             _metadataSystem.SetEntityName(entity.Owner, val, metadata);
             _metadataSystem.SetEntityDescription(entity.Owner, proto.LocalizedDescription, metadata);
             entity.Comp.CurrentReagent = proto;

Content.Server/Chemistry/ReagentEffectConditions/TotalHunger.cs

@@ -0,0 +1,35 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Chemistry.ReagentEffectConditions
+{
+    public sealed partial class Hunger : ReagentEffectCondition
+    {
+        [DataField]
+        public float Max = float.PositiveInfinity;
+
+        [DataField]
+        public float Min = 0;
+
+        public override bool Condition(ReagentEffectArgs args)
+        {
+            if (args.EntityManager.TryGetComponent(args.SolutionEntity, out HungerComponent? hunger))
+            {
+                var total = hunger.CurrentHunger;
+                if (total > Min && total < Max)
+                    return true;
+            }
+
+            return false;
+        }
+
+        public override string GuidebookExplanation(IPrototypeManager prototype)
+        {
+            return Loc.GetString("reagent-effect-condition-guidebook-total-hunger",
+                ("max", float.IsPositiveInfinity(Max) ? (float) int.MaxValue : Max),
+                ("min", Min));
+        }
+    }
+}

Content.Server/Drowsiness/DrowsinessSystem.cs

@@ -0,0 +1,49 @@
+using Content.Shared.Drowsiness;
+using Content.Shared.Bed.Sleep;
+using Content.Shared.StatusEffect;
+using Robust.Shared.Random;
+
+namespace Content.Server.Drowsiness;
+
+public sealed class DrowsinessSystem : SharedDrowsinessSystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    private const string SleepKey = "ForcedSleep"; // Same one used by N2O and other sleep chems.
+
+    [Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<DrowsinessComponent, ComponentStartup>(SetupDrowsiness);
+    }
+
+    private void SetupDrowsiness(EntityUid uid, DrowsinessComponent component, ComponentStartup args)
+    {
+        component.NextIncidentTime = _random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y);
+    }
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        var query = EntityQueryEnumerator<DrowsinessComponent>();
+        while (query.MoveNext(out var uid, out var component))
+        {
+            component.NextIncidentTime -= frameTime;
+
+            if (component.NextIncidentTime >= 0)
+                continue;
+
+            // Set the new time.
+            component.NextIncidentTime += _random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y);
+
+            var duration = _random.NextFloat(component.DurationOfIncident.X, component.DurationOfIncident.Y);
+
+            // Make sure the sleep time doesn't cut into the time to next incident.
+            component.NextIncidentTime += duration;
+
+            _statusEffects.TryAddStatusEffect<ForcedSleepingComponent>(uid, SleepKey, TimeSpan.FromSeconds(duration), false);
+        }
+    }
+}

Content.Server/GameTicking/GameTicker.RoundFlow.cs

@@ -453,8 +453,6 @@ namespace Content.Server.GameTicking
 
             _replayRoundPlayerInfo = listOfPlayerInfoFinal;
             _replayRoundText = roundEndText;
-
-            RaiseLocalEvent(new RoundEndedEvent(RoundId, roundDuration)); // WD-EDIT
         }
 
         private async void SendRoundEndDiscordMessage()
@@ -505,7 +503,9 @@ namespace Content.Server.GameTicking
             _sawmill.Info("Restarting round!");
 
             SendServerMessage(Loc.GetString("game-ticker-restart-round"));
-            RaiseLocalEvent(new RealRoundEndedEvent());
+
+            RaiseLocalEvent(new RealRoundEndedEvent()); // WD
+            RaiseLocalEvent(new RoundEndedEvent(RoundId, RoundDuration())); // WD
 
             RoundNumberMetric.Inc();
 

Content.Server/NPC/Components/NPCImprintingOnSpawnBehaviourComponent.cs

@@ -0,0 +1,34 @@
+using Content.Shared.Whitelist;
+using Robust.Shared.Collections;
+
+namespace Content.Server.NPC.Components;
+/// <summary>
+/// A component that makes the entity friendly to nearby creatures it sees on init.
+/// </summary>
+[RegisterComponent]
+public sealed partial class NPCImprintingOnSpawnBehaviourComponent : Component
+{
+    /// <summary>
+    /// filter who can be a friend to this creature
+    /// </summary>
+    [DataField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    /// when a creature appears, it will memorize all creatures in the radius to remember them as friends
+    /// </summary>
+    [DataField]
+    public float SpawnFriendsSearchRadius = 3f;
+
+    /// <summary>
+    /// if there is a FollowCompound in HTN, the target of the following will be selected from random nearby targets when it appears
+    /// </summary>
+    [DataField]
+    public bool Follow = true;
+
+    /// <summary>
+    /// is used to determine who became a friend from this component
+    /// </summary>
+    [DataField]
+    public List<EntityUid> Friends = new();
+}

Content.Server/NPC/Systems/NPCImprintingOnSpawnBehaviourSystem.cs

@@ -0,0 +1,49 @@
+using System.Numerics;
+using Content.Shared.NPC.Components;
+using Content.Shared.NPC.Systems;
+using Robust.Shared.Collections;
+using Robust.Shared.Map;
+using Robust.Shared.Random;
+using NPCImprintingOnSpawnBehaviourComponent = Content.Server.NPC.Components.NPCImprintingOnSpawnBehaviourComponent;
+
+namespace Content.Server.NPC.Systems;
+
+public sealed partial class NPCImprintingOnSpawnBehaviourSystem : SharedNPCImprintingOnSpawnBehaviourSystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly NPCSystem _npc = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<NPCImprintingOnSpawnBehaviourComponent, MapInitEvent>(OnMapInit);
+    }
+
+    private void OnMapInit(Entity<NPCImprintingOnSpawnBehaviourComponent> imprinting, ref MapInitEvent args)
+    {
+        HashSet<EntityUid> friends = new();
+        _lookup.GetEntitiesInRange(imprinting, imprinting.Comp.SpawnFriendsSearchRadius, friends);
+
+        foreach (var friend in friends)
+        {
+            if (imprinting.Comp.Whitelist?.IsValid(friend) != false)
+            {
+                AddImprintingTarget(imprinting, friend, imprinting.Comp);
+            }
+        }
+
+        if (imprinting.Comp.Follow && imprinting.Comp.Friends.Count > 0)
+        {
+            var mommy = _random.Pick(imprinting.Comp.Friends);
+            _npc.SetBlackboard(imprinting, NPCBlackboard.FollowTarget, new EntityCoordinates(mommy, Vector2.Zero));
+        }
+    }
+
+    public void AddImprintingTarget(EntityUid entity, EntityUid friend, NPCImprintingOnSpawnBehaviourComponent component)
+    {
+        component.Friends.Add(friend);
+        var exception = EnsureComp<FactionExceptionComponent>(entity);
+        exception.Ignored.Add(friend);
+    }
+}

Content.Server/NPC/Systems/NPCSystem.cs

@@ -5,6 +5,7 @@ using Content.Shared.CCVar;
 using Content.Shared.Mobs;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.NPC;
+using Content.Shared.NPC.Systems;
 using Robust.Server.GameObjects;
 using Robust.Shared.Configuration;
 using Robust.Shared.Player;

Content.Server/Radiation/Components/RadiationProtectionComponent.cs

@@ -0,0 +1,18 @@
+using Robust.Shared.Prototypes;
+using Content.Shared.Damage.Prototypes;
+
+namespace Content.Server.Radiation.Components;
+
+/// <summary>
+///     Exists for use as a status effect.
+///     Adds the DamageProtectionBuffComponent to the entity and adds the specified DamageModifierSet to its list of modifiers.
+/// </summary>
+[RegisterComponent]
+public sealed partial class RadiationProtectionComponent : Component
+{
+    /// <summary>
+    ///     The radiation damage modifier for entities with this component.
+    /// </summary>
+    [DataField("modifier")]
+    public ProtoId<DamageModifierSetPrototype> RadiationProtectionModifierSetId = "PotassiumIodide";
+}

Content.Server/Radiation/Systems/RadiationProtectionSystem.cs

@@ -0,0 +1,38 @@
+using Content.Server.Radiation.Components;
+using Content.Shared.Damage.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server.Radiation.EntitySystems;
+
+public sealed class RadiationProtectionSystem : EntitySystem
+{
+    [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentInit>(OnInit);
+        SubscribeLocalEvent<RadiationProtectionComponent, ComponentShutdown>(OnShutdown);
+    }
+
+    private void OnInit(EntityUid uid, RadiationProtectionComponent component, ComponentInit args)
+    {
+        if (!_prototypeManager.TryIndex(component.RadiationProtectionModifierSetId, out var modifier))
+            return;
+        var buffComp = EnsureComp<DamageProtectionBuffComponent>(uid);
+        // add the damage modifier if it isn't in the dict yet
+        if (!buffComp.Modifiers.ContainsKey(component.RadiationProtectionModifierSetId))
+            buffComp.Modifiers.Add(component.RadiationProtectionModifierSetId, modifier);
+    }
+
+    private void OnShutdown(EntityUid uid, RadiationProtectionComponent component, ComponentShutdown args)
+    {
+        if (!TryComp<DamageProtectionBuffComponent>(uid, out var buffComp))
+            return;
+        // remove the damage modifier from the dict
+        buffComp.Modifiers.Remove(component.RadiationProtectionModifierSetId);
+        // if the dict is empty now, remove the buff component
+        if (buffComp.Modifiers.Count == 0)
+            RemComp<DamageProtectionBuffComponent>(uid);
+    }
+}

Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs

@@ -25,11 +25,11 @@ public sealed partial class MeteorSchedulerComponent : Component
     /// The minimum time between swarms
     /// </summary>
     [DataField]
-    public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f);
+    public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(20.0f);
 
     /// <summary>
     /// The maximum time between swarms
     /// </summary>
     [DataField]
-    public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f);
+    public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(25.0f);
 }

Content.Server/_White/Cult/HellComponent.cs

@@ -0,0 +1,7 @@
+using Content.Shared._White.Cult.Pentagram;
+using Robust.Shared.GameStates;
+
+namespace Content.Server._White.Cult;
+
+[NetworkedComponent, RegisterComponent]
+public sealed partial class HellComponent : SharedHellComponent;

Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs

@@ -0,0 +1,17 @@
+using Content.Shared.Damage.Prototypes;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Damage.Components;
+
+/// <summary>
+///     Applies the specified DamageModifierSets when the entity takes damage.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DamageProtectionBuffComponent : Component
+{
+    /// <summary>
+    ///     The damage modifiers for entities with this component.
+    /// </summary>
+    [DataField]
+    public Dictionary<string, DamageModifierSetPrototype> Modifiers = new();
+}

Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs

@@ -0,0 +1,19 @@
+using Content.Shared.Damage.Components;
+
+namespace Content.Shared.Damage.Systems;
+
+public sealed class DamageProtectionBuffSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<DamageProtectionBuffComponent, DamageModifyEvent>(OnDamageModify);
+    }
+
+    private void OnDamageModify(EntityUid uid, DamageProtectionBuffComponent component, DamageModifyEvent args)
+    {
+        foreach (var modifier in component.Modifiers.Values)
+            args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifier);
+    }
+}

Content.Shared/Drowsiness/DrowsinessComponent.cs

@@ -0,0 +1,25 @@
+using System.Numerics;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Drowsiness;
+
+/// <summary>
+///     Exists for use as a status effect. Adds a shader to the client that scales with the effect duration.
+/// </summary>
+[RegisterComponent, NetworkedComponent]
+public sealed partial class DrowsinessComponent : Component
+{
+    /// <summary>
+    /// The random time between sleeping incidents, (min, max).
+    /// </summary>
+    [DataField("timeBetweenIncidents", required: true)]
+    public Vector2 TimeBetweenIncidents = new Vector2(5f, 60f);
+
+    /// <summary>
+    /// The duration of sleeping incidents, (min, max).
+    /// </summary>
+    [DataField("durationOfIncident", required: true)]
+    public Vector2 DurationOfIncident = new Vector2(2, 5);
+
+    public float NextIncidentTime;
+}

Content.Shared/Drowsiness/DrowsinessSystem.cs

@@ -0,0 +1,9 @@
+using Content.Shared.StatusEffect;
+
+namespace Content.Shared.Drowsiness;
+
+public abstract class SharedDrowsinessSystem : EntitySystem
+{
+    [ValidatePrototypeId<StatusEffectPrototype>]
+    public const string DrowsinessKey = "Drowsiness";
+}

Content.Shared/NPC/Components/FactionExceptionComponent.cs

@@ -7,7 +7,7 @@ namespace Content.Shared.NPC.Components;
 /// Prevents an NPC from attacking ignored entities from enemy factions.
 /// Can be added to if pettable, see PettableFriendComponent.
 /// </summary>
-[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(NpcFactionSystem), typeof(SharedNPCImprintingOnSpawnBehaviourSystem))] // TO DO (Metalgearsloth): If we start adding a billion access overrides they should be going through a system as then there's no reason to have access, but I'll fix this when I rework npcs.
 public sealed partial class FactionExceptionComponent : Component
 {
     /// <summary>

Content.Shared/NPC/Systems/SharedNPCImprintingOnSpawnBehaviourSystem.cs

@@ -0,0 +1,5 @@
+namespace Content.Shared.NPC.Systems;
+
+public abstract partial class SharedNPCImprintingOnSpawnBehaviourSystem : EntitySystem
+{
+}

Content.Shared/NPC/Systems/SharedNPCSystem.cs

@@ -0,0 +1,5 @@
+namespace Content.Shared.NPC.Systems;
+
+public abstract partial class SharedNPCSystem : EntitySystem
+{
+}

Content.Shared/_White/Cult/Pentagram/SharedHellComponent.cs

@@ -0,0 +1,3 @@
+namespace Content.Shared._White.Cult.Pentagram;
+
+public abstract partial class SharedHellComponent : Component;

Resources/Changelog/ChangelogWhite.yml

@@ -5401,3 +5401,112 @@
   id: 349
   time: '2024-07-02T15:56:53.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/413
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0442\u043E\u043C\
+      \u0430\u0442\u044B-\u0443\u0431\u0438\u0439\u0446\u044B, \u0440\u0430\u0434\u0443\
+      \u0436\u043D\u0430\u044F \u0430\u043C\u0431\u0440\u043E\u0437\u0438\u044F."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0435\u0430\
+      \u0433\u0435\u043D\u0442\u044B: \u041F\u0441\u0438\u0445\u043E\u0434\u0438\u043D\
+      , \u041C\u0430\u043D\u043D\u0438\u0442\u043E\u043B, \u041B\u0438\u043F\u0441\
+      \u0438\u0434\u0438\u043D \u0438 \u0425\u0435\u043F\u0438\u043D\u0435\u0441"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\
+      \u0430\u044F \u043C\u0443\u0442\u0430\u0446\u0438\u044F: \u041F\u0443\u0440\u0440\
+      \u043E\u0442\u043E\u043D"
+    type: Add
+  - message: "\u0423\u043B\u0443\u0447\u0448\u0435\u043D\u044B \u0432\u0441\u044F\u043A\
+      \u0438\u0435 \u0432\u0435\u0449\u0438 \u0432 \u0431\u043E\u0442\u0430\u043D\u0438\
+      \u043A\u0435 \u0440\u0430\u0437\u043D\u044B\u0435"
+    type: Tweak
+  id: 350
+  time: '2024-07-02T20:23:12.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/415
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B 4 \u043D\u043E\
+      \u0432\u044B\u0445  \u0440\u0430\u0441\u0442\u0435\u043D\u0438\u044F\u0445 \u0438\
+      \u0437 \u0441\u044113: \u041C\u044F\u0441\u043D\u043E\u0435 \u043F\u0448\u0435\
+      \u043D\u043E, \u043C\u043D\u043E\u0433\u043E\u043C\u0435\u0440\u043D\u044B\u0439\
+      \ \u0430\u043F\u0435\u043B\u044C\u0441\u0438\u043D, \u0441\u0432\u044F\u0442\
+      \u043E\u0434\u044B\u043D\u044F \u0438 \u043C\u0438\u0440\u043E\u0432\u043E\u0439\
+      \ \u0433\u043E\u0440\u043E\u0445. \u042D\u0444\u0444\u0435\u043A\u0442\u044B\
+      \ \u043F\u043E\u0434\u043E\u0431\u043D\u044B \u044D\u0444\u0444\u0435\u043A\u0442\
+      \u0430\u043C \u0438\u0437 \u0441\u044113"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0440\u0435\u0430\u0433\
+      \u0435\u043D\u0442 \u0439\u043E\u0434\u0438\u0434\u0430 \u043A\u0430\u043B\u0438\
+      \u044F, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0443\u0432\u0435\u043B\u0438\
+      \u0447\u0438\u0432\u0430\u0435\u0442 \u0441\u043E\u043F\u0440\u043E\u0442\u0438\
+      \u0432\u043B\u0435\u043D\u0438\u0435 \u0440\u0430\u0434\u0438\u0430\u0446\u0438\
+      \u0438 \u0434\u043E 90% \u0438 \u0413\u0430\u043B\u043E\u043F\u0435\u0440\u0438\
+      \u0434\u043E\u043B, \u0434\u0430\u044E\u0449\u0438\u0439 \u0443\u0441\u043F\u043E\
+      \u043A\u0430\u0438\u0432\u0430\u044E\u0449\u0438\u0439 \u0438 \u0443\u0441\u044B\
+      \u043F\u043B\u044F\u044E\u0449\u0438\u0439 \u044D\u0444\u0444\u0435\u043A\u0442\
+      ."
+    type: Add
+  - message: "\u0422\u043E\u043C\u0430\u0442\u044B \u0443\u0431\u0438\u0439\u0446\u044B\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435 \u0443\u0431\u0438\u0432\
+      \u0430\u044E\u0442 \u0445\u043E\u0437\u044F\u0438\u043D\u0430"
+    type: Tweak
+  id: 351
+  time: '2024-07-02T22:03:39.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/416
+- author: ThereDrD
+  changes:
+  - message: "\u0421\u0435\u043C\u0435\u043D\u0430 \u043F\u043E\u0441\u043B\u0435\
+      \ \u0441\u0431\u043E\u0440\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0441\
+      \u043D\u043E\u0432\u0430 \u043F\u043E\u044F\u0432\u043B\u044F\u044E\u0442\u0441\
+      \u044F \u0437\u0434\u043E\u0440\u043E\u0432\u044B\u043C\u0438"
+    type: Add
+  id: 352
+  time: '2024-07-02T22:12:36.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/417
+- author: ThereDrD0
+  changes:
+  - message: "\u0413\u043D\u043E\u043C\u044B \u043F\u0435\u0440\u0435\u0440\u0438\u0441\
+      \u043E\u0432\u0430\u043D\u044B"
+    type: Tweak
+  id: 353
+  time: '2024-07-05T07:09:51.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/419
+- author: Warete
+  changes:
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u0438\u0435 \u0417\u0434\
+      \u043E\u0440\u043E\u0432\u044C\u044F \u043C\u0435\u0442\u0435\u043E\u0440\u0438\
+      \u0442\u043E\u0432, \u0442\u0430\u0439\u043C\u0438\u043D\u0433\u043E\u0432 \u043F\
+      \u0440\u0438\u043B\u0451\u0442\u0430 \u0438 \u0438\u0445 \u043A\u043E\u043B\
+      -\u0432\u043E."
+    type: Fix
+  id: 354
+  time: '2024-07-05T16:04:04.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/420
+- author: ThereDrD
+  changes:
+  - message: "\u0421\u0430\u043C\u044B\u0439 \u0442\u043E\u0442\u0430\u043B\u044C\u043D\
+      \u044B\u0439 \u0438\u0437 \u0442\u043E\u0442\u0430\u043B\u044C\u043D\u044B\u0439\
+      \ \u043F\u0435\u0440\u0435\u0432\u043E\u0434. \u041F\u0435\u0440\u0435\u0432\
+      \u0435\u0434\u0435\u043D\u043E \u0432\u0441\u0435, \u0447\u0442\u043E \u043C\
+      \u043E\u0436\u043D\u043E. \u042D\u0442\u043E \u0437\u0430\u043D\u044F\u043B\u043E\
+      \ 2000 \u0444\u0430\u0439\u043B\u043E\u0432"
+    type: Add
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u044B \u0441\u0442\u0430\
+      \u0440\u044B\u0435 \u043F\u0440\u043E\u0431\u043B\u0435\u043C\u044B \u043F\u0435\
+      \u0440\u0435\u0432\u043E\u0434\u0430, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\
+      \u0440 \u043D\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0438\u0435\
+      \ \u0430\u043A\u0446\u0435\u043D\u0442\u044B."
+    type: Fix
+  id: 355
+  time: '2024-07-05T15:01:37.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/418
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u0438\u0441\u043A\u043E\u0440\u0434-\u0441\u043E\u043E\u0431\u0449\
+      \u0435\u043D\u0438\u0435 \u043E \u043A\u043E\u043D\u0446\u0435 \u0440\u0430\u0443\
+      \u043D\u0434\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438\u0445\
+      \u043E\u0434\u0438\u0442."
+    type: Fix
+  id: 356
+  time: '2024-07-05T17:43:49.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/422

Resources/Locale/en-US/flavors/flavor-profiles.ftl

@@ -169,6 +169,12 @@ flavor-complex-light = like a light gone out
 flavor-complex-profits = like profits
 flavor-complex-fishops = like the dreaded fishops
 flavor-complex-violets = like violets
+flavor-complex-pyrotton = like a burning mouth
+flavor-complex-mothballs = like mothballs
+flavor-complex-paint-thinner = like paint thinner
+flavor-complex-numbing-tranquility = like numbing tranquility
+flavor-complex-true-nature = like the true nature of reality
+flavor-complex-false-meat = not entirely unlike meat
 
 # Drink-specific flavors.
 

Resources/Locale/en-US/guidebook/chemistry/conditions.ftl

@@ -7,6 +7,15 @@
                  }
     }
 
+reagent-effect-condition-guidebook-total-hunger =
+    { $max ->
+        [2147483648] the target has at least {NATURALFIXED($min, 2)} total hunger
+        *[other] { $min ->
+                    [0] the target has at most {NATURALFIXED($max, 2)} total hunger
+                    *[other] the target has between {NATURALFIXED($min, 2)} and {NATURALFIXED($max, 2)} total hunger
+                 }
+    }
+
 reagent-effect-condition-guidebook-reagent-threshold =
     { $max ->
         [2147483648] there's at least {NATURALFIXED($min, 2)}u of {$reagent}

Resources/Locale/en-US/guidebook/chemistry/effects.ftl

@@ -344,3 +344,33 @@ reagent-effect-guidebook-missing =
         [1] Causes
         *[other] cause
     } an unknown effect as nobody has written this effect yet
+
+reagent-effect-guidebook-plant-attribute =
+    { $chance ->
+        [1] Adjusts
+        *[other] adjust
+    } {$attribute} by [color={$colorName}]{$amount}[/color]
+
+reagent-effect-guidebook-plant-cryoxadone =
+    { $chance ->
+        [1] Ages back
+        *[other] age back
+    } the plant, depending on the plant's age and time to grow
+
+reagent-effect-guidebook-plant-phalanximine =
+    { $chance ->
+        [1] Restores
+        *[other] restore
+    } viability to a plant rendered nonviable by a mutation
+
+reagent-effect-guidebook-plant-diethylamine =
+    { $chance ->
+        [1] Increases
+        *[other] increase
+    } the plant's lifespan and/or base health with 10% chance for each.
+
+reagent-effect-guidebook-plant-robust-harvest =
+    { $chance ->
+        [1] Increases
+        *[other] increase
+    } the plant's potency by {$increase} up to a maximum of {$limit}. Causes the plant to lose its seeds once the potency reaches {$seedlesstreshold}. Trying to add potency over {$limit} may cause decrease in yield at a 10% chance.

Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl

@@ -11,3 +11,5 @@ reagent-effect-status-effect-PressureImmunity = pressure immunity
 reagent-effect-status-effect-Pacified = combat pacification
 reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns
 reagent-effect-status-effect-StaminaModifier = modified stamina
+reagent-effect-status-effect-RadiationProtection = radiation protection
+reagent-effect-status-effect-Drowsiness = drowsiness

Resources/Locale/en-US/reagents/mannitol.ftl

@@ -0,0 +1 @@
+mannitol-effect-enlightened = You feel ENLIGHTENED!

Resources/Locale/en-US/reagents/meta/botany.ftl

@@ -11,7 +11,7 @@ reagent-name-plant-b-gone = plant-B-gone
 reagent-desc-plant-b-gone = A harmful toxic mixture to kill plantlife. Very effective against kudzu.
 
 reagent-name-robust-harvest = robust harvest
-reagent-desc-robust-harvest = A highly effective fertilizer, with a limited potency-boosting effect on plants. Be careful with it's usage since using too much has a chance to reduce the plant yield. It has a positive effect on dionas.
+reagent-desc-robust-harvest = A highly effective fertilizer with a limited potency-boosting effect on plants. Use it cautiously, as excessive application can reduce plant yield. It has a particularly beneficial effect on dionas.
 
 reagent-name-weed-killer = weed killer
 reagent-desc-weed-killer = A mixture that targets weeds. Very effective against kudzu. While useful it slowly poisons plants with toxins, be careful when using it.

Resources/Locale/en-US/reagents/meta/fun.ftl

@@ -22,7 +22,7 @@ reagent-desc-razorium = A strange, non-newtonian chemical. It is produced when t
 reagent-name-fresium = Fresium
 reagent-desc-fresium = A mysterious compound that slows the vibration of atoms and molecules... somehow. In layman's terms, it makes things cold... REALLY cold. Can cause long-lasting movement issues if ingested.
 
-reagent-name-laughter = Laughter
+reagent-name-laughter = laughter
 reagent-desc-laughter = Some say that this is the best medicine, but recent studies have proven that to be untrue.
 
 reagent-name-weh = juice that makes you Weh

Resources/Locale/en-US/reagents/meta/medicine.ftl

@@ -142,3 +142,14 @@ reagent-desc-silversulfadiazine = This compound with antibacterial properties is
 reagent-name-stypticpowder = styptic powder
 reagent-desc-stypticpowder = Aluminum sulfate styptic powder aids in managing bleeding and promoting the healing of bodily injuries.
 
+reagent-name-mannitol = mannitol
+reagent-desc-mannitol = Efficiently restores brain damage.
+
+reagent-name-psicodine = psicodine
+reagent-desc-psicodine = Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage.
+
+reagent-name-potassium-iodide = potassium iodide
+reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by 90%. Prophylactic use only.
+
+reagent-name-haloperidol = haloperidol
+reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.

Resources/Locale/en-US/reagents/meta/narcotics.ftl

@@ -39,3 +39,6 @@ reagent-desc-norepinephric-acid = A smooth chemical that blocks the optical rece
 
 reagent-name-tear-gas = tear gas
 reagent-desc-tear-gas = A chemical that causes severe irritation and crying, commonly used in riot control.
+
+reagent-name-happiness = happiness
+reagent-desc-happiness = Fills you with ecstatic numbness and causes minor brain damage. Highly addictive. If overdosed causes sudden mood swings.

Resources/Locale/en-US/reagents/meta/toxins.ftl

@@ -75,3 +75,6 @@ reagent-desc-vestine = Has an adverse reaction within the body causing major jit
 
 reagent-name-tazinide = tazinide
 reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current.
+
+reagent-name-lipolicide = lipolicide
+reagent-desc-lipolicide = A powerful toxin that will destroy fat cells, massively reducing body weight in a short time. Deadly to those without nutriment in their body.

Resources/Locale/en-US/reagents/psicodine.ftl

@@ -0,0 +1,3 @@
+psicodine-effect-fearless = You feel totally fearless!
+psicodine-effect-anxieties-wash-away = All of your anxieties wash away!
+psicodine-effect-at-peace = You feel completely at peace.

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

@@ -5,6 +5,8 @@ seeds-noun-spores = spores
 # Seeds
 seeds-wheat-name = wheat
 seeds-wheat-display-name = wheat stalks
+seeds-meatwheat-name = meatwheat
+seeds-meatwheat-display-name = meatwheat stalks
 seeds-oat-name = oat
 seeds-oat-display-name = oat stalks
 seeds-banana-name = banana
@@ -25,6 +27,8 @@ seeds-lime-name = lime
 seeds-lime-display-name = lime trees
 seeds-orange-name = orange
 seeds-orange-display-name = orange trees
+seeds-extradimensionalorange-name = extradimensional orange
+seeds-extradimensionalorange-display-name = extradimensional orange trees
 seeds-pineapple-name = pineapple
 seeds-pineapple-display-name = pineapple plant
 seeds-potato-name = potato
@@ -41,6 +45,8 @@ seeds-bluetomato-name = blue tomato
 seeds-bluetomato-display-name = blue tomato plant
 seeds-bloodtomato-name = blood tomato
 seeds-bloodtomato-display-name = blood tomato plant
+seeds-killertomato-name = tomato killer
+seeds-killertomato-display-name = tomato killer plant
 seeds-eggplant-name = eggplant
 seeds-eggplant-display-name = eggplants
 seeds-apple-name = apple
@@ -57,6 +63,8 @@ seeds-eggy-name = egg-plant
 seeds-eggy-display-name = egg-plants
 seeds-cannabis-name = cannabis
 seeds-cannabis-display-name = cannabis
+seeds-rainbow-cannabis-name = rainbow cannabis
+seeds-rainbow-cannabis-display-name = rainbow cannabis
 seeds-tobacco-name = tobacco
 seeds-tobacco-display-name = tobacco plant
 seeds-nettle-name = nettle
@@ -64,7 +72,7 @@ seeds-nettle-display-name = nettles
 seeds-deathnettle-name = death nettle
 seeds-deathnettle-display-name = death nettles
 seeds-chili-name = chili
-seeds-chili-display-name = chilis
+seeds-chili-display-name = chili peppers
 seeds-chilly-name = chilly
 seeds-chilly-display-name = chilly peppers
 seeds-poppy-name = poppy
@@ -96,7 +104,9 @@ seeds-spacemans-trumpet-display-name = spaceman's trumpet plant
 seeds-koibean-name = koibeans
 seeds-koibean-display-name = koibean plant
 seeds-watermelon-name = watermelon
-seeds-watermelon-display-name = watermelon plant
+seeds-watermelon-display-name = watermelon vines
+seeds-holymelon-name = holymelon
+seeds-holymelon-display-name = holymelon vines
 seeds-grape-name = grape
 seeds-grape-display-name = grape plant
 seeds-cocoa-name = cocoa
@@ -105,11 +115,15 @@ seeds-berries-name = berries
 seeds-berries-display-name = berry bush
 seeds-bungo-name = bungo
 seeds-bungo-display-name = bungo plant
-seeds-pea-name = pea
+seeds-pea-name = peas
 seeds-pea-display-name = pea vines
+seeds-worldpea-name = world peas
+seeds-worldpea-display-name = world pea vines
 seeds-pumpkin-name = pumpkin
 seeds-pumpkin-display-name = pumpkins
 seeds-cotton-name = cotton
 seeds-cotton-display-name = cotton plant
 seeds-gome-name = gnome
 seeds-gnome-display-name = gnome plant
+seeds-pyrotton-name = pyrotton
+seeds-pyrotton-display-name = pyrotton plant

Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl

@@ -1,138 +1,138 @@
 ent-GasCanister = { ent-BaseStructureDynamic }
     .desc = { ent-BaseStructureDynamic.desc }
-    .suffix = { "" }
+
 ent-StorageCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-AirCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-OxygenCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-NitrogenCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-CarbonDioxideCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-PlasmaCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-TritiumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-WaterVaporCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-MiasmaCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-NitrousOxideCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-FrezonCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-BZCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-PluoxiumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-HydrogenCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-NitriumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-HealiumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-HyperNobliumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-ProtoNitrateCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-ZaukerCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-HalonCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-HeliumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-AntiNobliumCanister = { ent-GasCanister }
     .desc = { ent-GasCanister.desc }
-    .suffix = { "" }
+
 ent-GasCanisterBrokenBase = { ent-BaseStructureDynamic }
     .desc = { ent-BaseStructureDynamic.desc }
-    .suffix = { "" }
+
 ent-StorageCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-AirCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-OxygenCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-NitrogenCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-CarbonDioxideCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-PlasmaCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-TritiumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-WaterVaporCanisterBroken = broken water vapor canister
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-MiasmaCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-NitrousOxideCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-FrezonCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-BZCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-PluoxiumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-HydrogenCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-NitriumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-HealiumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-HyperNobliumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-ProtoNitrateCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-ZaukerCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-HalonCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-HeliumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+
 ent-AntiNobliumCanisterBroken = { ent-GasCanisterBrokenBase }
     .desc = { ent-GasCanisterBrokenBase.desc }
-    .suffix = { "" }
+

Resources/Locale/ru-RU/HUD/game-hud.ftl

@@ -1,7 +1,7 @@
 game-hud-open-escape-menu-button-tooltip = Открыть меню паузы.
-game-hud-open-guide-menu-button-tooltip = Открыть руководство.
+game-hud-open-guide-menu-button-tooltip = Открыть меню руководства.
 game-hud-open-character-menu-button-tooltip = Открыть меню персонажа.
-game-hud-open-emotions-menu-button-tooltip = Открыть меню эмоций.
+game-hud-open-emotes-menu-button-tooltip = Открыть меню эмоций.
 game-hud-open-inventory-menu-button-tooltip = Открыть меню инвентаря.
 game-hud-open-crafting-menu-button-tooltip = Открыть меню создания.
 game-hud-open-actions-menu-button-tooltip = Открыть меню действий.

Resources/Locale/ru-RU/White/prototypes/entities/clothing/neck/necklace.ftl

@@ -1,15 +1,15 @@
 ent-ClothingNeckNecklaceGold = золотой крест
     .desc = Сделан из чистого золота. Приятно отсвечивает и дает чувство защищенности.
-    .suffix = { "" }
+
 
 ent-ClothingNeckNecklaceSilver = серебряный крест
     .desc = Приятно отсвечивает и дает чувство защищенности.
-    .suffix = { "" }
+
 
 ent-ClothingNeckNecklaceTech = технологичный крест
     .desc = Знак верности техно-богу и науке.
-    .suffix = { "" }
+
 
 ent-ClothingNeckNecklaceUnholy = крест антихриста
     .desc = Путь в рай закрыт.
-    .suffix = { "" }
+

Resources/Locale/ru-RU/_directions.ftl

@@ -2,7 +2,7 @@ zzzz-fmt-direction-North = Север
 zzzz-fmt-direction-South = Юг
 zzzz-fmt-direction-East = Восток
 zzzz-fmt-direction-West = Запад
-zzzz-fmt-direction-NorthEast = Северовосток
-zzzz-fmt-direction-SouthEast = Юговосток
-zzzz-fmt-direction-NorthWest = Северозапад
-zzzz-fmt-direction-SouthWest = Северовосток
+zzzz-fmt-direction-NorthEast = Северо-восток
+zzzz-fmt-direction-SouthEast = Юго-восток
+zzzz-fmt-direction-NorthWest = Северо-запад
+zzzz-fmt-direction-SouthWest = Юго-запад

Resources/Locale/ru-RU/_lib.ftl

@@ -1,33 +1,34 @@
 ### Special messages used by internal localizer stuff.
 
 # Used internally by the PRESSURE() function.
-zzzz-fmt-pressure = { TOSTRING($divided, "F1") } { $places ->
-    [0] кПа
-    [1] МПа
-    [2] ГПа
-    [3] ТПа
-    [4] ППа
-    *[5] ???
-}
-
+zzzz-fmt-pressure =
+    { TOSTRING($divided, "F1") } { $places ->
+        [0] кПа
+        [1] МПа
+        [2] ГПа
+        [3] ТПа
+        [4] ППа
+       *[5] ???
+    }
 # Used internally by the POWERWATTS() function.
-zzzz-fmt-power-watts = { TOSTRING($divided, "F1") } { $places ->
-    [0] Вт
-    [1] кВт
-    [2] МВт
-    [3] ГВт
-    [4] ТВт
-    *[5] ???
-}
-
+zzzz-fmt-power-watts =
+    { TOSTRING($divided, "F1") } { $places ->
+        [0] Вт
+        [1] кВт
+        [2] МВт
+        [3] ГВт
+        [4] ТВт
+       *[5] ???
+    }
 # Used internally by the POWERJOULES() function.
 # Reminder: 1 joule = 1 watt for 1 second (multiply watts by seconds to get joules).
 # Therefore 1 kilowatt-hour is equal to 3,600,000 joules (3.6MJ)
-zzzz-fmt-power-joules = { TOSTRING($divided, "F1") } { $places ->
-    [0] Дж
-    [1] кДж
-    [2] МДж
-    [3] ГДж
-    [4] ТДж
-    *[5] ???
-}
+zzzz-fmt-power-joules =
+    { TOSTRING($divided, "F1") } { $places ->
+        [0] Дж
+        [1] кДж
+        [2] МДж
+        [3] ГДж
+        [4] ТДж
+       *[5] ???
+    }

Resources/Locale/ru-RU/_units.ftl

@@ -70,16 +70,16 @@ units-g-watt-long = гигаватт
 
 ## Joule (Energy)
 
-units-u--joule = µДж
+units-u--joule = мкДж
 units-m--joule = мДж
 units-joule = Дж
 units-k-joule = кДж
 units-m-joule = МДж
-units-u--joule-long = Микроджоуль
-units-m--joule-long = Миллиджоуль
-units-joule-long = Джоуль
-units-k-joule-long = Килоджоуль
-units-m-joule-long = Мегаджоуль
+units-u--joule-long = микроджоуль
+units-m--joule-long = миллиджоуль
+units-joule-long = джоуль
+units-k-joule-long = килоджоуль
+units-m-joule-long = мегаджоуль
 
 ## Kelvin (Temperature)
 

Resources/Locale/ru-RU/_white/flavors/flavor-profiles.ftl

@@ -0,0 +1,3 @@
+flavor-complex-numbing-tranquility = как ошемляющее спокойствие
+flavor-complex-true-nature = как пролом четвертой стены
+flavor-complex-false-meat = мало, чем отличается от настоящего мяса

Resources/Locale/ru-RU/_white/guidebook/chemistry/statuseeffects.ftl

@@ -0,0 +1,2 @@
+reagent-effect-status-effect-RadiationProtection = защита от радиации
+reagent-effect-status-effect-Drowsiness = сонливость

Resources/Locale/ru-RU/_white/reagents/meta/medicine.ftl

@@ -0,0 +1,4 @@
+reagent-name-potassium-iodide = Йодид калия
+reagent-desc-potassium-iodide = Снижает поражающее действие радиации на 90%. Только для профилактического применения.
+reagent-name-haloperidol = Галоперидол
+reagent-desc-haloperidol = Выводит большинство стимулирующих/галлюциногенных препаратов. Уменьшает наркотические эффекты и нервозность. Вызывает сонливость.

Resources/Locale/ru-RU/_white/seeds/seeds.ftl

@@ -0,0 +1,8 @@
+seeds-meatwheat-name = мясное пшено
+seeds-meatwheat-display-name = стебли мясного пшена
+seeds-extradimensionalorange-name = многомерный апельсин
+seeds-extradimensionalorange-display-name = дерево многомерного апельсина
+seeds-holymelon-name = святодыня
+seeds-holymelon-display-name = ростки святодыни
+seeds-worldpea-name = мировой горох
+seeds-worldpea-display-name = стебли мирового гороха

Resources/Locale/ru-RU/abilities/mime.ftl

@@ -1,6 +1,4 @@
 mime-cant-speak = Данный вами обет молчания не позволяет вам говорить.
-mime-invisible-wall = Создать невидимую стену
-mime-invisible-wall-desc = Создаёт перед вами невидимую стену, если хватает места.
 mime-invisible-wall-popup = { CAPITALIZE($mime) } упирается в невидимую стену!
 mime-invisible-wall-failed = Вы не можете создать здесь невидимую стену.
 mime-not-ready-repent = Вы ещё не готовы покаяться за нарушенный обет.

Resources/Locale/ru-RU/accent/accents.ftl

@@ -18,12 +18,12 @@ accent-words-mouse-2 = Пиип!
 accent-words-mouse-3 = Чууу!
 accent-words-mouse-4 = Ииии!
 accent-words-mouse-5 = Пип!
-accent-words-mouse-6 = Фиип!
-accent-words-mouse-7 = Хиип!
+accent-words-mouse-6 = Уиип!
+accent-words-mouse-7 = Иип!
 # Mumble
 accent-words-mumble-1 = Ммпмв!
-accent-words-mumble-2 = Мммв мррввв!
-accent-words-mumble-3 = Мммв мпвф!
+accent-words-mumble-2 = Мммв-мррввв!
+accent-words-mumble-3 = Мммв-мпвф!
 # Silicon
 accent-words-silicon-1 = Бип.
 accent-words-silicon-2 = Буп.
@@ -42,16 +42,16 @@ accent-words-zombie-4 = Гррррр...
 accent-words-zombie-5 = Ууаагххххх...
 accent-words-zombie-6 = Граааааоооууллл...
 accent-words-zombie-7 = Мазгии... Ммааазгиии..
-accent-words-zombie-8 = Мозгууаагххх...
-accent-words-zombie-9 = Мозшшшш...
+accent-words-zombie-8 = Мазгххх...
+accent-words-zombie-9 = Маазгг...
 accent-words-zombie-10 = Граааааа...
 # Moth Zombie
-accent-words-zombie-moth-1 = Одеееждаа...
-accent-words-zombie-moth-2 = Ботииинкии...
-accent-words-zombie-moth-3 = Свееееет...
-accent-words-zombie-moth-4 = Лааампы...
-accent-words-zombie-moth-5 = Шляяяпы... Шляпппы...
-accent-words-zombie-moth-6 = Шаааарффы...
+accent-words-zombie-moth-1 = Одееежда...
+accent-words-zombie-moth-2 = Ооообувь...
+accent-words-zombie-moth-3 = Свеееет...
+accent-words-zombie-moth-4 = Лаааампы...
+accent-words-zombie-moth-5 = Шааапк... Шаааапки...
+accent-words-zombie-moth-6 = Шааарфы...
 # Generic Aggressive
 accent-words-generic-aggressive-1 = Грр!
 accent-words-generic-aggressive-2 = Рррр!
@@ -61,7 +61,7 @@ accent-words-generic-aggressive-4 = Гррав!!
 accent-words-duck-1 = Ква!
 accent-words-duck-2 = Ква.
 accent-words-duck-3 = Ква?
-accent-words-duck-4 = Ква ква!
+accent-words-duck-4 = Ква-ква!
 # Chicken
 accent-words-chicken-1 = Кудах!
 accent-words-chicken-2 = Кудах.
@@ -71,39 +71,39 @@ accent-words-chicken-4 = Кудах тах-тах!
 accent-words-pig-1 = Хрю.
 accent-words-pig-2 = Хрю?
 accent-words-pig-3 = Хрю!
-accent-words-pig-4 = Хрю Хрю!
+accent-words-pig-4 = Хрю-хрю!
 # Kangaroo
 accent-words-kangaroo-1 = Грр!
-accent-words-kangaroo-2 = Хиссс!
-accent-words-kangaroo-3 = Шрик!
-accent-words-kangaroo-4 = Чуу!
+accent-words-kangaroo-2 = Ххссс!
+accent-words-kangaroo-3 = Шррр!
+accent-words-kangaroo-4 = Чууу!
 # Slimes
 accent-words-slimes-1 = Блюмп.
-accent-words-slimes-2 = Блимф?
-accent-words-slimes-3 = Блумп!
-accent-words-slimes-4 = Блууумп...
-accent-words-slimes-5 = Блабл блумп!
+accent-words-slimes-2 = Блимпаф?
+accent-words-slimes-3 = Бламп!
+accent-words-slimes-4 = Блааамп...
+accent-words-slimes-5 = Блабл-бламп!
 # Mothroach
-accent-words-mothroach-1 = Чирп!
+accent-words-mothroach-1 = Чирик!
 # Crab
-accent-words-crab-1 = Щёлк.
-accent-words-crab-2 = Клик-клак!
+accent-words-crab-1 = Чик.
+accent-words-crab-2 = Чик-клац!
 accent-words-crab-3 = Клац?
 accent-words-crab-4 = Типи-тап!
-accent-words-crab-5 = Клик-тап.
-accent-words-crab-6 = Щёлкщёлк.
+accent-words-crab-5 = Чик-тап.
+accent-words-crab-6 = Чикичик.
 # Kobold
 accent-words-kobold-1 = Йип!
 accent-words-kobold-2 = Гррар.
 accent-words-kobold-3 = Йап!
 accent-words-kobold-4 = Бип.
-accent-words-kobold-5 = Скриит?
+accent-words-kobold-5 = Скрит?
 accent-words-kobold-6 = Гронк!
 accent-words-kobold-7 = Хисс!
-accent-words-kobold-8 = Ииии!
+accent-words-kobold-8 = Йии!
 accent-words-kobold-9 = Йип.
 # Nymph
-accent-words-nymph-1 = Чирп!
-accent-words-nymph-2 = Чуррр...
-accent-words-nymph-3 = Чиип?
-accent-words-nymph-4 = Чуррп!
+accent-words-nymph-1 = Чирик!
+accent-words-nymph-2 = Чурр...
+accent-words-nymph-3 = Чипи?
+accent-words-nymph-4 = Шрруп!

Resources/Locale/ru-RU/accent/cowboy.ftl

@@ -224,7 +224,7 @@ accent-cowboy-words-75 = secoff
 accent-cowboy-replacement-75 = deputy
 
 accent-cowboy-words-76 = security
-accent-cowboy-replacement-76 = law 
+accent-cowboy-replacement-76 = law
 
 accent-cowboy-words-77 = shitsec
 accent-cowboy-replacement-77 = crooked law
@@ -293,4 +293,4 @@ accent-cowboy-words-98 = yelled
 accent-cowboy-replacement-98 = hollered
 
 accent-cowboy-words-99 = yelling
-accent-cowboy-replacement-99 = hollering
+accent-cowboy-replacement-99 = hollering

Resources/Locale/ru-RU/accent/dwarf.ftl

@@ -3,299 +3,283 @@
 # https://en.wikipedia.org/wiki/Scottish_English
 # https://www.cs.stir.ac.uk/~kjt/general/scots.html
 
-accent-dwarf-words-1 = girl
-accent-dwarf-words-replace-1 = lassie
-accent-dwarf-words-2 = boy
-accent-dwarf-words-replace-2 = laddie
-accent-dwarf-words-3 = man
-accent-dwarf-words-replace-3 = lad
-accent-dwarf-words-4 = woman
-accent-dwarf-words-replace-4 = lass
-accent-dwarf-words-5 = do
-accent-dwarf-words-replace-5 = dae
-accent-dwarf-words-6 = don't
-accent-dwarf-words-replace-6 = dinnae
-accent-dwarf-words-7 = dont
-accent-dwarf-words-replace-7 = dinnae
-accent-dwarf-words-8 = i'm
-accent-dwarf-words-replace-8 = A'm
-accent-dwarf-words-9 = im
-accent-dwarf-words-replace-9 = am
-accent-dwarf-words-10 = going
-accent-dwarf-words-replace-10 = gaun
-accent-dwarf-words-11 = know
-accent-dwarf-words-replace-11 = ken
-accent-dwarf-words-12 = i
-accent-dwarf-words-replace-12 = Ah
-accent-dwarf-words-13 = you're
-accent-dwarf-words-replace-13 = ye're
-accent-dwarf-words-14 = youre
-accent-dwarf-words-replace-14 = yere
-accent-dwarf-words-15 = you
-accent-dwarf-words-replace-15 = ye
-accent-dwarf-words-16 = i'll
-accent-dwarf-words-replace-16 = A'll
-accent-dwarf-words-17 = ill
-accent-dwarf-words-replace-17 = all
-accent-dwarf-words-18 = of
-accent-dwarf-words-replace-18 = ae
-accent-dwarf-words-19 = was
-accent-dwarf-words-replace-19 = wis
-accent-dwarf-words-20 = can't
-accent-dwarf-words-replace-20 = cannae
-accent-dwarf-words-21 = cant
-accent-dwarf-words-replace-21 = cannae
-accent-dwarf-words-22 = yourself
-accent-dwarf-words-replace-22 = yersel
-accent-dwarf-words-23 = where
-accent-dwarf-words-replace-23 = whaur
-accent-dwarf-words-24 = oh
-accent-dwarf-words-replace-24 = ach
-accent-dwarf-words-25 = little
-accent-dwarf-words-replace-25 = wee
-accent-dwarf-words-26 = small
-accent-dwarf-words-replace-26 = wee
-accent-dwarf-words-27 = shit
-accent-dwarf-words-replace-27 = shite
-accent-dwarf-words-28 = yeah
-accent-dwarf-words-replace-28 = aye
-accent-dwarf-words-29 = yea
-accent-dwarf-words-replace-29 = aye
-accent-dwarf-words-30 = yes
-accent-dwarf-words-replace-30 = aye
-accent-dwarf-words-31 = too
-accent-dwarf-words-replace-31 = tae
-accent-dwarf-words-32 = my
-accent-dwarf-words-replace-32 = ma
-accent-dwarf-words-33 = not
-accent-dwarf-words-replace-33 = nae
-accent-dwarf-words-34 = dad
-accent-dwarf-words-replace-34 = da
-accent-dwarf-words-35 = mom
-accent-dwarf-words-replace-35 = maw
-accent-dwarf-words-36 = newbie
-accent-dwarf-words-replace-36 = greenbeard
-accent-dwarf-words-37 = noob
-accent-dwarf-words-replace-37 = greenbeard
-accent-dwarf-words-38 = noobie
-accent-dwarf-words-replace-38 = greenbeard
-accent-dwarf-words-39 = professional
-accent-dwarf-words-replace-39 = greybeard
-accent-dwarf-words-40 = veteran
-accent-dwarf-words-replace-40 = greybeard
-accent-dwarf-words-41 = fuck
-accent-dwarf-words-replace-41 = sod
-accent-dwarf-words-42 = would
-accent-dwarf-words-replace-42 = wou
-accent-dwarf-words-43 = should
-accent-dwarf-words-replace-43 = shou
-accent-dwarf-words-44 = could
-accent-dwarf-words-replace-44 = cou
-accent-dwarf-words-45 = would've
-accent-dwarf-words-replace-45 = wou'hae
-accent-dwarf-words-46 = should've
-accent-dwarf-words-replace-46 = shou'hae
-accent-dwarf-words-47 = could've
-accent-dwarf-words-replace-47 = cou'hae
-accent-dwarf-words-48 = wouldve
-accent-dwarf-words-replace-48 = wouhae
-accent-dwarf-words-49 = shouldve
-accent-dwarf-words-replace-49 = shouhae
-accent-dwarf-words-50 = couldve
-accent-dwarf-words-replace-50 = couhae
-accent-dwarf-words-51 = would'nt
-accent-dwarf-words-replace-51 = wou'nae
-accent-dwarf-words-52 = should'nt
-accent-dwarf-words-replace-52 = shou'nae
-accent-dwarf-words-53 = could'nt
-accent-dwarf-words-replace-53 = cou'nae
-accent-dwarf-words-54 = wouldnt
-accent-dwarf-words-replace-54 = wounae
-accent-dwarf-words-55 = shouldnt
-accent-dwarf-words-replace-55 = shounae
-accent-dwarf-words-56 = couldnt
-accent-dwarf-words-replace-56 = counae
-accent-dwarf-words-57 = have
-accent-dwarf-words-replace-57 = hae
-accent-dwarf-words-58 = no
-accent-dwarf-words-replace-58 = nae
-accent-dwarf-words-59 = to
-accent-dwarf-words-replace-59 = ta
-accent-dwarf-words-60 = the
-accent-dwarf-words-replace-60 = tha
-accent-dwarf-words-61 = have
-accent-dwarf-words-replace-61 = hae
-accent-dwarf-words-62 = are
-accent-dwarf-words-replace-62 = be
-accent-dwarf-words-63 = is
-accent-dwarf-words-replace-63 = be
-accent-dwarf-words-64 = am
-accent-dwarf-words-replace-64 = be
-accent-dwarf-words-65 = beer
-accent-dwarf-words-replace-65 = booze
-accent-dwarf-words-66 = food
-accent-dwarf-words-replace-66 = grub
-accent-dwarf-words-67 = have
-accent-dwarf-words-replace-67 = hae
-accent-dwarf-words-68 = hey
-accent-dwarf-words-replace-68 = oye
-accent-dwarf-words-69 = what
-accent-dwarf-words-replace-69 = wot
-accent-dwarf-words-70 = where
-accent-dwarf-words-replace-70 = whaur
-accent-dwarf-words-71 = when
-accent-dwarf-words-replace-71 = wen
-accent-dwarf-words-72 = myself
-accent-dwarf-words-replace-72 = mesel
-accent-dwarf-words-73 = himself
-accent-dwarf-words-replace-73 = hesel
-accent-dwarf-words-74 = herself
-accent-dwarf-words-replace-74 = shesel
-accent-dwarf-words-75 = move
-accent-dwarf-words-replace-75 = moev
-accent-dwarf-words-76 = moving
-accent-dwarf-words-replace-76 = moeven
-accent-dwarf-words-77 = wasn't
-accent-dwarf-words-replace-77 = wis'nae
-accent-dwarf-words-78 = wasnt
-accent-dwarf-words-replace-78 = wisnae
-accent-dwarf-words-79 = wizard
-accent-dwarf-words-replace-79 = wizer
-accent-dwarf-words-80 = fool
-accent-dwarf-words-replace-80 = wazzok
-accent-dwarf-words-81 = have
-accent-dwarf-words-replace-81 = hae
-accent-dwarf-words-82 = for
-accent-dwarf-words-replace-82 = fer
-accent-dwarf-words-83 = about
-accent-dwarf-words-replace-83 = abut
-accent-dwarf-words-84 = ow
-accent-dwarf-words-replace-84 = och
-accent-dwarf-words-85 = small
-accent-dwarf-words-replace-85 = wee
-accent-dwarf-words-86 = tiny
-accent-dwarf-words-replace-86 = tinnae
-accent-dwarf-words-87 = baby
-accent-dwarf-words-replace-87 = babee
-accent-dwarf-words-88 = after
-accent-dwarf-words-replace-88 = efter
-accent-dwarf-words-89 = for
-accent-dwarf-words-replace-89 = fer
-accent-dwarf-words-90 = gonna
-accent-dwarf-words-replace-90 = gaun'ae
-accent-dwarf-words-91 = going to
-accent-dwarf-words-replace-91 = gaun'ae
-accent-dwarf-words-92 = gone
-accent-dwarf-words-replace-92 = gaun
-accent-dwarf-words-93 = talk
-accent-dwarf-words-replace-93 = blather
-accent-dwarf-words-94 = talking
-accent-dwarf-words-replace-94 = blatherin'
-accent-dwarf-words-95 = now
-accent-dwarf-words-replace-95 = nou
-accent-dwarf-words-96 = talked
-accent-dwarf-words-replace-96 = blathered
-accent-dwarf-words-97 = give
-accent-dwarf-words-replace-97 = gie
-accent-dwarf-words-98 = gimme
-accent-dwarf-words-replace-98 = gie's
-accent-dwarf-words-99 = give me
-accent-dwarf-words-replace-99 = gie's
-accent-dwarf-words-100 = do you
-accent-dwarf-words-replace-100 = d'ye
-accent-dwarf-words-101 = with
-accent-dwarf-words-replace-101 = wi
-accent-dwarf-words-102 = without
-accent-dwarf-words-replace-102 = wi'ou
-accent-dwarf-words-103 = whether
-accent-dwarf-words-replace-103 = we'er
-accent-dwarf-words-104 = ever
-accent-dwarf-words-replace-104 = e'er
-accent-dwarf-words-105 = whenever
-accent-dwarf-words-replace-105 = wen'er
-accent-dwarf-words-106 = whatever
-accent-dwarf-words-replace-106 = wot'er
-accent-dwarf-words-107 = how
-accent-dwarf-words-replace-107 = hou
-accent-dwarf-words-108 = however
-accent-dwarf-words-replace-108 = hou'er
-accent-dwarf-words-109 = think
-accent-dwarf-words-replace-109 = reckon
-accent-dwarf-words-110 = thinking
-accent-dwarf-words-replace-110 = fer
-accent-dwarf-words-111 = hamlet
-accent-dwarf-words-replace-111 = hammy
-accent-dwarf-words-112 = hampster
-accent-dwarf-words-replace-112 = hammy
-accent-dwarf-words-113 = nukie
-accent-dwarf-words-replace-113 = reddie
-accent-dwarf-words-114 = nuclear op
-accent-dwarf-words-replace-114 = reddie
-accent-dwarf-words-115 = nuclear operative
-accent-dwarf-words-replace-115 = reddie
-accent-dwarf-words-116 = nuclear agent
-accent-dwarf-words-replace-116 = reddie
-accent-dwarf-words-117 = antag
-accent-dwarf-words-replace-117 = baddie
-accent-dwarf-words-118 = syndicate
-accent-dwarf-words-replace-118 = baddie
-accent-dwarf-words-119 = syndi
-accent-dwarf-words-replace-119 = baddie
-accent-dwarf-words-120 = syndie
-accent-dwarf-words-replace-120 = baddie
-accent-dwarf-words-121 = more
-accent-dwarf-words-replace-121 = maer
-accent-dwarf-words-122 = moreover
-accent-dwarf-words-replace-122 = maero'er
-accent-dwarf-words-123 = over
-accent-dwarf-words-replace-123 = o'er
-accent-dwarf-words-124 = shuttle
-accent-dwarf-words-replace-124 = molly
-accent-dwarf-words-125 = human
-accent-dwarf-words-replace-125 = humi
-accent-dwarf-words-126 = dwarf
-accent-dwarf-words-replace-126 = dorf
-accent-dwarf-words-127 = slime
-accent-dwarf-words-replace-127 = oozi
-accent-dwarf-words-128 = rat
-accent-dwarf-words-replace-128 = raki
-accent-dwarf-words-129 = arachnid
-accent-dwarf-words-replace-129 = aranaki
-accent-dwarf-words-130 = spider
-accent-dwarf-words-replace-130 = hisser
-accent-dwarf-words-131 = isn't
-accent-dwarf-words-replace-131 = be'nae
-accent-dwarf-words-132 = aren't
-accent-dwarf-words-replace-132 = be'nae
-accent-dwarf-words-133 = ain't
-accent-dwarf-words-replace-133 = be'nae
-accent-dwarf-words-134 = isnt
-accent-dwarf-words-replace-134 = benae
-accent-dwarf-words-135 = arent
-accent-dwarf-words-replace-135 = benae
-accent-dwarf-words-136 = aint
-accent-dwarf-words-replace-136 = benae
-accent-dwarf-words-137 = zombie
-accent-dwarf-words-replace-137 = rotter
-accent-dwarf-words-138 = zomb
-accent-dwarf-words-replace-138 = rotter
-accent-dwarf-words-139 = clown
-accent-dwarf-words-replace-139 = honki
-accent-dwarf-words-140 = cluwn
-accent-dwarf-words-replace-140 = hunki
-accent-dwarf-words-141 = carp
-accent-dwarf-words-replace-141 = fin
-accent-dwarf-words-142 = crusher
-accent-dwarf-words-replace-142 = axe
-accent-dwarf-words-143 = coward
-accent-dwarf-words-replace-143 = leaflover
-accent-dwarf-words-144 = idiot
-accent-dwarf-words-replace-144 = dobber
-accent-dwarf-words-145 = stupid
-accent-dwarf-words-replace-145 = diteit
-accent-dwarf-words-146 = officer
-accent-dwarf-words-replace-146 = bobby
-accent-dwarf-words-147 = seccie
-accent-dwarf-words-replace-147 = bobby
+accent-dwarf-words-1 = девочка
+accent-dwarf-words-replace-1 = дэвочшка
+accent-dwarf-words-2 = мальчик
+accent-dwarf-words-replace-2 = малчшык
+accent-dwarf-words-3 = мужчина
+accent-dwarf-words-replace-3 = мужчшына
+accent-dwarf-words-4 = женщина
+accent-dwarf-words-replace-4 = женчшына
+accent-dwarf-words-5 = делать
+accent-dwarf-words-replace-5 = дэлат
+accent-dwarf-words-6 = не
+accent-dwarf-words-replace-6 = нэ
+accent-dwarf-words-7 = нее
+accent-dwarf-words-replace-7 = нээ
+accent-dwarf-words-8 = я
+accent-dwarf-words-replace-8 = Йа
+accent-dwarf-words-9 = есть
+accent-dwarf-words-replace-9 = йэст
+accent-dwarf-words-10 = перейти
+accent-dwarf-words-replace-10 = пэрэйты
+accent-dwarf-words-11 = знать
+accent-dwarf-words-replace-11 = знат
+accent-dwarf-words-12 = и
+accent-dwarf-words-replace-12 = ыэ
+accent-dwarf-words-13 = вы
+accent-dwarf-words-replace-13 = вы
+accent-dwarf-words-14 = ты
+accent-dwarf-words-replace-14 = ты
+accent-dwarf-words-15 = приветствую
+accent-dwarf-words-replace-15 = прывэтству
+accent-dwarf-words-16 = привет
+accent-dwarf-words-replace-16 = прывэт
+accent-dwarf-words-17 = все
+accent-dwarf-words-replace-17 = всэ
+accent-dwarf-words-18 = от
+accent-dwarf-words-replace-18 = од
+accent-dwarf-words-19 = здравия
+accent-dwarf-words-replace-19 = здравыйа
+accent-dwarf-words-20 = меня
+accent-dwarf-words-replace-20 = мэнйа
+accent-dwarf-words-21 = тебя
+accent-dwarf-words-replace-21 = тэбйа
+accent-dwarf-words-22 = себя
+accent-dwarf-words-replace-22 = сэбйа
+accent-dwarf-words-23 = где
+accent-dwarf-words-replace-23 = гдэ
+accent-dwarf-words-24 = ой
+accent-dwarf-words-replace-24 = ойё
+accent-dwarf-words-25 = маленький
+accent-dwarf-words-replace-25 = мэлкый
+accent-dwarf-words-26 = большой
+accent-dwarf-words-replace-26 = громадный
+accent-dwarf-words-27 = сука
+accent-dwarf-words-replace-27 = кнурла
+accent-dwarf-words-28 = даа
+accent-dwarf-words-replace-28 = Ойии
+accent-dwarf-words-29 = конечно
+accent-dwarf-words-replace-29 = конэчшно
+accent-dwarf-words-30 = да
+accent-dwarf-words-replace-30 = Ойи
+accent-dwarf-words-31 = тоже
+accent-dwarf-words-replace-31 = тожэ
+accent-dwarf-words-32 = мой
+accent-dwarf-words-replace-32 = мойё
+accent-dwarf-words-33 = нет
+accent-dwarf-words-replace-33 = нэт
+accent-dwarf-words-34 = папа
+accent-dwarf-words-replace-34 = уру
+accent-dwarf-words-35 = мама
+accent-dwarf-words-replace-35 = дельва
+accent-dwarf-words-36 = срочник
+accent-dwarf-words-replace-36 = свэжак
+accent-dwarf-words-37 = новичок
+accent-dwarf-words-replace-37 = свэжак
+accent-dwarf-words-38 = стажёр
+accent-dwarf-words-replace-38 = свэжак
+accent-dwarf-words-39 = профессионал
+accent-dwarf-words-replace-39 = бывалый
+accent-dwarf-words-40 = ветеран
+accent-dwarf-words-replace-40 = бывалый
+accent-dwarf-words-41 = блять
+accent-dwarf-words-replace-41 = вррон
+accent-dwarf-words-42 = если
+accent-dwarf-words-replace-42 = эслы
+accent-dwarf-words-43 = следует
+accent-dwarf-words-replace-43 = слэдуэт
+accent-dwarf-words-44 = сделал
+accent-dwarf-words-replace-44 = сдэлал
+accent-dwarf-words-45 = пизда
+accent-dwarf-words-replace-45 = награ
+accent-dwarf-words-46 = никто
+accent-dwarf-words-replace-46 = ныкто
+accent-dwarf-words-47 = делайте
+accent-dwarf-words-replace-47 = дэлать
+accent-dwarf-words-48 = здравствуй
+accent-dwarf-words-replace-48 = здарова
+accent-dwarf-words-49 = очко
+accent-dwarf-words-replace-49 = дыра
+accent-dwarf-words-50 = синдикатовцы
+accent-dwarf-words-replace-50 = злодеи
+accent-dwarf-words-51 = капитан
+accent-dwarf-words-replace-51 = кэпытан
+accent-dwarf-words-52 = беги
+accent-dwarf-words-replace-52 = дэри ноги
+accent-dwarf-words-53 = волосы
+accent-dwarf-words-replace-53 = борода
+accent-dwarf-words-54 = вода
+accent-dwarf-words-replace-54 = пиво
+accent-dwarf-words-55 = выпить
+accent-dwarf-words-replace-55 = выпыт пиво
+accent-dwarf-words-56 = пить
+accent-dwarf-words-replace-56 = пить пиво
+accent-dwarf-words-57 = имею
+accent-dwarf-words-replace-57 = ымэу
+accent-dwarf-words-58 = напиток
+accent-dwarf-words-replace-58 = пиво
+accent-dwarf-words-59 = водка
+accent-dwarf-words-replace-59 = пиво
+accent-dwarf-words-60 = блин
+accent-dwarf-words-replace-60 = рыбьы головэжкы
+accent-dwarf-words-61 = в принципе
+accent-dwarf-words-replace-61 = в прынцыпэ
+accent-dwarf-words-62 = короче
+accent-dwarf-words-replace-62 = корочэ
+accent-dwarf-words-63 = вообще
+accent-dwarf-words-replace-63 = вообчшэ
+accent-dwarf-words-64 = ну
+accent-dwarf-words-replace-64 = нуэ
+accent-dwarf-words-66 = еда
+accent-dwarf-words-replace-66 = жратва
+accent-dwarf-words-67 = еды
+accent-dwarf-words-replace-67 = жратвы
+accent-dwarf-words-68 = эй
+accent-dwarf-words-replace-68 = эйэ
+accent-dwarf-words-69 = что
+accent-dwarf-words-replace-69 = чшто
+accent-dwarf-words-70 = зачем
+accent-dwarf-words-replace-70 = зачэм
+accent-dwarf-words-71 = почему
+accent-dwarf-words-replace-71 = почэму
+accent-dwarf-words-72 = сказать
+accent-dwarf-words-replace-72 = сказанут
+accent-dwarf-words-73 = своим
+accent-dwarf-words-replace-73 = своым
+accent-dwarf-words-74 = её
+accent-dwarf-words-replace-74 = йейё
+accent-dwarf-words-75 = двигай
+accent-dwarf-words-replace-75 = двыгай
+accent-dwarf-words-76 = двигаться
+accent-dwarf-words-replace-76 = двыгатсйа
+accent-dwarf-words-77 = не был
+accent-dwarf-words-replace-77 = нэ был
+accent-dwarf-words-78 = сейчас
+accent-dwarf-words-replace-78 = сэйчшас
+accent-dwarf-words-79 = волшебник
+accent-dwarf-words-replace-79 = вельдуност
+accent-dwarf-words-80 = маг
+accent-dwarf-words-replace-80 = вельнудост
+accent-dwarf-words-81 = чтобы
+accent-dwarf-words-replace-81 = чштобы
+accent-dwarf-words-82 = для
+accent-dwarf-words-replace-82 = длйа
+accent-dwarf-words-83 = даже
+accent-dwarf-words-replace-83 = дажэ
+accent-dwarf-words-84 = ай
+accent-dwarf-words-replace-84 = айэ
+accent-dwarf-words-85 = мышь
+accent-dwarf-words-replace-85 = мыш
+accent-dwarf-words-86 = клоун
+accent-dwarf-words-replace-86 = шут
+accent-dwarf-words-87 = друг
+accent-dwarf-words-replace-87 = брат
+accent-dwarf-words-88 = проблема
+accent-dwarf-words-replace-88 = закавыка
+accent-dwarf-words-90 = разрешите
+accent-dwarf-words-replace-90 = разрэшытэ
+accent-dwarf-words-91 = брифинг
+accent-dwarf-words-replace-91 = совет
+accent-dwarf-words-92 = врач
+accent-dwarf-words-replace-92 = лекарь
+accent-dwarf-words-93 = говорить
+accent-dwarf-words-replace-93 = говорит
+accent-dwarf-words-94 = разговаривать
+accent-dwarf-words-replace-94 = разговарыват
+accent-dwarf-words-95 = спиртное
+accent-dwarf-words-replace-95 = пиво
+accent-dwarf-words-96 = звоните
+accent-dwarf-words-replace-96 = звонытэ
+accent-dwarf-words-97 = подарить
+accent-dwarf-words-replace-97 = подарытэ
+accent-dwarf-words-98 = дайте
+accent-dwarf-words-replace-98 = дайтэ
+accent-dwarf-words-99 = выдайте
+accent-dwarf-words-replace-99 = выдайтэ
+accent-dwarf-words-100 = отвечайте
+accent-dwarf-words-replace-100 = отвэчшайтэ
+accent-dwarf-words-101 = без
+accent-dwarf-words-replace-101 = бэз
+accent-dwarf-words-102 = синдикат
+accent-dwarf-words-replace-102 = злодей
+accent-dwarf-words-103 = ли
+accent-dwarf-words-replace-103 = лы
+accent-dwarf-words-104 = никогда
+accent-dwarf-words-replace-104 = ныкогда
+accent-dwarf-words-105 = точно
+accent-dwarf-words-replace-105 = точшно
+accent-dwarf-words-106 = неважно
+accent-dwarf-words-replace-106 = нэважно
+accent-dwarf-words-107 = хуй
+accent-dwarf-words-replace-107 = елдак
+accent-dwarf-words-108 = однако
+accent-dwarf-words-replace-108 = однако
+accent-dwarf-words-109 = думать
+accent-dwarf-words-replace-109 = думат
+accent-dwarf-words-111 = гамлет
+accent-dwarf-words-replace-111 = грызун
+accent-dwarf-words-112 = хомяк
+accent-dwarf-words-replace-112 = грызун
+accent-dwarf-words-113 = нюкер
+accent-dwarf-words-replace-113 = красношлемый
+accent-dwarf-words-114 = нюкеры
+accent-dwarf-words-replace-114 = карсношлемые
+accent-dwarf-words-115 = ядерный оперативник
+accent-dwarf-words-replace-115 = красношлемый
+accent-dwarf-words-116 = ядерные оперативники
+accent-dwarf-words-replace-116 = красношлемые
+accent-dwarf-words-121 = ещё
+accent-dwarf-words-replace-121 = ещчшо
+accent-dwarf-words-122 = более того
+accent-dwarf-words-replace-122 = болээ того
+accent-dwarf-words-123 = пассажир
+accent-dwarf-words-replace-123 = пассажыр
+accent-dwarf-words-125 = человек
+accent-dwarf-words-replace-125 = чэловэк
+accent-dwarf-words-126 = гномы
+accent-dwarf-words-replace-126 = дворфы
+accent-dwarf-words-127 = слайм
+accent-dwarf-words-replace-127 = желе
+accent-dwarf-words-128 = слаймы
+accent-dwarf-words-replace-128 = желе
+accent-dwarf-words-129 = унатх
+accent-dwarf-words-replace-129 = ящер
+accent-dwarf-words-130 = паук
+accent-dwarf-words-replace-130 = хиссшер
+accent-dwarf-words-131 = унатхи
+accent-dwarf-words-replace-131 = ящеры
+accent-dwarf-words-132 = люди
+accent-dwarf-words-replace-132 = кнурлан
+accent-dwarf-words-133 = эвак
+accent-dwarf-words-replace-133 = вывоз
+accent-dwarf-words-134 = предатель
+accent-dwarf-words-replace-134 = злодей
+accent-dwarf-words-135 = корпорация
+accent-dwarf-words-replace-135 = корпорацыйа
+accent-dwarf-words-136 = мне
+accent-dwarf-words-replace-136 = мнэ
+accent-dwarf-words-137 = зомби
+accent-dwarf-words-replace-137 = гнилые
+accent-dwarf-words-138 = заражённый
+accent-dwarf-words-replace-138 = гнилой
+accent-dwarf-words-139 = мим
+accent-dwarf-words-replace-139 = молчун
+accent-dwarf-words-140 = считать
+accent-dwarf-words-replace-140 = счшытат
+accent-dwarf-words-141 = карп
+accent-dwarf-words-replace-141 = рыбёха
+accent-dwarf-words-142 = ксено
+accent-dwarf-words-replace-142 = монстры
+accent-dwarf-words-143 = шаттл
+accent-dwarf-words-replace-143 = судно
+accent-dwarf-words-144 = думаю
+accent-dwarf-words-replace-144 = думайу
+accent-dwarf-words-145 = крысы
+accent-dwarf-words-replace-145 = грызуны
+accent-dwarf-words-146 = даун
+accent-dwarf-words-replace-146 = обалдуй
+accent-dwarf-words-147 = СБ
+accent-dwarf-words-replace-147 = стража
 accent-dwarf-words-148 = a
 accent-dwarf-words-replace-148 = ae

Resources/Locale/ru-RU/accent/italian.ftl

@@ -7,101 +7,99 @@
 # accent-italian-prefix-3 = Mamma-mia! That's a spicy meat-ball!
 # accemt-italian-prefix-4 = La la la la la funiculi funicula!
 
-accent-italian-words-1 = assistant
-accent-italian-words-replace-1 = goombah
-accent-italian-words-2 = assistants
-accent-italian-words-replace-2 = goombahs
-accent-italian-words-3 = baby
-accent-italian-words-replace-3 = bambino
-accent-italian-words-4 = bad
-accent-italian-words-replace-4 = molto male
-accent-italian-words-5 = bye
-accent-italian-words-replace-5 = arrivederci
-accent-italian-words-6 = captain
-accent-italian-words-replace-6 = capitano
-accent-italian-words-7 = cheese
-accent-italian-words-replace-7 = parmesano
-accent-italian-words-8 = cook
-accent-italian-words-replace-8 = cook-a
-accent-italian-words-9 = could
-accent-italian-words-replace-9 = could-a
-accent-italian-words-10 = dad
-accent-italian-words-replace-10 = pappa
-accent-italian-words-11 = good
-accent-italian-words-replace-11 = molto bene
-accent-italian-words-12 = greytide
-accent-italian-words-replace-12 = curvisti
-accent-italian-words-13 = greytider
-accent-italian-words-replace-13 = curvisti
-accent-italian-words-14 = greytiders
-accent-italian-words-replace-14 = curvisti
-accent-italian-words-15 = hello
-accent-italian-words-replace-15 = ciao
-accent-italian-words-16 = it's
-accent-italian-words-replace-16 = it's-a
-accent-italian-words-17 = make
-accent-italian-words-replace-17 = make-a
-accent-italian-words-18 = meat
-accent-italian-words-replace-18 = prosciutto
-accent-italian-words-19 = mom
-accent-italian-words-replace-19 = mamma
-accent-italian-words-20 = my
-accent-italian-words-replace-20 = my-a
-accent-italian-words-21 = nuke
-accent-italian-words-replace-21 = spiciest-a meatball
-accent-italian-words-22 = op
-accent-italian-words-replace-22 = greek
-accent-italian-words-23 = operative
-accent-italian-words-replace-23 = greek
-accent-italian-words-24 = operatives
-accent-italian-words-replace-24 = greeks
-accent-italian-words-24 = ops
-accent-italian-words-replace-24 = greeks
-accent-italian-words-25 = sec
-accent-italian-words-replace-25 = polizia
-accent-italian-words-26 = security
-accent-italian-words-replace-26 = polizia
-accent-italian-words-27 = secoff
-accent-italian-words-replace-27 = polizia
-accent-italian-words-28 = shitcurity
-accent-italian-words-replace-28 = carabinieri
-accent-italian-words-29 = shitsec
-accent-italian-words-replace-29 = carabinieri
-accent-italian-words-30 = sing
-accent-italian-words-replace-30 = sing-a
-accent-italian-words-31 = spaghetti
-accent-italian-words-replace-31 = SPAGHETT
-accent-italian-words-32 = spicy
-accent-italian-words-replace-32 = a-spicy
-accent-italian-words-33 = thanks
-accent-italian-words-replace-33 = grazie
-accent-italian-words-34 = thing
-accent-italian-words-replace-34 = thing-a
-accent-italian-words-35 = traitor
-accent-italian-words-replace-35 = mafioso
-accent-italian-words-36 = traitors
-accent-italian-words-replace-36 = mafioso
-accent-italian-words-37 = use
-accent-italian-words-replace-37 = use-a
-accent-italian-words-38 = want
-accent-italian-words-replace-38 = want-a
-accent-italian-words-39 = what's
-accent-italian-words-replace-39 = what's-a
-accent-italian-words-40 = who's
-accent-italian-words-replace-40 = who's-a
-accent-italian-words-41 = whose
-accent-italian-words-replace-41 = whose-a
-accent-italian-words-42 = why
-accent-italian-words-replace-42 = for-a what reason
-accent-italian-words-43 = wine
-accent-italian-words-replace-43 = vino
-accent-italian-words-44 = passenger
-accent-italian-words-replace-44 = goombah
-accent-italian-words-45 = passengers
-accent-italian-words-replace-45 = goombahs
-accent-italian-words-46 = i'm
-accent-italian-words-replace-46 = i'm-a
-accent-italian-words-47 = am-a
-accent-italian-words-replace-47 = am-a
-accent-italian-words-48 = and-a
-accent-italian-words-replace-48 = and-a
+accent-italian-words-1 = ассистент
+accent-italian-words-replace-1 = гоомбах
+accent-italian-words-2 = ассистенты
+accent-italian-words-replace-2 = гоомбахы
+accent-italian-words-3 = малыш
+accent-italian-words-replace-3 = бамбино
+accent-italian-words-4 = плохой
+accent-italian-words-replace-4 = мольто мале
+accent-italian-words-5 = прощай
+accent-italian-words-replace-5 = арриведерчи
+accent-italian-words-6 = капитан
+accent-italian-words-replace-6 = капитанно
+accent-italian-words-7 = сыр
+accent-italian-words-replace-7 = пармезано
+accent-italian-words-8 = приготовь
+accent-italian-words-replace-8 = кукунера
+accent-italian-words-9 = могу
+accent-italian-words-replace-9 = потрибе
+accent-italian-words-10 = папа
+accent-italian-words-replace-10 = паппа
+accent-italian-words-11 = хороший
+accent-italian-words-replace-11 = мольто бене
+accent-italian-words-12 = грейтайд
+accent-italian-words-replace-12 = курбисти
+accent-italian-words-13 = грейтайдер
+accent-italian-words-replace-13 = курбисти
+accent-italian-words-14 = грейтайдеры
+accent-italian-words-replace-14 = курбисти
+accent-italian-words-15 = привет
+accent-italian-words-replace-15 = чао
+accent-italian-words-16 = это
+accent-italian-words-replace-16 = э ун
+accent-italian-words-17 = сделай
+accent-italian-words-replace-17 = фаре уна
+accent-italian-words-18 = мясо
+accent-italian-words-replace-18 = прошутто
+accent-italian-words-19 = мама
+accent-italian-words-replace-19 = мамма
+accent-italian-words-20 = мой
+accent-italian-words-replace-20 = ил мио
+accent-italian-words-21 = бомба
+accent-italian-words-replace-21 = полпетта ди карне
+accent-italian-words-22 = опер
+accent-italian-words-replace-22 = греко
+accent-italian-words-23 = оперативник
+accent-italian-words-replace-23 = греко
+accent-italian-words-24 = оперативники
+accent-italian-words-replace-24 = греци
+accent-italian-words-25 = СБ
+accent-italian-words-replace-25 = полиция
+accent-italian-words-26 = охрана
+accent-italian-words-replace-26 = полиция
+accent-italian-words-27 = офицер
+accent-italian-words-replace-27 = полиция
+accent-italian-words-28 = щиткюр
+accent-italian-words-replace-28 = карабиньери
+accent-italian-words-29 = щитсек
+accent-italian-words-replace-29 = карабиньери
+accent-italian-words-30 = петь
+accent-italian-words-replace-30 = кантаре
+accent-italian-words-31 = спагетти
+accent-italian-words-replace-31 = СПАГЕТТ
+accent-italian-words-32 = острый
+accent-italian-words-replace-32 = пиканте
+accent-italian-words-33 = спасибо
+accent-italian-words-replace-33 = грацие
+accent-italian-words-34 = вещь
+accent-italian-words-replace-34 = уна коза
+accent-italian-words-35 = предатель
+accent-italian-words-replace-35 = мафиозо
+accent-italian-words-36 = предатели
+accent-italian-words-replace-36 = мафиози
+accent-italian-words-37 = используй
+accent-italian-words-replace-37 = узаре
+accent-italian-words-38 = хочу
+accent-italian-words-replace-38 = дезидераре
+accent-italian-words-39 = что
+accent-italian-words-replace-39 = коза
+accent-italian-words-40 = кто
+accent-italian-words-replace-40 = ке
+accent-italian-words-41 = чьё
+accent-italian-words-replace-41 = ил куи
+accent-italian-words-42 = почему
+accent-italian-words-replace-42 = перке
+accent-italian-words-43 = вино
+accent-italian-words-replace-43 = вино
+accent-italian-words-44 = пассажир
+accent-italian-words-replace-44 = гоомбах
+accent-italian-words-45 = пассажиры
+accent-italian-words-replace-45 = гоомбахы
+accent-italian-words-46 = я
+accent-italian-words-replace-46 = соно
+accent-italian-words-47 = мы
+accent-italian-words-replace-47 = нои
+accent-italian-words-48 = и
+accent-italian-words-replace-48 = э

Resources/Locale/ru-RU/accent/mobster.ftl

@@ -4,37 +4,37 @@ accent-mobster-suffix-boss-2 = , дазабей.
 accent-mobster-suffix-boss-3 = , андестенд?
 accent-mobster-suffix-minion-1 = , йеах!
 accent-mobster-suffix-minion-2 = , босс говорит!
-accent-mobster-words-1 = let me
-accent-mobster-words-replace-1 = lemme
-accent-mobster-words-2 = should
-accent-mobster-words-replace-2 = oughta
-accent-mobster-words-3 = the
-accent-mobster-words-replace-3 = da
-accent-mobster-words-4 = them
-accent-mobster-words-replace-4 = dem
-accent-mobster-words-5 = attack
-accent-mobster-words-replace-5 = whack
-accent-mobster-words-6 = kill
-accent-mobster-words-replace-6 = whack
-accent-mobster-words-7 = murder
-accent-mobster-words-replace-7 = whack
-accent-mobster-words-8 = dead
-accent-mobster-words-replace-8 = sleepin' with da fishies
-accent-mobster-words-9 = hey
-accent-mobster-words-replace-9 = ey'o
-accent-mobster-words-10 = hi
-accent-mobster-words-replace-10 = ey'o
-accent-mobster-words-11 = hello
-accent-mobster-words-replace-11 = ey'o
-accent-mobster-words-12 = rules
-accent-mobster-words-replace-12 = roolz
-accent-mobster-words-13 = you
-accent-mobster-words-replace-13 = yous
-accent-mobster-words-14 = have to
-accent-mobster-words-replace-14 = gotta
-accent-mobster-words-15 = going to
-accent-mobster-words-replace-15 = boutta
-accent-mobster-words-16 = about to
-accent-mobster-words-replace-16 = boutta
-accent-mobster-words-17 = here
-accent-mobster-words-replace-17 = 'ere
+accent-mobster-words-1 = давай я
+accent-mobster-words-replace-1 = дайя
+accent-mobster-words-2 = ищи
+accent-mobster-words-replace-2 = рыскай
+accent-mobster-words-3 = это
+accent-mobster-words-replace-3 = эт
+accent-mobster-words-4 = они
+accent-mobster-words-replace-4 = эти вот
+accent-mobster-words-5 = атаковать
+accent-mobster-words-replace-5 = в крысу
+accent-mobster-words-6 = убить
+accent-mobster-words-replace-6 = замочить
+accent-mobster-words-7 = напасть
+accent-mobster-words-replace-7 = втащить
+accent-mobster-words-8 = мёртв
+accent-mobster-words-replace-8 = дрыхнет с рыбками
+accent-mobster-words-9 = привет
+accent-mobster-words-replace-9 = ей'йо
+accent-mobster-words-10 = хай
+accent-mobster-words-replace-10 = ей'йо
+accent-mobster-words-11 = хей
+accent-mobster-words-replace-11 = ей'йо
+accent-mobster-words-12 = правило
+accent-mobster-words-replace-12 = мутка
+accent-mobster-words-13 = ты
+accent-mobster-words-replace-13 = ты нна
+accent-mobster-words-14 = нужно
+accent-mobster-words-replace-14 = нада
+accent-mobster-words-15 = идет
+accent-mobster-words-replace-15 = шкандыбает
+accent-mobster-words-16 = идёт
+accent-mobster-words-replace-16 = шкандыбает
+accent-mobster-words-17 = тут
+accent-mobster-words-replace-17 = тута

Resources/Locale/ru-RU/accent/parrot.ftl

@@ -0,0 +1,8 @@
+accent-parrot-squawk-1 = СКВАК!
+accent-parrot-squawk-2 = СКВАААК!
+accent-parrot-squawk-3 = АВВК!
+accent-parrot-squawk-4 = ААВК!
+accent-parrot-squawk-5 = РАВВК!
+accent-parrot-squawk-6 = РАААВК!
+accent-parrot-squawk-7 = БРААВК!
+accent-parrot-squawk-8 = БРАВВК!

Resources/Locale/ru-RU/accent/pirate.ftl

@@ -1,67 +1,66 @@
-accent-pirate-prefix-1 = Аргх
-accent-pirate-prefix-2 = Гар
+accent-pirate-prefix-1 = Арргх
+accent-pirate-prefix-2 = Гарр
 accent-pirate-prefix-3 = Йарр
-accent-pirate-replaced-1 = my
-accent-pirate-replacement-1 = me
-accent-pirate-replaced-2 = you
-accent-pirate-replacement-2 = ya
-accent-pirate-replaced-3 = hello
-accent-pirate-replacement-3 = ahoy
-accent-pirate-replaced-4 = yes
-accent-pirate-replacement-4 = aye
-accent-pirate-replaced-5 = yea
-accent-pirate-replaced-6 = hi
-accent-pirate-replaced-7 = is
-accent-pirate-replacement-5 = be
-accent-pirate-replaced-8 = there
-accent-pirate-replacement-6 = thar
-accent-pirate-replacement-7 = heartie
-accent-pirate-replacement-8 = matey
-accent-pirate-replaced-9 = buddy
-accent-pirate-replacement-9 = heartie
-accent-pirate-replaced-10 = hi
-accent-pirate-replacement-10 = ahoy
-accent-pirate-replaced-11 = hey
-accent-pirate-replacement-11 = oye
-accent-pirate-replaced-12 = money
-accent-pirate-replacement-12 = dubloons
-accent-pirate-replaced-13 = cash
-accent-pirate-replacement-13 = doubloons
-accent-pirate-replaced-14 = crate
-accent-pirate-replacement-14 = coffer
-accent-pirate-replaced-15 = hello
-accent-pirate-replacement-15 = ahoy
-accent-pirate-replaced-16 = treasure
-accent-pirate-replacement-16 = booty
-accent-pirate-replaced-17 = attention
-accent-pirate-replacement-17 = avast
-accent-pirate-replaced-18 = stupid
-accent-pirate-replacement-18 = parrot-brained
-accent-pirate-replaced-19 = idiot
-accent-pirate-replacement-19 = seadog
-accent-pirate-replaced-20 = your
-accent-pirate-replacement-20 = yere
-accent-pirate-replaced-21 = song
-accent-pirate-replacement-21 = shanty
-accent-pirate-replaced-22 = music
-accent-pirate-replacement-22 = shanty
-accent-pirate-replaced-23 = no
-accent-pirate-replacement-23 = nay
-accent-pirate-replaced-24 = are
-accent-pirate-replacement-24 = arrr
-accent-pirate-replaced-25 = ow
-accent-pirate-replacement-25 = argh
-accent-pirate-replaced-26 = ouch
-accent-pirate-replacement-26 = argh
-accent-pirate-replaced-27 = passenger
-accent-pirate-replacement-27 = landlubber
-accent-pirate-replaced-28 = tider
-accent-pirate-replacement-28 = landlubber
-accent-pirate-replaced-29 = captain
-accent-pirate-replacement-29 = cap'n
-accent-pirate-replaced-30 = pistol
-accent-pirate-replacement-30 = flintlock
-accent-pirate-replaced-31 = rifle
-accent-pirate-replacement-31 = musket
-accent-pirate-replaced-32 = ammo
-accent-pirate-replacement-32 = gunpowder
+accent-pirate-prefix-4 = Йарргх
+accent-pirate-replaced-1 = мой
+accent-pirate-replacement-1 = я
+accent-pirate-replaced-2 = ты
+accent-pirate-replacement-2 = тырр
+accent-pirate-replaced-3 = привет
+accent-pirate-replacement-3 = ахой
+accent-pirate-replaced-4 = да
+accent-pirate-replacement-4 = йерс
+accent-pirate-replaced-6 = привет
+accent-pirate-replacement-6 = ахой
+accent-pirate-replaced-7 = сб
+accent-pirate-replacement-7 = гады
+accent-pirate-replaced-8 = там
+accent-pirate-replacement-8 = там
+accent-pirate-replaced-9 = друг
+accent-pirate-replacement-9 = дружище
+accent-pirate-replaced-10 = привет
+accent-pirate-replacement-10 = ахой
+accent-pirate-replaced-11 = эй
+accent-pirate-replacement-11 = ой
+accent-pirate-replaced-12 = деньги
+accent-pirate-replacement-12 = дублоны
+accent-pirate-replaced-13 = кредиты
+accent-pirate-replacement-13 = дублоны
+accent-pirate-replaced-14 = ящик
+accent-pirate-replacement-14 = сундук
+accent-pirate-replaced-15 = дарова
+accent-pirate-replacement-15 = ахой
+accent-pirate-replaced-16 = синдикат
+accent-pirate-replacement-16 = испанцы
+accent-pirate-replaced-17 = внимание
+accent-pirate-replacement-17 = а-ба-ба
+accent-pirate-replaced-18 = глупый
+accent-pirate-replacement-18 = тупой как попугай
+accent-pirate-replaced-19 = идиот
+accent-pirate-replacement-19 = ту
+accent-pirate-replaced-20 = твой
+accent-pirate-replacement-20 = твоёёр
+accent-pirate-replaced-21 = песня
+accent-pirate-replacement-21 = шанти
+accent-pirate-replaced-22 = музыка
+accent-pirate-replacement-22 = шанти
+accent-pirate-replaced-23 = теха
+accent-pirate-replacement-23 = трюм
+accent-pirate-replaced-24 = есть
+accent-pirate-replacement-24 = а-а-а
+accent-pirate-replaced-25 = ах
+accent-pirate-replacement-25 = аргх
+accent-pirate-replaced-26 = ай
+accent-pirate-replacement-26 = аргх
+accent-pirate-replaced-27 = пассажир
+accent-pirate-replacement-27 = сухопутный
+accent-pirate-replaced-28 = пассажир
+accent-pirate-replacement-28 = сухопутный
+accent-pirate-replaced-29 = блять
+accent-pirate-replacement-29 = разрази меня гром
+accent-pirate-replaced-30 = пистолет
+accent-pirate-replacement-30 = кремневый пистолет
+accent-pirate-replaced-31 = винтовка
+accent-pirate-replacement-31 = мушкет
+accent-pirate-replaced-32 = патроны
+accent-pirate-replacement-32 = порох

Resources/Locale/ru-RU/accent/southern.ftl

@@ -0,0 +1,12 @@
+accent-southern-words-1 = you all
+accent-southern-words-replace-1 = y'all
+accent-southern-words-2 = you guys
+accent-southern-words-replace-2 = y'all
+accent-southern-words-3 = isn't
+accent-southern-words-replace-3 = ain't
+accent-southern-words-4 = is not
+accent-southern-words-replace-4 = ain't
+accent-southern-words-5 = aren't
+accent-southern-words-replace-5 = ain't
+accent-southern-words-6 = are not
+accent-southern-words-replace-6 = ain't

Resources/Locale/ru-RU/access/components/agent-id-card-component.ftl

@@ -8,4 +8,5 @@ agent-id-new =
     }.
 agent-id-card-current-name = Имя:
 agent-id-card-current-job = Должность:
+agent-id-card-job-icon-label = Иконка:
 agent-id-menu-title = ID карта Агента

Resources/Locale/ru-RU/access/components/id-card-component.ftl

@@ -3,6 +3,6 @@
 access-id-card-component-owner-name-job-title-text = ID карта { $jobSuffix }
 access-id-card-component-owner-full-name-job-title-text = ID карта { $fullName },{ $jobSuffix }
 access-id-card-component-default = ID карта
-id-card-component-microwave-burnt = { $id } громко щелкает!
+id-card-component-microwave-burnt = { $id } громко щёлкает!
 id-card-component-microwave-bricked = { $id } шипит!
-id-card-component-microwave-safe = { $id } издает странный звук.
+id-card-component-microwave-safe = { $id } издаёт странный звук.

Resources/Locale/ru-RU/access/components/id-card-console-component.ftl

@@ -1,10 +1,11 @@
-id-card-console-window-privileged-id = Основной ID:
-id-card-console-window-target-id = Целевой ID:
+id-card-console-window-privileged-id = Основная ID:
+id-card-console-window-target-id = Целевая ID:
 id-card-console-window-full-name-label = Полное имя:
 id-card-console-window-save-button = Сохранить
 id-card-console-window-job-title-label = Должность:
 id-card-console-window-eject-button = Извлечь
 id-card-console-window-insert-button = Вставить
+id-card-console-window-job-selection-label = Предустановки должностей (задаёт иконку отдела и должности):
 access-id-card-console-component-no-hands-error = У вас нет рук.
-id-card-console-privileged-id = Основной ID
-id-card-console-target-id = Целевой ID
+id-card-console-privileged-id = Основная ID
+id-card-console-target-id = Целевая ID

Resources/Locale/ru-RU/accessories/human-hair.ftl

@@ -7,7 +7,7 @@ marking-HumanHairBedhead = Небрежная
 marking-HumanHairBedheadv2 = Небрежная 2
 marking-HumanHairBedheadv3 = Небрежная 3
 marking-HumanHairLongBedhead = Небрежная (Длинная)
-marking-HumanHairLongBedhead2 = Небрежная (Длинная) 2
+marking-HumanHairLongBedhead2 = Небрежная (Длинная 2)
 marking-HumanHairFloorlengthBedhead = Небрежная (До пола)
 marking-HumanHairBeehive = Улей
 marking-HumanHairBeehivev2 = Улей 2
@@ -15,6 +15,7 @@ marking-HumanHairBob = Каре
 marking-HumanHairBob2 = Каре 2
 marking-HumanHairBobcut = Каре 3
 marking-HumanHairBob4 = Каре 4
+marking-HumanHairBob5 = Каре 5
 marking-HumanHairBobcurl = Каре (Завитки)
 marking-HumanHairBoddicker = Боддикер
 marking-HumanHairBowlcut = Горшок
@@ -38,6 +39,15 @@ marking-HumanHairBusiness3 = Деловая 3
 marking-HumanHairBusiness4 = Деловая 4
 marking-HumanHairBuzzcut = Баз кат
 marking-HumanHairCia = ЦРУ
+marking-HumanHairClassicAfro = Классическая Афро
+marking-HumanHairClassicBigAfro = Классическая Афро (Большая)
+marking-HumanHairClassicBusiness = Классическая Деловая
+marking-HumanHairClassicCia = Классическая ЦРУ
+marking-HumanHairClassicCornrows2 = Классическая Корнроу 2
+marking-HumanHairClassicFloorlengthBedhead = Классическая Небрежная (До пола)
+marking-HumanHairClassicModern = Классическая Современная
+marking-HumanHairClassicMulder = Классическая Малдер
+marking-HumanHairClassicWisp = Классическая Пряди
 marking-HumanHairCoffeehouse = Кофейная
 marking-HumanHairCombover = Зачёс (Назад)
 marking-HumanHairCornrows = Корнроу
@@ -45,12 +55,15 @@ marking-HumanHairCornrows2 = Корнроу 2
 marking-HumanHairCornrowbun = Корнроу (Пучок)
 marking-HumanHairCornrowbraid = Корнроу (Косичка)
 marking-HumanHairCornrowtail = Корнроу (Хвостик)
+marking-HumanHairSpookyLong = Длинная (Зловещая)
 marking-HumanHairCrewcut = Крю-кат
+marking-HumanHairCrewcut2 = Крю-кат 2
 marking-HumanHairCurls = Завитки
 marking-HumanHairC = Подстриженная
 marking-HumanHairDandypompadour = Денди Помпадур
 marking-HumanHairDevilock = Дьявольский замок
 marking-HumanHairDoublebun = Двойной пучок
+marking-HumanHairDoublebunLong = Двойной пучок (Длинные)
 marking-HumanHairDreads = Дреды
 marking-HumanHairDrillruru = Дрели
 marking-HumanHairDrillhairextended = Дрели (Распущенные)
@@ -86,6 +99,7 @@ marking-HumanHairKusanagi = Кусанаги
 marking-HumanHairLong = Длинная 1
 marking-HumanHairLong2 = Длинная 2
 marking-HumanHairLong3 = Длинная 3
+marking-HumanHairLongWithBundles = Длинная с пучками
 marking-HumanHairLongovereye = Длинная (Через глаз)
 marking-HumanHairLbangs = Длинная (Чёлка)
 marking-HumanHairLongemo = Длинная (Эмо)
@@ -145,6 +159,7 @@ marking-HumanHairShorthairg = Короткая 8
 marking-HumanHair80s = Короткая (80-ые)
 marking-HumanHairRosa = Короткая (Роза)
 marking-HumanHairB = Волосы до плеч
+marking-HumanHairShoulderLengthOverEye = До плеч через глаз
 marking-HumanHairSidecut = Боковой вырез
 marking-HumanHairSkinhead = Бритоголовый
 marking-HumanHairProtagonist = Слегка длинная
@@ -153,6 +168,7 @@ marking-HumanHairSpiky = Колючая 2
 marking-HumanHairSpiky2 = Колючая 3
 marking-HumanHairSwept = Зачёс назад
 marking-HumanHairSwept2 = Зачёс назад 2
+marking-HumanHairTailed = Хвостатая
 marking-HumanHairThinning = Редеющая
 marking-HumanHairThinningfront = Редеющая (Спереди)
 marking-HumanHairThinningrear = Редеющая (Сзади)
@@ -161,9 +177,11 @@ marking-HumanHairTressshoulder = Коса на плече
 marking-HumanHairTrimmed = Под машинку
 marking-HumanHairTrimflat = Под машинку (Плоская)
 marking-HumanHairTwintail = Два хвостика
+marking-HumanHairTwoStrands = Две пряди
 marking-HumanHairUndercut = Андеркат
 marking-HumanHairUndercutleft = Андеркат (Слева)
 marking-HumanHairUndercutright = Андеркат (Справа)
+marking-HumanHairUneven = Неровная
 marking-HumanHairUnkept = Неухоженная
 marking-HumanHairUpdo = Высокая
 marking-HumanHairVlong = Очень длинная

Resources/Locale/ru-RU/accessories/vox-facial-hair.ftl

@@ -1,5 +1,5 @@
-marking-VoxFacialHairColonel = Вокс Полковник
-marking-VoxFacialHairFu = Перья Фу
-marking-VoxFacialHairNeck = Шейные перья
-marking-VoxFacialHairBeard = Перьевая борода
-marking-VoxFacialHairRuffBeard = Грубая борода
+marking-VoxFacialHairColonel = Вокс, Полковник
+marking-VoxFacialHairFu = Вокс, Перья Фу
+marking-VoxFacialHairNeck = Вокс, Шейные перья
+marking-VoxFacialHairBeard = Вокс, Перьевая борода
+marking-VoxFacialHairMane = Вокс, Борода (Грива)

Resources/Locale/ru-RU/accessories/vox-hair.ftl

@@ -1,13 +1,22 @@
-marking-VoxHairShortQuills = Вокс Короткие перья
-marking-VoxHairKingly = Вокс Королевская
-marking-VoxHairAfro = Вокс Афро
-marking-VoxHairMohawk = Вокс Могавк
-marking-VoxHairYasuhiro = Вокс Ясухиро
-marking-VoxHairHorns = Вокс Рога
-marking-VoxHairNights = Вокс Ночная
-marking-VoxHairSurf = Вокс Сёрфер
-marking-VoxHairCropped = Вокс Короткая
-marking-VoxHairRuffhawk = Вокс Руфхавк
-marking-VoxHairRows = Вокс Ряды
-marking-VoxHairMange = Вокс Лишай
-marking-VoxHairPony = Вокс Пони
+marking-VoxHairShortQuills = Вокс, Короткие перья
+marking-VoxHairBraids = Вокс, Косички
+marking-VoxHairCrestedQuills = Вокс, Гребнистые перья
+marking-VoxHairEmperorQuills = Вокс, Императорские перья
+marking-VoxHairFlowing = Вокс, Струящаяся
+marking-VoxHairHawk = Вокс, Ястреб
+marking-VoxHairKingly = Вокс, Королевская
+marking-VoxHairKeelQuills = Вокс, Килевые перья
+marking-VoxHairKeetQuills = Вокс, Перья цесарки
+marking-VoxHairAfro = Вокс, Афро
+marking-VoxHairLongBraid = Вокс, Длинная коса
+marking-VoxHairMohawk = Вокс, Могавк
+marking-VoxHairHorns = Вокс, Рога
+marking-VoxHairNights = Вокс, Ночная
+marking-VoxHairRazorClipped = Вокс, Бритва (Обрезанные)
+marking-VoxHairRazor = Вокс, Бритва
+marking-VoxHairSortBraid = Вокс, Короткая коса
+marking-VoxHairSurf = Вокс, Сёрфер
+marking-VoxHairTielQuills = Вокс, Тилские перья
+marking-VoxHairYasu = Вокс, Ясухиро
+marking-VoxHairMange = Вокс, Лишай
+marking-VoxHairPony = Вокс, Пони

Resources/Locale/ru-RU/actions/actions/actions-commands.ftl

@@ -1,6 +1,8 @@
-## Actions Commands loc
+## Actions Commands loc
+
 
 ## Upgradeaction command loc
+
 upgradeaction-command-need-one-argument = upgradeaction needs at least one argument, the action entity uid. The second optional argument is a specified level.
 upgradeaction-command-max-two-arguments = upgradeaction has a maximum of two arguments, the action entity uid and the (optional) level to set.
 upgradeaction-command-second-argument-not-number = upgradeaction's second argument can only be a number.

Resources/Locale/ru-RU/actions/actions/blocking.ftl

@@ -1,5 +1,3 @@
-action-name-blocking = Блокирование
-action-description-blocking = Поднимите или опустите свой щит.
 action-popup-blocking-user = Вы поднимаете свой { $shield }!
 action-popup-blocking-disabling-user = Вы опускаете свой { $shield }!
 action-popup-blocking-other = { CAPITALIZE($blockerName) } поднимает свой { $shield }!

Resources/Locale/ru-RU/actions/actions/combat-mode.ftl

@@ -1,6 +1,2 @@
-action-name-combat = [color=red]Боевой режим[/color]
-action-description-combat = Войти в боевой режим
-action-name-precision = [color=red]Прицельный режим[/color]
-action-description-precision = Войдите в прицельный боевой режим, для атаки целей под курсором.
-action-popup-precision = Прицельный режим отключён
-action-popup-precision-enabled = Прицельный режим включён
+action-popup-combat-disabled = Боевой режим отключён!
+action-popup-combat-enabled = Боевой режим включён!

Resources/Locale/ru-RU/actions/actions/crit.ftl

@@ -1 +1 @@
-action-name-crit-last-words = Произнести последние слова
+action-name-crit-last-words = Произнести последние слова

Resources/Locale/ru-RU/actions/actions/diona.ftl

@@ -0,0 +1,2 @@
+diona-gib-action-use = { $name } splits apart in an instant!
+diona-reform-attempt = { $name } attempts to reform!

Resources/Locale/ru-RU/actions/actions/disarm-action.ftl

@@ -3,5 +3,3 @@ disarm-action-popup-message-other-clients = { CAPITALIZE($performerName) } об
 disarm-action-popup-message-cursor = { CAPITALIZE($targetName) } обезоружен!
 disarm-action-shove-popup-message-other-clients = { CAPITALIZE($performerName) } толкает { $targetName }!
 disarm-action-shove-popup-message-cursor = Вы толкаете { $targetName }!
-action-name-disarm = [color=red]Обезоруживание[/color]
-action-description-disarm = Попытаться кого-либо [color=red]обезоружить[/color].

Resources/Locale/ru-RU/actions/actions/egg-lay.ftl

@@ -1,5 +1,3 @@
-action-name-lay-egg = Отложить яйцо
-action-description-lay-egg = Потратить сытость чтобы отложить яйцо.
 action-popup-lay-egg-user = Вы отложили яйцо.
 action-popup-lay-egg-others = { CAPITALIZE($entity) } откладывает яйцо.
 action-popup-lay-egg-too-hungry = Съешьте больше еды перед тем как отложить яйцо!

Resources/Locale/ru-RU/actions/actions/mask.ftl

@@ -1,4 +1,2 @@
-action-name-mask = Поменять положение маски
-action-description-mask-toggle = Удобно, но не позволяет вставить пирог в ваше отверстие для пирога.
 action-mask-pull-up-popup-message = Вы натягиваете { $mask } на лицо.
 action-mask-pull-down-popup-message = Вы приспускаете { $mask } с лица.

Resources/Locale/ru-RU/actions/actions/spider.ftl

@@ -1,5 +1,4 @@
-spider-web-action-name = Паутина
-spider-web-action-description = Создает паутину, которая замедляет вашу добычу.
-spider-web-action-nogrid = Под тобой нет пола!
-spider-web-action-success = Вы опутываете себя паутиной.
-spider-web-action-fail = Вы не можете размещать здесь паутину! Во всех направлениях света уже есть паутина!
+spider-web-action-nogrid = Под вами нет пола!
+spider-web-action-success = Вы развешиваете паутину вокруг себя.
+spider-web-action-fail = Вы не можете разместить паутину здесь! На основных направлениях вокруг вас уже есть паутина!
+sericulture-failure-hunger = Ваш желудок слишком пуст для плетения паутины!

Resources/Locale/ru-RU/actions/actions/suicide.ftl

@@ -0,0 +1 @@
+suicide-action-popup = ЭТО ДЕЙСТВИЕ УБЬЁТ ВАС! Для подтверждения выполните его ещё раз.

Resources/Locale/ru-RU/administration/admin-alerts.ftl

@@ -0,0 +1 @@
+admin-alert-shared-connection = { $player } имеет общее интернет-соединение с { $otherCount } другим(-и) игроком(-ами): { $otherList }

Resources/Locale/ru-RU/administration/admin-verbs.ftl

@@ -5,5 +5,13 @@ ahelp-verb-get-data-text = Написать
 admin-verbs-teleport-to = Телепортироваться к
 admin-verbs-teleport-here = Телепортировать сюда
 admin-verbs-freeze = Заморозить
+admin-verbs-freeze-and-mute = Заморозить и заглушить
 admin-verbs-unfreeze = Разморозить
+admin-verbs-erase = Стереть
 admin-verbs-admin-logs-entity = Админ логи
+admin-verbs-erase-description =
+    Удаляет игрока из раунда и манифеста членов экипажа, а также удаляет все его сообщения в чате.
+    Их вещи упадут на землю.
+    Игроки увидят всплывающее окно, указывающее им играть как будто исчезнувшего никогда не существовало.
+toolshed-verb-mark = Отметить
+toolshed-verb-mark-description = Помещает данную сущность в переменную $marked, заменяя её предыдущее значение.

Resources/Locale/ru-RU/administration/antag.ftl

@@ -1,18 +1,20 @@
-verb-categories-antag = Антаг меню
+verb-categories-antag = Антагонисты
 admin-verb-make-traitor = Сделать цель предателем.
-admin-verb-make-changeling = Сделать цель генокрадом.
-admin-verb-make-zombie = Немедленно превратить цель в зомби.
-admin-verb-make-nuclear-operative = Сделать цель одиноким Ядерным Оперативником.
+admin-verb-make-initial-infected = Сделать цель нулевым пациентом.
+admin-verb-make-zombie = Сделать цель зомби.
+admin-verb-make-nuclear-operative = Сделать цель одиноким Ядерным оперативником.
 admin-verb-make-pirate = Сделать цель пиратом\капером. Учтите, что это не меняет игровой режим.
 admin-verb-make-head-rev = Сделать цель главой революции.
 admin-verb-make-thief = Сделать цель вором.
-admin-verb-make-wizard = Сделать цель магом.
-
 admin-verb-text-make-traitor = Сделать предателем
-admin-verb-text-make-changeling = Сделать генокрадом
+admin-verb-text-make-initial-infected = Сделать нулевым пациентом
 admin-verb-text-make-zombie = Сделать зомби
-admin-verb-text-make-nuclear-operative = Сделать одиноким ядерным оперативником
+admin-verb-text-make-nuclear-operative = Сделать ядерным оперативником
 admin-verb-text-make-pirate = Сделать пиратом
-admin-verb-text-make-head-rev = Сделать главой революции
+admin-verb-text-make-head-rev = Сделать Главой революции
 admin-verb-text-make-thief = Сделать вором
+
+admin-verb-make-wizard = Сделать цель магом.
 admin-verb-text-make-wizard = Сделать магом
+admin-verb-make-changeling = Сделать цель генокрадом.
+admin-verb-text-make-changeling = Сделать генокрадом

Resources/Locale/ru-RU/administration/bwoink.ftl

@@ -2,8 +2,11 @@ bwoink-user-title = Сообщение от администратора
 bwoink-system-starmute-message-no-other-users = *Система: Никто не доступен для получения вашего сообщения. Попробуйте обратиться к администраторам игры в Discord.
 bwoink-system-messages-being-relayed-to-discord = Ваши сообщения передаются администраторам через Discord.
 bwoink-system-starmute-message-no-other-users-webhook = *Система: Ваше сообщение было передано администраторам в Discord.
-
-bwoink-system-typing-indicator = {$players} {$count ->
-[one] печатает
-*[other] печатают
-}...
+bwoink-system-typing-indicator =
+    { $players } { $count ->
+        [one] печатает
+       *[other] печатают
+    }...
+admin-bwoink-play-sound = Бвоинк?
+bwoink-title-none-selected = Ничего не выбрано
+bwoink-system-rate-limited = Система: вы отправляете сообщения слишком быстро.

Resources/Locale/ru-RU/administration/commands/add-uplink-command.ftl

@@ -1,4 +1,4 @@
-add-uplink-command-description = Создает аплинк в выбранном предмете и привязывает его к аккаунту игрока
+add-uplink-command-description = Создаёт аплинк в выбранном предмете и привязывает его к аккаунту игрока
 add-uplink-command-help = Использование: adduplink [username] [item-id]
 add-uplink-command-completion-1 = Username (по-умолчанию это вы сами)
 add-uplink-command-completion-2 = Uplink uid (по-умолчанию это ПДА)

Resources/Locale/ru-RU/administration/commands/aghost.ftl

@@ -0,0 +1,3 @@
+aghost-description = Делает вас призраком-админом.
+aghost-no-mind-self = Вы не можете стать призраком!
+aghost-no-mind-other = Эта сущность не может стать призраком!

Resources/Locale/ru-RU/administration/commands/connection-commands.ftl

@@ -0,0 +1,14 @@
+## Strings for the "grant_connect_bypass" command.
+
+cmd-grant_connect_bypass-desc = Temporarily allow a user to bypass regular connection checks.
+cmd-grant_connect_bypass-help =
+    Usage: grant_connect_bypass <user> [duration minutes]
+    Temporarily grants a user the ability to bypass regular connections restrictions.
+    The bypass only applies to this game server and will expire after (by default) 1 hour.
+    They will be able to join regardless of whitelist, panic bunker, or player cap.
+cmd-grant_connect_bypass-arg-user = <user>
+cmd-grant_connect_bypass-arg-duration = [duration minutes]
+cmd-grant_connect_bypass-invalid-args = Expected 1 or 2 arguments
+cmd-grant_connect_bypass-unknown-user = Unable to find user '{ $user }'
+cmd-grant_connect_bypass-invalid-duration = Invalid duration '{ $duration }'
+cmd-grant_connect_bypass-success = Successfully added bypass for user '{ $user }'

Resources/Locale/ru-RU/administration/commands/dsay-command.ftl

@@ -1,2 +1,2 @@
-dsay-command-description = Отправляет сообщение в чат мертвых от имени администратора
+dsay-command-description = Отправляет сообщение в чат мёртвых от имени администратора
 dsay-command-help-text = Использование: { $command } <message>

Resources/Locale/ru-RU/administration/commands/play-global-sound-command.ftl

@@ -1,7 +1,7 @@
-play-global-sound-command-description = Plays a global sound for a specific player or for every connected player if no players are specified.
+play-global-sound-command-description = Проигрывает глобальный звук для выбранного игрока или для каждого подключённого игрока, если не выбран конкретный.
 play-global-sound-command-help = playglobalsound <path> [user 1] ... [user n]
-play-global-sound-command-player-not-found = Player "{ $username }" not found.
-play-global-sound-command-volume-parse = Invalid volume of { $volume } specified.
+play-global-sound-command-player-not-found = Игрок "{ $username }" не найден.
+play-global-sound-command-volume-parse = Задан неправильный уровень громкости { $volume }.
 play-global-sound-command-arg-path = <path>
 play-global-sound-command-arg-volume = [volume]
 play-global-sound-command-arg-usern = [user { $user }]

Resources/Locale/ru-RU/administration/commands/polymorph-command.ftl

@@ -1,5 +1,5 @@
-polymorph-command-description = For when you need someone to stop being a person. Takes an entity and a polymorph prototype.
-polymorph-command-help-text = polymorph <id> <polymorph prototype
-add-polymorph-action-command-description = Takes an entity and gives them a voluntary polymorph.
-add-polymorph-action-command-help-text = addpolymorphaction <id> <polymorph prototype
-polymorph-not-valid-prototype-error = Polymorph prototype is not valid.
+polymorph-command-description = Когда хотите чтобы кто-то перестал быть персоной. Принимает entity и прототип полиморфа.
+polymorph-command-help-text = polymorph <id> <polymorph prototype>
+add-polymorph-action-command-description = Принимает сущность и выдаёт ей добровольный полиморф.
+add-polymorph-action-command-help-text = addpolymorphaction <id> <polymorph prototype>
+polymorph-not-valid-prototype-error = Прототип полиморфа не валиден.

Resources/Locale/ru-RU/administration/commands/set-looc-command.ftl

@@ -2,5 +2,5 @@ set-looc-command-description = Позволяет включить или вык
 set-looc-command-help = Использование: setlooc ИЛИ setlooc [value]
 set-looc-command-too-many-arguments-error = Слишком много аргументов.
 set-looc-command-invalid-argument-error = Неверный аргумент.
-set-looc-command-looc-enabled = LOOC чат был включен.
+set-looc-command-looc-enabled = LOOC чат был включён.
 set-looc-command-looc-disabled = LOOC чат был выключен.

Resources/Locale/ru-RU/administration/commands/set-mind-command.ftl

@@ -1,4 +1,4 @@
-set-mind-command-description = Перемещает сознание в указанную сущность. Сущность должна иметь { $requiredComponent }.
-set-mind-command-help-text = Использование: { $command } <entityUid> <username>
+set-mind-command-description = Перемещает сознание в указанную сущность. Сущность должна иметь { $requiredComponent }. По умолчанию это заставит разум, который в данный момент посещает другие сущности, вернуться обратно (т.е. вернуть призрака в своё основное тело).
+set-mind-command-help-text = Использование: { $command } <entityUid> <username> [unvisit]
 set-mind-command-target-has-no-content-data-message = Целевой игрок не имеет данных о содержимом (wtf?)
-set-mind-command-target-has-no-mind-message = Целевая сущность не обладает разумом (вы забыли сделать ее разумной?)
+set-mind-command-target-has-no-mind-message = Целевая сущность не обладает разумом (вы забыли сделать её разумной?)

Resources/Locale/ru-RU/administration/commands/set-ooc-command.ftl

@@ -2,5 +2,5 @@ set-ooc-command-description = Позволяет включить или вык
 set-ooc-command-help = Использование: setooc ИЛИ setooc [value]
 set-ooc-command-too-many-arguments-error = Слишком много аргументов.
 set-ooc-command-invalid-argument-error = Неверный аргумент.
-set-ooc-command-ooc-enabled = OOC чат был включен.
+set-ooc-command-ooc-enabled = OOC чат был включён.
 set-ooc-command-ooc-disabled = OOC чат был выключен.

Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl

@@ -0,0 +1,4 @@
+cmd-stealthmin-desc = Переключение видимости вас через adminwho.
+cmd-stealthmin-help = Использование: stealthmin
+    Используйте stealthmin для переключения отображение вас в результате вывода команды adminwho.
+cmd-stealthmin-no-console = Вы не можете использовать эту команду через консоль сервера

Resources/Locale/ru-RU/administration/commands/tag-commands.ftl

@@ -1,9 +1,9 @@
-addtag-command-description = Добавляет тэг выбранному энтити
-addtag-command-help = Usage: addtag <uidЭнтити> <тэг>
-addtag-command-success = Добавлен { $tag } к { $target }.
-addtag-command-fail = Не удалось добавить { $tag } к { $target }.
-removetag-command-description = Удаляет тэг с выбранного энтити
-removetag-command-help = Использование: removetag <uidЭнтити> <тэг>
-removetag-command-success = Удалён { $tag } с { $target }.
-removetag-command-fail = Не удалось удалить { $tag } с { $target }.
-tag-command-arg-tag = Тэг
+addtag-command-description = Добавить тег к выбранной сущности
+addtag-command-help = Использование: addtag <entity uid> <tag>
+addtag-command-success = Тег { $tag } был добавлен { $target }.
+addtag-command-fail = Не удалость добавить тег { $tag } к { $target }.
+removetag-command-description = Удалить тег у выбранной сущности
+removetag-command-help = Использование: removetag <entity uid> <tag>
+removetag-command-success = Тег { $tag } был удалён у { $target }.
+removetag-command-fail = Не удалость удалить тег { $tag } у { $target }.
+tag-command-arg-tag = Tag

Resources/Locale/ru-RU/administration/managers/admin-manager.ftl

@@ -1,9 +1,13 @@
-admin-manager-self-de-admin-message = { $exAdminName } убирает админ права с себя.
-admin-manager-self-re-admin-message = { $newAdminName } возвращает админ права себе.
+admin-manager-self-de-admin-message = { $exAdminName } снимает с себя права админа.
+admin-manager-self-re-admin-message = { $newAdminName } возвращает себе права админа.
 admin-manager-became-normal-player-message = Теперь вы обычный игрок.
 admin-manager-became-admin-message = Теперь вы администратор.
 admin-manager-no-longer-admin-message = Вы больше не администратор.
 admin-manager-admin-permissions-updated-message = Ваши права администратора были обновлены.
 admin-manager-admin-logout-message = Админ вышел: { $name }
-admin-manager-admin-login-message = Админ зашел: { $name }
+admin-manager-admin-login-message = Админ зашёл: { $name }
 admin-manager-admin-data-host-title = Хост
+admin-manager-stealthed-message = Теперь вы спрятавшийся администратор.
+admin-manager-unstealthed-message = Вы больше не прячетесь.
+admin-manager-self-enable-stealth = { $stealthAdminName } спрятался.
+admin-manager-self-disable-stealth = { $exStealthAdminName } больше не прячется.

Resources/Locale/ru-RU/administration/smites.ftl

@@ -2,7 +2,7 @@ admin-smite-chess-self = Вы чувствуете себя необычайно
 admin-smite-chess-others = { CAPITALIZE($name) } уменьшается до шахматной доски!
 admin-smite-set-alight-self = Вы загораетесь пламенем!
 admin-smite-set-alight-others = { CAPITALIZE($name) } загорается пламенем!
-admin-smite-remove-blood-self = Вы чувствуете легкость и прохладу.
+admin-smite-remove-blood-self = Вы чувствуете лёгкость и прохладу.
 admin-smite-remove-blood-others = { CAPITALIZE($name) } растекается кровью по всему полу!
 admin-smite-vomit-organs-self = Вас тошнит, и вы чувствуете себя опустошённо!
 admin-smite-vomit-organs-others = { CAPITALIZE($name) } изрыгает свои органы!
@@ -13,13 +13,58 @@ admin-smite-stomach-removal-self = Вы ощущаете пустоту в же
 admin-smite-run-walk-swap-prompt = Для бега вы должны нажать Shift!
 admin-smite-super-speed-prompt = Вы двигаетесь почти со скоростью звука!
 admin-smite-lung-removal-self = Вы не можете вдохнуть!
-admin-smite-explode-description = Взорвите цель.
-admin-smite-chess-dimension-description = Изгнание в шахматное измерение.
-admin-smite-set-alight-description = Заставляет цель гореть.
+
+## Smite names
+
+admin-smite-explode-name = Взрыв
+admin-smite-chess-dimension-name = Шахматное измерение
+admin-smite-set-alight-name = Воспламенить
+admin-smite-monkeyify-name = Превратить в обезьяну
+admin-smite-electrocute-name = Поразить током
+admin-smite-creampie-name = Кремовый пирог
+admin-smite-remove-blood-name = Обескровить
+admin-smite-vomit-organs-name = Рвота органами
+admin-smite-remove-hands-name = Удалить руки
+admin-smite-remove-hand-name = Удалить руку
+admin-smite-pinball-name = Пинбол
+admin-smite-yeet-name = Бросить сквозь станцию
+admin-smite-become-bread-name = Сделать хлебом
+admin-smite-ghostkick-name = Кик втихаря
+admin-smite-nyanify-name = НЯфикация
+admin-smite-kill-sign-name = Знак смерти
+admin-smite-cluwne-name = Сделать клувнем
+admin-smite-anger-pointing-arrows-name = Злые указатели
+admin-smite-dust-name = В прах
+admin-smite-buffering-name = Буферизация
+admin-smite-become-instrument-name = Сделать инструментом
+admin-smite-remove-gravity-name = Антиграв
+admin-smite-reptilian-species-swap-name = Сделать унатхом
+admin-smite-locker-stuff-name = Сунуть в шкаф
+admin-smite-headstand-name = Стойка на голове
+admin-smite-become-mouse-name = Сделать мышью
+admin-smite-maid-name = Мейдочка
+admin-smite-zoom-in-name = Зум +
+admin-smite-flip-eye-name = Перевернуть глаза
+admin-smite-run-walk-swap-name = Шаг вместо бега
+admin-smite-super-speed-name = Сверхскорость
+admin-smite-stomach-removal-name = Удалить желудок
+admin-smite-speak-backwards-name = Речь наоборот
+admin-smite-lung-removal-name = Удалить лёгкие
+admin-smite-disarm-prone-name = Обезоруживание и арест
+admin-smite-garbage-can-name = Мусор
+admin-smite-super-bonk-name = СуперБонк
+admin-smite-super-bonk-lite-name = СуперБонк-Лайт
+admin-smite-terminate-name = Экстерминировать
+admin-smite-super-slip-name = Суперскольжение
+
+## Smite descriptions
+
+admin-smite-explode-description = Взрывает цель.
+admin-smite-chess-dimension-description = Изгоняет цель в шахматное измерение.
+admin-smite-set-alight-description = Поджигает цель.
 admin-smite-monkeyify-description = Превращает цель в обезьяну.
-admin-smite-lung-cancer-description = Рак лёгких IIIA стадии, для настоящих любителей популярного шоу "Во все тяжкие".
-admin-smite-electrocute-description = Поражает цель электрическим током, делая бесполезным все, что было на них надето.
-admin-smite-creampie-description = Кремовый пирог, всего одной кнопкой.
+admin-smite-electrocute-description = Поражает цель электрическим током, делая бесполезным всё, что было на неё надето.
+admin-smite-creampie-description = Кримпай всего одной кнопкой.
 admin-smite-remove-blood-description = Обескровливает цель, кроваво.
 admin-smite-vomit-organs-description = Вызывает у цели рвоту, в том числе и органами.
 admin-smite-remove-hands-description = Лишает цель рук.
@@ -29,30 +74,35 @@ admin-smite-become-bread-description = Превращает цель в хлеб
 admin-smite-ghostkick-description = Тихо кикает пользователя, разрывая его соединение.
 admin-smite-nyanify-description = Насильно добавляет кошачьи ушки, от которых никуда не деться.
 admin-smite-kill-sign-description = Накладывает на игрока метку смерти для его товарищей.
-admin-smite-clown-description = Клоунирует цель. Костюм нельзя снять.
-admin-smite-cluwne-description = Клувнирует цель. Костюм нельзя снять и экипаж станции может спокойно их убить.
+admin-smite-cluwne-description = Превращает в клувеня. Костюм нельзя снять, и экипаж станции может беспрепятственно убивать их.
 admin-smite-anger-pointing-arrows-description = Разъяряет указательные стрелки, заставляя их атаковать цель взрывами.
 admin-smite-dust-description = Превращает цель в небольшую кучку пепла.
 admin-smite-buffering-description = Вызывает у цели случайный запуск буферизации, замораживая её на короткое время, пока она подгружается.
 admin-smite-become-instrument-description = Превращает цель в суперсинтезатор. И всё.
 admin-smite-remove-gravity-description = Наделяет цель антигравитацией.
-admin-smite-reptilian-species-swap-description = Меняет расу на Ящера. Пригодится для тех, кто ведёт себя как космический расист.
+admin-smite-reptilian-species-swap-description = Меняет расу на Унатха. Пригодится для тех, кто ведёт себя как космический расист.
 admin-smite-locker-stuff-description = Помещает цель в (заваренный) шкафчик.
 admin-smite-headstand-description = Переворачивает спрайт по вертикали.
-admin-smite-plasma-internals-description = Заменяет содержимое лёгких плазмой.
-admin-smite-become-mouse-description = Цель станет крысой. Рататуй.
+admin-smite-become-mouse-description = Цель станет мышью. Скуик.
 admin-smite-maid-description = Насильно превращает цель в кошко-служанку уборщицу. Это настоящая пытка для некоторых игроков, используйте её с умом.
-admin-smite-zoom-in-description = Увеличивает зум так, что цель перестает видеть окружение.
+admin-smite-zoom-in-description = Увеличивает зум так, что цель перестаёт видеть окружение.
 admin-smite-flip-eye-description = Переворачивает их обзор, фактически меняя управление и делая игру раздражающей.
 admin-smite-run-walk-swap-description = Меняет местами бег и ходьбу, заставляя цель держать Shift, чтобы двигаться быстро.
 admin-smite-stomach-removal-description = Удаляет желудок цели, лишая её возможности питаться.
 admin-smite-super-speed-description = Делает цель очень быстрой, заставляя её превращаться в фарш при столкновении со стеной.
-admin-smite-speak-backwards-description = Заставляет цель говорить задом наперед, так что она не сможет позвать на помощь.
+admin-smite-speak-backwards-description = Заставляет цель говорить задом наперёд, так что она не сможет позвать на помощь.
 admin-smite-lung-removal-description = Удаляет лёгкие цели, топя её.
 admin-smite-remove-hand-description = Удаляет только одну из рук цели вместо всех.
 admin-smite-disarm-prone-description = Шанс обезоружить цель становится 100%, а наручники надеваются на неё мгновенно.
 admin-smite-garbage-can-description = Превратите цель в мусорку, чтобы подчеркнуть, о чём она вам напоминает.
 admin-trick-unbolt-description = Разболтирует целевой шлюз.
+admin-smite-super-bonk-description = Заставляет цель удариться о каждый стол на станции и за её пределами.
+admin-smite-terminate-description = Создаёт экстерминатора с ролью призрака, с единственной задачей - убить выбранную цель.
+admin-smite-super-slip-description = Очень сильно поскальзывает цель.
+admin-smite-super-bonk-lite-description = Заставляет цель удариться о каждый стол на станции и за её пределами. Прекращает действовать после смерти цели.
+
+## Tricks descriptions
+
 admin-trick-bolt-description = Болтирует целевой шлюз.
 admin-trick-emergency-access-on-description = Включает аварийный доступ к целевому шлюзу.
 admin-trick-emergency-access-off-description = Выключает аварийный доступ к целевому шлюзу.
@@ -75,12 +125,11 @@ admin-trick-redescribe-description = Переописывает целевой
 admin-trick-rename-and-redescribe-description = Переименовывает и переописывает объект одной кнопкой.
 admin-trick-bar-job-slots-description = Закрывает все слоты должностей на станции, так что никто не сможет присоединиться.
 admin-trick-locate-cargo-shuttle-description = Телепортирует вас прямо на грузовой шаттл станции, если он есть.
-admin-trick-infinite-battery-description = Перенастраивает СМЕСы и подстанции на сетке/станции/карте на быструю автозарядку.
+admin-trick-infinite-battery-description = Перенастраивает СМЭСы и подстанции на сетке/станции/карте на быструю автозарядку.
 admin-trick-infinite-battery-object-description = Перенастраивает объект на быструю автозарядку его батареи.
 admin-trick-halt-movement-description = Прекращает движение целевого объекта, по крайней мере, пока что-то не сдвинет его снова.
 admin-trick-unpause-map-description = Снимает выбранную карту с паузы. ОБРАТИТЕ ВНИМАНИЕ, ЧТО ЭТО МОЖЕТ ПРИВЕСТИ К НЕПРАВИЛЬНОЙ РАБОТЕ СО STORAGE MAPS!
 admin-trick-pause-map-description = Ставит выбранную карту на паузу. Обратите внимание, что это не останавливает движение игроков полностью!
-admin-trick-snap-joints-description = Удаляет все физические шарниры из объекта. К сожалению, не отщелкивает все кости в теле.
+admin-trick-snap-joints-description = Удаляет все физические шарниры из объекта. К сожалению, не отщёлкивает все кости в теле.
 admin-trick-minigun-fire-description = Заставляет целевое оружие стрелять как миниган (очень быстро).
 admin-trick-set-bullet-amount-description = Быстро устанавливает значение количества незаспавненных патронов в оружии.
-admin-trick-force-say = Сказать что-то в IC чат от именем цели.

Resources/Locale/ru-RU/administration/ui/actions.ftl

@@ -1,12 +1,12 @@
+admin-player-actions-reason = Причина
 admin-player-actions-bans = Бан-лист
 admin-player-actions-notes = Заметки
 admin-player-actions-kick = Кикнуть
 admin-player-actions-ban = Забанить
 admin-player-actions-ahelp = Ахелп
-admin-player-actions-respawn = Респавн
+admin-player-actions-respawn = Респаун
 admin-player-actions-spawn = Заспавнить тут
 admin-player-spawn-failed = Не удалось найти подходящие координаты
-
 admin-player-actions-clone = Клонировать
 admin-player-actions-follow = Следовать
 admin-player-actions-confirm = Вы уверены?

Resources/Locale/ru-RU/administration/ui/admin-announce-window.ftl

@@ -1,5 +1,5 @@
 admin-announce-title = Сделать объявление
-admin-announce-announcement-placeholder = Текст объявления
+admin-announce-announcement-placeholder = Текст объявления...
 admin-announce-announcer-placeholder = Отправитель
 admin-announce-announcer-default = Центральное командование
 admin-announce-button = Сделать объявление

Resources/Locale/ru-RU/administration/ui/admin-erase.ftl

@@ -1 +1 @@
-admin-erase-popup = {$user} исчезает без следа. Вам следует продолжить играть, будто бы они никогда и не существовали.
+admin-erase-popup = { $user } бесследно исчезает. Продолжайте играть как будто его никогда не было.

Resources/Locale/ru-RU/administration/ui/admin-logs.ftl

@@ -11,8 +11,7 @@ admin-logs-select-all = Все
 admin-logs-select-none = Никакие
 # Players
 admin-logs-search-players-placeholder = Поиск игрока... (ИЛИ)
-admin-logs-select-none = Никакие
-admin-logs-include-non-player = Учитывать не игроков
+admin-logs-include-non-player = Включая не-игроков
 # Logs
 admin-logs-search-logs-placeholder = Поиск по логам...
 admin-logs-refresh = Обновить

Resources/Locale/ru-RU/administration/ui/admin-notes.ftl

@@ -24,8 +24,8 @@ admin-notes-delete-confirm = Вы уверены?
 admin-notes-edited = Последнее изменение от { $author } в { $date }
 admin-notes-unbanned = Разбанил { $admin } в { $date }
 admin-notes-message-desc = [color=white]Вы получили { $count ->
-[1] новое сообщение от администрации
-*[other] новых сообщений от администрации
+        [1] новое сообщение от администрации
+       *[other] новых сообщений от администрации
     } с момента последней игры на сервере.[/color]
 admin-notes-message-admin = От [bold]{ $admin }[/bold], датировано { TOSTRING($date, "f") }:
 admin-notes-message-wait = Кнопки будут доступны через { $time } секунд.
@@ -73,4 +73,4 @@ admin-remarks-command-description = Открыть страницу админ
 admin-remarks-command-error = Админ замечания были отключены
 admin-remarks-title = Админ замечания
 # Misc
-system-user = [Система]
+system-user = [Система]

Resources/Locale/ru-RU/administration/ui/admin-spawn-explosion-eui.ftl

@@ -1,15 +1,15 @@
-admin-explosion-eui-title = Spawn Explosions
-admin-explosion-eui-label-type = Explosion Type
-admin-explosion-eui-label-mapid = Map ID
-admin-explosion-eui-label-xmap = X (Map)
-admin-explosion-eui-label-ymap = Y (Map)
-admin-explosion-eui-label-current = Current Position
-admin-explosion-eui-label-preview = Preview
-admin-explosion-eui-label-total = Total Intensity
-admin-explosion-eui-label-slope = Intensity Slope
-admin-explosion-eui-label-max = Max Intensity
-admin-explosion-eui-label-directional = Directional
-admin-explosion-eui-label-angle = Angle
-admin-explosion-eui-label-spread = Spread
-admin-explosion-eui-label-distance = Distance
-admin-explosion-eui-label-spawn = Kabloom!
+admin-explosion-eui-title = Создание взрывов
+admin-explosion-eui-label-type = Тип взрыва
+admin-explosion-eui-label-mapid = ID карты
+admin-explosion-eui-label-xmap = X (Карты)
+admin-explosion-eui-label-ymap = Y (Карты)
+admin-explosion-eui-label-current = Текущая позиция
+admin-explosion-eui-label-preview = Предпросмотр
+admin-explosion-eui-label-total = Общая интенсивность
+admin-explosion-eui-label-slope = Наклон интенсивности
+admin-explosion-eui-label-max = Макс интенсивность
+admin-explosion-eui-label-directional = Направленный
+admin-explosion-eui-label-angle = Угол
+admin-explosion-eui-label-spread = Радиус
+admin-explosion-eui-label-distance = Дистанция
+admin-explosion-eui-label-spawn = Бабах!

Resources/Locale/ru-RU/administration/ui/ban-list.ftl

@@ -1,16 +1,20 @@
 # UI
-ban-list-header-ids = Id
+ban-list-bans = Баны
+ban-list-role-bans = Баны ролей
+# UI
+ban-list-header-ids = ID
 ban-list-header-reason = Причина
-ban-list-header-time = Длительность бана
+ban-list-header-role = Роль
+ban-list-header-time = Дата выдачи
+ban-list-header-server = Сервер
 ban-list-header-expires = Истекает
 ban-list-header-banning-admin = Забанил
-ban-list-header-server = Сервер
 ban-list-title = Все баны { $player }
 ban-list-view = Показать
 ban-list-id = ID: { $id }
 ban-list-ip = IP: { $ip }
 ban-list-hwid = HWID: { $hwid }
 ban-list-guid = GUID: { $guid }
-ban-list-permanent = PERMANENT
+ban-list-permanent = НАВСЕГДА
 ban-list-unbanned = Разбанен: { $date }
 ban-list-unbanned-by = Разбанил { $unbanner }

Resources/Locale/ru-RU/administration/ui/manage-solutions/manage-solutions.ftl

@@ -1,7 +1,7 @@
 admin-solutions-window-title = Редактирование раствора - { $targetName }
 admin-solutions-window-solution-label = Целевой раствор:
 admin-solutions-window-add-new-button = Добавить новый реагент
-admin-solutions-window-volume-label = Объем { $currentVolume }/{ $maxVolume } ед.
+admin-solutions-window-volume-label = Объём { $currentVolume }/{ $maxVolume } ед.
 admin-solutions-window-capacity-label = Вместимость (u):
 admin-solutions-window-specific-heat-label = Удельная теплоёмкость: { $specificHeat } Дж/(К*u)
 admin-solutions-window-heat-capacity-label = Теплоёмкость: { $heatCapacity } Дж/К

Resources/Locale/ru-RU/administration/ui/player-list-control.ftl

@@ -0,0 +1 @@
+player-list-filter = Фильтр