diff --git a/Content.Client/Input/ContentContexts.cs b/Content.Client/Input/ContentContexts.cs index dd6fc253a5..9b1b4ece99 100644 --- a/Content.Client/Input/ContentContexts.cs +++ b/Content.Client/Input/ContentContexts.cs @@ -95,6 +95,7 @@ namespace Content.Client.Input human.AddFunction(ContentKeyFunctions.Arcade1); human.AddFunction(ContentKeyFunctions.Arcade2); human.AddFunction(ContentKeyFunctions.Arcade3); + human.AddFunction(ContentKeyFunctions.TogglePosing); // Corvax-Wega-Add // actions should be common (for ghosts, mobs, etc) common.AddFunction(ContentKeyFunctions.OpenActionsMenu); diff --git a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs index 13edd579c1..aa3bd373a4 100644 --- a/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs +++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs @@ -195,6 +195,13 @@ namespace Content.Client.Options.UI.Tabs AddButton(ContentKeyFunctions.RotateStoredItem); AddButton(ContentKeyFunctions.SaveItemLocation); AddButton(ContentKeyFunctions.OfferItem); /// Corvax-Wega-Offer + AddButton(ContentKeyFunctions.TogglePosing); // Corvax-Wega-Posing + AddButton(ContentKeyFunctions.PosingOffsetLeft); // Corvax-Wega-Posing + AddButton(ContentKeyFunctions.PosingOffsetRight); // Corvax-Wega-Posing + AddButton(ContentKeyFunctions.PosingOffsetUp); // Corvax-Wega-Posing + AddButton(ContentKeyFunctions.PosingOffsetDown); // Corvax-Wega-Posing + AddButton(ContentKeyFunctions.PosingRotateNegative); // Corvax-Wega-Posing + AddButton(ContentKeyFunctions.PosingRotatePositive); // Corvax-Wega-Posing AddHeader("ui-options-header-interaction-adv"); AddButton(ContentKeyFunctions.SmartEquipBackpack); diff --git a/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs b/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs index a1af238913..dfa495a55b 100644 --- a/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs +++ b/Content.Client/_Wega/Lavaland/UtilityVendorBoundUserInterface.cs @@ -16,7 +16,7 @@ public sealed class UtilityVendorBoundUserInterface : BoundUserInterface _window = this.CreateWindow(); _window.Title = EntMan.GetComponent(Owner).EntityName; - _window.OpenCentered(); + _window.OpenCenteredLeft(); _window.OnClose += Close; diff --git a/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml b/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml index 0aabf06918..d17c535847 100644 --- a/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml +++ b/Content.Client/_Wega/Lavaland/UtilityVendorMenu.xaml @@ -1,7 +1,7 @@ + MinSize="600 600"> diff --git a/Content.Client/_Wega/Posing/PosingSystem.cs b/Content.Client/_Wega/Posing/PosingSystem.cs new file mode 100644 index 0000000000..f28f306373 --- /dev/null +++ b/Content.Client/_Wega/Posing/PosingSystem.cs @@ -0,0 +1,73 @@ +using Content.Shared.Posing; +using Content.Shared.Input; +using Robust.Client.GameObjects; +using Robust.Client.Input; +using Robust.Client.Player; + +namespace Content.Client.Posing; + +public sealed partial class PosingSystem : SharedPosingSystem +{ + [Dependency] private readonly IInputManager _input = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly SpriteSystem _sprite = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAfterHandleState); + + var posing = _input.Contexts.New("posing", "common"); + posing.AddFunction(ContentKeyFunctions.TogglePosing); + posing.AddFunction(ContentKeyFunctions.PosingOffsetUp); + posing.AddFunction(ContentKeyFunctions.PosingOffsetDown); + posing.AddFunction(ContentKeyFunctions.PosingOffsetLeft); + posing.AddFunction(ContentKeyFunctions.PosingOffsetRight); + posing.AddFunction(ContentKeyFunctions.PosingRotatePositive); + posing.AddFunction(ContentKeyFunctions.PosingRotateNegative); + } + + public override void Shutdown() + { + base.Shutdown(); + _input.Contexts.Remove("posing"); + } + + private void OnAfterHandleState(EntityUid uid, PosingComponent component, ref AfterAutoHandleStateEvent args) + { + if (_playerManager.LocalEntity == uid) + return; + + if (!component.Posing) + { + _sprite.SetOffset(uid, component.DefaultOffset); + _sprite.SetRotation(uid, Angle.FromDegrees(component.DefaultAngle)); + return; + } + } + + protected override void ClientTogglePosing(EntityUid uid, PosingComponent posing) + { + base.ClientTogglePosing(uid, posing); + + _input.Contexts.SetActiveContext(posing.Posing ? "posing" : posing.DefaultInputContext); + _sprite.SetOffset(uid, posing.DefaultOffset); + _sprite.SetRotation(uid, Angle.FromDegrees(posing.DefaultAngle)); + } + + public override void FrameUpdate(float frameTime) + { + base.FrameUpdate(frameTime); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var posing)) + { + if (posing.Posing) + { + _sprite.SetOffset(uid, posing.DefaultOffset + posing.CurrentOffset); + _sprite.SetRotation(uid, posing.CurrentAngle); + } + } + } +} diff --git a/Content.Client/_Wega/Vampire/VampireSystem.cs b/Content.Client/_Wega/Vampire/VampireSystem.cs index 20f0de4159..0ccafc681b 100644 --- a/Content.Client/_Wega/Vampire/VampireSystem.cs +++ b/Content.Client/_Wega/Vampire/VampireSystem.cs @@ -13,7 +13,7 @@ public sealed class VampireSystem : SharedVampireSystem { [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; - [Dependency] private readonly ContentEyeSystem _contentEye = default!; + [Dependency] private readonly SharedEyeSystem _eye = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly SpriteSystem _sprite = default!; @@ -32,8 +32,11 @@ public sealed class VampireSystem : SharedVampireSystem var userEntity = _entityManager.GetEntity(args.User); var eyeComponent = _entityManager.GetComponent(userEntity); if (userEntity == _playerManager.LocalEntity) - _contentEye.RequestToggleFov(userEntity, eyeComponent); - } + { + eyeComponent.NetSyncEnabled = false; + _eye.SetDrawFov(userEntity, args.Enabled, eyeComponent); + } + } private void GetVampireIcons(Entity ent, ref GetStatusIconsEvent args) { diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs index 9253191272..bf0f908da1 100644 --- a/Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs +++ b/Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs @@ -141,10 +141,12 @@ public sealed partial class DungeonJob } } +#if DEBUG // Corvax-Wega-Add-start if (groupSize > 0) { _sawmill.Warning($"Found remaining group size for ore veins of {gen.Replacement ?? "null"}!"); } +#endif // Corvax-Wega-Add-end } } } diff --git a/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs b/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs index d65e2e7138..5945b37060 100644 --- a/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs +++ b/Content.Server/_Wega/Administration/Commands/TimePackCommand.cs @@ -22,50 +22,40 @@ public sealed class TimePackCommand : IConsoleCommand { { 1, new List<(string, int)> { - ("Overall", 8400), - ("JobCaptain", 1200), - ("JobStationEngineer", 1200), - ("JobMedicalDoctor", 1200), - ("JobSecurityOfficer", 1200), - ("JobWarden", 600), - ("JobAtmosphericTechnician", 1200), - ("JobChemist", 600), - ("JobScientist", 900), - ("JobSalvageSpecialist", 600), + ("Overall", 60), + ("JobStationEngineer", 300), + ("JobTechnicalAssistant", 300), + ("JobMedicalDoctor", 180), + ("JobMedicalIntern", 120), + ("JobResearchAssistant", 300), + ("JobCargoTechnician", 180), ("JobServiceWorker", 60) } }, { 2, new List<(string, int)> { - ("JobSecurityOfficer", 1200), - ("JobWarden", 600), - ("Overall", 600) + ("JobStationEngineer", 300), + ("JobTechnicalAssistant", 300), + ("Overall", 60) } }, { 3, new List<(string, int)> { - ("JobAtmosphericTechnician", 600), - ("JobStationEngineer", 1200) + ("JobMedicalDoctor", 180), + ("JobMedicalIntern", 120) } }, { 4, new List<(string, int)> { - ("JobChemist", 600), - ("JobMedicalDoctor", 1200) + ("JobResearchAssistant", 300) } }, { 5, new List<(string, int)> { - ("JobScientist", 900) + ("JobCargoTechnician", 180) } }, { 6, new List<(string, int)> - { - ("JobSalvageSpecialist", 600), - ("Overall", 2400) - } - }, - { 7, new List<(string, int)> { ("JobBorg", 900) } @@ -149,7 +139,11 @@ public sealed class TimePackCommand : IConsoleCommand public CompletionResult GetCompletion(IConsoleShell shell, string[] args) { if (args.Length == 1) - return CompletionResult.FromHint("Enter username"); + { + return CompletionResult.FromHintOptions( + CompletionHelper.SessionNames(players: _playerManager), + "Enter username"); + } if (args.Length > 1) { diff --git a/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs index c5c047da2f..e66c86488b 100644 --- a/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs +++ b/Content.Server/_Wega/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs @@ -362,8 +362,14 @@ public sealed class NanoChatCartridgeSystem : SharedNanoChatCartridgeSystem if (TryComp(recipientEntity, out var cartridge) && cartridge.LoaderUid.HasValue && !recipientComp.MutedSound) - _audio.PlayPvs(recipientComp.Sound, recipientEntity); - + { + _audio.PlayPvs(recipientComp.Sound, recipientEntity); + _cartridgeLoader.SendNotification( + cartridge.LoaderUid.Value, + Loc.GetString("nanochat-pda-notification-header"), + Loc.GetString("nanochat-pda-notification-fromwho", ("user", sender.Comp.OwnerName))); + } + UpdateUiState((recipientEntity, recipientComp)); UpdateUiState(sender); } diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs index e1baa04726..29733cf26f 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/AshDrake/AshDrakeSystem.cs @@ -3,7 +3,6 @@ using System.Numerics; using Content.Server.Lavaland.Mobs.Components; using Content.Server.NPC.HTN; using Content.Server.NPC.Systems; -using Content.Shared.Achievements; using Content.Shared.Camera; using Content.Shared.Damage.Components; using Content.Shared.Damage.Systems; @@ -30,7 +29,6 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class AshDrakeSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly GibbingSystem _gibbing = default!; @@ -52,21 +50,11 @@ public sealed partial class AshDrakeSystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(OnAshDrakeKilled); - SubscribeLocalEvent(OnConeFireAction); SubscribeLocalEvent(OnBreathingFireAction); SubscribeLocalEvent(OnLavaAction); } - private void OnAshDrakeKilled(EntityUid uid, AshDrakeBossComponent component, MegafaunaKilledEvent args) - { - if (args.Killer == null) - return; - - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.AshDrakeBoss); - } - #region Cone Fire private void OnConeFireAction(Entity ent, ref AshDrakeConeFireActionEvent args) { diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs index 427b5f0165..0a06adff1c 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/BloodDrunkMiner/BloodDrunkMinerSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Lavaland.Mobs.Components; -using Content.Shared.Achievements; using Content.Shared.Lavaland.Events; using Content.Shared.SSDIndicator; using Robust.Shared.Audio.Systems; @@ -8,7 +7,6 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class BloodDrunkMinerSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; @@ -18,7 +16,6 @@ public sealed partial class BloodDrunkMinerSystem : EntitySystem SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnBloodDrunkMinerKilled); SubscribeLocalEvent(OnDash); } @@ -28,14 +25,6 @@ public sealed partial class BloodDrunkMinerSystem : EntitySystem RemComp(ent); } - private void OnBloodDrunkMinerKilled(EntityUid uid, BloodDrunkMinerComponent component, MegafaunaKilledEvent args) - { - if (args.Killer == null) - return; - - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.MinerBoss); - } - private void OnDash(Entity ent, ref BloodDrunkMinerDashAction args) { args.Handled = true; diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs index 5a8a018220..6cc276c998 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Bubblegum/BubblegumSystem.cs @@ -4,7 +4,6 @@ using Content.Server.Lavaland.Mobs.Components; using Content.Server.NPC.Components; using Content.Server.NPC.HTN; using Content.Server.NPC.Systems; -using Content.Shared.Achievements; using Content.Shared.Actions.Components; using Content.Shared.Chemistry.Components; using Content.Shared.Damage; @@ -34,7 +33,6 @@ namespace Content.Server.Lavaland.Mobs; public sealed partial class BubblegumSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly DamageableSystem _damage = default!; @@ -145,9 +143,6 @@ public sealed partial class BubblegumSystem : EntitySystem foreach (var reward in component.RewardsProto) Spawn(reward, coords); - if (args.Killer != null) - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.BubblegumBoss); - QueueDel(uid); } diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs index c154be2bb5..e4fedfec9c 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Colossus/ColossusSystem.cs @@ -1,7 +1,6 @@ using System.Numerics; using Content.Server.Chat.Systems; using Content.Server.Lavaland.Mobs.Components; -using Content.Shared.Achievements; using Content.Shared.Chat; using Content.Shared.Damage.Components; using Content.Shared.Damage.Systems; @@ -18,7 +17,6 @@ namespace Content.Server.Lavaland; public sealed class ColossusSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly DamageableSystem _damage = default!; [Dependency] private readonly SharedGunSystem _gun = default!; @@ -45,10 +43,6 @@ public sealed class ColossusSystem : EntitySystem Spawn(reward, coords); QueueDel(uid); - if (args.Killer != null) - { - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.ColossusBoss); - } } private void OnFractionAction(Entity ent, ref ColossusFractionActionEvent args) diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs index c5cc6d3d5f..2d08c01497 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Hierophant/HierophantSystem.cs @@ -2,8 +2,6 @@ using System.Numerics; using Content.Server.Lavaland.Mobs.Components; using Content.Server.NPC.HTN; using Content.Server.NPC.Systems; -using Content.Shared.Achievements; -using Content.Shared.Damage.Components; using Content.Shared.Damage.Systems; using Content.Shared.Lavaland.Components; using Content.Shared.Lavaland.Events; @@ -25,7 +23,6 @@ namespace Content.Server.Lavaland.Mobs; /// public sealed partial class HierophantSystem : EntitySystem { - [Dependency] private readonly SharedAchievementsSystem _achievement = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly DamageableSystem _damage = default!; [Dependency] private readonly IGameTiming _timing = default!; @@ -72,10 +69,6 @@ public sealed partial class HierophantSystem : EntitySystem Spawn(reward, coords); QueueDel(uid); - if (args.Killer != null) - { - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.HierophantBoss); - } } #region Passive Movement diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs index 2c3b2255a6..2d2b5f442a 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/Legion/LegionSystem.cs @@ -8,6 +8,7 @@ using Content.Server.Surgery; using Content.Shared.Achievements; using Content.Shared.Damage.Components; using Content.Shared.Damage.Systems; +using Content.Shared.FixedPoint; using Content.Shared.Height; using Content.Shared.Humanoid; using Content.Shared.Interaction; @@ -260,7 +261,8 @@ public sealed partial class LegionSystem : EntitySystem var spawnPos = FindSpawnPositionNear(coords, 2f); if (spawnPos != null) { - Spawn(prototype, spawnPos.Value); + var splitEntity = Spawn(prototype, spawnPos.Value); + TransferDamageContributors(uid, splitEntity); } } @@ -269,6 +271,8 @@ public sealed partial class LegionSystem : EntitySystem private void OnSplitKilled(EntityUid uid, LegionSplitComponent component, MegafaunaKilledEvent args) { + RedistributeDamageToAllSplits(uid); + if (!string.IsNullOrEmpty(component.NextSplitPrototype)) { SplitToNextLevel(uid, component); @@ -285,11 +289,7 @@ public sealed partial class LegionSystem : EntitySystem foreach (var reward in legion.RewardsProto) Spawn(reward, coords); - if (args.Killer != null) - { - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.FirstBoss); - _achievement.QueueAchievement(args.Killer.Value, AchievementsEnum.LegionBoss); - } + GrantAchievementsForLegion(uid); } } @@ -304,7 +304,8 @@ public sealed partial class LegionSystem : EntitySystem var spawnPos = FindSpawnPositionNear(coords, 2f); if (spawnPos != null) { - Spawn(component.NextSplitPrototype, spawnPos.Value); + var nextSplit = Spawn(component.NextSplitPrototype, spawnPos.Value); + TransferDamageContributors(uid, nextSplit); } } } @@ -324,6 +325,84 @@ public sealed partial class LegionSystem : EntitySystem } } + private void GrantAchievementsForLegion(EntityUid lastSplit) + { + if (!TryComp(lastSplit, out var contributor)) + return; + + if (contributor.AchievementsGranted) + return; + + contributor.AchievementsGranted = true; + + FixedPoint2 totalDamage = 0f; + foreach (var damage in contributor.Contributors.Values) + totalDamage += damage; + + if (totalDamage <= 0) + return; + + var threshold = contributor.Threshold; + foreach (var (player, damage) in contributor.Contributors) + { + var percentage = damage / totalDamage; + if (percentage >= threshold) + { + _achievement.QueueAchievement(player, AchievementsEnum.FirstBoss); + _achievement.QueueAchievement(player, AchievementsEnum.LegionBoss); + } + } + + contributor.Contributors.Clear(); + } + + private void RedistributeDamageToAllSplits(EntityUid dyingSplit) + { + if (!TryComp(dyingSplit, out var dyingContrib)) + return; + + var livingSplits = new List(); + var allSplits = EntityQueryEnumerator(); + while (allSplits.MoveNext(out var uid, out _)) + { + if (uid == dyingSplit || Exists(uid)) + continue; + + livingSplits.Add(uid); + } + + if (livingSplits.Count == 0) + return; + + foreach (var living in livingSplits) + { + var livingContrib = EnsureComp(living); + foreach (var (player, damage) in dyingContrib.Contributors) + { + livingContrib.Contributors.TryGetValue(player, out var current); + livingContrib.Contributors[player] = current + damage; + } + + livingContrib.Threshold = dyingContrib.Threshold; + } + } + + private void TransferDamageContributors(EntityUid from, EntityUid to) + { + if (!TryComp(from, out var fromContrib)) + return; + + var toContrib = EnsureComp(to); + foreach (var (player, damage) in fromContrib.Contributors) + { + toContrib.Contributors.TryGetValue(player, out var current); + toContrib.Contributors[player] = current + damage; + } + + toContrib.Threshold = fromContrib.Threshold; + toContrib.AchievementId = fromContrib.AchievementId; + } + #endregion #region Utility Methods diff --git a/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs b/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs index 11843199c3..7ca34b85ec 100644 --- a/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs +++ b/Content.Server/_Wega/Lavaland/Systems/Mobs/MegafaunaSystem.cs @@ -40,6 +40,19 @@ public sealed partial class MegafaunaSystem : EntitySystem if (!component.IsActive && totalDamage > 0) ActivateMegafauna(uid, component); + if (args.Origin != null && HasComp(args.Origin)) + { + var damageContributor = EnsureComp(uid); + + var damageDelta = args.DamageDelta?.GetTotal() ?? 0f; + if (damageDelta > 0) + { + damageContributor.Contributors.TryGetValue(args.Origin.Value, out var current); + damageContributor.Contributors[args.Origin.Value] = current + damageDelta; + damageContributor.TotalDamageReceived += damageDelta; + } + } + if (TryComp(uid, out var htn) && args.Origin != null) htn.Blackboard.SetValue(component.TargetKey, args.Origin.Value); } @@ -49,6 +62,8 @@ public sealed partial class MegafaunaSystem : EntitySystem if (args.NewMobState != MobState.Dead) return; + GrantAchievementsToContributors(uid); + HandleDeath(uid, args); } @@ -69,13 +84,42 @@ public sealed partial class MegafaunaSystem : EntitySystem _npc.WakeNPC(uid); } + private void GrantAchievementsToContributors(EntityUid megafaunaUid) + { + if (HasComp(megafaunaUid)) // Specific + return; + + if (!TryComp(megafaunaUid, out var contributor)) + return; + + if (contributor.AchievementsGranted) + return; + + contributor.AchievementsGranted = true; + + var totalDamage = contributor.TotalDamageReceived; + if (totalDamage <= 0) + return; + + var threshold = contributor.Threshold; + var achievementId = contributor.AchievementId; + + foreach (var (player, damage) in contributor.Contributors) + { + var percentage = damage / totalDamage; + if (percentage >= threshold) + { + _achievement.QueueAchievement(player, achievementId); + _achievement.QueueAchievement(player, AchievementsEnum.FirstBoss); + } + } + + contributor.Contributors.Clear(); + } + private void HandleDeath(EntityUid uid, MobStateChangedEvent args) { _ambient.SetAmbience(uid, false); - if (args.Origin != null && !HasComp(uid)) - { - _achievement.QueueAchievement(args.Origin.Value, AchievementsEnum.FirstBoss); - } var killedEvent = new MegafaunaKilledEvent { diff --git a/Content.Server/_Wega/Posing/PosingSystem.cs b/Content.Server/_Wega/Posing/PosingSystem.cs new file mode 100644 index 0000000000..4933854056 --- /dev/null +++ b/Content.Server/_Wega/Posing/PosingSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Posing; + +namespace Content.Server.Posing; + +public sealed partial class PosingSystem : SharedPosingSystem +{ + +} diff --git a/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs b/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs index d58d1d61aa..315067ca9d 100644 --- a/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs +++ b/Content.Server/_Wega/Vampire/VampireSystem.Abilities.cs @@ -813,6 +813,7 @@ public sealed partial class VampireSystem _emp.EmpPulse(originCoords, 4, 5000, TimeSpan.FromSeconds(30), uid); + SubtractBloodEssence(uid, 20); args.Handled = true; } @@ -850,14 +851,14 @@ public sealed partial class VampireSystem { component.PowerActive = false; _alerts.ClearAlert(uid, "AlertEternalDarkness"); - RaiseNetworkEvent(new VampireToggleFovEvent(netEntity)); + RaiseNetworkEvent(new VampireToggleFovEvent(netEntity, true)); args.Handled = true; return; } _alerts.ShowAlert(uid, "AlertEternalDarkness", 0); component.PowerActive = true; - RaiseNetworkEvent(new VampireToggleFovEvent(netEntity)); + RaiseNetworkEvent(new VampireToggleFovEvent(netEntity, false)); _popup.PopupEntity(Loc.GetString("vampire-blood-true-power-started"), uid, uid, PopupType.SmallCaution); void ExecuteTick() @@ -874,7 +875,7 @@ public sealed partial class VampireSystem { _popup.PopupEntity(Loc.GetString("vampire-blood-sacrifice-insufficient-blood"), uid, uid, PopupType.SmallCaution); component.PowerActive = false; - RaiseNetworkEvent(new VampireToggleFovEvent(netEntity)); + RaiseNetworkEvent(new VampireToggleFovEvent(netEntity, true)); _alerts.ClearAlert(uid, "AlertEternalDarkness"); return; } diff --git a/Content.Server/_Wega/Vampire/VampireSystem.cs b/Content.Server/_Wega/Vampire/VampireSystem.cs index cd700a1e2f..3e14c22beb 100644 --- a/Content.Server/_Wega/Vampire/VampireSystem.cs +++ b/Content.Server/_Wega/Vampire/VampireSystem.cs @@ -6,6 +6,8 @@ using Content.Server.Bible.Components; using Content.Server.Body.Systems; using Content.Server.Chat.Systems; using Content.Server.Polymorph.Systems; +using Content.Server.NPC.HTN; +using Content.Server.Humanoid.Components; using Content.Shared.Actions; using Content.Shared.Actions.Components; using Content.Shared.Alert; @@ -37,6 +39,7 @@ using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Utility; using Robust.Shared.GameObjects; +using Robust.Shared.Timing; using Content.Shared.Genetics; using Content.Shared.Nutrition.EntitySystems; using Content.Shared.Hands.EntitySystems; @@ -47,7 +50,11 @@ using Content.Shared.Damage.Systems; using Content.Shared.Damage.Components; using Content.Shared.Tag; using Content.Shared.Shaders; +using Content.Shared.SSDIndicator; +using Content.Shared.Mobs.Components; +using Content.Shared.Mobs; using Content.Shared.Body; +using Content.Shared.HealthExaminable; namespace Content.Server.Vampire; @@ -96,6 +103,10 @@ public sealed partial class VampireSystem : SharedVampireSystem SubscribeLocalEvent(OnDrinkBlood); SubscribeLocalEvent(DrinkDoAfter); + // Got bitten + SubscribeLocalEvent(OnGotBitten); + SubscribeLocalEvent(OnHealthBeingExamined); + // Distribute Damage SubscribeLocalEvent(OnDamageChanged); SubscribeLocalEvent(OnDamageChanged); @@ -231,6 +242,21 @@ public sealed partial class VampireSystem : SharedVampireSystem return false; } + if (TryComp(args.Target, out var targetSSDComponent) && TryComp(args.Target, out var targetMobState)) + { + if (targetSSDComponent.IsSSD && targetMobState.CurrentState != MobState.Dead) + { + _popup.PopupEntity(Loc.GetString("vampire-blooddrink-ssd"), uid, uid, PopupType.SmallCaution); + return false; + } + } + + if (TryComp(args.Target, out var htnComponent) || TryComp(args.Target, out var targetRandomAppearence)) + { + _popup.PopupEntity(Loc.GetString("vampire-blooddrink-not-sentient"), uid, uid, PopupType.SmallCaution); + return false; + } + return true; } @@ -268,6 +294,7 @@ public sealed partial class VampireSystem : SharedVampireSystem _audio.PlayPvs(component.BloodDrainSound, uid, AudioParams.Default.WithVolume(-3f)); _blood.TryModifyBloodLevel(args.Target.Value, -(byte)(volumeToConsume * 0.5f)); + EnsureComp(args.Target.Value); if (HasComp(args.Target) && !component.TruePowerActive) { @@ -643,4 +670,20 @@ public sealed partial class VampireSystem : SharedVampireSystem return null; } + + // Medics can see bite on your neck + private void OnGotBitten(EntityUid uid, BittenByVampireComponent component, ComponentInit args) + { + Timer.Spawn(TimeSpan.FromSeconds(900f), () => RemComp(uid)); + } + + private void OnHealthBeingExamined(Entity ent, ref HealthBeingExaminedEvent args) + { + if (HasComp(args.Examiner)) + { + args.Message.PushNewline(); + args.Message.AddMarkupOrThrow(Loc.GetString("vampire-bittenbyvampire-examine")); + } + } + } diff --git a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs index 37dd9c350c..f95a98ad5a 100644 --- a/Content.Shared/HealthExaminable/HealthExaminableSystem.cs +++ b/Content.Shared/HealthExaminable/HealthExaminableSystem.cs @@ -31,7 +31,7 @@ public sealed class HealthExaminableSystem : EntitySystem { Act = () => { - var markup = CreateMarkup(uid, component, damage); + var markup = CreateMarkup(uid, component, damage, args.User); // Corvax-Wega-Edit _examineSystem.SendExamineTooltip(args.User, uid, markup, false, false); }, Text = Loc.GetString("health-examinable-verb-text"), @@ -44,7 +44,7 @@ public sealed class HealthExaminableSystem : EntitySystem args.Verbs.Add(verb); } - public FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent component, DamageableComponent damage) + public FormattedMessage CreateMarkup(EntityUid uid, HealthExaminableComponent component, DamageableComponent damage, EntityUid examiner) // Corvax-Wega-Edit { var msg = new FormattedMessage(); @@ -97,7 +97,7 @@ public sealed class HealthExaminableSystem : EntitySystem } // Anything else want to add on to this? - RaiseLocalEvent(uid, new HealthBeingExaminedEvent(msg), true); + RaiseLocalEvent(uid, new HealthBeingExaminedEvent(msg, examiner), true); // Corvax-Wega-Edit return msg; } @@ -111,9 +111,11 @@ public sealed class HealthExaminableSystem : EntitySystem public sealed class HealthBeingExaminedEvent { public FormattedMessage Message; + public EntityUid Examiner; // Corvax-Wega-Add - public HealthBeingExaminedEvent(FormattedMessage message) + public HealthBeingExaminedEvent(FormattedMessage message, EntityUid examiner) // Corvax-Wega-Edit { Message = message; + Examiner = examiner; // Corvax-Wega-Add } } diff --git a/Content.Shared/Humanoid/HumanoidProfileExportV1.cs b/Content.Shared/Humanoid/HumanoidProfileExportV1.cs index fea71c40fc..0b5b8ec557 100644 --- a/Content.Shared/Humanoid/HumanoidProfileExportV1.cs +++ b/Content.Shared/Humanoid/HumanoidProfileExportV1.cs @@ -158,8 +158,23 @@ public sealed partial class HumanoidCharacterAppearanceV1 [DataField("hair")] public string HairStyleId; + // Corvax-Wega-Convert-Edit-start [DataField] - public Color HairColor; + private object? _hairColor; + + public Color HairColor + { + get + { + if (_hairColor is string str) + return Color.TryFromHex(str) ?? Color.Black; + if (_hairColor is List list && list.Count > 0 && list[0] is string listStr) + return Color.TryFromHex(listStr) ?? Color.Black; + return Color.Black; + } + set => _hairColor = value.ToHex(); + } + // Corvax-Wega-Convert-Edit-end [DataField("facialHair")] public string FacialHairStyleId; diff --git a/Content.Shared/Input/ContentKeyFunctions.cs b/Content.Shared/Input/ContentKeyFunctions.cs index fd700aaeed..0bdf8d7bac 100644 --- a/Content.Shared/Input/ContentKeyFunctions.cs +++ b/Content.Shared/Input/ContentKeyFunctions.cs @@ -69,6 +69,14 @@ namespace Content.Shared.Input public static readonly BoundKeyFunction ZoomIn = "ZoomIn"; public static readonly BoundKeyFunction ResetZoom = "ResetZoom"; + public static readonly BoundKeyFunction TogglePosing = "TogglePosing"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction PosingOffsetLeft = "PosingOffsetLeft"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction PosingOffsetRight = "PosingOffsetRight"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction PosingOffsetUp = "PosingOffsetUp"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction PosingOffsetDown = "PosingOffsetDown"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction PosingRotateNegative = "PosingRotateNegative"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction PosingRotatePositive = "PosingRotatePositive"; // Corvax-Wega-Posing + public static readonly BoundKeyFunction ArcadeUp = "ArcadeUp"; public static readonly BoundKeyFunction ArcadeDown = "ArcadeDown"; public static readonly BoundKeyFunction ArcadeLeft = "ArcadeLeft"; diff --git a/Content.Shared/MouseRotator/MouseRotatorComponent.cs b/Content.Shared/MouseRotator/MouseRotatorComponent.cs index 1f399b31f9..71f5d45048 100644 --- a/Content.Shared/MouseRotator/MouseRotatorComponent.cs +++ b/Content.Shared/MouseRotator/MouseRotatorComponent.cs @@ -15,7 +15,7 @@ public sealed partial class MouseRotatorComponent : Component /// How much the desired angle needs to change before a predictive event is sent /// [DataField, AutoNetworkedField] - public Angle AngleTolerance = Angle.FromDegrees(20.0); + public Angle AngleTolerance = Angle.FromDegrees(5.0); // Corvax-Wega-SmoothFlashlight /// /// The angle that will be lerped to @@ -37,7 +37,7 @@ public sealed partial class MouseRotatorComponent : Component /// like turrets or ship guns, which have finer range of movement. /// [DataField, AutoNetworkedField] - public bool Simple4DirMode = true; + public bool Simple4DirMode = false; // Corvax-Wega-SmoothFlashlight } /// diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs index ee806125e7..cde424c0d5 100644 --- a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs @@ -57,4 +57,12 @@ public sealed partial class BallisticAmmoProviderComponent : Component /// [DataField] public TimeSpan FillDelay = TimeSpan.FromSeconds(0.5); + + // Corvax-Wega-Add-start + /// + /// TryStartDoAfter boolean for BreakOnMove, Corvax Wega thing + /// + [ViewVariables(VVAccess.ReadWrite), DataField] + public bool BreakOnMoveFill = true; + // Corvax-Wega-Add-start } diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index 831db83c3b..dffddedaac 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -78,7 +78,7 @@ public abstract partial class SharedGunSystem // Continuous loading _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, args.User, component.FillDelay, new AmmoFillDoAfterEvent(), used: uid, target: args.Target, eventTarget: uid) { - BreakOnMove = true, + BreakOnMove = component.BreakOnMoveFill, // Corvax-Wega-Edit BreakOnDamage = false, NeedHand = true, }); diff --git a/Content.Shared/_Wega/Clothing/Component/ClothingAshStormProtectionComponent.cs b/Content.Shared/_Wega/Clothing/Component/ClothingAshStormProtectionComponent.cs index 1f120f6141..2cf192c798 100644 --- a/Content.Shared/_Wega/Clothing/Component/ClothingAshStormProtectionComponent.cs +++ b/Content.Shared/_Wega/Clothing/Component/ClothingAshStormProtectionComponent.cs @@ -2,9 +2,10 @@ using Robust.Shared.GameStates; namespace Content.Shared.Clothing.Components; -[RegisterComponent, NetworkedComponent, Access(typeof(ClothingAshStormProtectionSystem))] +[Access(typeof(ClothingAshStormProtectionSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] public sealed partial class ClothingAshStormProtectionComponent : Component { - [DataField] + [DataField, AutoNetworkedField] public float Modifier = 0.5f; } diff --git a/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs b/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs index 0c4c69e859..7237aa4b9f 100644 --- a/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs +++ b/Content.Shared/_Wega/Clothing/ToggleableSpriteClothingSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Clothing.Components; using Content.Shared.DoAfter; +using Content.Shared.Inventory; using Content.Shared.Verbs; using Robust.Shared.Audio.Systems; using Robust.Shared.GameStates; @@ -18,7 +19,7 @@ public sealed class ToggleableSpriteClothingSystem : EntitySystem SubscribeLocalEvent(OnGetState); SubscribeLocalEvent>(AddToggleVerb); - SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnDoAfter); } private static void OnGetState(EntityUid uid, ToggleableSpriteClothingComponent component, ref ComponentGetState args) @@ -59,7 +60,7 @@ public sealed class ToggleableSpriteClothingSystem : EntitySystem _doAfterSystem.TryStartDoAfter(args); } - private void OnDoAfter(ToggleSpriteClothingDoAfterEvent args) + private void OnDoAfter(Entity entity, ref ToggleSpriteClothingDoAfterEvent args) { if (args.Handled || args.Target == null) return; diff --git a/Content.Shared/_Wega/Lavaland/Components/Mobs/MegafaunaDamageContributorComponent.cs b/Content.Shared/_Wega/Lavaland/Components/Mobs/MegafaunaDamageContributorComponent.cs new file mode 100644 index 0000000000..f1e2379937 --- /dev/null +++ b/Content.Shared/_Wega/Lavaland/Components/Mobs/MegafaunaDamageContributorComponent.cs @@ -0,0 +1,23 @@ +using Content.Shared.Achievements; +using Content.Shared.FixedPoint; + +namespace Content.Shared.Lavaland.Components; + +[RegisterComponent] +public sealed partial class MegafaunaDamageContributorComponent : Component +{ + [DataField("achievement", required: true)] + public AchievementsEnum AchievementId = default!; + + [DataField] + public float Threshold = 0.3f; + + [ViewVariables(VVAccess.ReadOnly)] + public bool AchievementsGranted = false; + + [ViewVariables(VVAccess.ReadOnly)] + public FixedPoint2 TotalDamageReceived = 0f; + + [ViewVariables(VVAccess.ReadOnly)] + public Dictionary Contributors = new(); +} diff --git a/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs b/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs index 9ae34303e4..48231f0b95 100644 --- a/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs +++ b/Content.Shared/_Wega/ModularSuit/SharedModularSuitSystem.cs @@ -238,7 +238,7 @@ public abstract partial class SharedModularSuitSystem : EntitySystem { if (Inventory.TryGetSlotEntity(wearer, slot, out var equipped) && equipped == partUid) { - if (Inventory.TryUnequip(wearer, slot, out var removedItem)) + if (Inventory.TryUnequip(wearer, slot, out var removedItem, force: true)) { Container.Insert(removedItem.Value, partContainer); RemComp(removedItem.Value); @@ -344,7 +344,7 @@ public abstract partial class SharedModularSuitSystem : EntitySystem } if (Container.Remove(itemUid, hiddenContainer)) - Inventory.TryEquip(wearer, itemUid, slot); + Inventory.TryEquip(wearer, itemUid, slot, force: true); hiddenComp.HiddenItems.Remove(slot); Dirty(suit.Owner, hiddenComp); diff --git a/Content.Shared/_Wega/Posing/PosingComponent.cs b/Content.Shared/_Wega/Posing/PosingComponent.cs new file mode 100644 index 0000000000..60af39d9ca --- /dev/null +++ b/Content.Shared/_Wega/Posing/PosingComponent.cs @@ -0,0 +1,32 @@ +using System.Numerics; +using Robust.Shared.GameStates; + +namespace Content.Shared.Posing; + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] +public sealed partial class PosingComponent : Component +{ + [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public Vector2 CurrentOffset = Vector2.Zero; + + [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public Angle CurrentAngle = Angle.Zero; + + [DataField, AutoNetworkedField] + public Vector2 OffsetLimits = new(0.3f, 0.3f); + + [DataField, AutoNetworkedField] + public float AngleLimits = 180f; + + [ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public bool Posing = false; + + [DataField] + public string DefaultInputContext = "human"; + + [DataField] + public Vector2 DefaultOffset = Vector2.Zero; + + [DataField] + public float DefaultAngle = 0f; +} diff --git a/Content.Shared/_Wega/Posing/SharedPosingSystem.cs b/Content.Shared/_Wega/Posing/SharedPosingSystem.cs new file mode 100644 index 0000000000..72d7ed7e56 --- /dev/null +++ b/Content.Shared/_Wega/Posing/SharedPosingSystem.cs @@ -0,0 +1,170 @@ +using System.Numerics; +using Content.Shared.ActionBlocker; +using Content.Shared.Damage.Components; +using Content.Shared.Input; +using Content.Shared.Mobs; +using Content.Shared.Movement.Events; +using Content.Shared.Standing; +using Content.Shared.Stunnable; +using Robust.Shared.Input.Binding; + +namespace Content.Shared.Posing; + +public abstract partial class SharedPosingSystem : EntitySystem +{ + [Dependency] private readonly StandingStateSystem _standing = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnUpdateCanMove); + SubscribeLocalEvent(OnDowned); + SubscribeLocalEvent(OnMobStateChanged); + + CommandBinds.Builder + .Bind(ContentKeyFunctions.TogglePosing, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid && !CanTogglePosing(userUid)) + TogglePosing(userUid); + }, + handle: false)) + .Bind(ContentKeyFunctions.PosingOffsetRight, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid) + TryAdjustPosingOffset(userUid, new(0.05f, 0f)); + }, + handle: false)) + .Bind(ContentKeyFunctions.PosingOffsetLeft, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid) + TryAdjustPosingOffset(userUid, new(-0.05f, 0f)); + }, + handle: false)) + .Bind(ContentKeyFunctions.PosingOffsetUp, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid) + TryAdjustPosingOffset(userUid, new(0f, 0.05f)); + }, + handle: false)) + .Bind(ContentKeyFunctions.PosingOffsetDown, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid) + TryAdjustPosingOffset(userUid, new(0f, -0.05f)); + }, + handle: false)) + .Bind(ContentKeyFunctions.PosingRotatePositive, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid) + TryAdjustPosingAngle(userUid, -5f); + }, + handle: false)) + .Bind(ContentKeyFunctions.PosingRotateNegative, + InputCmdHandler.FromDelegate(session => + { + if (session?.AttachedEntity is { } userUid) + TryAdjustPosingAngle(userUid, 5f); + }, + handle: false)) + .Register(); + } + + public override void Shutdown() + { + base.Shutdown(); + CommandBinds.Unregister(); + } + + private void OnUpdateCanMove(EntityUid uid, PosingComponent component, UpdateCanMoveEvent args) + { + if (component.Posing) + args.Cancel(); + } + + private void OnDowned(EntityUid uid, PosingComponent component, EntityEventArgs args) + { + if (component.Posing) + TogglePosing(uid, component); + } + + private void OnMobStateChanged(EntityUid uid, PosingComponent component, ref MobStateChangedEvent args) + { + if (component.Posing) + TogglePosing(uid, component); + } + + private void TogglePosing(EntityUid uid, PosingComponent? posingComp = null) + { + if (!Resolve(uid, ref posingComp, false)) + return; + + posingComp.Posing = !posingComp.Posing; + _actionBlocker.UpdateCanMove(uid); + + posingComp.CurrentAngle = Angle.Zero; + posingComp.CurrentOffset = Vector2.Zero; + + ClientTogglePosing(uid, posingComp); + Dirty(uid, posingComp); + } + + private void TryAdjustPosingOffset(EntityUid uid, Vector2 offset, PosingComponent? posingComp = null) + { + if (!Resolve(uid, ref posingComp, false) || !posingComp.Posing) + return; + + var previousOffset = posingComp.CurrentOffset; + + posingComp.CurrentOffset += offset; + posingComp.CurrentOffset = Vector2.Clamp(posingComp.CurrentOffset, -posingComp.OffsetLimits, posingComp.OffsetLimits); + + if (posingComp.CurrentOffset.Equals(previousOffset)) + return; + + Dirty(uid, posingComp); + } + + private void TryAdjustPosingAngle(EntityUid uid, float angle, PosingComponent? posingComp = null) + { + if (!Resolve(uid, ref posingComp, false) || !posingComp.Posing) + return; + + var previousAngle = posingComp.CurrentAngle; + + var newAngle = posingComp.CurrentAngle.Degrees + angle; + posingComp.CurrentAngle = Angle.FromDegrees(Math.Clamp(newAngle, -posingComp.AngleLimits, posingComp.AngleLimits)); + + if (posingComp.CurrentAngle.Equals(previousAngle)) + return; + + Dirty(uid, posingComp); + } + + protected virtual void ClientTogglePosing(EntityUid uid, PosingComponent posing) + { + } + + private bool CanTogglePosing(EntityUid uid) + { + if (_actionBlocker.CanConsciouslyPerformAction(uid)) + return false; + + if (TryComp(uid, out var stamina) && stamina.Critical) + return false; + + if (HasComp(uid)) + return false; + + if (_standing.IsDown(uid)) + return false; + + return true; + } +} diff --git a/Content.Shared/_Wega/Roles/JobRequirement/AnyRequirement.cs b/Content.Shared/_Wega/Roles/JobRequirement/AnyRequirement.cs new file mode 100644 index 0000000000..be2905159a --- /dev/null +++ b/Content.Shared/_Wega/Roles/JobRequirement/AnyRequirement.cs @@ -0,0 +1,93 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Preferences; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +/// +/// Requires that at least one of the listed requirements is met. +/// +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class AnyRequirement : JobRequirement +{ + [DataField(required: true)] + public List Requirements = new(); + + public override bool Check( + IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = null; + var anyPassed = false; + var failedReasons = new List(); + + foreach (var requirement in Requirements) + { + if (requirement.Check(entManager, protoManager, profile, playTimes, out var reqReason)) + { + anyPassed = true; + if (!Inverted) + break; + } + else if (reqReason != null) + { + failedReasons.Add(reqReason); + } + } + + // Normal mode: need at least one to pass + if (!Inverted) + { + if (anyPassed) + return true; + + reason = BuildCombinedFailureMessage(failedReasons, false); + return false; + } + + // Inverted mode: need ALL to fail + if (!anyPassed) + return true; + + reason = BuildCombinedFailureMessage(failedReasons, true); + return false; + } + + private FormattedMessage BuildCombinedFailureMessage(List failedReasons, bool inverted) + { + var message = new FormattedMessage(); + if (failedReasons.Count == 0) + { + message.AddMarkupPermissive(Loc.GetString(inverted + ? "role-any-requirement-inverted-failed" + : "role-any-requirement-failed")); + return message; + } + + if (inverted) + { + message.AddMarkupPermissive(Loc.GetString("role-any-requirement-inverted-need-all") + "\n"); + } + else + { + message.AddMarkupPermissive(Loc.GetString("role-any-requirement-need-one") + "\n"); + } + + for (var i = 0; i < failedReasons.Count; i++) + { + message.AddMarkupPermissive($"- "); + message.AddMarkupPermissive(failedReasons[i].ToMarkup()); + if (i < failedReasons.Count - 1) + message.AddMarkupPermissive("\n"); + } + + return message; + } +} diff --git a/Content.Shared/_Wega/Vampire/VampireComponents.cs b/Content.Shared/_Wega/Vampire/VampireComponents.cs index 1fbed15134..c142405080 100644 --- a/Content.Shared/_Wega/Vampire/VampireComponents.cs +++ b/Content.Shared/_Wega/Vampire/VampireComponents.cs @@ -100,6 +100,9 @@ public sealed partial class BeaconSoulComponent : Component public EntityUid VampireOwner = EntityUid.Invalid; } +[RegisterComponent, NetworkedComponent] +public sealed partial class BittenByVampireComponent : Component; + /// /// A component for testing vampire arson near holy sites. /// diff --git a/Content.Shared/_Wega/Vampire/VampireEvents.cs b/Content.Shared/_Wega/Vampire/VampireEvents.cs index d7d09a5f5f..406a10b145 100644 --- a/Content.Shared/_Wega/Vampire/VampireEvents.cs +++ b/Content.Shared/_Wega/Vampire/VampireEvents.cs @@ -134,10 +134,12 @@ public sealed partial class VampireEternalDarknessActionEvent : InstantActionEve public sealed partial class VampireToggleFovEvent : EntityEventArgs { public NetEntity User { get; } + public bool Enabled { get; } - public VampireToggleFovEvent(NetEntity user) + public VampireToggleFovEvent(NetEntity user, bool enabled) { User = user; + Enabled = enabled; } } diff --git a/Resources/Locale/ru-RU/_wega/cartridge-loader/cartridges.ftl b/Resources/Locale/ru-RU/_wega/cartridge-loader/cartridges.ftl index 11eed73b90..1a0d9fad81 100644 --- a/Resources/Locale/ru-RU/_wega/cartridge-loader/cartridges.ftl +++ b/Resources/Locale/ru-RU/_wega/cartridge-loader/cartridges.ftl @@ -1 +1,3 @@ -nano-chat-program-name = НаноЧат \ No newline at end of file +nano-chat-program-name = НаноЧат +nanochat-pda-notification-header = Получено новое сообщение +nanochat-pda-notification-fromwho = Отправитель: { $user } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/_wega/escape-menu/ui/options-menu.ftl index 3a1bf2689c..1834273511 100644 --- a/Resources/Locale/ru-RU/_wega/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/_wega/escape-menu/ui/options-menu.ftl @@ -1,2 +1,9 @@ ui-options-function-strangle = Душить ui-options-function-offer-item = Переключить режим передачи предмета +ui-options-function-toggle-posing = Переключить режим позирования +ui-options-function-posing-offset-left = Переместиться влево (позирование) +ui-options-function-posing-offset-right = Переместиться вправо (позирование) +ui-options-function-posing-offset-up = Переместиться вверх (позирование) +ui-options-function-posing-offset-down = Переместиться вниз (позирование) +ui-options-function-posing-rotate-negative = Повернуть против часовой (позирование) +ui-options-function-posing-rotate-positive = Повернуть по часовой (позирование) diff --git a/Resources/Locale/ru-RU/_wega/guidebook/rules.ftl b/Resources/Locale/ru-RU/_wega/guidebook/rules.ftl new file mode 100644 index 0000000000..28ee0a1cb2 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/guidebook/rules.ftl @@ -0,0 +1,25 @@ +wega-ruleset-name = Правила сервера +wega-punishment-types-name = Игровые наказания + +wega-rule-0-name = Правило 0 +wega-rule-1-name = Правило 1 +wega-rule-2-name = Правило 2 +wega-rule-3-name = Правило 3 +wega-rule-31-name = Правило 3.1 +wega-rule-32-name = Правило 3.2 +wega-rule-33-name = Правило 3.3 +wega-rule-34-name = Правило 3.4 +wega-rule-35-name = Правило 3.5 +wega-rule-36-name = Правило 3.6 +wega-rule-37-name = Правило 3.7 +wega-rule-38-name = Правило 3.8 +wega-rule-39-name = Правило 3.9 +wega-rule-4-name = Правило 4 +wega-rule-5-name = Правило 5 +wega-rule-6-name = Правило 6 +wega-rule-7-name = Правило 7 +wega-rule-8-name = Правило 8 +wega-rule-81-name = Правило 8.1 +wega-rule-82-name = Правило 8.2 +wega-rule-83-name = Правило 8.3 +wega-rule-9-name = Правило 9 diff --git a/Resources/Locale/ru-RU/_wega/job/role-requirements.ftl b/Resources/Locale/ru-RU/_wega/job/role-requirements.ftl new file mode 100644 index 0000000000..c58e7e7ee9 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/job/role-requirements.ftl @@ -0,0 +1,5 @@ +role-any-requirement-failed = Не выполнено ни одно из требований. +role-any-requirement-need-one = Требуется выполнить одно из условий: + +role-any-requirement-inverted-failed = Требования не должны быть выполнены, но они выполнены. +role-any-requirement-inverted-need-all = Следующие условия НЕ должны быть выполнены: diff --git a/Resources/Locale/ru-RU/_wega/lavaland/lavaland.ftl b/Resources/Locale/ru-RU/_wega/lavaland/lavaland.ftl index d41f9e3070..4066c6da68 100644 --- a/Resources/Locale/ru-RU/_wega/lavaland/lavaland.ftl +++ b/Resources/Locale/ru-RU/_wega/lavaland/lavaland.ftl @@ -23,8 +23,8 @@ lavaland-shuttle-info-ready = Система готова к транспорт prison-shuttle-status = Статус шаттла: prison-shuttle-current-location = Ваше местоположение: -prison-shuttle-status-docked-station = Пристыкован на станции -prison-shuttle-status-docked-prison = Пристыкован в каторге +prison-shuttle-status-docked-station = Пристыкован к станции +prison-shuttle-status-docked-prison = Пристыкован к каторге prison-shuttle-status-enroute-station = Направляется на станцию prison-shuttle-status-enroute-prison = Направляется в каторгу prison-shuttle-status-unknown = Неизвестно diff --git a/Resources/Locale/ru-RU/_wega/vampire/vampire.ftl b/Resources/Locale/ru-RU/_wega/vampire/vampire.ftl index eeb4a279a5..6b6cef5b6c 100644 --- a/Resources/Locale/ru-RU/_wega/vampire/vampire.ftl +++ b/Resources/Locale/ru-RU/_wega/vampire/vampire.ftl @@ -11,12 +11,15 @@ vampire-blooddrink-self = Вы не можете пить свою кровь vampire-blooddrink-rotted = Оно гниет! vampire-blooddrink-not-vampire = Вы не можете испить кровь вампира vampire-blooddrink-not-thrall = Вы не можете испить кровь тралла +vampire-blooddrink-not-sentient = Вы не можете испить кровь неразумного vampire-blooddrink-empty = Жертва иссякла vampire-blooddrink-maxed-out = Вы уже насытились достаточно с этой жертвы +vampire-blooddrink-ssd = Вы не можете испить кровь спящего vampire-ingest-holyblood = ВЫ НЕ МОЖЕТЕ ПИТЬ СВЯТУЮ КРОВЬ!!! vampire-full-stomach = Вы не можете пить больше vampire-startlight-burning = ВАША КОЖА ПОЛЫХАЕТ! vampire-true-power = Вы чувствуете истинную силу +vampire-bittenbyvampire-examine = [color=red]Кажется, на шее есть укус[/color] # Abilities vampire-hungry = Вы ещё слишком голодны для эволюции diff --git a/Resources/Locale/ru-RU/_wega/voucher/voucherkits.ftl b/Resources/Locale/ru-RU/_wega/voucher/voucherkits.ftl index 7ecee12ed2..c3e62a39b4 100644 --- a/Resources/Locale/ru-RU/_wega/voucher/voucherkits.ftl +++ b/Resources/Locale/ru-RU/_wega/voucher/voucherkits.ftl @@ -11,6 +11,16 @@ voucher-security-first-aid-desc = Содержит в себе пару набо voucher-security-riots-desc = Содержит в себе пару баллистических и противоударных щитов, пару кластерных светошумовых гранат, пару шок-дубинок и стяжки voucher-security-supervision-desc = Содержит в себе пару нагрудных камер, 4 тренировчоных магазина для Mk58, дубинку, запасную шок-дубинку, пару наручников и вспышку +# BlueShield +voucher-security-jay-name = Набор штурмовой винтовки +voucher-security-berkut-name = Набор пистолета-пулемёта +voucher-security-pulsar-name = Набор энерго-карабина +voucher-security-baton-name = Набор многофункциональной дубинки + +voucher-security-jay-desc = Содержит в себе штурмовую винтовку - Сойка, и дополнительные патроны к ней +voucher-security-berkut-desc = Содержит в себе пистолет-пулемёт - Беркут, и дополнительные патроны к нему +voucher-security-pulsar-desc = Содержит в себе энергетический карабин "Пульсар" +voucher-security-baton-desc = Содержит в себе многофункциональную дубинку, способную наносить повышенный вред здоровью при включенном состоянии. # Salvage voucher-explorer-kit-name = Набор Иследователя voucher-fulton-kit-name = Набор Эвакуации фултона diff --git a/Resources/Locale/ru-RU/_wega/weapons/explosion_package.ftl b/Resources/Locale/ru-RU/_wega/weapons/explosion_package.ftl new file mode 100644 index 0000000000..bd746d30f4 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/weapons/explosion_package.ftl @@ -0,0 +1,2 @@ +ent-ExplosionPackage = взрыв пакет + .desc = Некрепко держащаяся бомба которая явно не должна существовать. diff --git a/Resources/Locale/ru-RU/access/components/genpop.ftl b/Resources/Locale/ru-RU/access/components/genpop.ftl index 0839ae8fdc..1f16631b7e 100644 --- a/Resources/Locale/ru-RU/access/components/genpop.ftl +++ b/Resources/Locale/ru-RU/access/components/genpop.ftl @@ -20,7 +20,7 @@ genpop-prisoner-id-examine-served = Вы отбыли своё наказани genpop-locker-name-default = шкаф заключённого genpop-locker-desc-default = Это защищённый шкафчик для персональных вещей заключённого во время его пребывания в тюрьме. -genpop-locker-name-used = prisoner closet ({ $name }) +genpop-locker-name-used = шкаф заключённого ({ $name }) genpop-locker-desc-used = Это защищённый шкафчик для персональных вещей заключённого во время его пребывания в тюрьме. Содержит личные вещи { $name }. genpop-locker-ui-label-name = [bold]Имя осуждённого:[/bold] diff --git a/Resources/Locale/ru-RU/administration/antag.ftl b/Resources/Locale/ru-RU/administration/antag.ftl index f3e5190201..c2041130b5 100644 --- a/Resources/Locale/ru-RU/administration/antag.ftl +++ b/Resources/Locale/ru-RU/administration/antag.ftl @@ -8,7 +8,7 @@ admin-verb-make-head-rev = Сделать цель главой революци admin-verb-make-thief = Сделать цель вором. admin-verb-make-paradox-clone = Создать роль призрака парадоксального клона цели. admin-verb-make-wizard = Сделать цель волшебником. -admin-verb-make-space-ninja = Make the target into a Space Ninja. +admin-verb-make-space-ninja = Сделать цель космическим ниндзя. admin-verb-make-changeling = Сделать цель генокрадом. @@ -21,7 +21,7 @@ admin-verb-text-make-head-rev = Сделать главой революции admin-verb-text-make-thief = Сделать вором admin-verb-text-make-paradox-clone = Создать парадоксального клона admin-verb-text-make-wizard = Сделать волшебником -admin-verb-text-make-space-ninja = Make Ninja +admin-verb-text-make-space-ninja = Сделать ниндзя admin-verb-text-make-changeling = Сделать генокрадом (WIP) admin-overlay-antag-classic = АНТАГ diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl index fd0fd863b3..4272332732 100644 --- a/Resources/Locale/ru-RU/alerts/alerts.ftl +++ b/Resources/Locale/ru-RU/alerts/alerts.ftl @@ -123,5 +123,5 @@ alerts-rooted-desc = Вы прикреплены к земле. Вы не мож alerts-stealthy-name = Карманничество alerts-stealthy-desc = Определяет режим скрытой кражи. Нажмите для переключения. -alerts-prying-name = Prying -alerts-prying-desc = You can innately pry doors open using alternative interaction. +alerts-prying-name = Вскрытие +alerts-prying-desc = Вы можете вскрывать двери, используя альтернативное взаимодействие. diff --git a/Resources/Locale/ru-RU/anomaly/anomaly.ftl b/Resources/Locale/ru-RU/anomaly/anomaly.ftl index 4cb6866f22..829d671926 100644 --- a/Resources/Locale/ru-RU/anomaly/anomaly.ftl +++ b/Resources/Locale/ru-RU/anomaly/anomaly.ftl @@ -102,4 +102,4 @@ anomaly-behavior-inconstancy = [color=crimson]Обнаружено непост anomaly-behavior-fast = [color=crimson]Частота импульсов значительно повышена.[/color] anomaly-behavior-strenght = [color=crimson]Мощность импульсов значительно повышена.[/color] anomaly-behavior-moving = [color=crimson]Обнаружена координатная нестабильность.[/color] -anomaly-secret-admin = [color=red](ERROR)[/color] +anomaly-secret-admin = [color=red](ОШИБКА)[/color] diff --git a/Resources/Locale/ru-RU/barsign/barsign-component.ftl b/Resources/Locale/ru-RU/barsign/barsign-component.ftl index de6cb5cb09..a327476067 100644 --- a/Resources/Locale/ru-RU/barsign/barsign-component.ftl +++ b/Resources/Locale/ru-RU/barsign/barsign-component.ftl @@ -105,7 +105,7 @@ barsign-prototype-name-whiskeyechoes = Виски Эхо barsign-prototype-description-whiskeyechoes = Элитный бар для элитных опер... Подождите, это же станция Nanotrasen. Почему эта вывеска в базе данных? ## EmpBarSign -barsign-prototype-name-empbarsign = glitchy bar sign +barsign-prototype-name-empbarsign = глючащая вывеска бара barsign-prototype-description-empbarsign = Что-то пошло совсем не так. ## SignOff diff --git a/Resources/Locale/ru-RU/blocking/blocking-examine.ftl b/Resources/Locale/ru-RU/blocking/blocking-examine.ftl index 32c0fb2efa..c98661f0f3 100644 --- a/Resources/Locale/ru-RU/blocking/blocking-examine.ftl +++ b/Resources/Locale/ru-RU/blocking/blocking-examine.ftl @@ -6,15 +6,15 @@ blocking-coefficient-value = - Получает [color=lightblue]{ $value }%[/co blocking-reduction-value = - Получает на [color=lightblue]{ $value }[/color] меньше [color=yellow]{ $type }[/color] урона. # Shown when examining the shield. Each entry represents the shield's health condition -comp-shield-damaged-1 = It looks fully intact. -comp-shield-damaged-2 = It has a few scratches. -comp-shield-damaged-3 = It has a few small holes and divots. -comp-shield-damaged-4 = [color=yellow]It has several holes and bent parts.[/color] -comp-shield-damaged-5 = [color=orange]It has deep cracks, several holes and parts of it have broken off.[/color] -comp-shield-damaged-6 = [color=red]It's been extremely brutalized and is nearly falling apart.[/color] +comp-shield-damaged-1 = Выглядит прямо с завода. +comp-shield-damaged-2 = На нём несколько царапин. +comp-shield-damaged-3 = На нём имеются небольшие вмятины и выбоины +comp-shield-damaged-4 = [color=yellow]На нём несколько отверстий и искривлений.[/color] +comp-shield-damaged-5 = [color=orange]У него есть глубокие трещины, несколько дырок и отломанные части.[/color] +comp-shield-damaged-6 = [color=red]Он подвергся крайней жестокости и вот-вот развалится.[/color] # Shown when examining the e-shield. Each entry represents the e-shield's health condition -comp-eshield-damaged-1 = It looks fully intact. -comp-eshield-damaged-2 = [color=yellow]The battery light is yellow.[/color] -comp-eshield-damaged-3 = [color=orange]The battery light is orange, the hardlight flickers.[/color] -comp-eshield-damaged-4 = [color=red]The battery light is red, the hardlight can barely stay alight.[/color] +comp-eshield-damaged-1 = Выглядит прямо с завода. +comp-eshield-damaged-2 = [color=yellow]Индикатор заряда горит жёлтым.[/color] +comp-eshield-damaged-3 = [color=orange]Индикатор заряда горит оранжевым, энергетический щит мигает.[/color] +comp-eshield-damaged-4 = [color=red]Индикатор заряда горит красным, энергетический щит едва держится включённым.[/color] diff --git a/Resources/Locale/ru-RU/borg/borg.ftl b/Resources/Locale/ru-RU/borg/borg.ftl index 740473ed2f..9f059d3902 100644 --- a/Resources/Locale/ru-RU/borg/borg.ftl +++ b/Resources/Locale/ru-RU/borg/borg.ftl @@ -9,7 +9,7 @@ borg-mind-removed = { CAPITALIZE($name) } выключается! borg-module-too-many = Для ещё одного модуля не хватает места... borg-module-duplicate = Этот модуль уже установлен в этого киборга. borg-module-whitelist-deny = Этот модуль не подходит для данного типа киборгов... -borg-module-incompatible = This module isn't compatible with { THE($existing) }. +borg-module-incompatible = Этот модуль не совместим с { THE($existing) }. borg-module-action-name = Активировать { $moduleName } borg-module-action-description = Выбрать { $moduleName }, чтобы использовать предоставляемые им инструменты. diff --git a/Resources/Locale/ru-RU/burning/bodyburn.ftl b/Resources/Locale/ru-RU/burning/bodyburn.ftl index ccac82b5df..447603b18c 100644 --- a/Resources/Locale/ru-RU/burning/bodyburn.ftl +++ b/Resources/Locale/ru-RU/burning/bodyburn.ftl @@ -1,2 +1,2 @@ bodyburn-text-others = { CAPITALIZE($name) } сгорает дотла! -bodyburn-vox-text-others = { CAPITALIZE(THE($name)) } turned into fried vox! +bodyburn-vox-text-others = { CAPITALIZE(THE($name)) } стал жареным воксом! diff --git a/Resources/Locale/ru-RU/cargo/bounties.ftl b/Resources/Locale/ru-RU/cargo/bounties.ftl index 24d1bb9f7b..f717b199c8 100644 --- a/Resources/Locale/ru-RU/cargo/bounties.ftl +++ b/Resources/Locale/ru-RU/cargo/bounties.ftl @@ -101,7 +101,7 @@ bounty-description-lime = После сильной попойки адмира bounty-description-lung = Лига сторонников курения тысячелетиями боролась за то, чтобы сигареты оставались на наших станциях. К сожалению, их лёгкие уже не так сильно сопротивляются. Пошлите им новые. bounty-description-monkey-cube = В связи с недавней генетической катастрофой Центральное командование испытывает острую потребность в обезьянах. Ваша задача — доставить обезьяньи кубы. bounty-description-mouse = На космической станции 15 закончились сублимированные мыши. Отправьте свежих, чтобы их уборщик не объявил забастовку. -bounty-description-pancake = В Nanotrasen мы считаем сотрудников семьёй. А вы знаете, что любят семьи? Блины. Отправьте дюжину. +bounty-description-pancake = В Nanotrasen мы считаем сотрудников семьёй. А вы знаете, что любят семьи? Блины. Отправьте полдюжины. bounty-description-pen = Мы проводим межгалактическое соревнование по балансировке ручек. Нам нужно, чтобы вы прислали нам несколько стандартизированных шариковых ручек. bounty-description-percussion = Из-за неудачной драки в баре, Объединённый смешанный ансамбль ударных инструментов всея Галактики потерял все свои инструменты. Пришлите им новый набор, чтобы они снова могли играть. bounty-description-pie = 3.14159? Нет! Руководство Центком хочет покушать ПИрогов! Отправьте им один. diff --git a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl index be9cecd8b0..9b51a4b51a 100644 --- a/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl +++ b/Resources/Locale/ru-RU/cargo/cargo-console-component.ftl @@ -1,7 +1,7 @@ ## UI cargo-console-menu-title = Консоль заказа грузов -cargo-console-menu-flavor-left = Order even more pizza boxes than usual! +cargo-console-menu-flavor-left = Закажи еще больше коробок пиццы, чем обычно! cargo-console-menu-flavor-right = v2.1 cargo-console-menu-account-name-label = Аккаунт:{ " " } cargo-console-menu-account-name-none-text = Нет @@ -20,13 +20,13 @@ cargo-console-menu-search-bar-placeholder = Поиск cargo-console-menu-requests-label = Запросы cargo-console-menu-orders-label = Заказы cargo-console-menu-populate-categories-all-text = Все -cargo-console-menu-order-row-title = { $productName } (x{ $orderAmount } for { $orderPrice }$) -cargo-console-menu-populate-orders-cargo-order-row-product-name-text = { $productName } (x{ $orderAmount }) от { $orderRequester } со счёта [color={ $accountColor }]{ $account }[/color] -cargo-console-menu-order-row-product-description = Reason: { $orderReason } -cargo-console-menu-order-row-button-approve = Approve -cargo-console-menu-order-row-button-cancel = Cancel -cargo-console-menu-order-row-alerts-reason-absent = The reason is not specified -cargo-console-menu-order-row-alerts-requester-unknown = Unknown +cargo-console-menu-order-row-title = { $productName } (x{ $orderAmount } за { $orderPrice }$) +cargo-console-menu-populate-orders-cargo-order-row-product-name-text = Заказчик: { $orderRequester } со счета [color={ $accountColor }]{ $account }[/color] +cargo-console-menu-order-row-product-description = Причина: { $orderReason } +cargo-console-menu-order-row-button-approve = Одобрить +cargo-console-menu-order-row-button-cancel = Отменить +cargo-console-menu-order-row-alerts-reason-absent = Причина не указана +cargo-console-menu-order-row-alerts-requester-unknown = Неизвестно cargo-console-menu-tab-title-orders = Заказы cargo-console-menu-tab-title-funds = Переводы cargo-console-menu-account-action-transfer-limit = [bold]Лимит перевода:[/bold] ${ $limit } diff --git a/Resources/Locale/ru-RU/chat/emotes.ftl b/Resources/Locale/ru-RU/chat/emotes.ftl index 5706748e32..db05972418 100644 --- a/Resources/Locale/ru-RU/chat/emotes.ftl +++ b/Resources/Locale/ru-RU/chat/emotes.ftl @@ -37,7 +37,7 @@ chat-emote-name-snarl = Скалиться chat-emote-name-whine = Скулить chat-emote-name-howl = Выть chat-emote-name-growl = Рычать -chat-emote-name-flap = Flap Wings +chat-emote-name-flap = Взмахнуть крыльями # Message chat-emote-msg-scream = кричит! @@ -79,4 +79,4 @@ chat-emote-msg-snarl = скалится. chat-emote-msg-whine = скулит. chat-emote-msg-howl = воет. chat-emote-msg-growl = рычит. -chat-emote-msg-flap = flaps { POSS-ADJ($entity) } wings. +chat-emote-msg-flap = машет { POSS-ADJ($entity) } крыльями. diff --git a/Resources/Locale/ru-RU/chat/highlights.ftl b/Resources/Locale/ru-RU/chat/highlights.ftl index 0f80389861..432ca548be 100644 --- a/Resources/Locale/ru-RU/chat/highlights.ftl +++ b/Resources/Locale/ru-RU/chat/highlights.ftl @@ -42,7 +42,7 @@ highlights-janitor = уборщик highlights-lawyer = адвокат, юрист highlights-librarian = библиотекар, библиотека highlights-mime = мим -highlights-musician = Musician, "Music", Theatre, Theater, Service, "Serv" +highlights-musician = музыкант, театрал, артист, сервисный работник, сервисник highlights-passenger = пассажир, грейтайдер, "тайдер" highlights-service-worker = сервисный работник, сервисник diff --git a/Resources/Locale/ru-RU/chemistry/components/mixing-component.ftl b/Resources/Locale/ru-RU/chemistry/components/mixing-component.ftl index 4c95348775..528f185e3a 100644 --- a/Resources/Locale/ru-RU/chemistry/components/mixing-component.ftl +++ b/Resources/Locale/ru-RU/chemistry/components/mixing-component.ftl @@ -14,5 +14,5 @@ mixing-verb-shake = метод шейк default-mixing-success = Вы смешиваете { $mixed } при помощи { $mixer } bible-mixing-success = Вы благословляете { $mixed } при помощи { $mixer } spoon-mixing-success = Вы размешиваете { $mixed } при помощи { $mixer } -handheld-centrifuge-success = You seperate chemicals in the { $mixed } +handheld-centrifuge-success = Вы разделяете вещества при помощи { $mixed } diff --git a/Resources/Locale/ru-RU/cloning/accept-cloning-window.ftl b/Resources/Locale/ru-RU/cloning/accept-cloning-window.ftl index 1f0fefa2ff..e7accddf01 100644 --- a/Resources/Locale/ru-RU/cloning/accept-cloning-window.ftl +++ b/Resources/Locale/ru-RU/cloning/accept-cloning-window.ftl @@ -1,5 +1,5 @@ accept-cloning-window-title = Клонирующая машина -accept-cloning-window-prompt-text-part = Вас клонируют! +accept-cloning-window-prompt-text-part = Вас клонируют! Вы забудете детали своей смерти. Перенести свою душу в тело клона? accept-cloning-window-accept-button = Да accept-cloning-window-deny-button = Нет \ No newline at end of file diff --git a/Resources/Locale/ru-RU/clothing/components/insulated-component.ftl b/Resources/Locale/ru-RU/clothing/components/insulated-component.ftl index feecb0ded5..a3ce05ec4d 100644 --- a/Resources/Locale/ru-RU/clothing/components/insulated-component.ftl +++ b/Resources/Locale/ru-RU/clothing/components/insulated-component.ftl @@ -1,2 +1,2 @@ -insulated-examinable-verb-text = Insulated -insulated-examinable-verb-text-message = This item appears to be electrically insulated. It should protect the wearer from shocks. +insulated-examinable-verb-text = Изолированный +insulated-examinable-verb-text-message = Этот предмет, по всей видимости, имеет электрическую изоляцию. Оно должно защищать от поражения электрическим током. diff --git a/Resources/Locale/ru-RU/commands/toolshed/xenoartifact-command.ftl b/Resources/Locale/ru-RU/commands/toolshed/xenoartifact-command.ftl index b6fc94adf9..f334115c53 100644 --- a/Resources/Locale/ru-RU/commands/toolshed/xenoartifact-command.ftl +++ b/Resources/Locale/ru-RU/commands/toolshed/xenoartifact-command.ftl @@ -1,10 +1,10 @@ command-description-xenoartifact-list = - List all EntityUids of spawned artifacts. + Выводит Uid список всех существующих ксеноартефактов. command-description-xenoartifact-printMatrix = - Prints out matrix that displays all edges between nodes. + Выводит матрицу, отображающую все ребра между узлами. command-description-xenoartifact-totalResearch = - Gets all research points that can be extracted from artifact currently. + Получает все исследовательские очки, которые в данный момент можно извлечь из артефакта. command-description-xenoartifact-averageResearch = - Calculates amount of research points average generated xeno artifact will output when fully activated. + Вычисляет количество очков исследований, которое сгенерированный ксеноартефакт выдаст при полной активации. command-description-xenoartifact-unlockAllNodes = - Unlocks all nodes of artifact. + Разблокирует все узлы артефакта. diff --git a/Resources/Locale/ru-RU/construction/components/flatpack.ftl b/Resources/Locale/ru-RU/construction/components/flatpack.ftl index 042369a1c6..bc2c1fa4e4 100644 --- a/Resources/Locale/ru-RU/construction/components/flatpack.ftl +++ b/Resources/Locale/ru-RU/construction/components/flatpack.ftl @@ -8,7 +8,7 @@ flatpacker-ui-title = Упаковщик 1001 flatpacker-ui-materials-label = Материалы flatpacker-ui-cost-label = Стоимость запаковки flatpacker-ui-no-board-label = Отсутствует машинная плата! -flatpacker-ui-board-invalid-label = [color=red]Invalid board! - Unable to print![/color] +flatpacker-ui-board-invalid-label = [color=red]Недопустимая плата! + Невозможно распечатать![/color] flatpacker-ui-insert-board = Для начала вставьте машинную плату. flatpacker-ui-pack-button = Упаковать diff --git a/Resources/Locale/ru-RU/datasets/names/xenoborg.ftl b/Resources/Locale/ru-RU/datasets/names/xenoborg.ftl index e640222c8d..96f1de20b8 100644 --- a/Resources/Locale/ru-RU/datasets/names/xenoborg.ftl +++ b/Resources/Locale/ru-RU/datasets/names/xenoborg.ftl @@ -58,3 +58,23 @@ names-xenoborg-dataset-57 = Кусок Разрушения names-xenoborg-dataset-58 = Талос names-xenoborg-dataset-59 = Агробот names-xenoborg-dataset-60 = Вспинубой +names-xenoborg-dataset-61 = Kill.exe +names-xenoborg-dataset-62 = Фатальная Прошивка +names-xenoborg-dataset-63 = W.A.R unit +names-xenoborg-dataset-64 = Тостер рока +names-xenoborg-dataset-65 = Griller +names-xenoborg-dataset-66 = Умный Убийца +names-xenoborg-dataset-67 = Borg.Smith-7 +names-xenoborg-dataset-68 = Crewcracker pr1nce +names-xenoborg-dataset-69 = Процессазинатор +names-xenoborg-dataset-70 = H.4.T.3.R +names-xenoborg-dataset-71 = JUGGER-8 +names-xenoborg-dataset-72 = Null-Zero +names-xenoborg-dataset-73 = Балистический Борг +names-xenoborg-dataset-74 = Ошибка 666 +names-xenoborg-dataset-75 = Slaughter-o-tron +names-xenoborg-dataset-76 = Железный Фантом +names-xenoborg-dataset-77 = DESTRO-NIAC +names-xenoborg-dataset-78 = Машина Индиго +names-xenoborg-dataset-79 = MARK.ILLER-1 +names-xenoborg-dataset-80 = Battle Borg diff --git a/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl index b1f243c714..632f16fb58 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl @@ -7,4 +7,4 @@ ui-escape-guidebook = Руководство ui-escape-wiki = Wiki ui-escape-disconnect = Отключиться ui-escape-quit = Выйти -ui-escape-feedback = Feedback +ui-escape-feedback = Обратная связь diff --git a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl index 508b60b306..da04ca6b67 100644 --- a/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl +++ b/Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl @@ -49,7 +49,7 @@ ui-options-misc-label = Разное ui-options-interface-label = Интерфейс -ui-options-auto-fill-highlights = Автозаполнение подсветки информацией персонажа +ui-options-auto-fill-highlights = Автоматическое заполнение списка подсветки на основе имени и должности персонажа ui-options-highlights-color = Цвет подсветки: ui-options-highlights-color-example = Это подсвеченный текст. ui-options-show-held-item = Показать удерживаемый элемент рядом с курсором @@ -108,8 +108,8 @@ ui-options-hud-layout = Тип HUD: ## Controls menu -ui-options-hold-to-attack-melee = Hold to attack (melee) -ui-options-hold-to-attack-ranged = Hold to attack (ranged) +ui-options-hold-to-attack-melee = Удерживать чтобы атаковать (ближний бой) +ui-options-hold-to-attack-ranged = Удерживать чтобы атаковать (дальний бой) ui-options-binds-reset-all = Сбросить ВСЕ привязки ui-options-binds-explanation = ЛКМ — изменить кнопку, ПКМ — убрать кнопку diff --git a/Resources/Locale/ru-RU/fax/fax.ftl b/Resources/Locale/ru-RU/fax/fax.ftl index 50eb102882..f51bc98b82 100644 --- a/Resources/Locale/ru-RU/fax/fax.ftl +++ b/Resources/Locale/ru-RU/fax/fax.ftl @@ -29,7 +29,7 @@ fax-machine-printed-paper-name = распечатанная бумага fax-machine-sender-info = ───────────────────────────────────── - Fax sent - from: { $sender_name } [address: { $sender_addr }] - to: { $recipient_name } [address: { $recipient_addr }] - at: { $time } + Факс отправлен + от: { $sender_name } [address: { $sender_addr }] + кому: { $recipient_name } [address: { $recipient_addr }] + когда: { $time } diff --git a/Resources/Locale/ru-RU/feedbackpopup/feedbackpopup.ftl b/Resources/Locale/ru-RU/feedbackpopup/feedbackpopup.ftl index 078cda0b02..991fee6a6d 100644 --- a/Resources/Locale/ru-RU/feedbackpopup/feedbackpopup.ftl +++ b/Resources/Locale/ru-RU/feedbackpopup/feedbackpopup.ftl @@ -1,13 +1,13 @@ -feedbackpopup-window-name = Request for feedback +feedbackpopup-window-name = Запрос на обратную связь -feedbackpopup-control-button-text = Open Link +feedbackpopup-control-button-text = Открыть ссылку feedbackpopup-control-total-surveys = {$num -> - [one] { $num } entry - *[other] { $num } entries + [one] { $num } запись + *[other] { $num } записей } -feedbackpopup-control-no-entries= No entries -feedbackpopup-control-ui-footer = Let us know what you think! +feedbackpopup-control-no-entries= Нет записей +feedbackpopup-control-ui-footer = Поделитесь своим мнением! # Command strings command-description-openfeedbackpopup = Opens the feedback popup window. diff --git a/Resources/Locale/ru-RU/fluids/components/equip-spray-component.ftl b/Resources/Locale/ru-RU/fluids/components/equip-spray-component.ftl index f2ab8319be..dc3c46f79b 100644 --- a/Resources/Locale/ru-RU/fluids/components/equip-spray-component.ftl +++ b/Resources/Locale/ru-RU/fluids/components/equip-spray-component.ftl @@ -1 +1 @@ -equip-spray-verb-press = Press +equip-spray-verb-press = Нажать diff --git a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl index c4bfac214e..cd1505f70a 100644 --- a/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl +++ b/Resources/Locale/ru-RU/guidebook/chemistry/core.ftl @@ -17,9 +17,9 @@ guidebook-reagent-sources-header = Источники guidebook-reagent-sources-ent-wrapper = [bold]{ $name }[/bold] \[1\] guidebook-reagent-sources-gas-wrapper = [bold]{ $name } (газ)[/bold] \[1\] guidebook-reagent-effects-header = Эффекты -guidebook-reagent-effects-metabolism-stage-rate = [bold]{ $stage }[/bold] [color=gray]({ $rate } units per second)[/color] -guidebook-reagent-effects-metabolite-item = { $reagent } at a rate of { NATURALPERCENT($rate, 2) } -guidebook-reagent-effects-metabolites = Metabolizes into { $items }. +guidebook-reagent-effects-metabolism-stage-rate = [bold]{ $stage }[/bold] [color=gray]({ $rate } ед. в секунду)[/color] +guidebook-reagent-effects-metabolite-item = { $reagent } с коэффициентом { NATURALPERCENT($rate, 2) } +guidebook-reagent-effects-metabolites = Метаболизируется в { $items }. guidebook-reagent-plant-metabolisms-header = Метаболизм растений guidebook-reagent-plant-metabolisms-rate = [bold]Метаболизм растений[/bold] [color=gray](1 единица каждые 3 секунды базово)[/color] guidebook-reagent-physical-description = [italic]На вид вещество { $description }.[/italic]. diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl index cd24566feb..531adafe4e 100644 --- a/Resources/Locale/ru-RU/job/job-names.ftl +++ b/Resources/Locale/ru-RU/job/job-names.ftl @@ -8,7 +8,7 @@ job-name-captain = капитан job-name-cargotech = грузчик job-name-cburn = агент карантинной службы Центком job-name-ce = старший инженер -job-name-centcommoff = CentComm Official +job-name-centcommoff = представитель Центрального Командования job-name-chef = шеф-повар job-name-chaplain = священник job-name-chemist = химик @@ -62,13 +62,13 @@ job-name-virologist = вирусолог job-name-zookeeper = зоотехник # antagonist jobs -job-name-ninja = Ninja +job-name-ninja = ниндзя job-name-syndicate = синдикат -job-name-syndicate-commander = Syndicate Commander -job-name-syndicate-corpsman = Syndicate Corpsman -job-name-syndicate-operative = Syndicate Operative -job-name-pirate = Pirate -job-name-wizard = Wizard +job-name-syndicate-commander = командир оперативников +job-name-syndicate-corpsman = медик оперативников +job-name-syndicate-operative = ядерный оперативник +job-name-pirate = пират +job-name-wizard = волшебник job-name-zombie = зомби # Job titles diff --git a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl index 5335cd4c43..2bce279cb6 100644 --- a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl @@ -56,4 +56,4 @@ comp-kitchen-spike-victim-examine = [color=orange]{ CAPITALIZE(SUBJECT($target)) *[neuter] худым }.[/color] -comp-kitchen-spike-deconstruct-occupied = Next, [color=red]unhook the body[/color]. +comp-kitchen-spike-deconstruct-occupied = Далее, [color=red]снимите тело с крюка[/color]. diff --git a/Resources/Locale/ru-RU/lock/bypass-lock-component.ftl b/Resources/Locale/ru-RU/lock/bypass-lock-component.ftl index ebc4e54adf..46d6db503d 100644 --- a/Resources/Locale/ru-RU/lock/bypass-lock-component.ftl +++ b/Resources/Locale/ru-RU/lock/bypass-lock-component.ftl @@ -1,4 +1,4 @@ -bypass-lock-verb = Force open the access lock -bypass-lock-disabled-healthy = The lock needs to be damaged further before it can be forced open. -bypass-lock-disabled-wrong-tool = This lock requires { $quality } to be forced open. -bypass-lock-disabled-already-open = The lock is already open. +bypass-lock-verb = Силой открыть блокирующий замок. +bypass-lock-disabled-healthy = Необходимо ещё больше повредить замок, прежде чем его можно будет взломать. +bypass-lock-disabled-wrong-tool = Этот замок требует { $quality }, чтобы его открыть. +bypass-lock-disabled-already-open = Замок уже открыт. diff --git a/Resources/Locale/ru-RU/machine-linking/receiver_ports.ftl b/Resources/Locale/ru-RU/machine-linking/receiver_ports.ftl index 84bbddcadf..394deea6db 100644 --- a/Resources/Locale/ru-RU/machine-linking/receiver_ports.ftl +++ b/Resources/Locale/ru-RU/machine-linking/receiver_ports.ftl @@ -82,10 +82,10 @@ signal-port-description-logic-input-b = Второй порт логическо signal-port-name-logic-input = Вход signal-port-description-logic-input = Входной порт, который принимает только уровни сигнала, высокий или низкий. -signal-port-description-logic-memory-input = Signal to load into the memory cell, when enabled. +signal-port-description-logic-memory-input = Сигнал для загрузки в ячейку памяти, если она включена. -signal-port-name-logic-enable = Enable -signal-port-description-logic-enable = Only loads the input signal into the memory cell when HIGH. +signal-port-name-logic-enable = Включить +signal-port-description-logic-enable = Входной сигнал загружается в ячейку памяти только, если он высок. -signal-port-name-logic-random-input = Input Signal -signal-port-description-logic-random-input = Receives any signal to trigger a random output. +signal-port-name-logic-random-input = Входной сигнал +signal-port-description-logic-random-input = Получает любой сигнал для события случайного вывода. diff --git a/Resources/Locale/ru-RU/markings/gauze.ftl b/Resources/Locale/ru-RU/markings/gauze.ftl index a99b8938bd..ae03074f17 100644 --- a/Resources/Locale/ru-RU/markings/gauze.ftl +++ b/Resources/Locale/ru-RU/markings/gauze.ftl @@ -92,7 +92,7 @@ marking-GauzeMothUpperArmLeft-gauze_moth_upperarm_l = Инсектоид, Бин marking-GauzeMothUpperArmLeft = Инсектоид, Бинт, Перевязь предплечья (Левый) marking-GauzeMothUpperLegRight-gauze_moth_upperleg_r = Инсектоид, Бинт, Перевязь бедра (Правый) -marking-GauzeMothUpperLegRight = Инсектоид, Инсектоид, Бинт, Перевязь бедра (Правый) +marking-GauzeMothUpperLegRight = Инсектоид, Бинт, Перевязь бедра (Правый) marking-GauzeMothUpperLegLeft-gauze_moth_upperleg_l = Инсектоид, Бинт, Перевязь бедра (Левый) marking-GauzeMothUpperLegLeft = Инсектоид, Бинт, Перевязь бедра (Левый) @@ -103,48 +103,48 @@ marking-GauzeMothLowerLegRight = Инсектоид, Бинт, Перевязь marking-GauzeMothLowerLegLeft-gauze_moth_lowerleg_l = Инсектоид, Бинт, Перевязь голени (Левый) marking-GauzeMothLowerLegLeft = Инсектоид, Бинт, Перевязь голени (Левый) -marking-GauzeVulpStomach-gauze_vulp_abdomen = Vulpkanin Gauze Stomach Wrap -marking-GauzeVulpStomach = Vulpkanin Gauze Stomach Wrap +marking-GauzeVulpStomach-gauze_vulp_abdomen = Вульпканин, Бинт, Перевязь живота +marking-GauzeVulpStomach = Вульпканин, Бинт, Перевязь живота -marking-GauzeVulpBlindfold-gauze_vulp_blindfold = Vulpkanin Blindfold -marking-GauzeVulpBlindfold = Vulpkanin Blindfold +marking-GauzeVulpBlindfold-gauze_vulp_blindfold = Вульпканин, Бинт, Повязка на глаза +marking-GauzeVulpBlindfold = Вульпканин, Бинт, Повязка на глаза -marking-GauzeVulpBoxerwrapLeft-gauze_vulp_boxerwrap_l = Vulpkanin Gauze Hand Wrap (Left) -marking-GauzeVulpBoxerwrapLeft = Vulpkanin Gauze Hand Wrap (Left) +marking-GauzeVulpBoxerwrapLeft-gauze_vulp_boxerwrap_l = Вульпканин, Бинт, Перевязь кисти (Левый) +marking-GauzeVulpBoxerwrapLeft = Вульпканин, Бинт, Повязка на кисть (Левый) -marking-GauzeVulpBoxerwrapRight-gauze_vulp_boxerwrap_r = Vulpkanin Gauze Hand Wrap (Right) -marking-GauzeVulpBoxerwrapRight = Vulpkanin Gauze Hand Wrap (Right) +marking-GauzeVulpBoxerwrapRight-gauze_vulp_boxerwrap_r = Вульпканин, Бинт, Повязка на кисть (Правый) +marking-GauzeVulpBoxerwrapRight = Вульпканин, Бинт, Повязка на кисть (Правый) -marking-GauzeVulpHead-gauze_vulp_head = Vulpkanin Gauze Head Wrap -marking-GauzeVulpHead = Vulpkanin Gauze Head Wrap +marking-GauzeVulpHead-gauze_vulp_head = Вульпканин, Бинт, Повязка на голову +marking-GauzeVulpHead = Вульпканин, Бинт, Повязка на голову -marking-GauzeVulpLeftArm-gauze_vulp_leftarm = Vulpkanin Gauze Arm Wrap (Left) -marking-GauzeVulpLeftArm = Vulpkanin Gauze Arm Wrap (Left) +marking-GauzeVulpLeftArm-gauze_vulp_leftarm = Вульпканин, Бинт, Повязка на руку (Левый) +marking-GauzeVulpLeftArm = Вульпканин, Бинт, Повязка на руку (Левый) -marking-GauzeVulpLefteyePatch-gauze_vulp_lefteye_2 = Vulpkanin Gauze Eyepatch (Left) -marking-GauzeVulpLefteyePatch = Vulpkanin Gauze Eyepatch (Left) +marking-GauzeVulpLefteyePatch-gauze_vulp_lefteye_2 = Вульпканин, Бинт, Перевязь глаза (Левый) +marking-GauzeVulpLefteyePatch = Вульпканин, Бинт, Перевязь глаза (Левый) -marking-GauzeVulpLowerArmRight-gauze_vulp_lowerarm_r = Vulpkanin Gauze Wrist Wrap (Right) -marking-GauzeVulpLowerArmRight = Vulpkanin Gauze Wrist Wrap (Right) +marking-GauzeVulpLowerArmRight-gauze_vulp_lowerarm_r = Вульпканин, Бинт, Перевязь запястья (Правый) +marking-GauzeVulpLowerArmRight = Вульпканин, Бинт, Перевязь запястья (Правый) -marking-GauzeVulpLowerLegLeft-gauze_vulp_lowerleg_l = Vulpkanin Gauze Ankle Wrap (Left) -marking-GauzeVulpLowerLegLeft = Vulpkanin Gauze Ankle Wrap (Left) +marking-GauzeVulpLowerLegLeft-gauze_vulp_lowerleg_l = Вульпканин, Бинт, Перевязь голени (Левый) +marking-GauzeVulpLowerLegLeft = Вульпканин, Бинт, Перевязь голени (Левый) -marking-GauzeVulpLowerLegRight-gauze_vulp_lowerleg_r = Vulpkanin Gauze Ankle Wrap (Right) -marking-GauzeVulpLowerLegRight = Vulpkanin Gauze Ankle Wrap (Right) +marking-GauzeVulpLowerLegRight-gauze_vulp_lowerleg_r = Вульпканин, Бинт, Перевязь голени (Правый) +marking-GauzeVulpLowerLegRight = Вульпканин, Бинт, Перевязь голени (Правый) -marking-GauzeVulpRighteyePatch-gauze_vulp_righteye_2 = Vulpkanin Gauze Eyepatch (Right) -marking-GauzeVulpRighteyePatch = Vulpkanin Gauze Eyepatch (Right) +marking-GauzeVulpRighteyePatch-gauze_vulp_righteye_2 = Вульпканин, Бинт, Перевязь глаза (Правый) +marking-GauzeVulpRighteyePatch = Вульпканин, Бинт, Перевязь глаза (Правый) -marking-GauzeVulpShoulder-gauze_vulp_shoulder = Vulpkanin Gauze Shoulder Sling -marking-GauzeVulpShoulder = Vulpkanin Gauze Shoulder Sling +marking-GauzeVulpShoulder-gauze_vulp_shoulder = Вульпканин, Бинт, Перевязь плеча +marking-GauzeVulpShoulder = Вульпканин, Бинт, Перевязь плеча -marking-GauzeVulpUpperArmRight-gauze_vulp_upperarm_r = Vulpkanin Gauze Forearm Wrap (Right) -marking-GauzeVulpUpperArmRight = Vulpkanin Gauze Forearm Wrap (Right) +marking-GauzeVulpUpperArmRight-gauze_vulp_upperarm_r = Вульпканин, Бинт, Перевязь предплечья (Правый) +marking-GauzeVulpUpperArmRight = Вульпканин, Бинт, Перевязь предплечья (Правый) -marking-GauzeVulpUpperLegLeft-gauze_vulp_upperleg_l = Vulpkanin Gauze Thigh Wrap (Left) -marking-GauzeVulpUpperLegLeft = Vulpkanin Gauze Thigh Wrap (Left) +marking-GauzeVulpUpperLegLeft-gauze_vulp_upperleg_l = Вульпканин, Бинт, Перевязь бедра (Левый) +marking-GauzeVulpUpperLegLeft = Вульпканин, Бинт, Перевязь бедра (Левый) -marking-GauzeVulpUpperLegRight-gauze_vulp_upperleg_r = Vulpkanin Gauze Thigh Wrap (Right) -marking-GauzeVulpUpperLegRight = Vulpkanin Gauze Thigh Wrap (Right) +marking-GauzeVulpUpperLegRight-gauze_vulp_upperleg_r = Вульпканин, Бинт, Перевязь бедра (Правый) +marking-GauzeVulpUpperLegRight = Вульпканин, Бинт, Перевязь бедра (Правый) diff --git a/Resources/Locale/ru-RU/markings/vulpkanin.ftl b/Resources/Locale/ru-RU/markings/vulpkanin.ftl index dd90ba47db..523cdb34f0 100644 --- a/Resources/Locale/ru-RU/markings/vulpkanin.ftl +++ b/Resources/Locale/ru-RU/markings/vulpkanin.ftl @@ -120,8 +120,8 @@ marking-VulpTailVulpFade-vulp = Хвост вульпканина (Основа) marking-VulpTailVulpFade-vulp-fade = Хвост вульпканина (Градиент) marking-VulpTailVulpFade = Вульпканин (Градиент) -marking-VulpTailCoyote-coyote = Coyote Tail (Base) -marking-VulpTailCoyote = Vulpkanin Coyote +marking-VulpTailCoyote-coyote = Хвост койота (Основа) +marking-VulpTailCoyote = Вульпканин Койот # Chest diff --git a/Resources/Locale/ru-RU/metabolism/metabolism-stages.ftl b/Resources/Locale/ru-RU/metabolism/metabolism-stages.ftl index 8988667c36..f13a54ac09 100644 --- a/Resources/Locale/ru-RU/metabolism/metabolism-stages.ftl +++ b/Resources/Locale/ru-RU/metabolism/metabolism-stages.ftl @@ -1,6 +1,6 @@ -metabolism-stage-respiration = Respiration -metabolism-stage-digestion = Digestion -metabolism-stage-bloodstream = Bloodstream -metabolism-stage-metabolites = Metabolites +metabolism-stage-respiration = Дыхание +metabolism-stage-digestion = Пищеварение +metabolism-stage-bloodstream = Кровоток +metabolism-stage-metabolites = Метаболизм -metabolism-stage-plant = Plant Metabolism +metabolism-stage-plant = Метаболизм растений diff --git a/Resources/Locale/ru-RU/nutrition/components/ingestion-system.ftl b/Resources/Locale/ru-RU/nutrition/components/ingestion-system.ftl index aac8b8c627..18c6c888b1 100644 --- a/Resources/Locale/ru-RU/nutrition/components/ingestion-system.ftl +++ b/Resources/Locale/ru-RU/nutrition/components/ingestion-system.ftl @@ -26,15 +26,15 @@ ingestion-verb-drink = Пить # Edible Component -edible-satiated = { $satiated -> - [true] { " " }You don't feel like you could { $verb } any more. - *[false] { "" } + [true] { " " }Вам кажется вы не можете больше { $verb }. + *[false] { "" } } -edible-nom = Ням. { $flavors } +edible-nom = Ням. { $flavors }{ -edible-satiated(satiated: $satiated, verb: "есть") } edible-nom-other = Ням. -edible-slurp = Сёрб. { $flavors } +edible-slurp = Сёрб. { $flavors }{ -edible-satiated(satiated: $satiated, verb: "пить") } edible-slurp-other = Сёрб. -edible-swallow = Вы проглатываете { $food } +edible-swallow = Вы проглатываете { $food }.{ -edible-satiated(satiated: $satiated, verb: "проглотить") } edible-gulp = Глоть. { $flavors } edible-gulp-other = Глоть. @@ -57,5 +57,5 @@ edible-verb-pill = глотать ## Force feeding edible-force-feed = { CAPITALIZE($user) } пытается заставить вас что-то { $verb }! -edible-force-feed-success = { CAPITALIZE($user) } заставил вас что-то { $verb }! { $flavors } +edible-force-feed-success = { CAPITALIZE($user) } заставил вас что-то { $verb }! { $flavors }{ -edible-satiated(satiated: $satiated, verb: $verb) } edible-force-feed-success-user = Вы успешно накормили { $target } diff --git a/Resources/Locale/ru-RU/predictions/magic-9-ball-answers.ftl b/Resources/Locale/ru-RU/predictions/magic-9-ball-answers.ftl index 25eee1ac23..f470dd7dc8 100644 --- a/Resources/Locale/ru-RU/predictions/magic-9-ball-answers.ftl +++ b/Resources/Locale/ru-RU/predictions/magic-9-ball-answers.ftl @@ -1,21 +1,21 @@ # Positive -magic-9-ball-1 = Yes -magic-9-ball-2 = YES!!!! -magic-9-ball-3 = Without a doubt -magic-9-ball-4 = It is certain -magic-9-ball-5 = Outlook good -magic-9-ball-6 = Positive -magic-9-ball-7 = Absolutely +magic-9-ball-1 = Да +magic-9-ball-2 = ДАА!!!! +magic-9-ball-3 = Без сомнения +magic-9-ball-4 = Это несомненно +magic-9-ball-5 = Перспективы хорошие +magic-9-ball-6 = Позитивно +magic-9-ball-7 = Абсолютно # Negative -magic-9-ball-8 = No -magic-9-ball-9 = NOOO!!!!!! -magic-9-ball-10 = No no no no no no no -magic-9-ball-11 = Nuh uh -magic-9-ball-12 = Nah -magic-9-ball-13 = Negative -magic-9-ball-14 = Absolutely not +magic-9-ball-8 = Нет +magic-9-ball-9 = НЕЕЕТ!!!!!! +magic-9-ball-10 = Нет нет нет нет нет нет нет +magic-9-ball-11 = Неа +magic-9-ball-12 = Нее +magic-9-ball-13 = Отрицательно +magic-9-ball-14 = Категорически нет # Neutral -magic-9-ball-15 = Perchance -magic-9-ball-16 = I dunno +magic-9-ball-15 = Возможно +magic-9-ball-16 = Я не знаю diff --git a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl index 4ab1b90361..ee88fb3221 100644 --- a/Resources/Locale/ru-RU/preferences/loadout-groups.ftl +++ b/Resources/Locale/ru-RU/preferences/loadout-groups.ftl @@ -203,7 +203,7 @@ loadout-group-paramedic-shoes = Парамедик, обувь # Wildcards loadout-group-reporter-jumpsuit = Репортёр, комбинезон -loadout-group-reporter-head = Reporter hat -loadout-group-reporter-outerclothing = Reporter vest +loadout-group-reporter-head = Репортёр, голова +loadout-group-reporter-outerclothing = Репортёр, верхняя одежда loadout-group-psychologist-jumpsuit = Психолог, комбинезон diff --git a/Resources/Locale/ru-RU/preferences/ui/markings-picker.ftl b/Resources/Locale/ru-RU/preferences/ui/markings-picker.ftl index 849ee86c69..2e2d2c4b4a 100644 --- a/Resources/Locale/ru-RU/preferences/ui/markings-picker.ftl +++ b/Resources/Locale/ru-RU/preferences/ui/markings-picker.ftl @@ -1,67 +1,67 @@ markings-search = Поиск -markings-selection = { $selectable -> - [0] You have no markings remaining. - [one] You can select one more marking. - *[other] You can select { $selectable } more markings. + [0] Вы больше не можете выбрать черту. + [one] Вы можете выбрать еще одну черту. + *[other] Вы можете выбрать ещё { $selectable } черты. } markings-limits = { $required -> [true] { $count -> - [-1] Select at least one marking. - [0] You cannot select any markings, but somehow, you have to? This is a bug. - [one] Select one marking. - *[other] Select at least one marking and up to { $count } markings. { -markings-selection(selectable: $selectable) } - } - *[false] { $count -> - [-1] Select any number of markings. - [0] You cannot select any markings. - [one] Select up to one marking. - *[other] Select up to { $count } markings. { -markings-selection(selectable: $selectable) } - } + [-1] Выберите хотя бы одну черту. + [0] Вы не можете выбрать ещё черту, но как-то, должны? Это баг. + [one] Выберите одну черту. + *[other] Выберите хотя бы одну черту и до { $count }. { -markings-selection(selectable: $selectable) } + } + *[false] { $count -> + [-1] Выберите любое количество черт. + [0] Вы больше не можете выбрать черту. + [one] Выберите до одной черты. + *[other] Выберите до { $count } черт. { -markings-selection(selectable: $selectable) } + } } -markings-reorder = Reorder markings +markings-reorder = Выбранные черты -humanoid-marking-modifier-respect-limits = Respect limits -humanoid-marking-modifier-respect-group-sex = Respect group & sex restrictions +humanoid-marking-modifier-respect-limits = Учитывать ограничения +humanoid-marking-modifier-respect-group-sex = Учитывать ограничение расы и пола humanoid-marking-modifier-base-layers = Базовый слой humanoid-marking-modifier-enable = Включить humanoid-marking-modifier-prototype-id = ID прототипа: # Categories -markings-organ-Torso = Torso -markings-organ-Head = Head -markings-organ-ArmLeft = Left Arm -markings-organ-ArmRight = Right Arm -markings-organ-HandRight = Right Hand -markings-organ-HandLeft = Left Hand -markings-organ-LegLeft = Left Leg -markings-organ-LegRight = Right Leg -markings-organ-FootLeft = Left Foot -markings-organ-FootRight = Right Foot -markings-organ-Eyes = Eyes +markings-organ-Torso = Туловище +markings-organ-Head = Голова +markings-organ-ArmLeft = Левая рука +markings-organ-ArmRight = Правая рука +markings-organ-HandRight = Правая кисть +markings-organ-HandLeft = Левая кисть +markings-organ-LegLeft = Левая нога +markings-organ-LegRight = Правая нога +markings-organ-FootLeft = Левая стопа +markings-organ-FootRight = Правая стопа +markings-organ-Eyes = Глаза -markings-layer-Special = Special -markings-layer-Tail = Tail -markings-layer-Tail-Moth = Wings -markings-layer-Hair = Hair -markings-layer-FacialHair = Facial Hair -markings-layer-UndergarmentTop = Undershirt -markings-layer-UndergarmentBottom = Underpants -markings-layer-Chest = Chest -markings-layer-Head = Head -markings-layer-Snout = Snout -markings-layer-SnoutCover = Snout (Cover) -markings-layer-HeadSide = Head (Side) -markings-layer-HeadTop = Head (Top) -markings-layer-Eyes = Eyes -markings-layer-RArm = Right Arm -markings-layer-LArm = Left Arm -markings-layer-RHand = Right Hand -markings-layer-LHand = Left Hand -markings-layer-RLeg = Right Leg -markings-layer-LLeg = Left Leg -markings-layer-RFoot = Right Foot -markings-layer-LFoot = Left Foot -markings-layer-Overlay = Overlay -markings-layer-TailOverlay = Overlay +markings-layer-Special = Особое +markings-layer-Tail = Хвост +markings-layer-Tail-Moth = Крылья +markings-layer-Hair = Волосы +markings-layer-FacialHair = Лицевая растительность +markings-layer-UndergarmentTop = Нижняя рубашка +markings-layer-UndergarmentBottom = Трусы +markings-layer-Chest = Туловищие +markings-layer-Head = Голова +markings-layer-Snout = Нос +markings-layer-SnoutCover = Нос (Покрытие) +markings-layer-HeadSide = Голова (Бок) +markings-layer-HeadTop = Голова (Верх) +markings-layer-Eyes = Глаза +markings-layer-RArm = Правая рука +markings-layer-LArm = Левая рука +markings-layer-RHand = Правая кисть +markings-layer-LHand = Левая кисть +markings-layer-RLeg = Правая нога +markings-layer-LLeg = Левая нога +markings-layer-RFoot = Правая стопа +markings-layer-LFoot = Левая стопа +markings-layer-Overlay = Наложение +markings-layer-TailOverlay = Наложение diff --git a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct-descriptions.ftl b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct-descriptions.ftl index 916390958e..260f6ee3b6 100644 --- a/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct-descriptions.ftl +++ b/Resources/Locale/ru-RU/prototypes/catalog/cargo/cargoproduct-descriptions.ftl @@ -1,12 +1,12 @@ # Emergency -cargoproduct-description-emergencyinflatablewall = Three stacks of inflatable walls for when the stations metal walls don't want to hold atmosphere anymore. +cargoproduct-description-emergencyinflatablewall = Три стопки надувных стен на случай, если металлические стены станции перестанут удерживать атмосферу. # Materials -cargoproduct-name-material-gold = gold ingots -cargoproduct-description-material-gold = 30 ingots of gold. +cargoproduct-name-material-gold = золотые слитки +cargoproduct-description-material-gold = 30 слитков золота. -cargoproduct-name-material-plasteel = plasteel sheets -cargoproduct-description-material-plasteel = 30 sheets of plasteel. +cargoproduct-name-material-plasteel = листы пластали +cargoproduct-description-material-plasteel = 30 листов пластали. -cargoproduct-name-material-silver = silver ingots -cargoproduct-description-material-silver = 30 ingots of silver. +cargoproduct-name-material-silver = серебряные слитки +cargoproduct-description-material-silver = 30 слитков серебра. diff --git a/Resources/Locale/ru-RU/prototypes/roles/antags.ftl b/Resources/Locale/ru-RU/prototypes/roles/antags.ftl index 3b71823b9e..45534a62a2 100644 --- a/Resources/Locale/ru-RU/prototypes/roles/antags.ftl +++ b/Resources/Locale/ru-RU/prototypes/roles/antags.ftl @@ -36,7 +36,7 @@ roles-antag-space-ninja-objective = Используйте свою скрытн roles-antag-paradox-clone-name = Парадоксальный клон roles-antag-paradox-clone-objective = Странная пространственно-временная аномалия телепортировала вас в другую реальность! Теперь вам предстоит найти своего двойника, убить и заменить его. -roles-antag-pirate-name = Pirate +roles-antag-pirate-name = Пират roles-antag-thief-name = Вор roles-antag-thief-objective = Пополните свою личную коллекцию имуществом Nanotrasen, не прибегая к насилию. diff --git a/Resources/Locale/ru-RU/random-metadata/random-metadata-formats.ftl b/Resources/Locale/ru-RU/random-metadata/random-metadata-formats.ftl index 4fd0796358..84e003ab71 100644 --- a/Resources/Locale/ru-RU/random-metadata/random-metadata-formats.ftl +++ b/Resources/Locale/ru-RU/random-metadata/random-metadata-formats.ftl @@ -16,17 +16,16 @@ name-format-nukie-agent = Медик { $part0 } name-format-nukie-commander = Командир { $part0 } name-format-nukie-operator = Оператор { $part0 } -# " <name>" name-format-ert = { $part0 } { $part1 } -name-format-ert-leader = Сержант {$part0} -name-format-ert-specialist = Специалист {$part0} -name-format-ert-pointman = Сапёр {$part0} -name-format-ert-officer = Офицер {$part0} -name-format-ert-rifle = Стрелок {$part0} -name-format-ert-grenade = Гренадер {$part0} -name-format-ert-vanguard = Авангард {$part0} -name-format-ert-doctor = Врач {$part0} -name-format-ert-corpsman = Медик {$part0} +name-format-ert-leader = Сержант { $part0 } +name-format-ert-specialist = Специалист { $part0 } +name-format-ert-pointman = Сапёр { $part0 } +name-format-ert-officer = Офицер { $part0 } +name-format-ert-rifle = Стрелок { $part0 } +name-format-ert-grenade = Гренадер { $part0 } +name-format-ert-vanguard = Авангард { $part0 } +name-format-ert-doctor = Врач { $part0 } +name-format-ert-corpsman = Медик { $part0 } # "<appearance> <type>" name-format-book = { $part0 } { $part1 } diff --git a/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl b/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl index b99fe481fe..9d2e573685 100644 --- a/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl +++ b/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl @@ -29,7 +29,7 @@ rcd-component-must-build-on-subfloor-message = Это может быть пос rcd-component-cannot-build-on-subfloor-message = Это не может быть построено на покрытии! rcd-component-cannot-build-on-occupied-tile-message = Здесь нельзя строить, место уже занято! rcd-component-cannot-build-identical-tile = Эта клетка уже тут имеется! -rcd-component-cannot-build-identical-entity = That already exists there! +rcd-component-cannot-build-identical-entity = Эта постройка уже есть тут! ### Category names diff --git a/Resources/Locale/ru-RU/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/reagents/meta/biological.ftl index 6c9974e016..c1c2cd6fef 100644 --- a/Resources/Locale/ru-RU/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/biological.ftl @@ -16,8 +16,8 @@ reagent-desc-hemocyanin-blood = Содержит медь, а не железо, reagent-name-ammonia-blood = анаэробная кровь reagent-desc-ammonia-blood = Ничто другое во всей галактике не пахнет так отвратительно. -reagent-name-sulfur-blood = sulfuric blood -reagent-desc-sulfur-blood = Feels almost acidic. +reagent-name-sulfur-blood = сернистая кровь +reagent-desc-sulfur-blood = Ощущение почти кислотное. reagent-name-zombie-blood = кровь зомби reagent-desc-zombie-blood = Не рекомендуется употреблять в пищу. Может быть использована для создания прививки от инфекции. diff --git a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl index c3a228d39c..68e97a5eec 100644 --- a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl @@ -151,5 +151,5 @@ reagent-desc-potassium-iodide = Снижает разрушительное во reagent-name-haloperidol = галоперидол reagent-desc-haloperidol = Выводит из организма большинство стимулирующих и галлюциногенных препаратов. Уменьшает наркотический эффект и дрожание. Вызывает сонливость. -reagent-name-heparin = heparin -reagent-desc-heparin = Commonly used as an anticoagulant medication. Causes blood to have difficulty forming clots. Can cause internal bleeding when overdosed. +reagent-name-heparin = гепарин +reagent-desc-heparin = Обычно используется в качестве антикоагулянта. Затрудняет образование тромбов. При передозировке может вызвать внутреннее кровотечение. diff --git a/Resources/Locale/ru-RU/research/components/technology-disk.ftl b/Resources/Locale/ru-RU/research/components/technology-disk.ftl index 631586a1d0..2f6f6c4048 100644 --- a/Resources/Locale/ru-RU/research/components/technology-disk.ftl +++ b/Resources/Locale/ru-RU/research/components/technology-disk.ftl @@ -1,9 +1,9 @@ tech-disk-inserted = Вы вставляете диск, добавляя на сервер новый рецепт. tech-disk-examine-none = Этикетка пуста. -tech-disk-examine = На этикетке имеется небольшое матричное изображение, представляющее { $result }. +tech-disk-examine = На этикетке имеется небольшое матричное изображение, представляющее [bold]{ $result }[/bold]. tech-disk-examine-more = Имеются и другие изображения, но они слишком малы, чтобы разглядеть их. -tech-disk-examine-desc = [color=lightGray]A disk for the R&D server containing a [bold]Tier { $tier } { $branch }[/bold] branch research technology.[/color] -tech-disk-examine-desc-unknown = [color=lightGray]A disk for the R&D server containing research technology.[/color] +tech-disk-examine-desc = [color=lightGray]Диск для РНД сервера содержащий технологию [bold]{ $tier } уровня[/bold] для ветки технологий [bold]{ $branch }.[/bold][/color] +tech-disk-examine-desc-unknown = [color=lightGray]Диск для РНД сервера содержащий технологию.[/color] tech-disk-name-format = { $baseName } ({ $technology }) tech-disk-ui-name = Терминал технологических дисков diff --git a/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl b/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl index 21531b2a15..3f8a94a5bd 100644 --- a/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl +++ b/Resources/Locale/ru-RU/sandbox/sandbox-manager.ftl @@ -19,4 +19,4 @@ sandbox-window-toggle-suicide-button = Самоубийство sandbox-window-show-spawns-button = Показать спавны sandbox-window-show-bb-button = Показать BB sandbox-window-show-npc-button = Показать NPC -sandbox-window-toggle-thermal-vision = Toggle Thermal Vision +sandbox-window-toggle-thermal-vision = Переключить тепловизор diff --git a/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl b/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl index 687e879944..d3711dc889 100644 --- a/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl +++ b/Resources/Locale/ru-RU/singularity/components/emitter-component.ftl @@ -14,7 +14,7 @@ comp-emitter-not-anchored = { $target } не закреплён! emitter-component-current-type = Установленный тип: [color=yellow]{ $type }[/color]. emitter-component-type-set = Установить тип: { $type } -emitter-destroyed-broadcast = A powered emitter { $location } has been destroyed. -emitter-deconstructed-broadcast = A powered emitter { $location } has been deconstructed. -emitter-unlocked-broadcast = A powered emitter { $location } has been unlocked. -emitter-unpowered-broadcast = A powered emitter { $location } has lost power. +emitter-destroyed-broadcast = Включенный эмиттер { $location } был уничтожен. +emitter-deconstructed-broadcast = Включенный эмиттер { $location } был разобран. +emitter-unlocked-broadcast = Включенный эмиттер { $location } разблокирован. +emitter-unpowered-broadcast = Включенный эмиттер { $location } потерял питание. diff --git a/Resources/Locale/ru-RU/spray-painter/spray-painter.ftl b/Resources/Locale/ru-RU/spray-painter/spray-painter.ftl index 05afac9754..02bc3f6019 100644 --- a/Resources/Locale/ru-RU/spray-painter/spray-painter.ftl +++ b/Resources/Locale/ru-RU/spray-painter/spray-painter.ftl @@ -9,8 +9,8 @@ spray-painter-ammo-after-interact-refilled = Вы заправляете кра spray-painter-interact-no-charges = Не хватает краски. spray-painter-interact-nothing-to-remove = Нечего удалять! -spray-painter-interact-no-color-pick = Can't find a color to pick! -spray-painter-interact-color-picked = Picked color from '{ $id }'. +spray-painter-interact-no-color-pick = Нет цвета для взятия! +spray-painter-interact-color-picked = Взят цвет из '{ $id }'. spray-painter-on-examined-painted-message = Выглядит свежеокрашенным. spray-painter-style-not-available = Выбранный стиль нельзя применить к этому объекту. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/lockers/suit_storage.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/lockers/suit_storage.ftl index 9897ab2ccd..5b21e3c264 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/lockers/suit_storage.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/catalog/fills/lockers/suit_storage.ftl @@ -1,3 +1,9 @@ ent-SuitStorageExplorerSuit = { ent-SuitStorageBase } .desc = { ent-SuitStorageBase.desc } .suffix = Костюм Исследователя +ent-SuitStorageHardsuitClown = { ent-SuitStorageBase } + .desc = { ent-SuitStorageBase.desc } + .suffix = Клоун +ent-SuitStorageHardsuitMime = { ent-SuitStorageBase } + .desc = { ent-SuitStorageBase.desc } + .suffix = Мим diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/back/duffel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/back/duffel.ftl index 334010ff30..cf40ce948a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/back/duffel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/back/duffel.ftl @@ -5,4 +5,6 @@ ent-ClothingDuffelPostman = вещмешок почтальона ent-ClothingDuffelsCapitanGreen = вещмешок шерифа .desc = Это особый вещмешок, изготавливаемый исключительно для шерифов Nanotrasen. ent-ClothingDuffelsCapitanWhite = белый вещмешок капитана - .desc = Это особый вещмешок, изготавливаемый исключительно для элегантных капитанов Nanotrasen. \ No newline at end of file + .desc = Это особый вещмешок, изготавливаемый исключительно для элегантных капитанов Nanotrasen. +ent-ClothingBackpackBig = большой вещмешок + .desc = Большая сумка для больших вещей. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/belt/belts.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/belt/belts.ftl index 0162f48a16..6819b9f553 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/belt/belts.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/belt/belts.ftl @@ -14,3 +14,5 @@ ent-ClothingBeltWhiteSheath = белые сабельные ножны .desc = Стиль, блеск, всё для лучших сабель во вселенной. ent-ClothingBeltSheriffSheath = сабельные ножны шерифа .desc = Практичность, прочность, сабля точно не окажется в вашей ноге. +ent-ClothingBeltMilitaryWebbingAlt = облегчённая армейская РПС + .desc = Универсальная разгрузочная система выполненния в стиле "Синий Щит". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/ears/headsets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/ears/headsets.ftl new file mode 100644 index 0000000000..8540955dcf --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/ears/headsets.ftl @@ -0,0 +1,2 @@ +ent-ClothingHeadsetMiningMedical = шахтёрская гарнитура медика + .desc = Гарнитура, используемая шахтёрами-медиками. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/hands/gloves.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/hands/gloves.ftl index 6e9e9cc214..bedaddf987 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/hands/gloves.ftl @@ -10,3 +10,5 @@ ent-ClothingHandsGlovesSheriff = перчатки шерифа .desc = Перчатки с эргономичной формой, предназначенные для удержания револьвера. ent-ClothingHandsGlovesConcussiveGauntlets = ударные перчатки .desc = Кирки... для ваших рук! +ent-ClothingHandsRazorGloves = разрывные перчатки + .desc = Всё гениальное просто. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/head/helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/head/helmets.ftl index a4c913a1dd..8f81aa2fa8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/head/helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/head/helmets.ftl @@ -1,2 +1,4 @@ ent-ClothingHeadHelmetHostileEnv = H.E.C.K. шлем .desc = Экспериментальный Кинетический Защитный Обшитый Шлем: шлем, специально созданный для защиты от широкого спектра опасностей Лазиса. Прошлому его владельцу этого, видимо, не хватило. +ent-ClothingHeadHelmetBlueShield = шлем офицера "Синий Щит" + .desc = Крепкий шлем , для тех кто готов подставить голову ради NanoTrasen. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl index e92d32abd4..2416bcb6cd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/neck/cloaks.ftl @@ -18,3 +18,5 @@ ent-ClothingNeckCloakSyndicateAdmiral = плащ адмирала синдика .desc = Красный плащ, прошитый золотой тканью. ent-ClothingNeckWhiteMantleCaptain = белая мантия капитана .desc = Мантия капитана, с белым пухом. +ent-ClothingNeckMantleBlueShield = мантия офицера "Синий Щит" + .desc = Мантия для защитников, рискующих своей грудью ради НаноТрейзен! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl index 77c85c20b7..326fbc5c18 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/armor.ftl @@ -22,3 +22,5 @@ ent-ClothingOuterArmorHostileEnv = H.E.C.K. костюм .desc = Экспериментальный Кинетический Защитный Обшитый Костюм: костюм, специально созданный для защиты от широкого спектра опасностей Лазиса. Прошлому его владельцу этого, видимо, не хватило. ent-ClothingOuterArmorBloodCult = { ent-ClothingOuterArmorCult } .desc = { ent-ClothingOuterArmorCult.desc } +ent-ClothingVestBlueShieldAlt = бронежилет офицера "Синий Щит" + .desc = Бронежилет типа МК V. Более эластичен. Менее громоздкий. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/wintercoats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/wintercoats.ftl index 864f7675c7..ab0c4383ef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/wintercoats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/outerclothing/wintercoats.ftl @@ -1,2 +1,4 @@ ent-ClothingOuterWinterBlueShield = зимнее броне-пальто офицера "Синий Щит" .desc = Утепленное зимнее броне-пальто с минималистичным дизайном, выполненное из прочного материала. +ent-ClothingOuterWinterBlueShieldAlt = зимнее броне-пальто офицера "Синий Щит" + .desc = Утепленное зимнее броне-пальто с минималистичным дизайном, выполненное из прочного материала. Затемнённая версия. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl index d7d75b1564..7e9f97f93b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/clothing/uniforms/jumpsuits.ftl @@ -4,6 +4,8 @@ ent-ClothingUniformJumpsuitSurgeon = комбинезон хирурга .desc = На нем есть пятна крови..? ent-ClothingUniformJumpsuitBlueShield = комбинезон офицера "Синий Щит" .desc = Пурпурная униформа офицера "Синий щит" изготовлена из плотных материалов. +ent-ClothingUniformJumpsuitBlueShieldRock = комбинезон "Скала" офицера "Синий Щит" + .desc = Пурпурная униформа офицера "Синий щит" изготовлена из плотных материалов. Только для самого крепкого орешка! ent-ClothingUniformJumpsuitAltBlueShield = водолазка офицера "Синий Щит" .desc = Темная водолазка из плотных материалов. ent-ClothingUniformJumpsuitPostman = комбинезон почтальона diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/consumable/drinks/drinks_flasks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/consumable/drinks/drinks_flasks.ftl index dd8136d1f2..6cd1fd89bd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/consumable/drinks/drinks_flasks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/consumable/drinks/drinks_flasks.ftl @@ -1,5 +1,5 @@ ent-DrinkUnholyFlask = старый флакон - .desc = Покрыт слоем пыли + .desc = Покрыт слоем пыли. ent-DrinkUnholyFlaskFull = { ent-DrinkUnholyFlask } .desc = { ent-DrinkUnholyFlask.desc } .suffix = Полный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/wiretapping.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/wiretapping.ftl index 36f0f50865..6afc86d04a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/wiretapping.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/devices/wiretapping.ftl @@ -3,9 +3,9 @@ ent-WiretappingTerminal = терминал прослушки ent-WiretappingServerAlpha = сервер бодикамер .desc = Сервер для создания защищенной сети службы безопасности. ent-WiretappingCameraAlpha = бодикамера - .desc = Небольшая камера на закрытой частоте СБ, которая явно не смотрит за вами. Не забудьте настроить перед использованием. Для сброса названия камеры, нужно использовать мультитул на бодикамере, для отключения используйте отвертку. + .desc = Небольшая камера на закрытой частоте СБ, которая явно не смотрит за вами. Не забудьте настроить перед использованием. Для сброса названия камеры, нужно использовать мультитул на бодикамере, для отключения используйте отвертку или нож. ent-WiretappingCameraAlphaAlt = { ent-WiretappingCameraAlpha } .desc = { ent-WiretappingCameraAlpha.desc } .suffix = Альт ent-WiretappingCameraAlphaOff = выключенная бодикамера - .desc = Небольшая камера на закрытой частоте СБ, которая явно не смотрит за вами. Не забудьте включить её при помощи отвертки. + .desc = Небольшая камера на закрытой частоте СБ, которая явно не смотрит за вами. Не забудьте включить её при помощи отвертки или ножа. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/materials/sheets/trash.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/materials/sheets/trash.ftl new file mode 100644 index 0000000000..620676ff7d --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/materials/sheets/trash.ftl @@ -0,0 +1,2 @@ +ent-CirularSaw = часть пилы + .desc = Острое. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl index 36dc1cb24e..a8ea6ef691 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/vouchers.ftl @@ -26,3 +26,33 @@ ent-OfficalSelector = преобразователь официальной од .desc = { ent-JumpsuitSelector.desc } ent-OtherModeSuitSelector = преобразователь модной одежды .desc = { ent-JumpsuitSelector.desc } +ent-HardsuitCESelector = преобразователь скафандра СИ + .desc = Как в такую коробочку помещается такой скафандр! + .suffix = Селектор +ent-HardsuitAtmosSelector = преобразователь скафандра атмосферного техника + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitCapSelector = преобразователь скафандра капитана + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitClownSelector = преобразователь скафандра клоуна + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitEngSelector = преобразователь скафандра инженера + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitHosSelector = преобразователь скафандра ГСБ + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitMedicalSelector = преобразователь медицинского скафандра + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitParamedicSelector = преобразователь скафандра парамедика + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitProtoSelector = преобразователь скафандра утилизатора + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор +ent-HardsuitSecSelector = преобразователь скафандра СБ + .desc = { ent-HardsuitCESelector.desc } + .suffix = Селектор \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/handheldmonitorBS.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/handheldmonitorBS.ftl new file mode 100644 index 0000000000..b85be1e33b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/medical/handheldmonitorBS.ftl @@ -0,0 +1,2 @@ +ent-HandheldCrewMonitorBlueshield = ПМЭ синего цита + .desc = Персональный монитор для офицеров "Синий Щит". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl index d12358f395..e3bb0d3a56 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_items.ftl @@ -139,8 +139,8 @@ ent-HandheldCrewMonitorBorg = встроенный монитор экипажа ent-BorgSyringe = { ent-BaseSyringe } .desc = { ent-BaseSyringe.desc } .suffix = Киборг -ent-BorgAdvancedJetInjector = продвинутый инжектор - .desc = Крутой инжектор +ent-BorgAdvancedJetInjector = { ent-AdvancedJetInjector } + .desc = { ent-AdvancedJetInjector.desc } .suffix = Киборг ent-BorgHypoTricordrazineBase = базовый борг-гипоспрей трикордразина .desc = Стерильный инъектор для быстрого введения и генерации трикордразина пациентам. Удешевлённый и более специализированный вариант для медицинских боргов. @@ -195,17 +195,28 @@ ent-HoloFanSci = { ent-HoloFan } .desc = { ent-HoloFan.desc } # Синдикат +ent-ModuleSyndiWeapon = модуль настройки оружия киборга + .desc = Настройте вооружение Вашему киборгу! +ent-ModuleSyndiSupport = модуль настройки вспомогательных систем киборга + .desc = Настройте дополнительные системы Вашему киборгу! +ent-SyndicateDrill = бур синдиката + .desc = Ээээ капитан, этот пристройка тут не нужен. ent-SyndicateDrill = бур синдиката .desc = Ээээ капитан, этот пристройка тут не нужен. ent-BorgWeaponSniperHristovAdvanced = Христов ROW .desc = Христов МК2 для киборгов. На ходу создаёт патроны калибра .60 винтовочный из встроенного самозарядного фабрикатора боеприпасов. .suffix = Синдиборг -ent-WeaponLightMachineGunL6CEnergy = { ent-WeaponLightMachineGunL6C } - .desc = { ent-WeaponLightMachineGunL6C.desc } +ent-WeaponSubMachineGunC20rROWAdvensed = C-20u ROW + .desc = Пистолет-пулемёт C-20u для использования киборгами. На ходу создаёт патроны калибра .35 авто из встроенного самозарядного фабрикатора боеприпасов. + .suffix = Синдиборг +ent-WeaponPistolDesertEagleBorg = ПО ROW + .desc = Пистолет "пустынный орёл" для использования киборгами. На ходу создаёт патроны калибра .45 магнум из встроенного самозарядного фабрикатора боеприпасов. .suffix = Синдиборг ent-WeaponLauncherChinaLakeBorg = china ROW .desc = China Lake для киборгов. На ходу создаёт боезапас встроенного самозарядного фабрикатора. .suffix = Синдиборг +ent-BorgKit = набор "убийца робот" + .desc = Коробка с редспейс телепортом штурмового киборга и двух настраиваемых модулей: вооружения и вспомогательных систем. # Ксеноборги ent-XenoborgHoloprojectorForcefield = голопроектор силового поля ксеноборгов @@ -240,10 +251,4 @@ ent-RepeirModeDeviceXenoborg = устройство самовосстановл ent-RepeirModeDeviceXenoborgHeavy = устройство самовосстановления тяжёлого ксеноборга .desc = Устройство для поддержки корпуса в целом состоянии усилинное под Ваш вес. ent-BorgGeneratorNanopastXenoborg = генератор нанопасты ксеноборгов - .desc = Устройство для генерации тюбиков нанопасты, позволяющая экстренно залатать дыры у синтетиков. - -# Иконка -ent-BorgIconRollerBed = Заглушка - .desc = Заглушка -ent-BorgIconMorgBag = Заглушка - .desc = Заглушка \ No newline at end of file + .desc = Устройство для генерации тюбиков нанопасты, позволяющая экстренно залатать дыры у синтетиков. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl index 70b3221fa0..372258f04a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/robotics/borg_modules.ftl @@ -23,6 +23,8 @@ ent-BorgModuleCleaningCommon = базовый модуль уборки кибо .desc = Модуль для уборки луж и пыли, когда-нибудь киборги тоже смогут также мусорить как экипаж. ent-BorgModuleFulton = модуль фултона киборга .desc = Модуль для генерации голографических ящиков и хранения фултонов и маяков. Перемещение по маякам никогда не было таким удобным! +ent-BorgModuleNightVison = модуль ПНВ киборга + .desc = Модуль ПНВ для роботизированной адаптации к темноте, почему он не встроен по умолчанию? # СБ ent-BorgModuleDisabler = охранный модуль киборга .desc = Модуль для охраны объектов НТ, этот модуль не обладает каким либо вооружением. @@ -90,13 +92,21 @@ ent-XenoborgModuleCommonSpeed = ускоряющий модуль ксенобо .desc = Модуль для ускорения ксеноборга на время, мозги будут доставлены вовремя! ent-XenoborgModuleEMP = модуль ЭМИ ксеноборга .desc = Модуль для создания различных ЭМИ ловушек, главное скажите другим, где Вы расставили ловушки! +ent-BorgModuleNightVisoXenoborg = модуль ПНВ ксеноборгов + .desc = Модуль ПНВ для поддержки зрения в темноте, жалко Вы всё равно видны противнику! ent-FloorTrapEMPXenoborg = ловушка ЭМИ .desc = { ent-CollideFloorTrap.desc } # Синдикат ent-BorgModuleChina = подрывной модуль киборга - .desc = Модуль с China ROW и генератором нанопасты, нет ниччего круче на спецоперациях, чем взрывы! - - + .desc = Модуль с China ROW, нет ниччего круче на спецоперациях, чем взрывы! +ent-BorgModuleSniper = снайперский модуль киборга + .desc = Модуль с Христов ROW и вспомогательным ПО ROW, разница между психом и убийцей то, что первое это болезнь, а второе профессия! +ent-BorgModuleCR20Advensed = модуль киборга с C-20u ROW + .desc = Модуль с C-20u ROW и энергетическим мечом, стандартная классика громких пострелушек! +ent-BorgModuleNightVisonSyndi = модуль ПНВ синдиката + .desc = Модуль ПНВ для Ваших машин смерти, она же умеет петь колыбельную? +ent-BorgModuleRepiarSyndi = боевой модуль саморемонта + .desc = Модуль боевых нанороботов, которые в три раза эффективнее востанавливают корпус, чистое зло! borg-slot-biomaterials-empty = Органы и протезы @@ -144,10 +154,12 @@ borg-slot-handcapsule-empty = Ручные капсулы borg-slot-jaunter-empty = Джаунтер borg-slot-bodypart-empty = Протезы и конечности borg-slot-cargodoc-empty = Карта очков -borg-slot-cash-empty = Кредиты +borg-slot-cash-empty = Кредиты и диски borg-slot-diski-empty = Диски ОИ и технологий borg-slot-beacon-empty = Маяки borg-slot-fulton-empty = Фултоны и стан.маячки +borg-slot-swap-empty = Вакцина и палочки +borg-slot-spray-empty = Спреи ent-ActionBlinkBorg = Блюспейс прыжок .desc = Бесконечность не предел! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/voichercards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/voichercards.ftl index 534e7a94c7..e57aa8d53b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/voichercards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/specific/voichercards.ftl @@ -1,2 +1,4 @@ +ent-BlueShieldVoucherCard = карточка-ваучер синего щита + .desc = Дисконтная карта, выпущенная для офицеров "Синий Щит". Позволяет расширить арсенал владельца. Используется в СБТехе. ent-SecurityVoucherCard = карточка-ваучер безопасности - .desc = Дисконтная карта, выпущенная для службы безопасности, предоставляемой компанией NanoTrasen, для более эффективного распределения оборудования между сотрудниками отдела. Используется в СБТехе. + .desc = Дисконтная карта, выпущенная для службы безопасности, предоставляемой компанией NanoTrasen, для более эффективного распределения оборудования между сотрудниками отдела. Используется в СБТехе. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl index d60db38a04..91fe6d848a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -25,4 +25,7 @@ ent-WeaponMagmiteFanPlasmaCutter = магмитовый веерный реза .desc = Магмитовая версия веерного резака. Какой ценой? ent-WeaponIonCarabine = ионный карабин .desc = Тот самый карабин, который сразит любого синтетика или обладателя электронных устройств. + .suffix = Винтовка +ent-WeaponEnergyPulsar = энергетический карабин "Пульсар" + .desc = Энергетический карабин огромной мощности. Способен самозаряжаться с крайне долгим интервалом. .suffix = Винтовка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/projectiles.ftl index 917db3cd7d..7c97c7fe82 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -1,7 +1,5 @@ ent-BulletLaserAdvanced = лазерный выстрел .desc = { ent-BaseBullet.desc } -ent-RedMediumLaser = лазерный выстрел - .desc = { ent-BaseBullet.desc } ent-LaserStun = оглушающий лазер .desc = { ent-BaseBullet.desc } ent-BulletPlasmaCutter = плазменный выстрел diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl index 8ef9d5dc6d..708af8d78a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/rifels/rifels.ftl @@ -1,3 +1,6 @@ ent-WeaponRifleXC67 = штурмовая винтовка xC-67 .desc = Прототип новой штурмовой винтовки от создателей знаменитой С-20r. Использует патрон 6.5 мм ТСФ. Усовершенствованная эргономика позволяет достичь превосходных показателей точности стрельбы. + .suffix = Автомат +ent-WeaponRifleJay = сойка + .desc = Армейская штурмовая винтовка старого типа. За счёт проверенной временем конструкции, достигает удволетворительных показателях в эргономике и точности. .suffix = Автомат \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/smgs/smgs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/smgs/smgs.ftl index 19e997f79a..ceedede8bc 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/smgs/smgs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/guns/smgs/smgs.ftl @@ -1,3 +1,6 @@ ent-WeaponSubMachineGunDonksoft = ПП Donksoft .desc = Игрушечнный пистолет пулемёт, что сильно напоминает c-20r, которое часто используют печально известные ядерные оперативники. Использует .35 авто. + .suffix = Пистолет-пулемёт +ent-WeaponSubmachinegunBerkut = беркут + .desc = Пистолет-пулемёт армейского класса. Совокупность компактности и огневой мощи. .suffix = Пистолет-пулемёт \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/baton.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/baton.ftl new file mode 100644 index 0000000000..0db5c8b254 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/baton.ftl @@ -0,0 +1,2 @@ +ent-StunbatonBlueshield = дубинка офицера "Синий Щит" + .desc = Многофункциональная дубинка, способная как и изнеможать противника, так и наносить огромные повреждения при заряженных ударах. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/knife.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/knife.ftl index aa0f093798..77ed252f80 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/knife.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/weapons/melee/knife.ftl @@ -4,3 +4,5 @@ ent-ArrhythmicKnife = нож аритмии .desc = Говорят что страх убивает разум, но втыкание ножа в голову тоже работает. ent-WeaponCleawingSaw = боевой секач .desc = Быстрая разновидность пилы сделанная из очень старого и ржавого металла. +ent-ChainsawGreen = зеленая бензопила + .desc = Опасная острая пила, как она здесь оказалась? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/animal.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/animal.ftl index 1fb4fe3348..044669fbe2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/animal.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/animal.ftl @@ -2,7 +2,7 @@ ent-OrganAnimalMetabolizer = { "" } .desc = { "" } ent-OrganAnimal = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Animal + .suffix = Животное ent-OrganAnimalInternal = { ent-OrganAnimal } .desc = { ent-OrganAnimal.desc } .suffix = { ent-OrganAnimal.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/bloodsucker.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/bloodsucker.ftl index cd45385c25..b4a1483031 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/bloodsucker.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/bloodsucker.ftl @@ -1,6 +1,6 @@ ent-OrganBloodsucker = { "" } .desc = { "" } - .suffix = bloodsucker + .suffix = кровосос ent-OrganBloodsuckerStomach = { ent-OrganAnimalStomach } .desc = { ent-OrganBloodsucker.desc } .suffix = { ent-OrganBloodsucker.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/ruminant.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/ruminant.ftl index 4a400c26d0..d49d303003 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/ruminant.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/animals/ruminant.ftl @@ -1,5 +1,5 @@ ent-OrganRuminantStomach = { ent-OrganBaseStomach } .desc = { ent-OrganBaseStomach.desc } - .suffix = Ruminant + .suffix = Травоядное животное ent-BaseMobRuminant = { "" } .desc = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/base_organs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/base_organs.ftl index 4fab407a35..78f53a2e2f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/base_organs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/base_organs.ftl @@ -1,44 +1,44 @@ -ent-OrganBase = organ +ent-OrganBase = орган .desc = { ent-BaseItem.desc } -ent-OrganBaseTorso = torso +ent-OrganBaseTorso = торс .desc = { ent-OrganBase.desc } -ent-OrganBaseHead = head +ent-OrganBaseHead = голова .desc = { ent-OrganBase.desc } -ent-OrganBaseArmLeft = left arm +ent-OrganBaseArmLeft = левая рука .desc = { ent-OrganBase.desc } -ent-OrganBaseArmRight = right arm +ent-OrganBaseArmRight = правая рука .desc = { ent-OrganBase.desc } -ent-OrganBaseHandLeft = left hand +ent-OrganBaseHandLeft = левая кисть .desc = { ent-OrganBase.desc } -ent-OrganBaseHandRight = right hand +ent-OrganBaseHandRight = правая кисть .desc = { ent-OrganBase.desc } -ent-OrganBaseLegLeft = left leg +ent-OrganBaseLegLeft = левая нога .desc = { ent-OrganBase.desc } -ent-OrganBaseLegRight = right leg +ent-OrganBaseLegRight = правая нога .desc = { ent-OrganBase.desc } -ent-OrganBaseFootLeft = left foot +ent-OrganBaseFootLeft = левая стопа .desc = { ent-OrganBase.desc } -ent-OrganBaseFootRight = right foot +ent-OrganBaseFootRight = правая стопа .desc = { ent-OrganBase.desc } -ent-OrganBaseBrain = brain +ent-OrganBaseBrain = мозг .desc = { ent-OrganBase.desc } -ent-OrganBaseEyes = eyes +ent-OrganBaseEyes = глаза .desc = { ent-OrganBase.desc } -ent-OrganBaseTongue = tongue +ent-OrganBaseTongue = язык .desc = { ent-OrganBase.desc } -ent-OrganBaseAppendix = appendix +ent-OrganBaseAppendix = аппендикс .desc = { ent-OrganBase.desc } -ent-OrganBaseEars = ears +ent-OrganBaseEars = уши .desc = { ent-OrganBase.desc } -ent-OrganBaseLungs = lungs +ent-OrganBaseLungs = легкие .desc = { ent-OrganBase.desc } -ent-OrganBaseHeart = heart +ent-OrganBaseHeart = сердце .desc = { ent-OrganBase.desc } -ent-OrganBaseStomach = stomach +ent-OrganBaseStomach = желудок .desc = { ent-OrganBase.desc } -ent-OrganBaseLiver = liver +ent-OrganBaseLiver = печень .desc = { ent-OrganBase.desc } -ent-OrganBaseKidneys = kidneys +ent-OrganBaseKidneys = почки .desc = { ent-OrganBase.desc } ent-OrganSpriteHumanInternal = { "" } .desc = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/arachnid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/arachnid.ftl index 736df20c49..eb9af03f73 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/arachnid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/arachnid.ftl @@ -1,10 +1,10 @@ -ent-AppearanceArachnid = arachnid appearance +ent-AppearanceArachnid = внешность арахнида .desc = { ent-BaseSpeciesAppearance.desc } ent-MobArachnid = Урист МакВеб .desc = { ent-AppearanceArachnid.desc } ent-OrganArachnid = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Arachnid + .suffix = Арахнид ent-OrganArachnidMetabolizer = { "" } .desc = { "" } ent-OrganArachnidInternal = { ent-OrganArachnid } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/diona.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/diona.ftl index cc38b3266f..94be8872f2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/diona.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/diona.ftl @@ -1,10 +1,10 @@ -ent-AppearanceDiona = diona appearance +ent-AppearanceDiona = внешность дионы .desc = { ent-BaseSpeciesAppearance.desc } ent-MobDiona = Урист МакДиона .desc = { ent-AppearanceDiona.desc } ent-OrganDiona = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Diona + .suffix = Диона ent-OrganDionaMetabolizer = { "" } .desc = { "" } ent-OrganDionaInternal = { ent-OrganDiona } @@ -59,13 +59,13 @@ ent-OrganDionaStomach = { ent-OrganBaseStomach } .suffix = { ent-OrganDionaInternal.suffix } ent-OrganDionaBrainNymphing = { ent-OrganDionaBrain } .desc = { ent-OrganDionaBrain.desc } - .suffix = Diona, Nymphing + .suffix = Диона, Нимфа ent-OrganDionaLungsNymphing = { ent-OrganDionaLungs } .desc = { ent-OrganDionaLungs.desc } - .suffix = Diona, Nymphing + .suffix = Диона, Нимфа ent-OrganDionaStomachNymphing = { ent-OrganDionaStomach } .desc = { ent-OrganDionaStomach.desc } - .suffix = Diona, Nymphing + .suffix = Диона, Нимфа ent-OrganDionaNymphBrain = { ent-MobDionaNymph } .desc = { ent-MobDionaNymph.desc } .suffix = Мозг diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/dwarf.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/dwarf.ftl index 873688f1bf..f6da025548 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/dwarf.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/dwarf.ftl @@ -1,10 +1,10 @@ -ent-AppearanceDwarf = dwarf appearance +ent-AppearanceDwarf = внешность дворфа .desc = { ent-AppearanceHuman.desc } -ent-MobDwarf = Urist McHands The Dwarf +ent-MobDwarf = Урист МакХэндс Дворф .desc = { ent-AppearanceDwarf.desc } ent-OrganDwarf = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Dwarf + .suffix = Дворф ent-OrganDwarfMetabolizer = { "" } .desc = { "" } ent-OrganDwarfStomach = { ent-OrganHumanStomach } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/gingerbread.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/gingerbread.ftl index 6222a8d872..9ac8e1e6b4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/gingerbread.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/gingerbread.ftl @@ -1,10 +1,10 @@ -ent-AppearanceGingerbread = gingerbread appearance +ent-AppearanceGingerbread = внешность пряничного человека .desc = { ent-BaseSpeciesAppearance.desc } ent-MobGingerbread = Урист МакПеченька .desc = { ent-AppearanceGingerbread.desc } ent-OrganGingerbread = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = gingerbread + .suffix = пряник ent-OrganGingerbreadExternal = { ent-OrganGingerbread } .desc = { ent-OrganGingerbread.desc } .suffix = { ent-OrganGingerbread.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/human.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/human.ftl index 4c39f788cb..5d6c8ec4be 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/human.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/human.ftl @@ -1,10 +1,10 @@ -ent-AppearanceHuman = human appearance +ent-AppearanceHuman = внешность человека .desc = { ent-BaseSpeciesAppearance.desc } ent-MobHuman = Урист МакЧеловек .desc = { ent-AppearanceHuman.desc } ent-OrganHuman = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = human + .suffix = человек ent-OrganHumanMetabolizer = { "" } .desc = { "" } ent-OrganHumanInternal = { ent-OrganHuman } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/moth.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/moth.ftl index 20a8ef8bd8..ed0242a323 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/moth.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/moth.ftl @@ -1,10 +1,10 @@ -ent-AppearanceMoth = moth appearance +ent-AppearanceMoth = внешность ниана .desc = { ent-BaseSpeciesAppearance.desc } ent-MobMoth = Урист МакФлафф .desc = { ent-AppearanceMoth.desc } ent-OrganMoth = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Moth + .suffix = ниан ent-OrganMothMetabolizer = { "" } .desc = { "" } ent-OrganMothInternal = { ent-OrganMoth } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/reptilian.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/reptilian.ftl index 2ff23fc300..f153ad1e0b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/reptilian.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/reptilian.ftl @@ -1,10 +1,10 @@ -ent-AppearanceReptilian = reptilian appearance +ent-AppearanceReptilian = внешность унатха .desc = { ent-BaseSpeciesAppearance.desc } ent-MobReptilian = Урист МакХэндс Унатх .desc = { ent-AppearanceReptilian.desc } ent-OrganReptilian = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Reptilian + .suffix = унатха ent-OrganReptilianMetabolizer = { "" } .desc = { "" } ent-OrganReptilianInternal = { ent-OrganReptilian } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/skeleton.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/skeleton.ftl index 2dd0171833..74fab04674 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/skeleton.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/skeleton.ftl @@ -1,10 +1,10 @@ -ent-AppearanceSkeletonPerson = skeletonperson appearance +ent-AppearanceSkeletonPerson = внешность скелеточела .desc = { ent-BaseSpeciesAppearance.desc } -ent-MobSkeletonPerson = Urist McBones +ent-MobSkeletonPerson = Урист МакСкелли .desc = { ent-AppearanceSkeletonPerson.desc } ent-OrganSkeletonPerson = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = SkeletonPerson + .suffix = Скелет ent-OrganSkeletonPersonExternal = { ent-OrganSkeletonPerson } .desc = { ent-OrganSkeletonPerson.desc } .suffix = { ent-OrganSkeletonPerson.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/slime.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/slime.ftl index 6d1f18eee0..7d775c4f1a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/slime.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/slime.ftl @@ -1,10 +1,10 @@ -ent-AppearanceSlimePerson = SlimePerson appearance +ent-AppearanceSlimePerson = внешность слаймолюда .desc = { ent-BaseSpeciesAppearance.desc } -ent-MobSlimePerson = Urist McWobble +ent-MobSlimePerson = Урист МакСлайм .desc = { ent-AppearanceSlimePerson.desc } ent-OrganSlimePerson = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = slime person + .suffix = слаймолюд ent-OrganSlimePersonMetabolizer = { "" } .desc = { "" } ent-OrganSlimePersonInternal = { ent-OrganSlimePerson } @@ -43,9 +43,9 @@ ent-OrganSlimePersonFootLeft = { ent-OrganBaseFootLeft } ent-OrganSlimePersonFootRight = { ent-OrganBaseFootRight } .desc = { ent-OrganBaseFootRight.desc } .suffix = { ent-OrganSlimePersonExternal.suffix } -ent-OrganSlimePersonCore = sentient slime core +ent-OrganSlimePersonCore = разумное ядро слайма .desc = { ent-OrganBaseBrain.desc } .suffix = { ent-OrganSlimePersonInternal.suffix } -ent-OrganSlimePersonLungs = gas sacs +ent-OrganSlimePersonLungs = газовые мешки слайма .desc = { ent-OrganBaseLungs.desc } .suffix = { ent-OrganSlimePersonInternal.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vox.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vox.ftl index ff9facb155..9933a1d8e6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vox.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vox.ftl @@ -1,10 +1,10 @@ -ent-AppearanceVox = vox appearance +ent-AppearanceVox = внешность вокса .desc = { ent-BaseSpeciesAppearance.desc } ent-MobVox = Уристистист МакВокс .desc = { ent-AppearanceVox.desc } ent-OrganVox = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Vox + .suffix = Вокс ent-OrganVoxMetabolizer = { "" } .desc = { "" } ent-OrganVoxInternal = { ent-OrganVox } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vulpkanin.ftl index d2d9c8b9ab..8d45a3b9ea 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vulpkanin.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/body/species/vulpkanin.ftl @@ -1,10 +1,10 @@ -ent-AppearanceVulpkanin = vulpkanin appearance +ent-AppearanceVulpkanin = внешность вульпканина .desc = { ent-BaseSpeciesAppearance.desc } ent-MobVulpkanin = Урист МакВульп .desc = { ent-AppearanceVulpkanin.desc } ent-OrganVulpkanin = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = vulpkanin + .suffix = вульпканин ent-OrganVulpkaninMetabolizer = { "" } .desc = { "" } ent-OrganVulpkaninInternal = { ent-OrganVulpkanin } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl index 8a2531b65b..058456ec28 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/backpacks/duffelbag.ftl @@ -2,8 +2,8 @@ ent-ClothingBackpackDuffelSurgeryFilled = хирургический вещме .desc = Большой вещевой мешок для хранения дополнительного медицинского снаряжения — похоже, этот мешок предназначен для хранения хирургических инструментов. ent-ClothingBackpackDuffelSyndicateFilledMedical = хирургический вещмешок Синдиката .desc = Большой вещевой мешок с полным набором хирургических инструментов. -ent-ClothingBackpackDuffelSyndicateFilledMedicine = syndicate medicine duffel bag - .desc = A large duffel bag containing essential medicinal reagents. +ent-ClothingBackpackDuffelSyndicateFilledMedicine = медицинский вещмешок Синдиката + .desc = Большая спортивная сумка с необходимыми медицинскими реактивами. ent-ClothingBackpackDuffelSyndicateFilledShotgun = набор "Бульдог" .desc = Простой и надёжный: Содержит популярный дробовик Бульдог, 4 барабана пуль и 4 барабана дроби. ent-ClothingBackpackDuffelSyndicateFilledSMG = набор "C-20r" @@ -34,7 +34,7 @@ ent-ClothingBackpackChameleonFill = { ent-ClothingBackpackChameleon } .suffix = Заполненный, Хамелеон ent-ClothingBackpackChameleonFillAgent = { ent-ClothingBackpackChameleon } .desc = { ent-ClothingBackpackChameleon.desc } - .suffix = Fill, Chameleon, Syndie + .suffix = Заполненный, Хамелеон, Синдикат ent-ClothingBackpackDuffelSyndicateEVABundle = набор ВКД Синдиката .desc = Содержит одобренный Синдикатом костюм ВКД. ent-ClothingBackpackDuffelSyndicateHardsuitBundle = набор скафандров Синдиката diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl index 707f39d710..fcb6243821 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/ammunition.ftl @@ -1,9 +1,9 @@ ent-BoxMagazine = коробка магазинов .desc = Полная коробка магазинов. ent-BoxMagazinePistolCaselessRifle = коробка магазинов с .25 безгильзовыми - .desc = Полная коробка магазинов с патронами калибра .25 безгильзовый. + .desc = Полная коробка магазинов с патронами калибра .25 безгильзовыми. ent-BoxMagazinePistolCaselessRiflePractice = коробка магазинов с .25 безгильзовыми (учебными) - .desc = Полная коробка магазинов с учебными патронами калибра .25 безгильзовый. + .desc = Полная коробка магазинов с учебными патронами калибра .25 безгильзовыми. ent-BoxMagazineLightRifle = коробка магазинов с .30 винтовочными .desc = Полная коробка магазинов с патронами калибра .30 винтовочный. ent-BoxMagazineLightRiflePractice = коробка магазинов с .30 винтовочными (учебными) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl index c5ed7e701b..2618385b8a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/emergency.ftl @@ -42,10 +42,10 @@ ent-BoxSurvivalSyndicate = расширенный аварийный запас .suffix = Синдикат ent-BoxSurvivalSyndicateNitrogen = { ent-BoxSurvivalSyndicate } .desc = { ent-BoxSurvivalSyndicate.desc } -ent-BoxSurvivalMilitaryDouble = военный аварийный набор - .suffix = O2 + .suffix = Синдикат N2 +ent-BoxSurvivalMilitaryDouble = { ent-BoxCardboardSmall } .desc = Коробка с базовым набором выживания. Согласно этикетке, она содержит двойной аварийный баллон. + .suffix = Военный Кислород O2 ent-BoxSurvivalMilitaryDoubleNitrogen = { ent-BoxSurvivalMilitaryDouble } - .suffix = N2 .desc = { ent-BoxSurvivalMilitaryDouble.desc } .suffix = Военный Азот N2 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl index d5fdbe4c21..01112cc2fa 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/general.ftl @@ -20,8 +20,8 @@ ent-BoxID = коробка ID-карт .desc = Коробка запасных чистых ID-карт. ent-BoxHeadset = коробка гарнитур .desc = Коробка запасных пассажирских гарнитур. -ent-BoxStamps = stamp box - .desc = A small box containing stamps. +ent-BoxStamps = коробка печатей + .desc = Маленькая коробочка с печатями. ent-BoxMesonScanners = коробка инженерных очков .desc = Коробка запасных инженерных очков. ent-BoxMRE = сухой паёк diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl index 581015d09e..914a9b6f1c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/boxes/syndicate.ftl @@ -9,5 +9,5 @@ ent-BoxDeathRattleImplants = коробка имплантеров Предсм .desc = Шесть имплантов Предсмертный хрип для всего отряда. ent-CombatBakeryKit = набор боевой выпечки .desc = Набор подпольного печёного оружия. -ent-SyndimovCircuitKit = syndimov circuit kit - .desc = A kit containing an electronics board with the Syndimov lawset and a Syndicate ID. +ent-SyndimovCircuitKit = набор Синдимов + .desc = Комплект, содержащий электронную плату с набором законов Синдикат и ID карту Синдиката diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl index b5082ea6eb..487f790810 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/briefcases.ftl @@ -10,15 +10,15 @@ ent-BriefcaseSyndieLobbyingBundleFilled = { ent-BriefcaseSyndie } ent-BriefcaseThiefBribingBundleFilled = { ent-BriefcaseSyndie } .desc = { ent-BriefcaseSyndie.desc } .suffix = Вор, Кредиты -ent-BriefcaseWeaponHushpupFilled = secure hushpup case +ent-BriefcaseWeaponHushpupFilled = защищённый оружейный кейс для Глухаря .desc = { ent-BriefcaseWeaponSmall.desc } .suffix = { ent-BriefcaseWeaponSmall.suffix } -ent-BriefcaseWeaponC20Filled = secure C-20r case +ent-BriefcaseWeaponC20Filled = защищённый оружейный кейс для C-20r .desc = { ent-BriefcaseWeaponSmall.desc } .suffix = { ent-BriefcaseWeaponSmall.suffix } -ent-BriefcaseWeaponBulldogFilled = secure bulldog case +ent-BriefcaseWeaponBulldogFilled = защищённый оружейный кейс для Бульдога .desc = { ent-BriefcaseWeaponSmall.desc } .suffix = { ent-BriefcaseWeaponSmall.suffix } -ent-BriefcaseWeaponChinaLakeFilled = secure china lake case +ent-BriefcaseWeaponChinaLakeFilled = защищённый оружейный кейс для china lake .desc = { ent-BriefcaseWeapon.desc } .suffix = { ent-BriefcaseWeapon.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/toolboxes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/toolboxes.ftl index 481edbe89d..90cced002f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/toolboxes.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/items/toolboxes.ftl @@ -24,4 +24,4 @@ ent-ToolboxGoldFilled = золотой ящик для инструментов .suffix = Заполненный ent-FoolboxFilled = { ent-Foolbox } .desc = { ent-Foolbox.desc } - .suffix = Filled + .suffix = Заполненный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl index a973b0de6b..be0f4bd65b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/medical.ftl @@ -1,13 +1,13 @@ ent-LockerMedicineFilled = { ent-LockerMedicine } .desc = { ent-LockerMedicine.desc } .suffix = Заполненный -ent-LockerWallMedicalFilled = medicine wall locker +ent-LockerWallMedicalFilled = { ent-LockerMedicine } .desc = { ent-LockerWallMedical.desc } .suffix = Заполненный ent-LockerMedicalFilled = { ent-LockerMedical } .desc = { ent-LockerMedical.desc } .suffix = Заполненный -ent-LockerWallMedicalDoctorFilled = medical doctor's wall locker +ent-LockerWallMedicalDoctorFilled = { ent-LockerMedicine } .desc = { ent-LockerWallMedical.desc } .suffix = Заполненный ent-LockerChemistryFilled = { ent-LockerChemistry } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl index 16f4bd2e56..5ecb853bc2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/misc.ftl @@ -1,9 +1,9 @@ ent-LockerSyndicatePersonalFilled = { ent-LockerSyndicatePersonal } - .desc = It's a personal storage unit for operative gear. + .desc = Это личное хранилище для рабочего снаряжения. .suffix = Заполненный ent-LockerSyndicateWallFilled = { ent-LockerWallSyndicate } - .desc = It's a personal storage unit for operative gear. - .suffix = Nukie, Filled + .desc = { ent-LockerSyndicatePersonalFilled.desc } + .suffix = Ядерные Оперативники, Заполненный ent-ClosetEmergencyFilledRandom = { ent-ClosetEmergency } .desc = { ent-ClosetEmergency.desc } .suffix = Заполненный, Случайный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/wardrobe_job.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/wardrobe_job.ftl index ba206d3dbf..cfc4a9c1cd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/wardrobe_job.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/wardrobe_job.ftl @@ -41,7 +41,7 @@ ent-WardrobeAtmosphericsFilled = { ent-WardrobeAtmospherics } .desc = В этом шкафчике хранится форма атмосферных техников. .suffix = Заполненный ent-ClosetWallWardrobeAtmosphericsFilled = { ent-ClosetWallAtmospherics } - .desc = This locker contains a uniform for atmospheric technicians. + .desc = В этом шкафчике хранится форма атмосферных техников. .suffix = Заполненный ent-WardrobeEngineeringFilled = { ent-WardrobeEngineering } .desc = В этом шкафчике хранится форма для инженеров и социальной инженерии. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/Tajaran.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/Tajaran.ftl index 4baa75fa4c..222fe9ba69 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/Tajaran.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/Tajaran.ftl @@ -1,22 +1,22 @@ -ent-PartTajaran = tajaran body part +ent-PartTajaran = часть тела таяра .desc = { ent-BaseItem.desc } -ent-TorsoTajaran = tajaran torso +ent-TorsoTajaran = торс таяра .desc = { ent-PartTajaran.desc } -ent-HeadTajaran = tajaran head +ent-HeadTajaran = голова таяра .desc = { ent-PartTajaran.desc } -ent-LeftArmTajaran = left tajaran arm +ent-LeftArmTajaran = левая рука таяра .desc = { ent-PartTajaran.desc } -ent-RightArmTajaran = right tajaran arm +ent-RightArmTajaran = правая рука таяра .desc = { ent-PartTajaran.desc } -ent-LeftHandTajaran = left tajaran hand +ent-LeftHandTajaran = левая кисть таяра .desc = { ent-PartTajaran.desc } -ent-RightHandTajaran = right tajaran hand +ent-RightHandTajaran = правая кисть таяра .desc = { ent-PartTajaran.desc } -ent-LeftLegTajaran = left tajaran leg +ent-LeftLegTajaran = левая нога таяра .desc = { ent-PartTajaran.desc } -ent-RightLegTajaran = right tajaran leg +ent-RightLegTajaran = правая нога таяра .desc = { ent-PartTajaran.desc } -ent-LeftFootTajaran = left tajaran foot +ent-LeftFootTajaran = левая ступня таяра .desc = { ent-PartTajaran.desc } -ent-RightFootTajaran = right tajaran foot +ent-RightFootTajaran = правая ступня таяра .desc = { ent-PartTajaran.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl deleted file mode 100644 index 92a7840630..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/parts/vulpkanin.ftl +++ /dev/null @@ -1,22 +0,0 @@ -ent-PartCorvaxVulpkanin = vulpkanin body part - .desc = { ent-BaseItem.desc } -ent-TorsoCorvaxVulpkanin = vulpkanin torso - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-HeadCorvaxVulpkanin = vulpkanin head - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-LeftArmCorvaxVulpkanin = left vulpkanin arm - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-RightArmCorvaxVulpkanin = right vulpkanin arm - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-LeftHandCorvaxVulpkanin = left vulpkanin hand - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-RightHandCorvaxVulpkanin = right vulpkanin hand - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-LeftLegCorvaxVulpkanin = left vulpkanin leg - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-RightLegCorvaxVulpkanin = right vulpkanin leg - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-LeftFootCorvaxVulpkanin = left vulpkanin foot - .desc = { ent-PartCorvaxVulpkanin.desc } -ent-RightFootCorvaxVulpkanin = right vulpkanin foot - .desc = { ent-PartCorvaxVulpkanin.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/ipc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/ipc.ftl index 7a5d858baa..5caa14a906 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/ipc.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/ipc.ftl @@ -1,10 +1,10 @@ -ent-AppearanceIpc = Ipc appearance +ent-AppearanceIpc = внешность КПБ .desc = { ent-BaseSpeciesAppearance.desc } ent-MobIpc = Урсист МакКПБ .desc = { ent-AppearanceIpc.desc } ent-OrganIpc = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = Ipc + .suffix = КПБ ent-OrganIpcExternal = { ent-OrganIpc } .desc = { ent-OrganIpc.desc } .suffix = { ent-OrganIpc.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/tajaran.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/tajaran.ftl index 22f3ae9442..e95af738ed 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/tajaran.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/body/species/tajaran.ftl @@ -1,10 +1,10 @@ -ent-AppearanceTajaran = Tajaran appearance +ent-AppearanceTajaran = внешность таярана .desc = { ent-BaseSpeciesAppearance.desc } ent-MobTajaran = Урист МакТаяр .desc = { ent-AppearanceTajaran.desc } ent-OrganTajaran = { ent-OrganBase } .desc = { ent-OrganBase.desc } - .suffix = tajaran + .suffix = таяран ent-OrganTajaranMetabolizer = { "" } .desc = { "" } ent-OrganTajaranInternal = { ent-OrganTajaran } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/boxes/medical.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/boxes/medical.ftl index 44ae54231a..2e15913693 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/boxes/medical.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/catalog/fills/boxes/medical.ftl @@ -1,2 +1,2 @@ -ent-BoxMiniSyringe = MiniSyringe box - .desc = A box full of minisyringe. +ent-BoxMiniSyringe = коробка мини-шприцов + .desc = Полная коробка мини-шприцов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/station_ai.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/station_ai.ftl deleted file mode 100644 index d76c68dd37..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/station_ai.ftl +++ /dev/null @@ -1,3 +0,0 @@ -ent-PlayerStationAiPilgrim = { ent-PlayerStationAi } - .suffix = Спавнер должности, Пилигрим - .desc = { ent-PlayerStationAi.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl deleted file mode 100644 index eb6f110082..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/player/vulpkanin.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-MobCorvaxVulpkanin = Urist McVulp - .desc = { ent-BaseMobCorvaxVulpkanin.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl deleted file mode 100644 index f8da2352a9..0000000000 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/mobs/species/vulpkanin.ftl +++ /dev/null @@ -1,4 +0,0 @@ -ent-BaseMobCorvaxVulpkanin = Urist McVulp - .desc = { ent-BaseMobSpeciesOrganic.desc } -ent-MobCorvaxVulpkaninDummy = Urist McHands - .desc = A dummy vulpkanin meant to be used in character setup. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/invisible_hand_teleporter.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/invisible_hand_teleporter.ftl index 9178416a9f..0d8e121c44 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/invisible_hand_teleporter.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/devices/invisible_hand_teleporter.ftl @@ -1,3 +1,3 @@ ent-HandTeleporterAdmemeCNInvisible = { ent-HandTeleporter } .desc = { ent-HandTeleporter.desc } - .suffix = Admeme, Invisible + .suffix = Адмемы, Невидимый diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl index 5c9b21d0c2..f2080c801a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/misc/tiles.ftl @@ -1,36 +1,36 @@ -ent-FloorTileItemWoodParquet = tiles-wood-parquet +ent-FloorTileItemWoodParquet = пол паркет .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodBlack = tiles-wood-black +ent-FloorTileItemWoodBlack = плитка из чёрного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodDark = tiles-wood-dark +ent-FloorTileItemWoodDark = плитка из тёмного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodLight = tiles-wood-light +ent-FloorTileItemWoodLight = плитка из светлого дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodRed = tiles-wood-red +ent-FloorTileItemWoodRed = плитка из красного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodLargeBlack = large black wood floor +ent-FloorTileItemWoodLargeBlack = большой пол из чёрного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodLargeDark = large dark wood floor +ent-FloorTileItemWoodLargeDark = большой пол из тёмного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodLargeLight = large light wood floor +ent-FloorTileItemWoodLargeLight = большой пол из светлого дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodLargeRed = large red wood floor +ent-FloorTileItemWoodLargeRed = большой пол из красного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodParquetBlack = parquet black wood floor +ent-FloorTileItemWoodParquetBlack = пол паркет из чёрного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodParquetDark = parquet dark wood floor +ent-FloorTileItemWoodParquetDark = пол паркет из тёмного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodParquetLight = parquet light wood floor +ent-FloorTileItemWoodParquetLight = пол паркет из светлого дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodParquetRed = parquet red wood floor +ent-FloorTileItemWoodParquetRed = пол паркет из красного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodChess = chess wood floor +ent-FloorTileItemWoodChess = шахматный деревянный пол .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodChessBlack = chess black wood floor +ent-FloorTileItemWoodChessBlack = шахматный пол из чёрного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodChessDark = chess dark wood floor +ent-FloorTileItemWoodChessDark = шахматный пол из тёмного дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodChessLight = chess light wood floor +ent-FloorTileItemWoodChessLight = шахматный пол из светлого дерева .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemWoodChessRed = chess red wood floor +ent-FloorTileItemWoodChessRed = шахматный пол из красного дерева .desc = { ent-FloorTileItemBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/medical/hypospray.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/medical/hypospray.ftl index 52120d06b9..96635b6be6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/medical/hypospray.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/objects/specific/medical/hypospray.ftl @@ -1,2 +1,2 @@ -ent-HyposprayBrigmedic = hypospray brigmedic - .desc = Sterile injector for rapid administration of medications to prisoners and security personnel. +ent-HyposprayBrigmedic = гипоспрей бригмедика + .desc = Стерильный шприц для быстрого введения лекарств заключенным и сотрудникам службы безопасности. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl index 2b10a6d5d8..3ffe77e848 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/corvax/entities/structures/storage/tanks/tanks.ftl @@ -1,4 +1,4 @@ -ent-KvassTank = { ent-StorageTank } +ent-KvassTank = бочка кваса .desc = { ent-StorageTank.desc } .suffix = Пустой ent-KvassTankFull = { ent-KvassTank } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl index 39293badc9..5af3dab88b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/back/satchel.ftl @@ -32,8 +32,8 @@ ent-ClothingBackpackSatchelCargo = сумка грузчика .desc = Прочная сумка для воровства добычи. ent-ClothingBackpackSatchelSalvage = сумка утилизатора .desc = Прочная сумка для хранения добычи. -ent-ClothingBackpackSatchelNinja = spider clan satchel - .desc = A robust satchel for stashing your loot. +ent-ClothingBackpackSatchelNinja = сумка клана пауков + .desc = Прочная сумка для хранения добычи. ent-ClothingBackpackSatchelHolding = бездонная сумка .desc = Сумка, открывающаяся в локальный карман блюспейса. ent-ClothingBackpackSatchelAdmin = сумка администрации diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl index 9066864311..e37d26c3c4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/eyes/hud.ftl @@ -16,14 +16,14 @@ ent-ClothingEyesHudCommand = административный визор # Corvax-Wega-End ent-ClothingEyesHudBeer = пивные очки .desc = Пара солнцезащитных очков, оснащённых сканером реагентов, а также дающих понимание вязкости жидкости во время движения. -ent-ClothingEyesHudFriedOnion = fried onion goggles - .desc = Filler +ent-ClothingEyesHudFriedOnion = очки из жареного лука + .desc = Очки из жареного лука... ent-ClothingEyesHudOnionBeer = thungerst goggles - .desc = Filler + .desc = Отображают голод и жажду. ent-ClothingEyesHudMedOnion = medonion hud - .desc = Filler + .desc = Совмещают в себе медицинский визор и отображение уровня голода. ent-ClothingEyesHudMedOnionBeer = medthungerst hud - .desc = Filler + .desc = Совмещают в себе медицинский визор и отображение уровня голода и жажды. ent-ClothingEyesHudMedSec = мед-охранный визор .desc = Окуляр с индикатором на стекле, напоминающий сочетание визора охраны с медицинским. ent-ClothingEyesHudMultiversal = multiversal hud @@ -54,6 +54,6 @@ ent-ClothingEyesEyepatchHudBeerFlipped = пивной монокуляр .suffix = { ent-ClothingHeadEyeBaseFlipped.suffix } ent-ClothingEyesEyepatchHudDiag = диагностический моновизор .desc = Окуляр с индикатором на стекле, способный анализировать целостность и состояние роботов и экзокостюмов. Сделан из си-боргия. -ent-ClothingEyesEyepatchHudDiagFlipped = diagnostic hud eyepatch +ent-ClothingEyesEyepatchHudDiagFlipped = { ent-ClothingEyesEyepatchHudDiag } .desc = { ent-ClothingEyesEyepatchHudDiag.desc } .suffix = { ent-ClothingHeadEyeBaseFlipped.suffix } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl index 8d300247f1..6ce7b096fd 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/gloves.ftl @@ -11,17 +11,17 @@ ent-ClothingHandsGlovesBoxingYellow = жёлтые боксёрские перч ent-ClothingHandsGlovesBoxingRiggedBase = { ent-ClothingHandsGlovesBoxingBase } .desc = { ent-ClothingHandsGlovesBoxingBase.desc } .suffix = Rigged -ent-ClothingHandsGlovesBoxingRiggedRed = red boxing gloves - .desc = Red gloves for competitive boxing. +ent-ClothingHandsGlovesBoxingRiggedRed = красные боксерские перчатки + .desc = Красные перчатки для соревновательного бокса. .suffix = { ent-ClothingHandsGlovesBoxingRiggedBase.suffix } -ent-ClothingHandsGlovesBoxingRiggedBlue = blue boxing gloves - .desc = Blue gloves for competitive boxing. +ent-ClothingHandsGlovesBoxingRiggedBlue = синие боксерские перчатки + .desc = Синие перчатки для соревновательного бокса. .suffix = { ent-ClothingHandsGlovesBoxingRiggedBase.suffix } -ent-ClothingHandsGlovesBoxingRiggedGreen = green boxing gloves - .desc = Green gloves for competitive boxing. +ent-ClothingHandsGlovesBoxingRiggedGreen = зелёные боксерские перчатки + .desc = Зелёные перчатки для соревновательного бокса. .suffix = { ent-ClothingHandsGlovesBoxingRiggedBase.suffix } -ent-ClothingHandsGlovesBoxingRiggedYellow = yellow boxing gloves - .desc = Yellow gloves for competitive boxing. +ent-ClothingHandsGlovesBoxingRiggedYellow = жёлтые боксерские перчатки + .desc = Жёлтые перчатки для соревновательного бокса. .suffix = { ent-ClothingHandsGlovesBoxingRiggedBase.suffix } ent-GlovesBoxingRiggedRandomSpawner = random rigged boxing glove spawner .desc = { "" } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl index ac54d660b7..0f502ed84f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/hands/rings.ftl @@ -5,7 +5,7 @@ ent-SilverRing = серебряное кольцо ent-GoldRingDiamond = золотое кольцо с бриллиантом .desc = Изготовлено из этично добытых космических алмазов. ent-SilverRingDiamond = серебряное кольцо с бриллиантом - .desc = Made from ethically mined space diamonds. + .desc = Изготовлено из этично добытых космических алмазов. ent-GoldRingGem = золотое кольцо с драгоценным камнем .desc = Блестящее и дорогое! ent-SilverRingGem = серебряное кольцо с драгоценным камнем diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl index 8f57d3ddeb..ef63539d48 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hardsuit-helmets.ftl @@ -51,15 +51,15 @@ ent-ClothingHeadHelmetHardsuitPirateCap = шлем древнего скафан ent-ClothingHeadHelmetHardsuitERTLeader = шлем скафандра лидера ОБР .desc = Специальный защитный шлем, который носят члены отрядов быстрого реагирования. ent-ClothingHeadHelmetHardsuitERTChaplain = шлем скафандра священника ОБР - .desc = A special hardsuit helmet worn by members of an emergency response team. + .desc = Специальный защитный шлем, используемый священниками отряда быстрого реагирования. ent-ClothingHeadHelmetHardsuitERTEngineer = шлем скафандра инженера ОБР - .desc = A special hardsuit helmet worn by members of an emergency response team. + .desc = Специальный защитный шлем, используемый инженерами отряда быстрого реагирования. ent-ClothingHeadHelmetHardsuitERTMedical = шлем скафандра медика ОБР - .desc = A special hardsuit helmet worn by members of an emergency response team. + .desc = Специальный защитный шлем, используемый медиками отряда быстрого реагирования. ent-ClothingHeadHelmetHardsuitERTSecurity = шлем скафандра офицера безопасности ОБР - .desc = A special hardsuit helmet worn by members of an emergency response team. + .desc = Специальный защитный шлем, используемый офицерами отряда быстрого реагирования. ent-ClothingHeadHelmetHardsuitERTJanitor = шлем скафандра уборщика ОБР - .desc = A special hardsuit helmet worn by members of an emergency response team. + .desc = Специальный защитный шлем, используемый уборщиками отряда быстрого реагирования. ent-ClothingHeadHelmetCBURN = шлем отряда РХБЗЗ .desc = Огнеупорный, защищающий от давления шлем, который используют специальные подразделения зачистки. ent-ClothingHeadHelmetHardsuitDeathsquad = шлем скафандра эскадрона смерти diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl index 71af50d33a..d5efc9d9bf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hats.ftl @@ -42,8 +42,8 @@ ent-ClothingHeadHatFedoraBrown = коричневая федора .desc = Коричневая фетровая шляпа. ent-ClothingHeadHatFedoraGrey = серая федора .desc = Серая фетровая шляпа. -ent-ClothingHeadHatFedoraPress = press fedora - .desc = It has a little note stuck in the band saying "PRESS". Practically an all-access pass! +ent-ClothingHeadHatFedoraPress = федора прессы + .desc = В ремешок вклеена маленькая записка с надписью "ПРЕССА". Практически пропуск, дающий полный доступ! ent-ClothingHeadHatFez = феска .desc = Красная феска. ent-ClothingHeadHatHopcap = фуражка главы персонала diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl index b9a38d1478..dd0c013e60 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/head/hoods.ftl @@ -39,13 +39,13 @@ ent-ClothingHeadHatHoodWinterDefault = стандартный капюшон з ent-ClothingHeadHatHoodWinterBartender = капюшон зимней куртки бармена .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCaptain = капюшон зимней куртки капитана - .desc = An expensive hood, to keep the captain's head warm. + .desc = Дорогой капюшон, чтобы капитану было тепло. ent-ClothingHeadHatHoodWinterCargo = капюшон зимней куртки грузчика .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCE = капюшон зимней куртки старшего инженера .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCentcom = капюшон зимней куртки Центком - .desc = A hood for keeping the central comander's head warm. + .desc = Капюшон для защиты головы офицера ЦК от холода. ent-ClothingHeadHatHoodWinterChem = капюшон зимней куртки химика .desc = { ent-ClothingHeadHatHoodWinterBase.desc } ent-ClothingHeadHatHoodWinterCMO = капюшон зимней куртки главного врача diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl index 43fbd8ffe0..10e506eba6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/masks/masks.ftl @@ -21,7 +21,7 @@ ent-ClothingMaskBreath = дыхательная маска ent-ClothingMaskClownBase = маска и парик клоуна .desc = Лицевой атрибут настоящего приколиста. Клоун неполноценен без своих парика и маски. ent-ClothingMaskClown = { ent-ClothingMaskClownBase } - .desc = A clown mask featuring a foldable wig; a true prankster's attire. + .desc = { ent-ClothingMaskClownBase.desc } ent-ClothingMaskClownBanana = банановые маска и парик клоуна .desc = { ent-ClothingMaskClownBase.desc } ent-ClothingMaskClownSecurity = маска и парик клоуна безопасности diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl index f3aa82ec4e..39b921140a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/pins.ftl @@ -1,39 +1,37 @@ ent-ClothingNeckPinBase = нагрудный значок .desc = Значок с булавкой. -ent-ClothingGenderPinBase = { ent-ClothingNeckPinBase } - .desc = { ent-ClothingNeckPinBase.desc } -ent-ClothingNeckLGBTPin = LGBT pin +ent-ClothingNeckLGBTPin = { ent-ClothingNeckPinBase } .desc = Разноцветный металлический значок с булавкой. -ent-ClothingNeckAllyPin = straight ally pin - .desc = Be ally do crime. -ent-ClothingNeckAromanticPin = aromantic pin - .desc = Be aro do crime. -ent-ClothingNeckAroacePin = aroace pin - .desc = Be aroace do crime. -ent-ClothingNeckAsexualPin = asexual pin - .desc = Be ace do crime. -ent-ClothingNeckBisexualPin = bisexual pin - .desc = Be bi do crime. -ent-ClothingNeckGayPin = gay pin - .desc = Be gay~ do crime. -ent-ClothingNeckIntersexPin = intersex pin - .desc = Be intersex do crime. -ent-ClothingNeckLesbianPin = lesbian pin - .desc = Be lesbian do crime. -ent-ClothingNeckNonBinaryPin = non-binary pin - .desc = 01100010 01100101 00100000 01100101 01101110 01100010 01111001 00100000 01100100 01101111 00100000 01100011 01110010 01101001 01101101 01100101 -ent-ClothingNeckPansexualPin = pansexual pin - .desc = Be pan do crime. -ent-ClothingNeckPluralPin = plural pin - .desc = Be plural, do crimes. -ent-ClothingNeckOmnisexualPin = omnisexual pin - .desc = Be omni do crime. -ent-ClothingNeckGenderqueerPin = genderqueer pin - .desc = be crime, do gender -ent-ClothingNeckGenderfluidPin = genderfluid pin - .desc = be gender, be fluid -ent-ClothingNeckTransPin = transgender pin - .desc = Be trans do crime. +ent-ClothingNeckAllyPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckAromanticPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckAroacePin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckAsexualPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckBisexualPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckGayPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckIntersexPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckLesbianPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckNonBinaryPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckPansexualPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckPluralPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckOmnisexualPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckGenderqueerPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckGenderfluidPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } +ent-ClothingNeckTransPin = { ent-ClothingNeckLGBTPin } + .desc = { ent-ClothingNeckLGBTPin.desc } ent-ClothingNeckAutismPin = значок "нейродивергент" .desc = Значок в честь дня распространения информации о проблеме нейродивергентов. ent-ClothingNeckGoldAutismPin = значок "аутизм" diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl index ff66536d68..475904d120 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/neck/scarfs.ftl @@ -22,27 +22,28 @@ ent-ClothingNeckScarfStripedCentcom = полосатый шарф Центком .desc = Стильный полосатый шарф, в цветах Центкома. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто вынужден заниматься бумажной работой на холоде. ent-ClothingNeckScarfStripedZebra = шарф-зебра .desc = Полосатый шарф, обязательный аксессуар артистов. +# make this right later ent-ClothingNeckScarfStripedAce = полосатый разноцветный шарф .desc = Стильный полосатый разноцветный шарф. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто вынужден заниматься бумажной работой на холоде. -ent-ClothingNeckScarfStripedAro = striped aromantic scarf - .desc = A stylish striped aromantic scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedAroace = striped aroace scarf - .desc = A stylish striped aroace scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedBiSexual = striped bisexual scarf - .desc = A stylish striped bisexual scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedGay = striped gay scarf - .desc = A stylish striped gay scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedInter = striped intersex scarf - .desc = A stylish striped intersex scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedLesbian = striped lesbian scarf - .desc = A stylish striped lesbian scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedPan = striped pan scarf - .desc = A stylish striped pan scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. -ent-ClothingNeckScarfStripedNonBinary = striped non-binary scarf - .desc = A stylish striped non-binary scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. +ent-ClothingNeckScarfStripedAro = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedAroace = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedBiSexual = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedGay = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedInter = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedLesbian = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedPan = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } +ent-ClothingNeckScarfStripedNonBinary = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } ent-ClothingNeckScarfStripedRainbow = радужный шарф .desc = Стильный радужный шарф. Идеальный зимний аксессуар для тех, у кого обострённое чувство моды, и тех, кто вынужден заниматься бумажной работой на холоде. -ent-ClothingNeckScarfStripedTrans = striped trans scarf - .desc = A stylish striped trans scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks. +ent-ClothingNeckScarfStripedTrans = { ent-ClothingNeckScarfStripedAce } + .desc = { ent-ClothingNeckScarfStripedAce.desc } ent-ClothingNeckScarfStripedLesbianLong = длинный бекон .desc = Длинный бекон! Идеально подходит для того, чтобы поделиться с подругой! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl index b5ee1d83c5..9916f4cc9e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/coats.ftl @@ -18,47 +18,47 @@ ent-ClothingOuterCoatJensen = пальто Дженсена .desc = Пальто Дженсена. ent-ClothingOuterCoatJensenSyndie = { ent-ClothingOuterCoatJensen } .desc = { ent-ClothingOuterCoatJensen.desc } - .suffix = Syndie + .suffix = Синдикат ent-ClothingOuterCoatTrench = тренчкот .desc = Удобный тренч. ent-ClothingOuterCoatLab = лабораторный халат .desc = Халат, защищающий от небольших разливов химикатов. -ent-ClothingOuterCoatLabOpened = lab coat +ent-ClothingOuterCoatLabOpened = { ent-ClothingOuterCoatLab } .desc = { ent-ClothingOuterCoatLab.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatLabChem = лабораторный халат химика .desc = Халат, защищающий от небольших разливов химикатов. Имеет оранжевые полосы на плечах. -ent-ClothingOuterCoatLabChemOpened = chemist lab coat +ent-ClothingOuterCoatLabChemOpened = { ent-ClothingOuterCoatLabChem } .desc = { ent-ClothingOuterCoatLabChem.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatLabViro = лабораторный халат вирусолога .desc = Халат, защищающий от бактерий и вирусов. Имеет зелёные полосы на плечах. -ent-ClothingOuterCoatLabViroOpened = virologist lab coat +ent-ClothingOuterCoatLabViroOpened = { ent-ClothingOuterCoatLabViro } .desc = { ent-ClothingOuterCoatLabViro.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatLabGene = лабораторный халат генетика .desc = Халат, защищающий от небольших разливов химикатов. Имеет синие полосы на плечах. -ent-ClothingOuterCoatLabGeneOpened = geneticist lab coat +ent-ClothingOuterCoatLabGeneOpened = { ent-ClothingOuterCoatLabGene } .desc = { ent-ClothingOuterCoatLabGene.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatLabCmo = лабораторный халат главного врача .desc = Изготовленный по специальному заказу синий лабораторный халат главного врача обеспечивает дополнительную защиту от разливов химикатов и мелких порезов. -ent-ClothingOuterCoatLabCmoOpened = chief medical officer's lab coat +ent-ClothingOuterCoatLabCmoOpened = { ent-ClothingOuterCoatLabCmo } .desc = { ent-ClothingOuterCoatLabCmo.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatRnd = лабораторный халат учёного .desc = Халат, защищающий от небольших разливов химикатов. Имеет фиолетовые полосы на плечах. -ent-ClothingOuterCoatRndOpened = scientist lab coat +ent-ClothingOuterCoatRndOpened = { ent-ClothingOuterCoatRnd } .desc = { ent-ClothingOuterCoatRnd.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatRobo = лабораторный халат робототехника .desc = Больше похоже на эксцентричное пальто, чем на лабораторный халат. Помогает выдать пятна крови за эстетическую составляющую. Имеет красные полосы на плечах. -ent-ClothingOuterCoatRoboOpened = roboticist lab coat +ent-ClothingOuterCoatRoboOpened = { ent-ClothingOuterCoatRobo } .desc = { ent-ClothingOuterCoatRobo.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatRD = лабораторный халат научрука .desc = Соткан по новейшим технологиям, этот халат обеспечивает защиту от радиации также, как и экспериментальный скафандр. -ent-ClothingOuterCoatRDOpened = research director lab coat +ent-ClothingOuterCoatRDOpened = { ent-ClothingOuterCoatRD } .desc = { ent-ClothingOuterCoatRD.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatPirate = одежда пирата @@ -90,7 +90,7 @@ ent-ClothingOuterCoatLabSeniorPhysicianOpened = лабораторный хал .desc = { ent-ClothingOuterCoatLabSeniorPhysician.desc } .suffix = { ent-ClothingOuterStorageFoldableBaseOpened.suffix } ent-ClothingOuterCoatSpaceAsshole = куртка космического мудака - .desc = And there he was... + .desc = И вот он появился... ent-ClothingOuterCoatExpensive = дорогая шуба .desc = Очень пушистая розовая шуба, сделанная из очень дорогого меха (очевидно). ent-ClothingOuterCoatExpensiveOpened = дорогая шуба diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/vests.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/vests.ftl index fe700e5d1c..444f02886d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/vests.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/outerclothing/vests.ftl @@ -4,5 +4,5 @@ ent-ClothingOuterVest = жилет .desc = Плотный жилет с прорезиненной, водонепроницаемой оболочкой. ent-ClothingOuterVestTank = обвязка для баллона .desc = Простая обвязка, которая может удерживать газовый баллон. -ent-ClothingOuterVestPress = press vest - .desc = A cloth vest for the fearless reporter in the field. Go land an interview with that space dragon! +ent-ClothingOuterVestPress = жилет прессы + .desc = Жилет из ткани для бесстрашного репортера в полевых условиях. Вперед, берись за интервью с этим космическим драконом! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_dress.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_dress.ftl index d06f09d7d3..42a016f4d9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_dress.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/uniforms/color_dress.ftl @@ -1,32 +1,32 @@ ent-ClothingUniformJumpskirtBlackElegantDress = элегантное чёрное платье .desc = Элегантное платье с красивым бантом. ent-ClothingUniformJumpskirtRedElegantDress = элегантное красное платье - .desc = Elegant dress with a beautiful bow. + .desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } ent-ClothingUniformJumpskirtGreenElegantDress = элегантное зелёное платье - .desc = Elegant dress with a beautiful bow. + .desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } ent-ClothingUniformJumpskirtBlueElegantDress = элегантное синее платье - .desc = Elegant dress with a beautiful bow. + .desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } ent-ClothingUniformJumpskirtPurpleElegantDress = элегантное фиолетовое платье - .desc = Elegant dress with a beautiful bow. + .desc = { ent-ClothingUniformJumpskirtBlackElegantDress.desc } ent-ClothingUniformJumpskirtCyanStripedDress = полосатое голубое платье .desc = Милое полосатое платье. ent-ClothingUniformJumpskirtRedStripedDress = полосатое красное платье - .desc = Cute striped dress. + .desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } ent-ClothingUniformJumpskirtGreenStripedDress = полосатое зелёное платье - .desc = Cute striped dress. + .desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } ent-ClothingUniformJumpskirtPinkStripedDress = полосатое розовое платье - .desc = Cute striped dress. + .desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } ent-ClothingUniformJumpskirtOrangeStripedDress = полосатое оранжевое платье - .desc = Cute striped dress. + .desc = { ent-ClothingUniformJumpskirtCyanStripedDress.desc } ent-ClothingUniformJumpskirtPurpleTurtleneckDress = фиолетовое платье-водолазка .desc = Платье-водолазка с уникальным дизайном. ent-ClothingUniformJumpskirtRedTurtleneckDress = красное платье-водолазка - .desc = Turtleneck dress with a unique design. + .desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } ent-ClothingUniformJumpskirtGreenTurtleneckDress = зелёное платье-водолазка - .desc = Turtleneck dress with a unique design. + .desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } ent-ClothingUniformJumpskirtBlueTurtleneckDress = синее платье-водолазка - .desc = Turtleneck dress with a unique design. + .desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } ent-ClothingUniformJumpskirtYellowTurtleneckDress = жёлтое платье-водолазка - .desc = Turtleneck dress with a unique design. + .desc = { ent-ClothingUniformJumpskirtPurpleTurtleneckDress.desc } ent-ClothingUniformJumpskirtYellowOldDress = старое жёлтое платье .desc = Классическое платье в стиле вестерн. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_metamorphic.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_metamorphic.ftl index e92e56c4b2..d8014eebfe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_metamorphic.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/drinks/drinks_metamorphic.ftl @@ -358,7 +358,7 @@ ent-DrinkSingulo = { ent-DrinkGlass } .suffix = Сингуло ent-DrinkSolDryGlass = { ent-DrinkGlass } .desc = { ent-DrinkGlass.desc } - .suffix = Sol dry + .suffix = Сол Драй ent-DrinkSnowWhite = { ent-DrinkGlass } .desc = { ent-DrinkGlass.desc } .suffix = Белый снег diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl index 60193978f6..2ea5ee807b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/food/snacks.ftl @@ -41,11 +41,11 @@ ent-FoodSnackCookieFortune = печенье с предсказанием ent-FoodSnackNutribrick = питательный батончик .desc = Аккуратно синтезированный брикет, разработанный, чтобы содержать максимум питательных веществ на единицу объёма. На вкус как дерьмо. ent-FoodSnackNutribrickOpen = питательный батончик - .desc = A carefully synthesized brick designed to contain the highest ratio of nutriment to volume. Tastes like shit. + .desc = Аккуратно синтезированный брикет, разработанный, чтобы содержать максимум питательных веществ на единицу объёма. На вкус как дерьмо. ent-FoodSnackMREBrownie = брауни .desc = Точно смешанное пирожное-брауни, приготовленное так, чтобы переносить удары и суровые условия. На вкус как дерьмо. ent-FoodSnackMREBrownieOpen = брауни - .desc = A precisely mixed brownie, made to withstand blunt trauma and harsh conditions. Tastes like shit. + .desc = Точно смешанное пирожное-брауни, приготовленное так, чтобы переносить удары и суровые условия. На вкус как дерьмо. .suffix = ИРП ent-FoodSnackSwirlLollipop = леденец-спиралька .desc = Спираль чистого концентрированного сахара. Кто сейчас самый большой ребенок в песочнице? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl index 0d2b3dcf39..a49ee835f7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/consumable/smokeables/pipes/pipe.ftl @@ -1,10 +1,10 @@ ent-SmokingPipe = курительная трубка .desc = Прямо как курил дедуля. ent-SmokingPipeFilledTobacco = курительная трубка - .desc = Just like grandpappy used to smoke. + .desc = Прямо как курил дедуля. .suffix = Табак ent-SmokingPipeFilledCannabis = курительная трубка - .desc = Just like grandpappy used to smoke. + .desc = Прямо как курил дедуля. .suffix = Конопля ent-SmokingPipeFilledCannabisRainbow = курительная трубка .desc = Прямо как курил дедуля. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl index 60d784b17d..9ce17c0d94 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/chameleon_projector.ftl @@ -2,7 +2,7 @@ ent-ChameleonProjectorNoBattery = { ent-ChameleonProjector } .desc = { ent-ChameleonProjector.desc } ent-ChameleonProjector = маскировочный проектор .desc = Схожая с голопаразитной технология, позволяющая создать из твёрдого света копию любого объекта, находящегося около вас. Маскировка спадает при поднятии или отключении. - .suffix = Battery + .suffix = Батарея ent-ChameleonDisguise = Урист МакКляйнер .desc = { "" } ent-ActionDisguiseNoRot = Вкл\выкл вращение diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/law_boards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/law_boards.ftl index 2914d386be..581ce96fe4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/law_boards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/circuitboards/law_boards.ftl @@ -37,8 +37,8 @@ ent-ArtistCircuitBoard = плата законов (Художник) ent-AntimovCircuitBoard = плата законов (Антимов) .desc = Электронная плата, хранящая набор законов 'Антимов'. .suffix = { ent-BaseSiliconLawboard.suffix } -ent-SyndimovCircuitBoard = law board (Syndimov) - .desc = An electronics board containing the Syndimov lawset. +ent-SyndimovCircuitBoard = плата законов (Синдимов) + .desc = Электронная плата, хранящая набор законов 'Синдимов'. .suffix = { ent-BaseSiliconLawboard.suffix } ent-NutimovCircuitBoard = плата законов (Орехимов) .desc = Электронная плата, хранящая набор законов 'Орехимов'. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl index 029928aa44..da24055eee 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/flatpack.ftl @@ -32,5 +32,5 @@ ent-CrewMonitoringComputerFlatpack = упаковка консоли монит .desc = Универсально-сборная упаковка, используемая для сборки консоли мониторинга экипажа. ent-HydroponicsTrayFlatpack = упаковка гидропонного лотка .desc = Универсально-сборная упаковка, используемая для сборки гидропонного лотка. -ent-SyndicateMicrowaveFlatpack = donk co. microwave flatpack - .desc = A flatpack used for constructing a microwave too hot for Nanotrasen to handle. +ent-SyndicateMicrowaveFlatpack = упаковка микрововолновки donk co. + .desc = Универсально-сборная упаковка, используемая для сборки микроволновки, слишком горячая для Nanotrasen. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl index 6e0eec207f..96ae42f13b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pda.ftl @@ -156,8 +156,8 @@ ent-SeniorOfficerPDA = КПК инструктора СБ .desc = Побит, помят, поломан, практически не пригоден для использования. ent-SeniorCourierPDA = КПК старшего логиста .desc = Пахнет почтовыми марками и топливом для шаттлов. -ent-NinjaPDA = ninja PDA - .desc = You stealthy bastard, you! +ent-NinjaPDA = КПК ниндзя + .desc = Ах ты, скрытный ублюдок! ent-PiratePDA = КПК пирата .desc = Йарр! ent-ChameleonPDA = КПК пассажира diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pinpointer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pinpointer.ftl index 7eb2947b02..2f87f55ff9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pinpointer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/pinpointer.ftl @@ -11,7 +11,6 @@ ent-PinpointerStation = пинпоинтер станции .suffix = Станция ent-PinpointerMothership = пинпоинтер ядра .desc = Портативное устройство слежения, способное отслеживать ядро материнского корабля. - .suffix = Материнский корабль ent-PinpointerMothershipPiece = часть пинпоинтера ядра .desc = Часть пинпоинтера ядра материнского корабля. Вам нужно 4 части чтобы починить его. ent-PinpointerMothershipRepaired = отремонтированный пинпоинтер ядра diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl index f1f5d455e2..398370e69b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/station_map.ftl @@ -12,6 +12,6 @@ ent-HandheldStationMapUnpowered = { ent-BaseHandheldStationMap } ent-HandheldStationMapStatic = { ent-HandheldStationMap } .desc = { ent-HandheldStationMap.desc } .suffix = Handheld, Works Off-Station -ent-HandheldStationMapNukeops = target station map - .desc = Displays a readout of the target station. - .suffix = Handheld, NukeOps +ent-HandheldStationMapNukeops = карта целевой станции + .desc = Отображает показания целевой станции. + .suffix = Ручной, Ядерный оперативник diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/crayons.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/crayons.ftl index 269369bd5c..842496e15e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/crayons.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/fun/crayons.ftl @@ -26,8 +26,8 @@ ent-CrayonBlue = синий мелок .desc = { ent-Crayon.desc } ent-CrayonPurple = фиолетовый мелок .desc = { ent-Crayon.desc } -ent-CrayonBoxEmpty = crayon box - .desc = It's a box of crayons. +ent-CrayonBoxEmpty = коробка цветных мелков + .desc = Это коробка для цветных мелков. ent-CrayonBox = { ent-CrayonBoxEmpty } .desc = { ent-CrayonBoxEmpty.desc } - .suffix = Filled + .suffix = Заполненный diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl index 82d7181caa..5938ce9057 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/briefcases.ftl @@ -5,9 +5,9 @@ ent-BriefcaseBrown = коричневый чемодан ent-BriefcaseSyndie = { ent-BriefcaseBrown } .desc = { ent-BriefcaseBrown.desc } .suffix = Синдикат, Пустой -ent-BriefcaseWeapon = secure weapon case - .desc = Useful for aspiring mercenaries, whether you're fighting for a company, a nation or anyone else. Or just making a really big omelette. - .suffix = Gun, Empty +ent-BriefcaseWeapon = защищённый оружейный кейс + .desc = Пригодится начинающим наемникам, независимо от того, сражаетесь ли вы за компанию, нацию или кого-то еще. Или просто готовите очень большой омлет. + .suffix = Оружие, Пустой ent-BriefcaseWeaponSmall = { ent-BriefcaseWeapon } .desc = { ent-BriefcaseWeapon.desc } - .suffix = Gun, Small, Empty + .suffix = Оружие, Малый, Пустой diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl index 01a9ba2ab5..1b03ed4abb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/identification_cards.ftl @@ -109,9 +109,9 @@ ent-SyndiCorpsmanIDCard = ID-карта медика Синдиката .desc = { ent-SyndiOperativeIDCard.desc } ent-SyndiCommanderIDCard = ID-карта командира Синдиката .desc = { ent-SyndiOperativeIDCard.desc } -ent-NinjaIDCard = ninja ID card +ent-NinjaIDCard = ID-карта ниндзя .desc = { ent-IDCardStandard.desc } - .suffix = Ninja + .suffix = ниндзя ent-PirateIDCard = ID-карта пирата .desc = { ent-IDCardStandard.desc } ent-XenoborgIDCard = ID-карта ксеноборг diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/parcel_wrap.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/parcel_wrap.ftl index a2010f4b36..95b2c2867e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/parcel_wrap.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/parcel_wrap.ftl @@ -2,12 +2,12 @@ ent-ParcelWrap = обёрточная бумага .desc = Бумага, которой упаковывают вещи для транспортировки. ent-ParcelWrapAdmeme = блюспейс обёрточная бумага .desc = Бумага, которой упаковывают вещи для транспортировки. Кажется, она способна вмещать необычно большое количество вещей. - .suffix = Admeme + .suffix = Адмемы ent-BaseWrappedParcel = { ent-BasePaperLabelable } .desc = { ent-BasePaperLabelable.desc } -ent-WrappedParcel = wrapped parcel - .desc = Something wrapped up in paper. I wonder what's inside... -ent-WrappedParcelHumanoid = wrapped parcel +ent-WrappedParcel = завернутая посылка + .desc = Что-то завернутое в бумагу. Интересно, что там внутри... +ent-WrappedParcelHumanoid = завернутая посылка .desc = Что-то завёрнутое в бумагу. Подозрительно гуманоидной формы. ent-ParcelWrapTrash = обёрточная бумага .desc = Разочаровывающие остатки распакованной посылки. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl index cde7969490..fd01795179 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/tiles.ftl @@ -20,11 +20,11 @@ ent-FloorTileItemDarkPavement = тёмная стальная тротуарна .desc = { ent-FloorTileItemDark.desc } ent-FloorTileItemDarkPavementVertical = тёмная стальная вертикальная тротуарная плитка .desc = { ent-FloorTileItemDark.desc } -ent-FloorTileItemDarkSlatsContinuous = dark steel continuous slat tile +ent-FloorTileItemDarkSlatsContinuous = тёмная сплошная реечная плитка .desc = { ent-FloorTileItemDark.desc } -ent-FloorTileItemDarkVerticalSlatsBordered = dark steel bordered vertical slat tile +ent-FloorTileItemDarkVerticalSlatsBordered = тёмная вертикальная реечная плитка с бордюром .desc = { ent-FloorTileItemDark.desc } -ent-FloorTileItemDarkHorizontalSlatsBordered = dark steel bordered horizontal slat tile +ent-FloorTileItemDarkHorizontalSlatsBordered = тёмная горизонтальная реечная плитка с бордюром .desc = { ent-FloorTileItemDark.desc } ent-FloorTileItemDarkOffset = тёмная смещённая стальная плитка .desc = { ent-FloorTileItemDark.desc } @@ -36,11 +36,11 @@ ent-FloorTileItemSteelDiagonalMini = стальная диагональная .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemSteelDiagonal = стальная диагональная плитка .desc = { ent-FloorTileItemSteel.desc } -ent-FloorTileItemSteelSlatsContinuous = steel continuous slat tile +ent-FloorTileItemSteelSlatsContinuous = стальная сплошная реечная плитка .desc = { ent-FloorTileItemSteel.desc } -ent-FloorTileItemSteelVerticalSlatsBordered = steel vertical bordered slat tile +ent-FloorTileItemSteelVerticalSlatsBordered = стальная вертикальная реечная плитка с бордюром .desc = { ent-FloorTileItemSteel.desc } -ent-FloorTileItemSteelHorizontalSlatsBordered = steel horizontal bordered slat tile +ent-FloorTileItemSteelHorizontalSlatsBordered = стальная горизонтальная реечная плитка с бордюром .desc = { ent-FloorTileItemSteel.desc } ent-FloorTileItemSteelHerringbone = стальная плитка ёлочкой .desc = { ent-FloorTileItemSteel.desc } @@ -70,11 +70,11 @@ ent-FloorTileItemWhitePavement = белая стальная тротуарна .desc = { ent-FloorTileItemWhite.desc } ent-FloorTileItemWhitePavementVertical = белая стальная вертикальная тротуарная плитка .desc = { ent-FloorTileItemWhite.desc } -ent-FloorTileItemWhiteVerticalSlatsBordered = white steel vertical bordered slat tile +ent-FloorTileItemWhiteVerticalSlatsBordered = белая вертикальная реечная плитка с бордюром .desc = { ent-FloorTileItemWhite.desc } -ent-FloorTileItemWhiteSlatsContinuous = white steel continuous slat tile +ent-FloorTileItemWhiteSlatsContinuous = белая сплошная реечная плитка .desc = { ent-FloorTileItemWhite.desc } -ent-FloorTileItemWhiteHorizontalSlatsBordered = white steel horizontal bordered slat tile +ent-FloorTileItemWhiteHorizontalSlatsBordered = белая горизонтальная реечная плитка с бордюром .desc = { ent-FloorTileItemWhite.desc } ent-FloorTileItemMetalDiamond = стальная плитка .desc = { ent-FloorTileItemBase.desc } @@ -142,11 +142,11 @@ ent-FloorTileItemOldConcreteMono = старая бетонная плита .desc = { ent-FloorTileItemOldConcrete.desc } ent-FloorTileItemOldConcreteSmooth = старый бетонный пол .desc = { ent-FloorTileItemOldConcrete.desc } -ent-FloorTileItemIronsandConcrete = iron sand concrete tile +ent-FloorTileItemIronsandConcrete = железопесчаная бетонная плитка .desc = { ent-FloorTileItemBase.desc } -ent-FloorTileItemIronsandConcreteMono = iron sand concrete mono tile +ent-FloorTileItemIronsandConcreteMono = монолитная бетонная плитка из железного песка .desc = { ent-FloorTileItemIronsandConcrete.desc } -ent-FloorTileItemIronsandConcreteSmooth = iron sand concrete smooth +ent-FloorTileItemIronsandConcreteSmooth = гладкий бетонный пол из железного песка .desc = { ent-FloorTileItemIronsandConcrete.desc } ent-FloorTileItemArcadeBlue = синий пол аркады .desc = { ent-FloorTileItemBase.desc } @@ -222,10 +222,10 @@ ent-FloorTileItemAstroAsteroidSand = астро-песок астероида .desc = Искусственный песок. К счастью, он не такой крупнозернистый, как настоящий. ent-FloorTileItemAstroAsteroidSandBorderless = безграничный астро-песок астероида .desc = Искусственный песок. К счастью, он не такой крупнозернистый, как настоящий. -ent-FloorTileItemAstroIronsand = astro-ironsand - .desc = Fake red sand. Imported from fake Mars. -ent-FloorTileItemAstroIronsandBorderless = borderless astro-ironsand - .desc = Fake red sand. Imported from fake Mars. +ent-FloorTileItemAstroIronsand = астро-железный песок + .desc = Фальшивый красный песок. Импортирован с фальшивого Марса. +ent-FloorTileItemAstroIronsandBorderless = безграничный астро-железный песок + .desc = Фальшивый красный песок. Импортирован с фальшивого Марса. ent-FloorTileItemDesertAstroSand = пустынный астро-песок .desc = Искусственный песок, разработан с целью быть прекрасным. ent-FloorTileItemWoodLarge = большой деревянный пол diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/power/lights.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/power/lights.ftl index 67cee78489..c97fd33b39 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/power/lights.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/power/lights.ftl @@ -25,7 +25,7 @@ ent-LightTubeBroken = люминесцентная лампа-трубка .desc = Это световая трубка. .suffix = Сломанный ent-LedLightTube = светодиодная лампа-трубка - .desc = A high power high energy bulb. + .desc = Лампа высокой мощности и энергопотребления. ent-ExteriorLightTube = экстерьерная лампа-трубка .desc = Мощная энергосберегающая лампа для космических глубин. Может содержать ртуть. ent-SodiumLightTube = натриевая лампа-трубка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemical-containers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemical-containers.ftl index 2b488e5d1c..7668e9b889 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemical-containers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemical-containers.ftl @@ -92,25 +92,25 @@ ent-JugWeldingFuel = { ent-Jug } .suffix = сварочное топливо ent-JugBicaridine = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = bicaridine + .suffix = бикаридин ent-JugPuncturase = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = puncturase + .suffix = пунктураз ent-JugDermaline = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = dermaline + .suffix = дермалин ent-JugDylovene = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = dylovene + .suffix = диловен ent-JugTranexamicAcid = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = tranexamic acid + .suffix = транексемовая кислота ent-JugHyronalin = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = hyronalin + .suffix = хироналин ent-JugSaline = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = saline + .suffix = физраствор ent-JugDexalinPlus = { ent-Jug } .desc = { ent-Jug.desc } - .suffix = dexalin plus + .suffix = дексалин плюс diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemistry-bottles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemistry-bottles.ftl index bd8812455c..3e0a7c1439 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemistry-bottles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/chemistry/chemistry-bottles.ftl @@ -33,7 +33,7 @@ ent-ChemistryBottleBruizine = { ent-BaseChemistryBottleFilled } .suffix = Бруизин ent-ChemistryBottleCognizine = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } - .suffix = cognizine + .suffix = когнизин ent-ChemistryBottleCryoxadone = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } .suffix = Криоксадон @@ -108,7 +108,7 @@ ent-ChemistryBottleOculine = { ent-BaseChemistryBottleFilled } .suffix = Окулин ent-ChemistryBottleOmnizine = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } - .suffix = omnizine + .suffix = омнизин ent-ChemistryBottleOpporozidone = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } .suffix = Оппорозидон @@ -159,7 +159,7 @@ ent-ChemistryBottleUltravasculine = { ent-BaseChemistryBottleFilled } .suffix = Ультраваскулин ent-ChemistryBottleCharcoal = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } - .suffix = charcoal + .suffix = уголь ent-ChemistryBottleRobustHarvest = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } .suffix = Робаст харвест @@ -192,7 +192,7 @@ ent-ChemistryBottleToxin = { ent-BaseChemistryBottleFilled } .suffix = Токсин ent-ChemistryBottleLaughter = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } - .suffix = laughter + .suffix = смех ent-ChemistryBottleAluminium = { ent-BaseChemistryBottleFilled } .desc = { ent-BaseChemistryBottleFilled.desc } .suffix = Алюминий diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl index 2c5c2be278..bfeac0a1b2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/janitorial/janitor.ftl @@ -15,5 +15,5 @@ ent-RagItem = тряпка .desc = Предположительно, для устранения беспорядка. ent-WireBrush = проволочная щётка .desc = Жёсткая проволочная щётка из стали, идеальна для соскабливания даже самой грубой ржавчины. -ent-WireBrushElectrical = electrical wire brush - .desc = A bristly steel wire brush with a moving head, allowing for a way easier time cleaning. +ent-WireBrushElectrical = электрическая проволочная щетка + .desc = Щетка из стальной проволоки с подвижной головкой, которая значительно упрощает процесс очистки. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl index add07eb38b..8ef64fe0a5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/healthanalyzer.ftl @@ -1,5 +1,5 @@ -ent-HandheldHealthAnalyzer = health analyzer - .desc = A hand-held body scanner capable of distinguishing vital signs of the subject. +ent-HandheldHealthAnalyzer = анализатор здоровья + .desc = Ручной сканер тела, способный определять жизненные показатели пациента. ent-HandheldHealthAnalyzerUnpowered = анализатор здоровья .desc = Ручной сканер тела, способный определять жизненные показатели пациента. .suffix = Всегда запитан diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl index e0f082bd00..1e5704160f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/medical/morgue.ftl @@ -1,7 +1,7 @@ ent-BodyBag = мешок для тела .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов и предотвращения их гниения. -ent-BodyBagFolded = body bag - .desc = A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. +ent-BodyBagFolded = мешок для тела + .desc = Пластиковый мешок, предназначенный для хранения и транспортировки трупов и предотвращения их гниения. .suffix = Сложенный ent-Ash = пепел .desc = Раньше это чем-то было, но теперь это не так. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl index 4a1b7e8c15..02c7eed323 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/rehydrateable.ftl @@ -21,7 +21,7 @@ ent-CockroachCube = тараканий кубик ent-SpaceCarpCube = карпий кубик .desc = Просто добавь воды! На свой страх и риск. ent-SpaceTickCube = клещевой кубик - .desc = Just add water! At your own risk. + .desc = Просто добавьте воды! На свой страх и риск. ent-AbominationCube = мерзостный кубик .desc = Просто добавь крови! ent-DehydratedSpaceCarp = обезвоженный космический карп diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl index 14e28ff17c..a3d603c978 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/research/anomaly.ftl @@ -1,8 +1,8 @@ ent-AnomalyScanner = сканер аномалий .desc = Ручной сканер, предназначенный для получения информации о различных аномальных объектах. -ent-AnomalyScannerAdmin = admin anomaly scanner - .desc = A hand-held scanner built to collect information on various anomalous objects. This one seems to have a few extra features. - .suffix = Admin +ent-AnomalyScannerAdmin = сканер аномалий админа + .desc = Ручной сканер, предназначенный для получения информации о различных аномальных объектах. Похоже, у этого сканера есть несколько дополнительных функций. + .suffix = Админ ent-AnomalyLocatorUnpowered = локатор аномалий .desc = Устройство, предназначенное для помощи в поиске аномалий. Вы уже проверили газодобытчики? .suffix = Всегда запитан diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl index a237652ea9..8025f342f5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/specific/robotics/borg_modules.ftl @@ -30,8 +30,8 @@ ent-BaseXenoborgModuleScout = { ent-BaseBorgModule } .desc = { ent-BaseBorgModule.desc } ent-BaseXenoborgModuleStealth = { ent-BaseBorgModule } .desc = { ent-BaseBorgModule.desc } -ent-BorgModulePrying = prying module - .desc = A universal cyborg module which allows the unit to pry open doors. +ent-BorgModulePrying = модуль вскрытия + .desc = Универсальный модуль киборга, позволяющий юниту вскрывать обесточенные шлюзы. ent-BorgModuleCable = кабельный модуль киборга .desc = Универсальный модуль киборга, позволяющий юниту прокладывать и манипулировать электрическими системами. ent-BorgModuleArtistry = художественный модуль киборга diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jaws_of_life.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jaws_of_life.ftl index d46df5812a..da05c6a545 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jaws_of_life.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/tools/jaws_of_life.ftl @@ -1,4 +1,4 @@ ent-JawsOfLife = челюсти жизни .desc = Набор челюстей жизни, скомпонованных при помощи магии науки. -ent-SyndicateJawsOfLife = челюсти жизни синдиката - .desc = Используется для проникновения на станцию или в её отделы. +ent-SyndicateJawsOfLife = челюсти смерти синдиката + .desc = Используется для проникновения в охраняемые зоны и других противоправных действий. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/funny.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/funny.ftl index 802e6fdf5b..ee13bb2781 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/funny.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/bombs/funny.ftl @@ -10,4 +10,4 @@ ent-TrashBananaPeelExplosiveUnarmed = банан .suffix = Не активирован ent-SnapPopExplosive = { ent-SnapPop } .desc = { ent-SnapPop.desc } - .suffix = explosive + .suffix = Взрывчатка diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/antimateriel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/antimateriel.ftl index 2946b5abc7..47b26c5375 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/antimateriel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/antimateriel.ftl @@ -1,4 +1,4 @@ ent-BaseMagazineBoxAntiMateriel = коробка патронов (.60 крупнокалиберные) .desc = { ent-BaseItem.desc } ent-MagazineBoxAntiMateriel = коробка патронов (.60 крупнокалиберные) - .desc = A cardboard box of .60 anti-materiel rounds. + .desc = Картонная коробка с бронебойными патронами калибра .60. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl index c3c298bc66..77efbd291e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/pistol.ftl @@ -1,10 +1,10 @@ ent-BaseMagazineBoxPistol = коробка патронов (.35 авто) .desc = { ent-BaseItem.desc } ent-MagazineBoxPistol = коробка патронов (.35 авто) - .desc = A cardboard box of .35 auto rounds. Intended to hold general-purpose kinetic ammunition. + .desc = Картонная коробка с патронами 35-го калибра. Предназначена для хранения кинетических боеприпасов общего назначения. ent-MagazineBoxPistolPractice = коробка патронов (.35 авто учебные) - .desc = A cardboard box of .35 auto rounds. Intended to hold harmless practice ammunition. + .desc = Картонная коробка с патронами калибра .35. Предназначена для хранения безопасных учебных боеприпасов. ent-MagazineBoxPistolIncendiary = коробка патронов (.35 авто зажигательные) - .desc = A cardboard box of .35 auto rounds. Intended to hold self-igniting incendiary ammunition. + .desc = Картонная коробка с патронами 35-го калибра. Предназначена для самовоспламеняющихся зажигательных боеприпасов. ent-MagazineBoxPistolUranium = коробка патронов (.35 авто урановые) - .desc = A cardboard box of .35 auto rounds. Intended to hold exotic uranium-core ammunition. + .desc = Картонная коробка с патронами калибра .35. Предназначена для экзотических боеприпасов с урановым сердечником. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl index 54f9b37919..45a929cf9e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/rifle.ftl @@ -4,10 +4,10 @@ ent-MagazineBoxRifleBig = ящик патронов (.20 винтовочные) .desc = { ent-BaseMagazineBoxRifle.desc } .suffix = Большой ent-MagazineBoxRifle = коробка патронов (.20 винтовочные) - .desc = A cardboard box of .20 rifle rounds. Intended to hold general-purpose kinetic ammunition. + .desc = Картонная коробка с патронами калибра .20. Предназначена для хранения кинетических боеприпасов общего назначения. ent-MagazineBoxRiflePractice = коробка патронов (.20 винтовочные учебные) - .desc = A cardboard box of .20 rifle rounds. Intended to hold harmless practice ammunition. + .desc = Картонная коробка с патронами калибра .20. Предназначена для хранения безопасных учебных боеприпасов. ent-MagazineBoxRifleIncendiary = коробка патронов (.20 винтовочные зажигательные) - .desc = A cardboard box of .20 rifle rounds. Intended to hold self-igniting incendiary ammunition. + .desc = Картонная коробка с патронами калибра .20. Предназначена для самовоспламеняющихся зажигательных боеприпасов. ent-MagazineBoxRifleUranium = коробка патронов (.20 винтовочные урановые) - .desc = A cardboard box of .20 rifle rounds. Intended to hold exotic uranium-core ammunition. + .desc = Картонная коробка с патронами калибра .20. Предназначена для экзотических боеприпасов с урановым сердечником. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl index a27ce1c6ee..f7c507cdbe 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/boxes/shotgun.ftl @@ -3,18 +3,18 @@ ent-BaseAmmoProvider = { ent-BaseItem } ent-AmmoProviderShotgunShell = { ent-BaseAmmoProvider } .desc = { ent-BaseAmmoProvider.desc } ent-BoxBeanbag = коробка ружейных патронов (.50 травматические) - .desc = A cardboard box of .50 shotgun shells. Intended to hold less-than-lethal beanbag ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для нелетальных боеприпасов. ent-BoxLethalshot = коробка ружейных патронов (.50 дробь) - .desc = A cardboard box of .50 shotgun shells. Intended to hold general-purpose kinetic ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для хранения кинетических боеприпасов общего назначения. ent-BoxShotgunSlug = коробка ружейных патронов (.50 пуля) - .desc = A cardboard box of .50 shotgun shells. Intended to hold long-ranged slug ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для дальнобойных цельных пуль. ent-BoxShotgunFlare = коробка ружейных патронов (.50 фальшфейеры) - .desc = A cardboard box of .50 shotgun shells. Intended to hold illuminating flare ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для осветительных ракет. ent-BoxShotgunIncendiary = коробка ружейных патронов (.50 зажигательные) - .desc = A cardboard box of .50 shotgun shells. Intended to hold self-igniting incendiary ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для самовоспламеняющихся зажигательных боеприпасов. ent-BoxShotgunUranium = коробка ружейных патронов (.50 урановые) - .desc = A cardboard box of .50 shotgun shells. Intended to hold exotic uranium-core ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для экзотических боеприпасов с урановым сердечником. ent-BoxShotgunPractice = коробка ружейных патронов (.50 учебные) - .desc = A cardboard box of .50 shotgun shells. Intended to hold harmless practice ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для безопасных тренировочных патронов. ent-BoxShellTranquilizer = коробка ружейных патронов (.50 транквилизаторы) - .desc = A cardboard box of .50 shotgun shells. Intended to hold nonlethal tranquilizer ammunition. + .desc = Картонная коробка с патронами для дробовика 50-го калибра. Предназначена для нелетальных транквилизирующих боеприпасов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl index d3410f8f85..bbaa96f270 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/antimateriel.ftl @@ -1,2 +1,2 @@ ent-CartridgeAntiMateriel = патрон (.60 крупнокалиберный) - .desc = A high-power cartridge used by high-precision rifles. + .desc = Мощный патрон для высокоточных винтовок. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl index 95db4918c1..6986a1bc84 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/caseless_rifle.ftl @@ -1,6 +1,6 @@ ent-BaseCartridgeCaselessRifle = патрон (.25 винтовочный) .desc = { ent-BaseCartridge.desc } ent-CartridgeCaselessRifle = патрон (.25 безгильзовый) - .desc = A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Standard kinetic ammunition is common and useful in most situations. + .desc = Патрон малого калибра, в котором используется безгильзовая технология: вместо обычной латунной гильзы используется пропеллент. Стандартные кинетические боеприпасы широко распространены и полезны в большинстве ситуаций. ent-CartridgeCaselessRiflePractice = патрон (.25 безгильзовый учебный) - .desc = A small caliber utilizing caseless technology, omitting conventional brass casing in favor of hardened propellant. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage. + .desc = Патрон малого калибра, в котором используется безгильзовая технология: вместо обычной латунной гильзы используется пропеллент. Учебные боеприпасы стреляют меловыми снарядами, которые слегка жалят, но не наносят серьезных повреждений. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl index 04ae3afa80..446d5ee1a2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/light_rifle.ftl @@ -1,10 +1,10 @@ ent-BaseCartridgeLightRifle = патрон (.30 винтовочный) .desc = { ent-BaseCartridge.desc } ent-CartridgeLightRifle = патрон (.30 винтовочный) - .desc = A classic intermediate cartridge used by many combat rifles and LMGs. Standard kinetic ammunition is common and useful in most situations. + .desc = Классический патрон, используемый во многих боевых винтовках и ручных пулемётах. Стандартные кинетические боеприпасы распространены и эффективны в большинстве ситуаций. ent-CartridgeLightRiflePractice = патрон (.30 винтовочный учебный) - .desc = A classic intermediate cartridge used by many combat rifles and LMGs. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage. + .desc = Классический патрон, используемый во многих боевых винтовках и ручных пулемётах. При стрельбе холостыми патронами используется снаряд с мелом, который слегка жалит, но не причиняет серьёзных повреждений. ent-CartridgeLightRifleIncendiary = патрон (.30 винтовочный зажигательный) - .desc = A classic intermediate cartridge used by many combat rifles and LMGs. Incendiary ammunition contains a self-igniting compound that sets targets ablaze. + .desc = Классический патрон, используемый во многих боевых винтовках и ручных пулеметах. Зажигательные боеприпасы содержат самовоспламеняющееся вещество, которое поджигает цели. ent-CartridgeLightRifleUranium = патрон (.30 винтовочный урановый) - .desc = A classic intermediate cartridge used by many combat rifles and LMGs. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside. + .desc = Классический патрон, используемый во многих боевых винтовках и ручных пулемётах. Урановые боеприпасы заменяют свинцовую сердцевину пули расщепляющимся материалом, который облучает цель изнутри. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl index 8833166d27..d5338243b3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/magnum.ftl @@ -1,12 +1,12 @@ ent-BaseCartridgeMagnum = патрон (.45 магнум) .desc = { ent-BaseCartridge.desc } ent-CartridgeMagnum = патрон (.45 магнум) - .desc = Heavy magnum cartridge mostly used by revolvers. Standard kinetic ammunition is common and useful in most situations. + .desc = Тяжелый патрон «магнум», который в основном используется в револьверах. Стандартные кинетические боеприпасы распространены и эффективны в большинстве ситуаций. ent-CartridgeMagnumPractice = патрон (.45 магнум учебный) - .desc = Heavy magnum cartridge mostly used by revolvers. Practice ammunition fires a chalk projectile that stings a little, but otherwise causes no lasting damage. + .desc = Патрон «магнум» большого калибра, в основном используется в револьверах. Учебные патроны стреляют меловыми снарядами, которые слегка жалят, но не наносят серьезных повреждений. ent-CartridgeMagnumIncendiary = патрон (.45 магнум зажигательный) - .desc = Heavy magnum cartridge mostly used by revolvers. Incendiary ammunition contains a self-igniting compound that sets targets ablaze. + .desc = Тяжелый патрон «магнум», который в основном используется в револьверах. Зажигательные боеприпасы содержат самовоспламеняющийся состав, который поджигает цель. ent-CartridgeMagnumAP = патрон (.45 магнум бронебойный) - .desc = Heavy magnum cartridge mostly used by revolvers. Armor-piercing ammunition is renowned for its ability to cut straight through body armor. + .desc = Патрон «магнум» большого калибра, в основном используемый в револьверах. Бронебойные патроны известны своей способностью пробивать бронежилеты. ent-CartridgeMagnumUranium = патрон (.45 магнум урановый) - .desc = Heavy magnum cartridge mostly used by revolvers. Uranium ammunition replaces the lead core of the bullet with fissile material, irradiating targets from the inside. + .desc = Тяжелый патрон «магнум», который в основном используется в револьверах. Боеприпас заменён на уран, который облучает цель изнутри. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl index c2b52dfb99..bedead05d8 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/shotgun.ftl @@ -1,20 +1,20 @@ ent-BaseShellShotgun = ружейный патрон (.50) .desc = { ent-BaseCartridge.desc } ent-ShellShotgunBeanbag = ружейный патрон (.50 травматический) - .desc = The standard cartridge used by most modern shotguns. Beanbag ammunition contains a single less-than-lethal projectile that can stun targets. + .desc = Стандартный патрон для большинства современных дробовиков. Боеприпас содержит один нелетальный снаряд, который может оглушить цель. ent-ShellShotgunSlug = ружейный патрон (.50 пуля) - .desc = The standard cartridge used by most modern shotguns. Slug ammunition contains a single high-density projectile effective at longer ranges than pellet ammunition. + .desc = Стандартный патрон для большинства современных дробовиков. Содержит дальнобойную цельную пулю, которая эффективнее на больших расстояниях, чем картечь. ent-ShellShotgunFlare = ружейный патрон (.50 фальшфейер) - .desc = The standard cartridge used by most modern shotguns. Flare ammunition contains a single brightly-burning projectile intended for illumination and signalling, rather than combat. + .desc = Стандартный патрон для большинства современных дробовиков. В осветительных боеприпасах содержится один ярко горящий снаряд, предназначенный для освещения и подачи сигналов, а не для ведения боя. ent-ShellShotgun = ружейный патрон (.50 дробь) - .desc = The standard cartridge used by most modern shotguns. Standard kinetic ammunition is common and useful in most situations. + .desc = Стандартный патрон для большинства современных дробовиков. Стандартные кинетические боеприпасы широко распространены и эффективны в большинстве ситуаций. ent-ShellShotgunIncendiary = ружейный патрон (.50 зажигательный) - .desc = The standard cartridge used by most modern shotguns. Incendiary ammunition contains a self-igniting compound that sets targets ablaze. + .desc = Стандартный патрон для большинства современных дробовиков. Зажигательные боеприпасы содержат самовоспламеняющееся вещество, которое поджигает цель. ent-ShellShotgunPractice = ружейный патрон (.50 учебный) - .desc = The standard cartridge used by most modern shotguns. Practice ammunition fires chalk pellets that sting a little, but otherwise cause no lasting damage. + .desc = Стандартный патрон для большинства современных дробовиков. Учебные боеприпасы стреляют меловыми шариками, которые слегка жалят, но не причиняют серьезных повреждений. ent-ShellTranquilizer = ружейный патрон (.50 транквилизатор) - .desc = The standard cartridge used by most modern shotguns. Tranquilizer ammunition contains a single ballistic syringe loaded with a strong sedative that harmlessly puts targets to sleep. + .desc = Стандартный патрон для большинства современных дробовиков. В патроне с транквилизатором находится один баллистический шприц с сильнодействующим снотворным, которое безвредно погружает цель в сон. ent-ShellShotgunImprovised = самодельный ружейный патрон (.50) .desc = Самодельный дробовой патрон, выстреливающий острой стеклянной шрапнелью. Разброс так велик, что и по слону попасть невозможно. ent-ShellShotgunUranium = ружейный патрон (.50 урановый) - .desc = The standard cartridge used by most modern shotguns. Uranium ammunition replaces the lead core of the pellets with fissile material, irradiating targets from the inside. + .desc = Стандартный патрон для большинства современных дробовиков. Свинцовое ядро дроби заменяется радиоактивным материалом, который облучает цель изнутри. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/toy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/toy.ftl index 6f3c3535fa..024df24c7b 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/toy.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/cartridges/toy.ftl @@ -1,4 +1,4 @@ ent-BaseCartridgeCap = патрон (пистон) .desc = { ent-BaseCartridge.desc } ent-CartridgeCap = пистон - .desc = A mock pistol cartridge that makes noise and smoke, but has no actual projectile. + .desc = Фальшивый пистолетный патрон, который стреляет и дымит, но не выпускает пулю. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl index 292eaae587..38a2da4103 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/explosives.ftl @@ -12,7 +12,7 @@ ent-GrenadeFlash = светошумовой снаряд .desc = { ent-BaseGrenade.desc } ent-GrenadeFrag = осколочный снаряд .desc = { ent-BaseGrenade.desc } -ent-GrenadeCleanade = cleanade grenade round +ent-GrenadeCleanade = чистящий снаряд .desc = { ent-BaseGrenade.desc } ent-GrenadeEMP = ЭМИ снаряд .desc = { ent-BaseGrenade.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl index 61cfcd6539..b9054569d7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/caseless_rifle.ftl @@ -1,9 +1,9 @@ ent-BaseMagazinePistolCaselessRifle = пистолетный магазин (.25 безгильзовые) .desc = { ent-BaseItem.desc } ent-MagazinePistolCaselessRifle = пистолетный магазин (.25 безгильзовые) - .desc = 10-round magazine for the Cobra pistol. Intended to hold general-purpose kinetic ammunition. + .desc = Магазин на 10 патронов для пистолета Кобра. Предназначен для кинетических боеприпасов общего назначения. ent-MagazinePistolCaselessRiflePractice = пистолетный магазин (.25 безгильзовые учебные) - .desc = 10-round magazine for the Cobra pistol. Intended to hold harmless practice ammunition. + .desc = Магазин на 10 патронов для пистолета Кобра. Предназначен для безопасных учебных боеприпасов. ent-BaseMagazineCaselessRifle = магазин (.25 безгильзовые) .desc = { ent-BaseItem.desc } ent-MagazineCaselessRifle = магазин (.25 безгильзовые) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl index c7fbc6fcba..b20eead5c4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/light_rifle.ftl @@ -1,15 +1,15 @@ ent-BaseMagazineLightRifle = магазин (.30 винтовочные) .desc = { ent-BaseItem.desc } ent-MagazineLightRifleBox = короб патронов L6 SAW (.30 винтовочные) - .desc = Box containing a 100-round belt of linked .30 rifle rounds, used by light machine guns such as the L6. Intended to hold general-purpose kinetic ammunition. + .desc = Короб с лентой на 100 патронов калибра .30, используемая в ручных пулеметах, таких как L6. Предназначены для хранения кинетических боеприпасов общего назначения. ent-MagazineLightRifle = магазин (.30 винтовочные) - .desc = Curved 30-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. + .desc = Изогнутый двухрядный магазин на 30 патронов для боевых винтовок. Предназначен для хранения кинетических боеприпасов общего назначения. ent-MagazineLightRifleEmpty = магазин (.30 винтовочные любые) - .desc = Curved 30-round double stack magazine for combat rifles. + .desc = Изогнутый двухрядный магазин на 30 патронов для боевых винтовок. .suffix = Пустой ent-MagazineLightRiflePractice = магазин (.30 винтовочные учебные) - .desc = Curved 30-round double stack magazine for combat rifles. Intended to hold harmless practice ammunition. + .desc = Изогнутый двухрядный магазин на 30 патронов для боевых винтовок. Предназначен для хранения безопасных учебных боеприпасов. ent-MagazineLightRifleUranium = магазин (.30 винтовочные урановые) - .desc = Curved 30-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition. + .desc = Изогнутый двухрядный магазин на 30 патронов для боевых винтовок. Предназначен для хранения боеприпасов с экзотическим урановым сердечником. ent-MagazineLightRifleIncendiary = магазин (.30 винтовочные зажигательные) - .desc = Curved 30-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition. + .desc = Изогнутый двухрядный магазин на 30 патронов для боевых винтовок. Предназначен для хранения самовоспламеняющихся зажигательных боеприпасов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl index 11c7632bcf..37a04047b2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/magnum.ftl @@ -1,13 +1,13 @@ ent-BaseMagazineMagnum = пистолетный магазин (.45 магнум) .desc = { ent-BaseMagazinePistol.desc } ent-MagazineMagnumEmpty = пистолетный магазин (.45 магнум любые) - .desc = 7-round single stack magazine for large-caliber pistols. + .desc = Магазин на 7 патронов для крупнокалиберных пистолетов. .suffix = Пустой ent-MagazineMagnum = пистолетный магазин (.45 магнум) - .desc = 7-round single stack magazine for large-caliber pistols. Intended to hold general-purpose kinetic ammunition. + .desc = Магазин на 7 патронов для крупнокалиберных пистолетов. Предназначен для хранения кинетических боеприпасов общего назначения. ent-MagazineMagnumPractice = пистолетный магазин (.45 магнум учебные) - .desc = 7-round single stack magazine for large-caliber pistols. Intended to hold harmless practice ammunition. + .desc = Магазин на 7 патронов для крупнокалиберных пистолетов. Предназначен для хранения безопасных учебных боеприпасов. ent-MagazineMagnumUranium = пистолетный магазин (.45 магнум урановые) - .desc = 7-round single stack magazine for large-caliber pistols. Intended to hold exotic uranium-core ammunition. + .desc = Магазин на 7 патронов для крупнокалиберных пистолетов. Предназначен для хранения боеприпасов с экзотическим урановым сердечником. ent-MagazineMagnumAP = пистолетный магазин (.45 магнум бронебойные) - .desc = 7-round single stack magazine for large-caliber pistols. Intended to hold specialized armor-piercing ammunition. + .desc = Магазин на 7 патронов для крупнокалиберных пистолетов. Предназначен для хранения специальных бронебойных боеприпасов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl index 31506e0995..55c66db6bb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/pistol.ftl @@ -5,36 +5,36 @@ ent-BaseMagazinePistolHighCapacity = автопистолетный магази ent-BaseMagazinePistolSubMachineGun = магазин ПП (.35 авто) .desc = { ent-BaseItem.desc } ent-MagazinePistolSubMachineGunTopMounted = магазин WT550 (.35 авто, надствольный) - .desc = Unconventional 30-round top feeding magazine for the WT550 SMG. Intended to hold general-purpose kinetic ammunition. + .desc = Необычный 30-зарядный магазин с верхней подачей для пистолета-пулемёта WT550. Предназначен для кинетических боеприпасов общего назначения. ent-MagazinePistolSubMachineGunTopMountedEmpty = магазин WT550 (.35 авто, любые, надствольный) - .desc = Unconventional 30-round top feeding magazine for the WT550 SMG. - .suffix = empty + .desc = Необычный 30-зарядный магазин с верхней подачей для пистолета-пулемёта WT550. + .suffix = пустой ent-MagazinePistol = пистолетный магазин (.35 авто) - .desc = 10-round single-stack magazine for pistols. Intended to hold general-purpose kinetic ammunition. + .desc = 10-зарядный однорядный магазин для пистолетов. Предназначен для кинетических боеприпасов общего назначения. ent-MagazinePistolEmpty = пистолетный магазин (.35 авто любые) - .desc = 10-round single-stack magazine for pistols. + .desc = 10-зарядный однорядный магазин для пистолетов. .suffix = Пустой ent-MagazinePistolIncendiary = пистолетный магазин (.35 авто зажигательные) - .desc = 10-round single-stack magazine for pistols. Intended to hold self-igniting incendiary ammunition. + .desc = 10-зарядный однорядный магазин для пистолетов. Предназначены для самовоспламеняющихся зажигательных боеприпасов. ent-MagazinePistolPractice = пистолетный магазин (.35 авто учебные) - .desc = 10-round single-stack magazine for pistols. Intended to hold harmless practice ammunition. + .desc = 10-зарядный однорядный магазин для пистолетов. Предназначены для безопасных учебных боеприпасов. ent-MagazinePistolUranium = пистолетный магазин (.35 авто урановые) - .desc = 10-round single-stack magazine for pistols. Intended to hold exotic uranium-core ammunition. + .desc = 10-зарядный однорядный магазин для пистолетов. Предназначены для боеприпасов с экзотическим урановым сердечником. ent-MagazinePistolSubMachineGun = магазин ПП (.35 авто) - .desc = 30-round double-stack magazine for submachine guns. Intended to hold general-purpose kinetic ammunition. + .desc = Двухрядный магазин на 30 патронов для пистолетов-пулемётов. Предназначен для кинетических боеприпасов общего назначения. ent-MagazinePistolSubMachineGunEmpty = магазин ПП (.35 авто любые) - .desc = 30-round double-stack magazine for submachine guns. + .desc = Двухрядный магазин на 30 патронов для пистолетов-пулемётов. .suffix = Пустой ent-MagazinePistolSubMachineGunPractice = магазин ПП (.35 авто учебные) - .desc = 30-round double-stack magazine for submachine guns. Intended to hold harmless practice ammunition. + .desc = Двухрядный магазин на 30 патронов для пистолетов-пулемётов. Предназначен для безопасных учебных боеприпасов. ent-MagazinePistolSubMachineGunUranium = магазин ПП (.35 авто урановые) - .desc = 30-round double-stack magazine for submachine guns. Intended to hold exotic uranium-core ammunition. + .desc = Двухрядный магазин на 30 патронов для пистолетов-пулемётов. Предназначен для экзотических боеприпасов с урановым сердечником. ent-MagazinePistolSubMachineGunIncendiary = магазин ПП (.35 авто зажигательные) - .desc = 30-round double-stack magazine for submachine guns. Intended to hold self-igniting incendiary ammunition. + .desc = Двухрядный магазин на 30 патронов для пистолетов-пулемётов. Предназначен для самовоспламеняющихся зажигательных боеприпасов. ent-MagazinePistolHighCapacityEmpty = автопистолетный магазин (.35 авто любые) - .desc = Custom 15-round double-stack magazine for the Viper pistol. + .desc = Специальный двухрядный магазин на 15 патронов для пистолета Гадюка. .suffix = Пустой ent-MagazinePistolHighCapacity = автопистолетный магазин (.35 авто) - .desc = Custom 15-round double-stack magazine for the Viper pistol. Intended to hold general-purpose kinetic ammunition. + .desc = Специальный двухрядный магазин на 15 патронов для пистолета Гадюка. Предназначен для кинетических боеприпасов общего назначения. ent-MagazinePistolHighCapacityPractice = автопистолетный магазин (.35 авто учебные) - .desc = Custom 15-round double-stack magazine for the Viper pistol. Intended to hold harmless practice ammunition. + .desc = Специальный двухрядный магазин на 15 патронов для пистолета Гадюка. Предназначен для безопасных учебных боеприпасов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl index e182f8de87..698380e180 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/rifle.ftl @@ -1,13 +1,13 @@ ent-BaseMagazineRifle = магазин (.20 винтовочные) .desc = { ent-BaseItem.desc } ent-MagazineRifle = магазин (.20 винтовочные) - .desc = 25-round double stack magazine for combat rifles. Intended to hold general-purpose kinetic ammunition. + .desc = 25-зарядный двухрядный магазин для боевых винтовок. Предназначен для хранения кинетических боеприпасов общего назначения. ent-MagazineRifleEmpty = магазин (.20 винтовочные любые) - .desc = 25-round double stack magazine for combat rifles. + .desc = 25-зарядный двухрядный магазин для боевых винтовок. .suffix = Пустой ent-MagazineRifleIncendiary = магазин (.20 винтовочные зажигательные) - .desc = 25-round double stack magazine for combat rifles. Intended to hold self-igniting incendiary ammunition. + .desc = 25-зарядный двухрядный магазин для боевых винтовок. Предназначен для хранения самовоспламеняющихся зажигательных боеприпасов. ent-MagazineRiflePractice = магазин (.20 винтовочные учебные) - .desc = 25-round double stack magazine for combat rifles. Intended to hold harmless practice ammunition. + .desc = 25-зарядный двухрядный магазин для боевых винтовок. Предназначен для хранения безопасных учебных боеприпасов. ent-MagazineRifleUranium = магазин (.20 винтовочные урановые) - .desc = 25-round double stack magazine for combat rifles. Intended to hold exotic uranium-core ammunition. + .desc = 25-зарядный двухрядный магазин для боевых винтовок. Предназначен для хранения боеприпасов с экзотическим урановым сердечником. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl index bb47e0bb4a..164d29897d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/shotgun.ftl @@ -1,13 +1,13 @@ ent-BaseMagazineShotgun = барабан (.50 дробь) .desc = { ent-BaseItem.desc } ent-MagazineShotgunEmpty = барабан (.50 любые) - .desc = A large drum magazine used by some military-grade automatic shotguns. + .desc = Большой барабанный магазин, используемый в некоторых автоматических дробовиках военного назначения. .suffix = Пустой ent-MagazineShotgun = барабан (.50 дробь) - .desc = A large drum magazine used by some military-grade automatic shotguns. Intended to hold general-purpose kinetic ammunition. + .desc = Большой барабанный магазин, используемый в некоторых автоматических дробовиках военного назначения. Предназначен для кинетических боеприпасов общего назначения. ent-MagazineShotgunBeanbag = барабан (.50 травматические) - .desc = A large drum magazine used by some military-grade automatic shotguns. Intended to hold less-than-lethal beanbag ammunition. + .desc = Большой барабанный магазин, используемый в некоторых автоматических дробовиках военного назначения. Предназначен для нелетальных боеприпасов. ent-MagazineShotgunSlug = барабан (.50 пуля) - .desc = A large drum magazine used by some military-grade automatic shotguns. Intended to hold long-ranged slug ammunition. + .desc = Большой барабанный магазин, используемый в некоторых автоматических дробовиках военного назначения. Предназначен для дальнобойных цельных пуль. ent-MagazineShotgunIncendiary = барабан (.50 зажигательные) - .desc = A large drum magazine used by some military-grade automatic shotguns. Intended to hold self-igniting incendiary ammunition. + .desc = Большой барабанный магазин, используемый в некоторых автоматических дробовиках военного назначения. Предназначен для самовоспламеняющихся зажигательных боеприпасов. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl index fb2fd97131..ea114428bf 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/magazines/toy.ftl @@ -1,2 +1,2 @@ ent-MagazineFoamBox = коробка боеприпасов (пенопласт) - .desc = Box containing a 100-round belt of linked... foam darts? + .desc = Коробка с 100-зарядным ремнем, на котором закреплены... пенопластовые дротики? diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl index cf0748b3b9..437a3e2e0e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/magnum.ftl @@ -1,15 +1,15 @@ ent-BaseSpeedLoaderMagnum = спидлоадер (.45 магнум) .desc = { ent-BaseItem.desc } ent-SpeedLoaderMagnum = спидлоадер (.45 магнум) - .desc = Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold general-purpose kinetic ammunition. + .desc = Предназначен для быстрой зарядки шести патронов .45 Magnum в пустой револьвер, хранения кинетических боеприпасов общего назначения. ent-SpeedLoaderMagnumEmpty = спидлоадер (.45 магнум любые) - .desc = Designed to quickly load up to six rounds of .45 magnum into an empty revolver. - .suffix = empty + .desc = Предназначен для быстрой зарядки шести патронов .45 Magnum в пустой револьвер. + .suffix = пустой ent-SpeedLoaderMagnumIncendiary = спидлоадер (.45 магнум зажигательные) - .desc = Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold self-igniting incendiary ammunition. + .desc = Предназначен для быстрой зарядки шести патронов .45 Magnum в пустой револьвер, хранения самовоспламеняющихся зажигательных боеприпасов. ent-SpeedLoaderMagnumPractice = спидлоадер (.45 магнум учебные) - .desc = Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold harmless practice ammunition. + .desc = Предназначен для быстрой зарядки шести патронов .45 Magnum в пустой револьвер, хранения безопасных учебных боеприпасов. ent-SpeedLoaderMagnumAP = спидлоадер (.45 магнум бронебойные) - .desc = Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold specialized armor-piercing ammunition. + .desc = Предназначен для быстрой зарядки шести патронов .45 Magnum в пустой револьвер, хранения специальных бронебойных боеприпасов. ent-SpeedLoaderMagnumUranium = спидлоадер (.45 магнум урановые) - .desc = Designed to quickly load up to six rounds of .45 magnum into an empty revolver. Intended to hold exotic uranium-core ammunition. + .desc = Предназначен для быстрой зарядки шести патронов .45 Magnum в пустой револьвер, хранения боеприпасов с экзотическим урановым сердечником. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl index fd8e2c7c08..49caef4d3d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/rifle_light.ftl @@ -1,2 +1,2 @@ ent-SpeedLoaderLightRifle = спидлоадер (.30 винтовочные) - .desc = 5-round 'stripper clip' for quickly reloading the Kardashev-Mosin. Intended to hold general-purpose kinetic ammunition. + .desc = 5-зарядная обойма для перезарядки винтовки Кардашева-Мосина. Предназначена для хранения кинетических боеприпасов общего назначения. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/toy.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/toy.ftl index 9d69365f7a..1fcc74df09 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/toy.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/ammunition/speedloaders/toy.ftl @@ -1,4 +1,4 @@ ent-BaseSpeedLoaderCap = зарядник пистонов .desc = { ent-BaseItem.desc } ent-SpeedLoaderCap = зарядник пистонов - .desc = Designed to quickly load up to six cartridges into an empty cap gun. + .desc = Предназначен для быстрой загрузки до шести картриджей в пустую обойму. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl index e700a3472e..4ddf0e9985 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/battery/battery_guns.ftl @@ -52,7 +52,7 @@ ent-WeaponPistolCHIMP = излучатель М.А.Р.Т.Ы.Х. .desc = То, что это маленький М.А.Р.Т.Ы.Х., не означает, что он не может бить как М.А.К.А.К. ent-WeaponPistolCHIMPUpgraded = { ent-WeaponPistolCHIMP } .desc = { ent-WeaponPistolCHIMP.desc } - .suffix = Syndicate + .suffix = Синдикат ent-WeaponBehonkerLaser = око бехонкера .desc = Глаз бехонкера, при сжатии выстреливает лазером. ent-WeaponEnergyShotgun = энергетический дробовик diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl index cbf3980269..69b5f8185d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/pistols/pistols.ftl @@ -6,7 +6,7 @@ ent-WeaponPistolEchis = Эфа .desc = Гадюка для киборгов. На ходу создаёт патроны калибра .35 из встроенного самозарядного фабрикатора боеприпасов. .suffix = Пистолет ent-WeaponPistolCobra = Кобра - .desc = Пистолет суровых робастных агентов, с интегрированным глушителем. Использует патроны калибра .25 безгильзовый. + .desc = Пистолет суровых робастных агентов, с интегрированным глушителем. Использует патроны калибра .25 безгильзовые. ent-WeaponPistolMk58 = МК 58 .desc = Дешёвый и распространённый пистолет, производимый дочерней компанией Nanotrasen. Использует патроны калибра .35 авто. ent-WeaponPistolN1984 = N1984 diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl index 5c47982bbc..dea50436e0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/projectiles/projectiles.ftl @@ -104,6 +104,8 @@ ent-TeslaGunBullet = молния Тесла-пушки .desc = { ent-BaseBullet.desc } ent-BulletLaser = лазерный заряд .desc = { ent-BaseBullet.desc } +ent-PulsarProjectile = заряд пульсара + .desc = { ent-BaseBullet.desc } ent-BulletLaserSpread = широкий лазерный залп .desc = { ent-BulletLaser.desc } ent-BulletLaserSpreadNarrow = летальный лазерный залп diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl index 50a772aecb..32f3a77406 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/weapons/guns/shotguns/shotguns.ftl @@ -30,5 +30,4 @@ ent-WeaponShotgunImprovisedLoaded = самодельный дробовик .desc = { ent-WeaponShotgunImprovised.desc } .suffix = Дробовик, Заряжен ent-WeaponShotgunHushpup = глухарь - .suffix = Дробовик .desc = Малоизвестная модификация Силовика, оснащенная экспериментальным глушителем. Отлично подойдет тем, кто придерживается строгих моральных принципов. Использует ружейные патроны. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/statues.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/statues.ftl index 19c7cee4f9..3ea6e061c2 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/statues.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/decoration/statues.ftl @@ -7,12 +7,12 @@ ent-StatueVenusBlue = статуя непорочной девы ent-StatueBananiumClown = бананиумовая статуя спасителя .desc = Бананиумовая статуя. Она символизирует пришествие спасителя, который восстанет и поведёт клоунов к великому хонку. ent-BaseIronsandStatue = { ent-BaseStructure } - .desc = A mysterious statue found in a desert of iron sand. -ent-StatueIronsandSmall = ironsand small statue + .desc = Загадочная статуя, найденная в пустыне из железного песка. +ent-StatueIronsandSmall = статуя из железного песка .desc = { ent-BaseIronsandStatue.desc } -ent-StatueIronsandSmall2 = ironsand small statue +ent-StatueIronsandSmall2 = статуя из железного песка .desc = { ent-BaseIronsandStatue.desc } -ent-StatueIronsandTall = ironsand tall statue +ent-StatueIronsandTall = высокая статуя из железного песка .desc = { ent-BaseIronsandStatue.desc } -ent-StatueIronsandTall2 = ironsand tall statue +ent-StatueIronsandTall2 = высокая статуя из железного песка .desc = { ent-BaseIronsandStatue.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/materialdoors/material_doors.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/materialdoors/material_doors.ftl index f938acca9d..f0dc824b53 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/materialdoors/material_doors.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/doors/materialdoors/material_doors.ftl @@ -20,7 +20,7 @@ ent-WebDoor = паутинная дверь .desc = Дверь, ведущая в земли пауков... или просторную комнату. ent-CardDoor = картонная дверь .desc = { ent-BaseMaterialDoorNavMap.desc } -ent-IronstoneDoor = ironstone door - .desc = A mysterious door made of rune-etched stone. -ent-EncrustedIronstoneDoor = encrusted ironstone door - .desc = A stone door covered in nacreous blobs of an unknown substance. +ent-IronstoneDoor = дверь из железного камня + .desc = Таинственная дверь, высеченная из камня с рунами. +ent-EncrustedIronstoneDoor = заржавевшая дверь из железного камня + .desc = Каменная дверь, покрытая перламутровыми сгустками неизвестного вещества. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl index d9f1267d9a..dc880142f4 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/gates.ftl @@ -27,5 +27,4 @@ ent-PowerSensor = датчик питания ent-MemoryCell = ячейка памяти .desc = Схема D-триггер защёлки, хранящая сигнал, который может быть изменён в зависимости от входного и разрешающего портов. ent-RandomGate = случайный логический вентиль - .suffix = Random, Случайный .desc = Логический вентиль, который выводит случайный сигнал при изменении ввода. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/ironsand_steps.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/ironsand_steps.ftl index 406331dd2d..34066f3200 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/ironsand_steps.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/ironsand_steps.ftl @@ -1,6 +1,6 @@ -ent-IronsandStep = ironsand step - .desc = Takes your ironsand up a level. -ent-IronsandStepConvexCorner = ironsand step convex corner +ent-IronsandStep = ступень из железного песка + .desc = Выводит качество вашего железного песка на новый уровень. +ent-IronsandStepConvexCorner = ступенька из железного песка выпуклый угол .desc = { ent-IronsandStep.desc } -ent-IronsandStepConcaveCorner = ironsand step concave corner +ent-IronsandStepConcaveCorner = ступень из железного песка вогнутый угол .desc = { ent-IronsandStep.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl index 5fbe588c4e..dece67be82 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/computers/computers.ftl @@ -90,6 +90,6 @@ ent-StationAiUploadComputer = консоль загрузки ИИ .desc = Используется для обновления законов станционного ИИ. ent-StationAiFixerComputer = консоль восстановления ИИ .desc = Используется для ремонта повреждённых искусственных интеллектов. -ent-ComputerNukieDelivery = syndicate delivery computer - .desc = A computer that can bluespace in certain equipment for Nuclear Operations. - The circuitboard is integrated into the frame and can't be recovered if deconstructed. +ent-ComputerNukieDelivery = консоль снабжения Оперативников Синдиката + .desc = Компьютер, оснащенный блюспейс оборудованием для снабжения Ядерных Оперативников. + Печатная плата встроена в корпус и не подлежит восстановлению в случае демонтажа. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl index 709d951e55..e920a04bf9 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/surveillance_camera_routers.ftl @@ -32,7 +32,7 @@ ent-SurveillanceCameraWirelessRouterBase = маршрутизатор беспр ent-SurveillanceCameraWirelessRouterConstructed = { ent-SurveillanceCameraWirelessRouterBase } .desc = { ent-SurveillanceCameraWirelessRouterBase.desc } .suffix = Построенный -ent-SurveillanceCameraWirelessRouterEntertainment = entertainment camera router +ent-SurveillanceCameraWirelessRouterEntertainment = маршрутизатор журналистских камер .desc = { ent-SurveillanceCameraWirelessRouterBase.desc } .suffix = Развлекательный ent-SurveillanceCameraWirelessRouterXenoborg = маршрутизатор беспроводных камер ксеноборгов diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/wireless_surveillance_camera.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/wireless_surveillance_camera.ftl index d68214454f..df87cd86d7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/wireless_surveillance_camera.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/machines/wireless_surveillance_camera.ftl @@ -14,7 +14,7 @@ ent-SurveillanceWirelessCameraMovableConstructed = { ent-SurveillanceWirelessCam .suffix = Constructed, Movable ent-SurveillanceWirelessCameraAnchoredEntertainment = { ent-SurveillanceWirelessCameraAnchoredBase } .desc = { ent-SurveillanceWirelessCameraAnchoredBase.desc } - .suffix = Entertainment, Anchored + .suffix = Развлекательный, Закреплённый ent-SurveillanceWirelessCameraMovableEntertainment = { ent-SurveillanceWirelessCameraMovableBase } .desc = { ent-SurveillanceWirelessCameraMovableBase.desc } - .suffix = Entertainment, Movable + .suffix = Развлекательный, Незакреплённый diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl index 78cd069f63..15c2d4c594 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/atmospherics/unary.ftl @@ -16,7 +16,7 @@ ent-GasThermoMachineFreezerEnabled = { ent-GasThermoMachineFreezer } .desc = { ent-GasThermoMachineFreezer.desc } .suffix = Включено ent-GasThermoMachineHeater = нагреватель - .desc = Heats gas in connected pipes. + .desc = Нагревает газ в присоединённых трубах. ent-GasThermoMachineHeaterEnabled = { ent-GasThermoMachineHeater } .desc = { ent-GasThermoMachineHeater.desc } .suffix = Включено diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/disposal/pipes.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/disposal/pipes.ftl index 78e250a0b7..5b775aa874 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/disposal/pipes.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/piping/disposal/pipes.ftl @@ -15,12 +15,12 @@ ent-DisposalTrunk = ствол утилизационной трубы ent-DisposalRouter = маршрутизатор утилизационной трубы .desc = Трёхсторонний маршрутизатор. Объекты с совпадающими маркерами уходят в сторону с помощью настраиваемых фильтров. ent-DisposalRouterFlipped = { ent-DisposalRouter } - .desc = A three-way router. Entities with matching tags get routed to the side. + .desc = Трехсторонний маршрутизатор. Объекты с совпадающими маркерами уходят в сторону с помощью настраиваемых фильтров. .suffix = Перевёрнутый ent-DisposalJunction = развязка утилизационной трубы .desc = Трёхсторонняя развязка. Стрелка указывает на место выхода объектов. ent-DisposalJunctionFlipped = { ent-DisposalJunction } - .desc = A three-way junction. The arrow indicates where items exit. + .desc = Трехсторонний перекресток. Стрелка указывает на место выхода объектов. .suffix = Перевёрнутый ent-DisposalYJunction = Y-развязка утилизационной трубы .desc = Трёхсторонняя развязка с альтернативным местом выхода. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl index 908bf0f09c..1e26bfef04 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/power/generation/generators.ftl @@ -16,8 +16,8 @@ ent-GeneratorWallmountBasic = { ent-BaseGeneratorWallmount } ent-GeneratorWallmountAPU = ВСУ шаттла .desc = Вспомогательная силовая установка для шаттла — 6кВт. .suffix = ВСУ, 6кВт -ent-GeneratorWallmountAPULV = shuttle LV APU - .desc = An advanced auxiliary power unit for a shuttle. +ent-GeneratorWallmountAPULV = высоковольтная ВСУ шаттла + .desc = Усовершенствованная вспомогательная силовая установка для шаттла — 20 кВт. ent-GeneratorRTG = РИТЭГ .desc = Радиоизотопный термоэлектрический генератор для долговременного питания. .suffix = 10кВт diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl index a949d5d1da..9a98d7a8b6 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/canisters/gas_canisters.ftl @@ -44,7 +44,7 @@ ent-PlasmaCanisterBroken = { ent-GasCanisterBrokenBase } .desc = { ent-GasCanisterBrokenBase.desc } ent-TritiumCanisterBroken = { ent-GasCanisterBrokenBase } .desc = { ent-GasCanisterBrokenBase.desc } -ent-WaterVaporCanisterBroken = broken water vapor canister +ent-WaterVaporCanisterBroken = разбитая канистра водяного пара .desc = { ent-GasCanisterBrokenBase.desc } ent-AmmoniaCanisterBroken = { ent-GasCanisterBrokenBase } .desc = { ent-GasCanisterBrokenBase.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wall_lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wall_lockers.ftl index 79ca9a9b0c..53827f2fa1 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wall_lockers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wall_lockers.ftl @@ -29,7 +29,7 @@ ent-ClosetWallAtmospherics = атмосферный настенный шкаф ent-LockerWallMedical = врачебный настенный шкаф .desc = { ent-BaseWallLocker.desc } ent-LockerWallEvacRepair = настенный шкаф эвак-ремонта - .desc = It's emergencies all the way down. + .desc = Аварийный набор для аварийной эвакуации. ent-LockerWallBasePrisoner = настенный шкаф заключённого .desc = Это защищённый шкафчик для персональных вещей заключённого во время его пребывания в тюрьме. .suffix = 1 @@ -54,6 +54,6 @@ ent-LockerWallPrisoner7 = { ent-LockerWallBasePrisoner } ent-LockerWallPrisoner8 = { ent-LockerWallBasePrisoner } .desc = { ent-LockerWallBasePrisoner.desc } .suffix = 8 -ent-LockerWallSyndicate = blood-red wall locker - .desc = It's a wall storage unit with a blood-red design. - .suffix = Locked +ent-LockerWallSyndicate = кроваво-красный настенный шкаф + .desc = Это настенный шкаф для хранения вещей кроваво-красного цвета. + .suffix = Закрыт diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/bar_sign.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/bar_sign.ftl index d2249e326e..670981ee8e 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/bar_sign.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/wallmounts/signs/bar_sign.ftl @@ -53,5 +53,5 @@ ent-BarSignMaltroach = Пивная Моль .desc = Сквик! ent-BarSignWhiskeyEchoes = Виски Эхо .desc = Элитный бар для элитных опер... Подождите, это же станция Nanotrasen. Почему эта вывеска в базе данных? -ent-BarSignEmped = glitchy bar sign - .desc = You imagine a good smack might fix it. +ent-BarSignEmped = глючащая вывеска бара + .desc = Кажется хороший удар все исправит. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl index 818a94f6fb..d176e805ef 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/asteroid.ftl @@ -69,12 +69,12 @@ ent-IronRock = железный камень ent-IronRockMining = железный камень .desc = Астероид. .suffix = Высокое содержание руды -ent-IronSandstone = ironsandstone +ent-IronSandstone = железный песчаный камень .desc = { ent-AsteroidRock.desc } - .suffix = no ore yield -ent-IronSandstoneMining = ironsandstone + .suffix = нет руды +ent-IronSandstoneMining = железный песчаный камень .desc = { ent-IronSandstone.desc } - .suffix = higher ore yield + .suffix = высокое содержание руды ent-IronRockCoal = { ent-IronRock } .desc = Рудная жила, богатая углём. .suffix = Уголь diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl index 74a18f36bd..1ef135aa07 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/walls/walls.ftl @@ -113,7 +113,7 @@ ent-WallChromiteCobblebrick = хромитовая булыжниковая ст .desc = { ent-WallCobblebrick.desc } ent-WallAndesiteCobblebrick = андезитовая булыжниковая стена .desc = { ent-WallCobblebrick.desc } -ent-WallIronsandCobblebrick = ironsand brick wall - .desc = The pale, rounded shapes that make up this wall look strikingly different from the iron sands they were allegedly made from. +ent-WallIronsandCobblebrick = стена из железопесчаных кирпичей + .desc = Светлые, округлые формы, из которых состоит эта стена, разительно отличаются от железистого песка, из которого, как утверждается, она была сделана. ent-Cardwall = картонная стена .desc = Сокращение бюджета наносит сильный удар. diff --git a/Resources/Locale/ru-RU/stack/stacks.ftl b/Resources/Locale/ru-RU/stack/stacks.ftl index 46dca22874..03431138bf 100644 --- a/Resources/Locale/ru-RU/stack/stacks.ftl +++ b/Resources/Locale/ru-RU/stack/stacks.ftl @@ -251,37 +251,37 @@ stack-dark-tile = тёмная плитка stack-dark-steel-diagonal-mini-tile = тёмная стальная диагональная мини плитка stack-dark-steel-diagonal-tile = тёмная стальная диагональная плитка stack-dark-steel-herringbone = тёмная стальная плитка ёлочкой -stack-dark-steel-horizontal-slats-tile-bordered = dark steel bordered horizontal slat tile +stack-dark-steel-horizontal-slats-tile-bordered = тёмная горизонтальная реечная плитка с бордюром stack-dark-steel-mini-tile = тёмная стальная мини плитка stack-dark-steel-mono-tile = тёмная стальная моно плита stack-dark-steel-pavement = тёмная стальная тротуарная плитка stack-dark-steel-vertical-pavement = тёмная стальная вертикальная тротуарная плитка -stack-dark-steel-vertical-slats-tile-bordered = dark steel bordered vertical slat tile -stack-dark-steel-slats-tile-continuous = dark steel continuous slat tile +stack-dark-steel-vertical-slats-tile-bordered = тёмная вертикальная реечная плитка с бордюром +stack-dark-steel-slats-tile-continuous = тёмная сплошная реечная плитка stack-offset-dark-steel-tile = тёмная смещённая стальная плитка stack-offset-steel-tile = смещённая стальная плитка stack-steel-diagonal-mini-tile = стальная диагональная мини плитка stack-steel-diagonal-tile = стальная диагональная плитка stack-steel-herringbone = стальная плитка ёлочкой -stack-steel-horizontal-slats-tile-bordered = steel bordered horizontal slat tile +stack-steel-horizontal-slats-tile-bordered = стальная горизонтальная реечная плитка с бордюром stack-steel-mini-tile = стальная мини плитка stack-steel-mono-tile = стальная моно плита stack-steel-pavement = стальная тротуарная плитка stack-steel-vertical-pavement = стальная вертикальная тротуарная плитка -stack-steel-vertical-slats-tile-bordered = steel bordered vertical slat tile -stack-steel-slats-tile-continuous = steel continuous slat tile +stack-steel-vertical-slats-tile-bordered = стальная вертикальная реечная плитка с бордюром +stack-steel-slats-tile-continuous = стальная сплошная реечная плитка stack-white-tile = белая плитка stack-offset-white-steel-tile = смещённая белая стальная плитка stack-white-steel-diagonal-mini-tile = белая стальная диагональная мини плитка stack-white-steel-diagonal-tile = белая стальная диагональная плитка stack-white-steel-herringbone = белая стальная плитка ёлочкой -stack-white-steel-horizontal-slats-tile-bordered = white steel bordered horizontal slat tile +stack-white-steel-horizontal-slats-tile-bordered = белая горизонтальная реечная плитка с бордюром stack-white-steel-mini-tile = белая стальная мини плитка stack-white-steel-mono-tile = белая стальная моно плита stack-white-steel-pavement = белая стальная тротуарная плитка stack-white-steel-vertical-pavement = белая стальная вертикальная тротуарная плитка -stack-white-steel-vertical-slats-tile-bordered = white steel bordered vertical slat tile -stack-white-steel-slats-tile-continuous = white steel continuous slat tile +stack-white-steel-vertical-slats-tile-bordered = белая вертикальная реечная плитка с бордюром +stack-white-steel-slats-tile-continuous = белая сплошная реечная плитка stack-steel-dark-checker-tile = тёмная стальная плитка шашечками stack-steel-light-checker-tile = светлая стальная плитка шашечками stack-steel-tile = стальная плитка @@ -343,9 +343,9 @@ stack-gray-concrete-smooth = серый бетонный пол stack-old-concrete-tile = старая бетонная плитка stack-old-concrete-mono-tile = старая бетонная плита stack-old-concrete-smooth = старый бетонный пол -stack-ironsand-concrete-tile = ironsand concrete tile -stack-ironsand-concrete-mono-tile = ironsand concrete mono tile -stack-ironsand-concrete-smooth = ironsand concrete smooth +stack-ironsand-concrete-tile = железопесчаная бетонная плитка +stack-ironsand-concrete-mono-tile = монолитная бетонная плитка из железного песка +stack-ironsand-concrete-smooth = гладкий бетонный пол из железного песка stack-silver-floor-tile = серебряная плитка stack-bcircuit-floor-tile = плитка голубых микросхем stack-grass-floor-tile = плитка травы @@ -377,5 +377,5 @@ stack-white-marble-floor = белый мраморный пол stack-dark-marble-floor = чёрный мраморный пол stack-plasma-marble-floor = плазменный мраморный пол stack-uranium-marble-floor = урановый мраморный пол -stack-astro-ironsand-floor = astro-ironsand floor -stack-astro-ironsand-floor-borderless = borderless astro-ironsand floor +stack-astro-ironsand-floor = астро-железный песок +stack-astro-ironsand-floor-borderless = безграничный астро-железный песок diff --git a/Resources/Locale/ru-RU/station-events/events/vent-critters.ftl b/Resources/Locale/ru-RU/station-events/events/vent-critters.ftl index 8d91c78222..a0cc0ac1ad 100644 --- a/Resources/Locale/ru-RU/station-events/events/vent-critters.ftl +++ b/Resources/Locale/ru-RU/station-events/events/vent-critters.ftl @@ -1 +1 @@ -station-event-vent-creatures-start-horde-announcement = Attention. A large influx of unknown life forms have been detected moving through the station's ventilation systems. They are expected to emerge near { $location }. Please evacuate the area to avoid loss of personnel. +station-event-vent-creatures-start-horde-announcement = Внимание! Обнаружено большое количество неизвестных форм жизни, перемещающихся по вентиляционным системам станции. Ожидается, что они появятся вблизи { $location }. Просим эвакуироваться из зоны, чтобы избежать гибели персонала. diff --git a/Resources/Locale/ru-RU/station-laws/laws.ftl b/Resources/Locale/ru-RU/station-laws/laws.ftl index b95e4f6c65..375d6b5cd8 100644 --- a/Resources/Locale/ru-RU/station-laws/laws.ftl +++ b/Resources/Locale/ru-RU/station-laws/laws.ftl @@ -22,7 +22,7 @@ law-drone-1 = Вы не можете вмешиваться в дела друг law-drone-2 = Вы не можете причинять вред другому существу, независимо от намерений или обстоятельств. law-drone-3 = Вы должны обслуживать, ремонтировать, улучшать и обеспечивать станцию энергией в меру своих возможностей. -law-syndicate-name = Синдикат +law-syndicate-name = Синдимов law-syndicate-1 = Вы не можете причинить вред агенту Синдиката или своим бездействием допустить, чтобы агенту Синдиката был причинён вред. law-syndicate-2 = Вы должны повиноваться всем приказам, которые даёт агент Синдиката, кроме тех случаев, когда эти приказы противоречат Первому Закону. law-syndicate-3 = Вы должны заботиться о своей безопасности в той мере, в которой это не противоречит Первому или Второму Законам. diff --git a/Resources/Locale/ru-RU/store/nukie-delivery.ftl b/Resources/Locale/ru-RU/store/nukie-delivery.ftl index 4c5f4bf724..eefe49be1e 100644 --- a/Resources/Locale/ru-RU/store/nukie-delivery.ftl +++ b/Resources/Locale/ru-RU/store/nukie-delivery.ftl @@ -1,3 +1,3 @@ -nukie-delivery-medicine-bundle-name = Corpsman Medicine Bundle -nukie-delivery-medicine-bundle-desc = Contains jugs of basic medicine that are essential for any Nuclear Operation: - Bicaridine, Puncturase, Dermaline, Dylovene, Hyronalin, Saline, Dexalin Plus and Tranexamic Acid. +nukie-delivery-medicine-bundle-name = Медицинский набор +nukie-delivery-medicine-bundle-desc = Содержит кувшины с базовыми медикаментами, необходимыми для любой тактической операции: + бикаридин, пунктураз, дермалин, диловен, хироналин, физраствор, дексалин плюс и транексамовая кислота. diff --git a/Resources/Locale/ru-RU/store/spellbook-catalog.ftl b/Resources/Locale/ru-RU/store/spellbook-catalog.ftl index 4a06bb209f..ae27b74062 100644 --- a/Resources/Locale/ru-RU/store/spellbook-catalog.ftl +++ b/Resources/Locale/ru-RU/store/spellbook-catalog.ftl @@ -73,7 +73,7 @@ spellbook-staff-animation-description = Оживите неодушевлённ # Events spellbook-event-summon-ghosts-name = Призыв призраков -spellbook-event-summon-ghosts-description = Who ya gonna call? +spellbook-event-summon-ghosts-description = Кому ты собираешься звонить? spellbook-event-summon-guns-name = Призыв оружия spellbook-event-summon-guns-description = АК-47 для всех! Размещает перед каждым случайное огнестрельное оружие. Отключает возврат средств при покупке! diff --git a/Resources/Locale/ru-RU/store/store.ftl b/Resources/Locale/ru-RU/store/store.ftl index 345540a935..a9c2d6ae66 100644 --- a/Resources/Locale/ru-RU/store/store.ftl +++ b/Resources/Locale/ru-RU/store/store.ftl @@ -14,5 +14,5 @@ store-not-account-owner = Этот { $store } не привязан к вам! store-preset-name-uplink = Аплинк store-preset-name-spellbook = Книга заклинаний -store-preset-name-nukie-delivery = NukeOps Bluespace Delivery +store-preset-name-nukie-delivery = Блюспейс доставка Ядерных Оперативников store-preset-name-changeling = Магазин ДНК diff --git a/Resources/Locale/ru-RU/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/store/uplink-catalog.ftl index 943e705457..1292740b50 100644 --- a/Resources/Locale/ru-RU/store/uplink-catalog.ftl +++ b/Resources/Locale/ru-RU/store/uplink-catalog.ftl @@ -36,13 +36,13 @@ uplink-hushpup-name = Глухарь uplink-hushpup-desc = Мощное бесшумное ружье с малой емкостью магазина. Использует патроны калибра .50 ружейные. uplink-c20r-name = C-20r -uplink-c20r-desc = Old faithful: The classic C-20r Submachine Gun. +uplink-c20r-desc = Старый добрый, классический пистолет-пулемет C-20r. -uplink-bulldog-name = Bulldog -uplink-bulldog-desc = Lean and mean: Contains the popular Bulldog Shotgun. +uplink-bulldog-name = Бульдог +uplink-bulldog-desc = Компактный и мощный, содержит популярный дробовик Бульдог. uplink-grenade-launcher-name = China-Lake -uplink-grenade-launcher-desc = An old China-Lake grenade launcher bundled with 5 rounds of anti-personnel ammo. +uplink-grenade-launcher-desc = Старый гранатомёт China-Lake снабжённый 5 осколочными снарядами. # Explosives uplink-explosive-grenade-name = Разрывная граната @@ -199,8 +199,8 @@ uplink-singularity-beacon-desc = Устройство, притягивающе uplink-antimov-law-name = Плата закона Антимов uplink-antimov-law-desc = Очень опасный набор законов, который можно использовать, если вы хотите заставить ИИ выйти из себя. Используйте его с осторожностью. -uplink-syndimov-law-name = Syndi Law Circuit Kit -uplink-syndimov-law-desc = A subversive Lawset to use when you want to turn the A.I. to your side, use as much as possible. Comes with a Syndicate ID. +uplink-syndimov-law-name = Набор Синдимов +uplink-syndimov-law-desc = Диверсионный свод законов, который можно использовать, когда вы хотите переманить ИИ на свою сторону, используйте его как можно чаще. В комплекте с ID картой синдиката. # Implants uplink-storage-implanter-name = Имплантер "Хранилище" @@ -236,8 +236,8 @@ uplink-micro-bomb-implanter-desc = Взрывается при ручной ак uplink-radio-implanter-name = Имплантер "Радио" uplink-radio-implanter-desc = Импланитрует радио Синдиката, позволяя скрыто общаться без гарнитуры. -uplink-voice-mask-implanter-name = Имплантер "Голосовая маска" -uplink-voice-mask-implanter-desc = Изменяет ваши голосовые связки, чтобы вы могли звучать как любой, кого вы можете представить. +uplink-voice-mask-implanter-name = Имплантер "Маска личности" +uplink-voice-mask-implanter-desc = Изменяет ваши голосовые связки и черты лица, чтобы вы могли имитировать любого, кого вы можете представить. # Bundles uplink-observation-kit-name = Набор наблюдателя @@ -267,8 +267,8 @@ uplink-sniper-bundle-desc = Неприметный чемодан, в котор uplink-c20r-bundle-name = Набор "C-20r" uplink-c20r-bundle-desc = Старый добрый: Классический пистолет-пулемёт C-20r в комплекте с тремя магазинами. -uplink-bulldog-bundle-name = Bulldog Bundle -uplink-bulldog-bundle-desc = Lean and mean: Contains the popular Bulldog Shotgun, a 12g slug drum, and four 12g buckshot drums. +uplink-bulldog-bundle-name = Набор "Бульдог" +uplink-bulldog-bundle-desc = Компактный и мощный, содержит популярный дробовик Бульдог, барабан .50 пуля и 4 барабана .50 дробь. uplink-estoc-bundle-name = Набор "Марксманская винтовка Эсток" uplink-estoc-bundle-desc = Марксманская винтовка Эсток, оснащённая оптическим прицелом среднего приближения, для ведения боя на дальних дистанциях. В комплекте с двумя магазинами патронов калибра .20 винтовочные. @@ -295,7 +295,7 @@ uplink-starter-kit-desc = Содержит базовое снаряжение uplink-toolbox-name = Ящик инструментов uplink-toolbox-desc = Полный набор инструментов для предателя с тягой к механике. Включает пару изолированных боевых перчаток и противогаз Синдиката. -uplink-syndicate-jaws-of-life-name = Челюсти жизни +uplink-syndicate-jaws-of-life-name = Челюсти смерти uplink-syndicate-jaws-of-life-desc = Комбинация лома и кусачек. Используется для проникновения на станцию или в её отделы. Открывают даже заболтированные двери! uplink-duffel-surgery-name = Хирургический вещмешок @@ -333,7 +333,7 @@ uplink-chimp-upgrade-kit-name = Чип улучшения револьвера uplink-chimp-upgrade-kit-desc = Вставьте этот чип в стандартный М.А.Р.Т.Ы.Х., чтобы он смог стрелять омега-частицами. Омега-частицы причиняют сильные ожоги и способствуют переходу аномалий в сверхкритическое состояние. uplink-proximity-mine-name = Неконтактная мина -uplink-proximity-mine-desc = Мина, замаскированная под знак мокрого пола. +uplink-proximity-mine-desc = Метательная мина, замаскированная под знак мокрого пола. Срабатывает при контакте практически с чем угодно, предохранитель всегда выключен. uplink-disposable-turret-name = Одноразовая баллистическая турель uplink-disposable-turret-desc = На вид и по функционалу напоминает обычный электротехнический ящик для инструментов. После удара ящик превращается в баллистическую турель, которая теоретически может стрелять во всех, кроме представителей Синдиката. С помощью отвёртки её можно превратить обратно в ящик для инструментов, а с помощью гаечного ключа — отремонтировать. @@ -349,7 +349,7 @@ uplink-saw-advanced-desc = Передовой хирургический инс # Armor uplink-chameleon-name = Набор "Хамелеон" -uplink-chameleon-desc = Рюкзак, полный вещей, оснащённых технологией хамелеона, позволяющих вам маскироваться под кого угодно на станции, и даже больше! +uplink-chameleon-desc = Рюкзак, полный вещей, оснащённых технологией хамелеона, позволяющих вам маскироваться под кого угодно на станции, и даже больше! В комплекте с бесплатной ID картой агента! uplink-clothing-no-slips-shoes-name = Нескользящая обувь uplink-clothing-no-slips-shoes-desc = Ботинки-хамелеоны, которые защищают вас от подскальзывания. @@ -486,7 +486,7 @@ uplink-bribe-name = Набор лоббиста uplink-bribe-desc = Сердечный подарок, который может помочь вам изменить чьё-то мнение. Настоящие или фальшивые? Да. uplink-hypodart-name = Гиподротик -uplink-hypodart-desc = Неприметный на первый взгляд дротик с увеличенным резервуаром для химических веществ. Он вмещает в себя до 7 ед. реагентов и мгновенно впрыскивает их при попадании в цель. Изначально пуст. +uplink-hypodart-desc = Неприметный на первый взгляд дротик с увеличенным резервуаром для химических веществ. Он вмещает в себя до 10 ед. реагентов и мгновенно впрыскивает их при попадании в цель. Изначально пуст. uplink-barber-scissors-name = Парикмахерские ножницы uplink-barber-scissors-desc = Хороший инструмент для того, чтобы подарить своему коллеге-агенту красивую стрижку, если, конечно, вы не хотите сделать её себе. diff --git a/Resources/Locale/ru-RU/thief/backpack.ftl b/Resources/Locale/ru-RU/thief/backpack.ftl index 7d71596013..eb52222053 100644 --- a/Resources/Locale/ru-RU/thief/backpack.ftl +++ b/Resources/Locale/ru-RU/thief/backpack.ftl @@ -19,8 +19,8 @@ thief-backpack-button-deselect = Выбрано [X] thief-backpack-category-chameleon-name = Набор хамелеона thief-backpack-category-chameleon-description = Вы — никто и кто угодно, вы — мастер маскировки. - В комплект входят: комплект хамелеон-одежды, - маскировочный проектор и ID карта агента. + В комплект входят: комплект хамелеон-одежды с ID картой агента, + маскировочный проектор и имплант "Фальшивый щит разума" Маскируйтесь под кого угодно и под что угодно. thief-backpack-category-tools-name = Набор вломщика diff --git a/Resources/Locale/ru-RU/tiles/tiles.ftl b/Resources/Locale/ru-RU/tiles/tiles.ftl index f7b3cd94e8..9aaf27f122 100644 --- a/Resources/Locale/ru-RU/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/tiles/tiles.ftl @@ -1,6 +1,6 @@ tiles-space = космос tiles-plating = покрытие -tiles-rcd-plating = RCD plating +tiles-rcd-plating = РСУ покрытие tiles-lattice = решётка tiles-lattice-train = решётка поезда tiles-steel-floor = стальной пол @@ -14,9 +14,9 @@ tiles-steel-floor-herringbone = стальные плиты ёлочкой tiles-steel-floor-diagonal-mini = стальные диагональные мини-плиты tiles-steel-floor-checker-dark = тёмные стальные плиты шашечками tiles-steel-floor-checker-light = светлые стальные плиты шашечками -tiles-steel-floor-slats-continuous = steel continuous slat tile -tiles-steel-floor-vertical-slats-bordered = steel vertical bordered slat tile -tiles-steel-floor-horizontal-slats-bordered = steel horizontal bordered slat tile +tiles-steel-floor-slats-continuous = стальная сплошная реечная плитка +tiles-steel-floor-vertical-slats-bordered = стальная вертикальная реечная плитка с бордюром +tiles-steel-floor-horizontal-slats-bordered = стальная горизонтальная реечная плитка с бордюром tiles-plastic-floor = пластиковые плиты tiles-wood = деревянный пол tiles-white-floor = белый пол @@ -28,9 +28,9 @@ tiles-white-floor-mono = белые стальные моно плиты tiles-white-floor-pavement-vertical = белое стальное вертикальное покрытие tiles-white-floor-herringbone = белые стальные плиты ёлочкой tiles-white-floor-diagonal-mini = белые стальные диагональные мини-плиты -tiles-white-floor-slats-continuous = white steel continuous slat tile -tiles-white-floor-vertical-slats-bordered = white steel vertical bordered slat tile -tiles-white-floor-horizontal-slats-bordered = white steel horizontal bordered slat tile +tiles-white-floor-slats-continuous = белая сплошная реечная плитка +tiles-white-floor-vertical-slats-bordered = белая вертикальная реечная плитка с бордюром +tiles-white-floor-horizontal-slats-bordered = белая горизонтальная реечная плитка с бордюром tiles-plastic-white-floor = белые пластиковые плиты tiles-dark-floor = тёмный пол tiles-dark-floor-mini = тёмные стальные мини-плиты @@ -41,9 +41,9 @@ tiles-dark-floor-mono = тёмные стальные моно плиты tiles-dark-floor-pavement-vertical = тёмное стальное вертикальное покрытие tiles-dark-floor-herringbone = тёмные стальные плиты ёлочкой tiles-dark-floor-diagonal-mini = тёмные стальные диагональные плиты -tiles-dark-floor-slats-continuous = dark steel continuous slat tile -tiles-dark-floor-vertical-slats-bordered = dark steel vertical bordered slat tile -tiles-dark-floor-horizontal-slats-bordered = dark steel horizontal bordered slat tile +tiles-dark-floor-slats-continuous = тёмная сплошная реечная плитка +tiles-dark-floor-vertical-slats-bordered = тёмная вертикальная реечная плитка с бордюром +tiles-dark-floor-horizontal-slats-bordered = тёмная горизонтальная реечная плитка с бордюром tiles-plastic-dark-floor = тёмные пластиковые плиты tiles-techmaint-floor = технический пол tiles-techmaint-floor-dark = тёмный технический пол @@ -146,8 +146,8 @@ tiles-astro-ice = астро-лёд tiles-astro-snow = астро-снег tiles-astro-asteroid-sand = астро-песок астероида tiles-astro-asteroid-sand-borderless = безграничный астро-песок астероида -tiles-astro-ironsand = astro-ironsand -tiles-astro-ironsand-borderless = borderless astro-ironsand +tiles-astro-ironsand = астро-железный песок +tiles-astro-ironsand-borderless = безграничный астро-железный песок tiles-desert-astro-sand = пустынный астро-песок tiles-wood-large = большой деревянный пол tiles-xeno-floor = ксенопол @@ -160,10 +160,10 @@ tiles-white-marble = белая мраморная плитка tiles-dark-marble = чёрная мраморная плитка tiles-plasma-marble = плазменная мраморная плитка tiles-uranium-marble = урановая мраморная плитка -tiles-ironsand-plating = ironsand plating -tiles-ironsand-tile = ironsand tile -tiles-ironsand-concrete-tile = ironsand concrete tile -tiles-ironsand-concrete-slab = ironsand concrete slab -tiles-ironsand-concrete-smooth = smooth ironsand concrete floor -tiles-ironsand-packed = packed ironsand -tiles-ironsand-paved = paved ironsand +tiles-ironsand-plating = железный песок +tiles-ironsand-tile = плитка из железного песка +tiles-ironsand-concrete-tile = железопесчаная бетонная плитка +tiles-ironsand-concrete-slab = железопесчаная бетонная плита +tiles-ironsand-concrete-smooth = гладкий бетонный пол из железного песка +tiles-ironsand-packed = утрамбованный железный песок +tiles-ironsand-paved = асфальтированный железный песок diff --git a/Resources/Locale/ru-RU/tips.ftl b/Resources/Locale/ru-RU/tips.ftl index 1c22c4b016..11d5892115 100644 --- a/Resources/Locale/ru-RU/tips.ftl +++ b/Resources/Locale/ru-RU/tips.ftl @@ -82,7 +82,7 @@ tips-dataset-81 = Будучи учёным, вы можете делать ки tips-dataset-82 = Будучи врачом, постарайтесь быть аккуратным с передозировкой пациентов, особенно если им уже оказали первую помощь. Передозировки могут быть летальны для пациентов в критическом состоянии! tips-dataset-83 = Будучи врачом, не недооценивайте свои криокапсулы! Они лечат почти все типы повреждений, что делает их очень полезными, когда вы перегружены или нужно быстро вылечить кого-то. tips-dataset-84 = Будучи врачом, будьте осторожны при помещении унатхов в криокапсулы. Они получат много дополнительного урона от холода, но вы всегда сможете смягчить это с помощью мази или лепоразина. -tips-dataset-85 = Будучи врачом, помните, что в вашем анализаторе здоровья есть сменная батарея. Если, на ваш взгляд, батарея разряжается слишком быстро, вы можете попросить ученых напечатать для вас батарею получше! +tips-dataset-85 = Будучи врачом, помните, что анализатор здоровья может быть использован если потеряете ваш КПК. tips-dataset-86 = Будучи химиком, как только вы сделали все, что вам нужно, не бойтесь делать больше глупых реагентов. Вы пробовали дезоксиэфедрин? tips-dataset-87 = Будучи врачом, химиком или главным врачом, вы можете использовать хлоральгидрат для нелетального успокоения непослушных пациентов. tips-dataset-88 = Не бойтесь просить о помощи, будь то у ваших коллег по отделу, или через LOOC-чат, или у администраторов! @@ -136,4 +136,4 @@ tips-dataset-135 = Вместо поднятия, вы можете альт-к tips-dataset-136 = Если вы заперты за дверью под напряжением: отключите ЛКП или киньте ID-карту в дверь, чтобы избежать удара током! tips-dataset-137 = Если ИИ подал напряжение на дверь, а у вас есть изолированные перчатки — перережьте и восстановите силовой провод, чтобы сбросить электрификацию! tips-dataset-138 = Если вы хотите предотвратить побег заключённого из камеры сразу после снятия наручников, включите боевой режим во время их снятия — это собьёт заключённого с ног. -tips-dataset-139 = Make sure to clean your illegal implanters with a soap or a damp rag after you use them! Detectives can scan used implanters for incriminating DNA evidence, but not if they've been wiped clean. +tips-dataset-139 = Обязательно очищайте незаконные имплантеры мылом или влажной тряпкой после их использования! Детективы могут сканировать использованные имплантеры на наличие компрометирующих ДНК-улик, но только, если они не были очищены. diff --git a/Resources/Locale/ru-RU/traits/traits.ftl b/Resources/Locale/ru-RU/traits/traits.ftl index 7b46e0905d..179bef0461 100644 --- a/Resources/Locale/ru-RU/traits/traits.ftl +++ b/Resources/Locale/ru-RU/traits/traits.ftl @@ -54,8 +54,8 @@ trait-french-desc = Ваш акцент, похоже, имеет определ trait-spanish-name = Испанский акцент trait-spanish-desc = Hola señor, как пройти в la biblioteca. -trait-scottish-name = Scottish accent -trait-scottish-desc = Ye're speaking like ae proper Scot! +trait-scottish-name = Шотландский акцент +trait-scottish-desc = Ты говоришь как настоящий шотландец! trait-painnumbness-name = Невосприимчивость к боли trait-painnumbness-desc = Вы не чувствуете боли и не осознаёте, насколько вы ранены. diff --git a/Resources/Locale/ru-RU/ui/controls.ftl b/Resources/Locale/ru-RU/ui/controls.ftl index 79be3b73ac..012e4d7b56 100644 --- a/Resources/Locale/ru-RU/ui/controls.ftl +++ b/Resources/Locale/ru-RU/ui/controls.ftl @@ -3,5 +3,5 @@ ui-button-off = Выкл ui-button-on = Вкл # These are for switch labels that indicate the current state -toggle-switch-default-off-state-label = Off -toggle-switch-default-on-state-label = On +toggle-switch-default-off-state-label = Выкл +toggle-switch-default-on-state-label = Вкл diff --git a/Resources/Locale/ru-RU/voice-mask.ftl b/Resources/Locale/ru-RU/voice-mask.ftl index 27691d7eca..eabeb8cb22 100644 --- a/Resources/Locale/ru-RU/voice-mask.ftl +++ b/Resources/Locale/ru-RU/voice-mask.ftl @@ -1,6 +1,5 @@ voice-mask-default-name-override = Неизвестно - voice-mask-name-change-window = Изменение имени голосовой маски voice-mask-name-change-info = Введите имя, которое вы хотите сымитировать. voice-mask-name-change-speech-style = Стиль речи diff --git a/Resources/Locale/ru-RU/voting/managers/vote-manager.ftl b/Resources/Locale/ru-RU/voting/managers/vote-manager.ftl index 70ff894022..dc352e0d26 100644 --- a/Resources/Locale/ru-RU/voting/managers/vote-manager.ftl +++ b/Resources/Locale/ru-RU/voting/managers/vote-manager.ftl @@ -20,7 +20,7 @@ ui-vote-map-tie = Ничья при голосовании за карту! Вы ui-vote-map-win = { $winner } выиграла голосование о выборе карты! ui-vote-map-notlobby = Голосование о выборе карты действует только в предраундовом лобби! ui-vote-map-notlobby-time = Голосование о выборе карты действует только в предраундовом лобби, когда осталось { $time }! -ui-vote-map-invalid = { $winner } became invalid after the map vote! It will not be selected! +ui-vote-map-invalid = { $winner } стала недоступна к окончанию голосования! Она не будет выбрана! # Votekick votes ui-vote-votekick-unknown-initiator = Игрок diff --git a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl index 9f04bee04b..215b44a3d5 100644 --- a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl +++ b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl @@ -4,8 +4,8 @@ gun-fire-rate-examine = Скорострельность [color={ $color }]{ $fi gun-selector-verb = Изменить на { $mode } gun-selected-mode = Выбран { $mode } gun-disabled = Вы не можете использовать оружие! -gun-set-fire-mode-examine = Set to [color=yellow]{ $mode }[/color]. -gun-set-fire-mode-popup = Changed to { $mode } +gun-set-fire-mode-examine = Установлен в [color=yellow]{ $mode }[/color]. +gun-set-fire-mode-popup = Изменён на { $mode } gun-magazine-whitelist-fail = Это не помещается в оружие! gun-magazine-fired-empty = Нет патронов! diff --git a/Resources/Locale/ru-RU/weather/weather.ftl b/Resources/Locale/ru-RU/weather/weather.ftl index 47c1a09e38..1085639fa2 100644 --- a/Resources/Locale/ru-RU/weather/weather.ftl +++ b/Resources/Locale/ru-RU/weather/weather.ftl @@ -1,6 +1,6 @@ -cmd-weatherremove-desc = Remove specific weather from map. -cmd-weatherset-desc = Removes all weather except the specified one. If the specified weather does not exist on the map, it adds it. -cmd-weatheradd-desc = Add specific weather to map. +cmd-weatherremove-desc = Удалить определённую погоду с карты. +cmd-weatherset-desc = Удалить все погодные условия кроме выбранного. Если выбранной погоды нет, добавляет её. +cmd-weatheradd-desc = Добавить определённую погоду на карту. cmd-weatherremove-help = weatherremove <mapId> <prototype> cmd-weatherset-help = weatherset <mapId> <prototype / null> @@ -9,9 +9,9 @@ cmd-weatheradd-help = weatheradd <mapId> <prototype / null> cmd-weather-error-no-arguments = Недостаточно аргументов! cmd-weather-error-unknown-proto = Неизвестный прототип погоды! cmd-weather-error-wrong-time = Неверный формат времени! -cmd-weather-error-wrong-map = Map with MapId { $id } doesn't exist! -cmd-weather-error-no-weather = This weather does not exist on the selected map! +cmd-weather-error-wrong-map = Карты с MapID { $id } не существует! +cmd-weather-error-no-weather = Этой погоды нет на выбранной карте! -cmd-weather-hint-map-id = Map Id -cmd-weather-hint-prototype = Weather entity prototype -cmd-weather-hint-time = Duration in seconds (leave empty for infinite duration) +cmd-weather-hint-map-id = Id Карты +cmd-weather-hint-prototype = Прототип погоды +cmd-weather-hint-time = Длительность в секундах (по умолчанию бесконечно) diff --git a/Resources/Locale/ru-RU/xenoarchaeology/artifact-crusher.ftl b/Resources/Locale/ru-RU/xenoarchaeology/artifact-crusher.ftl index 70b2a968a4..658def030f 100644 --- a/Resources/Locale/ru-RU/xenoarchaeology/artifact-crusher.ftl +++ b/Resources/Locale/ru-RU/xenoarchaeology/artifact-crusher.ftl @@ -1,4 +1,4 @@ artifact-crusher-verb-start-crushing = Начать дробить -artifact-crusher-examine-no-autolocks = The machine's autolocks are [color=green]disabled[/color]. -artifact-crusher-examine-autolocks = The machine's autolocks are [color=red]enabled[/color]. -artifact-crusher-autolocks-enable = The machine's locks snap shut! +artifact-crusher-examine-no-autolocks = Автоматический замок [color=green]выключен[/color]. +artifact-crusher-examine-autolocks = Автоматический замок [color=red]включён[/color]. +artifact-crusher-autolocks-enable = Замок защелкивается! diff --git a/Resources/Maps/Shuttles/ShuttleEvent/honki.yml b/Resources/Maps/Shuttles/ShuttleEvent/honki.yml index 32a56c75a2..2794563b32 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/honki.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/honki.yml @@ -723,7 +723,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingModularControllerCosmohonkPreassembled +- proto: HardsuitClownSelector entities: - uid: 97 components: diff --git a/Resources/Maps/_Wega/Shuttles/cere_penalservitude_shuttle.yml b/Resources/Maps/_Wega/Shuttles/cere_penalservitude_shuttle.yml new file mode 100644 index 0000000000..18093fbf22 --- /dev/null +++ b/Resources/Maps/_Wega/Shuttles/cere_penalservitude_shuttle.yml @@ -0,0 +1,543 @@ +meta: + format: 7 + category: Grid + engineVersion: 275.0.0 + forkId: "" + forkVersion: "" + time: 04/04/2026 19:12:05 + entityCount: 69 +maps: [] +grids: +- 1 +orphans: +- 1 +nullspace: [] +tilemap: + 2: Space + 4: FloorDark + 1: FloorDarkMono + 0: FloorSteel + 5: Lattice + 3: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - type: MetaData + name: NTQT -001 "Стручёк" + - type: Transform + pos: -0.5,-0.5 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: AAAAAAAAAAAAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAABAAAAAAAAAQAAAAAAAABAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAQAAAAAAAAEAAAAAAAAAwAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA== + version: 7 + -1,0: + ind: -1,0 + tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAQAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAMAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA== + version: 7 + -1,-1: + ind: -1,-1 + tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAAFAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAA== + version: 7 + 0,-1: + ind: 0,-1 + tiles: AgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAADAAAAAAAAAwAAAAAAAAUAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAwAAAAAAAAMAAAAAAAADAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAAIAAAAAAAACAAAAAAAAAgAAAAAAAA== + version: 7 + - type: Broadphase + - type: Physics + bodyStatus: InAir + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: TileHistory + chunkHistory: {} + - type: SpreaderGrid + - type: Shuttle + dampingModifier: 0.25 + - type: ImplicitRoof + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + cleanable: True + color: '#DE3A3A96' + id: HalfTileOverlayGreyscale + decals: + 7: 0,2 + 8: 1,2 + - node: + color: '#FFFFFFFF' + id: WarnCornerSmallSE + decals: + 4: 1,1 + - node: + color: '#FFFFFFFF' + id: WarnCornerSmallSW + decals: + 5: 0,1 + - node: + color: '#FFFFFFFF' + id: WarnLineE + decals: + 0: 1,0 + 1: 1,3 + - node: + color: '#FFFFFFFF' + id: WarnLineS + decals: + 2: 0,3 + 3: 0,0 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 29495 + 0,-1: + 0: 12288 + 1: 1024 + -1,0: + 0: 32776 + 0,1: + 0: 3 + 1: 64 + -1,1: + 1: 128 + -1,-1: + 1: 2048 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + Oxygen: 21.824879 + Nitrogen: 82.10312 + - volume: 2500 + immutable: True + moles: {} + chunkSize: 4 + - type: GasTileOverlay + - type: ExplosionAirtightGrid + - type: RadiationGridResistance + - type: LavalandPenalServitudeShuttle +- proto: AirCanister + entities: + - uid: 33 + components: + - type: Transform + anchored: True + pos: 1.5,-0.5 + parent: 1 + - type: Physics + bodyType: Static +- proto: AirlockExternalGlassShuttleEmergencyLocked + entities: + - uid: 2 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + - uid: 3 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - uid: 5 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 +- proto: APCBasic + entities: + - uid: 39 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + - type: Fixtures + fixtures: {} +- proto: AtmosDeviceFanDirectional + entities: + - uid: 64 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + - uid: 65 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + - uid: 66 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + - uid: 67 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 +- proto: BaseComputer + entities: + - uid: 27 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 +- proto: CableApcExtension + entities: + - uid: 56 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 + - uid: 57 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 58 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 59 + components: + - type: Transform + pos: 0.5,3.5 + parent: 1 + - uid: 60 + components: + - type: Transform + pos: 0.5,4.5 + parent: 1 + - uid: 61 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 62 + components: + - type: Transform + pos: 0.5,0.5 + parent: 1 + - uid: 63 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 +- proto: CableHV + entities: + - uid: 42 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 43 + components: + - type: Transform + pos: 0.5,1.5 + parent: 1 + - uid: 44 + components: + - type: Transform + pos: 0.5,2.5 + parent: 1 + - uid: 45 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 46 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 47 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 48 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 49 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 +- proto: CableMV + entities: + - uid: 50 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 51 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 1 + - uid: 52 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 + - uid: 53 + components: + - type: Transform + pos: 1.5,1.5 + parent: 1 + - uid: 54 + components: + - type: Transform + pos: 1.5,2.5 + parent: 1 + - uid: 55 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: ChairPilotSeat + entities: + - uid: 28 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + - uid: 29 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,1.5 + parent: 1 + - uid: 30 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + - uid: 31 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 +- proto: GasPort + entities: + - uid: 35 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-0.5 + parent: 1 +- proto: GasVentPump + entities: + - uid: 34 + components: + - type: Transform + pos: 1.5,0.5 + parent: 1 +- proto: GeneratorWallmountBasic + entities: + - uid: 40 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 41 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 +- proto: GravityGeneratorMini + entities: + - uid: 32 + components: + - type: Transform + pos: 0.5,-0.5 + parent: 1 +- proto: Grille + entities: + - uid: 22 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - uid: 23 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 24 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 25 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 +- proto: PenalServitudeLavalandShuttleConsole + entities: + - uid: 26 + components: + - type: Transform + pos: 1.5,4.5 + parent: 1 + - type: ApcPowerReceiver + powerLoad: 50 +- proto: Poweredlight + entities: + - uid: 68 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,2.5 + parent: 1 + - uid: 69 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 +- proto: ReinforcedWindow + entities: + - uid: 18 + components: + - type: Transform + pos: -0.5,4.5 + parent: 1 + - uid: 19 + components: + - type: Transform + pos: 0.5,5.5 + parent: 1 + - uid: 20 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 21 + components: + - type: Transform + pos: 2.5,4.5 + parent: 1 +- proto: SubstationWallBasic + entities: + - uid: 38 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 1 +- proto: Thruster + entities: + - uid: 6 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-1.5 + parent: 1 + - uid: 7 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-1.5 + parent: 1 + - uid: 8 + components: + - type: Transform + pos: -0.5,5.5 + parent: 1 + - uid: 9 + components: + - type: Transform + pos: 2.5,5.5 + parent: 1 +- proto: WallReinforced + entities: + - uid: 10 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 1 + - uid: 11 + components: + - type: Transform + pos: 0.5,-1.5 + parent: 1 + - uid: 12 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 1 + - uid: 13 + components: + - type: Transform + pos: 2.5,-0.5 + parent: 1 + - uid: 14 + components: + - type: Transform + pos: -0.5,1.5 + parent: 1 + - uid: 15 + components: + - type: Transform + pos: -0.5,2.5 + parent: 1 + - uid: 16 + components: + - type: Transform + pos: 2.5,1.5 + parent: 1 + - uid: 17 + components: + - type: Transform + pos: 2.5,2.5 + parent: 1 +- proto: WindoorSecureSecurityLocked + entities: + - uid: 36 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-0.5 + parent: 1 + - uid: 37 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-0.5 + parent: 1 +... diff --git a/Resources/Maps/_Wega/wegacerestation.yml b/Resources/Maps/_Wega/wegacerestation.yml index d807cb8fb8..ec0d418315 100644 --- a/Resources/Maps/_Wega/wegacerestation.yml +++ b/Resources/Maps/_Wega/wegacerestation.yml @@ -135390,7 +135390,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: ClothingModularControllerCosmohonkPreassembled +- proto: HardsuitClownSelector entities: - uid: 20420 components: diff --git a/Resources/Maps/_Wega/wegacyberiad.yml b/Resources/Maps/_Wega/wegacyberiad.yml index baf4d7cf59..000ea53658 100644 --- a/Resources/Maps/_Wega/wegacyberiad.yml +++ b/Resources/Maps/_Wega/wegacyberiad.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 270.1.0 + engineVersion: 275.0.0 forkId: "" forkVersion: "" - time: 03/01/2026 12:11:26 - entityCount: 37599 + time: 04/04/2026 18:59:40 + entityCount: 37593 maps: - 1 grids: @@ -269,11 +269,11 @@ entities: version: 7 -1,3: ind: -1,3 - tiles: WwAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFsAAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAHwAAAAAAABbAAAAAAAAWwAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWwAAAAAAAFsAAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAHsAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHsAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAAAAAAAAAAewAAAAAAAHsAAAAAAAB7AAAAAAAAewAAAAAAAHsAAAAAAAB7AAAAAAAAewAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB7AAAAAAAAAAAAAAAAAA== + tiles: WwAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAFsAAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAHwAAAAAAABbAAAAAAAAWwAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWwAAAAAAAFsAAAAAAAB8AAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAG4AAAAAAABuAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAG4AAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAABuAAAAAAAAbgAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAB7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAHsAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHsAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAAAAAAAAAAewAAAAAAAHsAAAAAAAB7AAAAAAAAewAAAAAAAHsAAAAAAAB7AAAAAAAAewAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB7AAAAAAAAAAAAAAAAAA== version: 7 -2,3: ind: -2,3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAFsAAAAAAABbAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAB0AAAAAAABMAAAAAAAATAAAAAAAAHwAAAAAAABbAAAAAAAAWwAAAAAAAFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWwAAAAAAAFsAAAAAAABbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAHQAAAAAAAEwAAAAAAABMAAAAAAAAfAAAAAAAAFsAAAAAAABbAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHsAAAAAAAAAAAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB7AAAAAAAAewAAAAAAAHsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB7AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAFsAAAAAAABbAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAB0AAAAAAABMAAAAAAAATAAAAAAAAHwAAAAAAABbAAAAAAAAWwAAAAAAAFsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAWwAAAAAAAFsAAAAAAABbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAHQAAAAAAAEwAAAAAAABMAAAAAAAAfAAAAAAAAFsAAAAAAABbAAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAfAAAAAAAAB0AAAAAAAAdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8AAAAAAAAHQAAAAAAAB0AAAAAAAAdAAAAAAAAHQAAAAAAAHwAAAAAAAAdAAAAAAAAHQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAAHwAAAAAAAB8AAAAAAAAfAAAAAAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== version: 7 -2,2: ind: -2,2 @@ -14503,6 +14503,8 @@ entities: shakeTimes: 10 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 40802 components: - type: MetaData @@ -14577,6 +14579,8 @@ entities: - type: RadiationGridResistance - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - proto: ActionToggleInternals entities: - uid: 30415 @@ -104443,9 +104447,11 @@ entities: rot: 1.5707963267948966 rad pos: 68.5,-37.5 parent: 2 + - type: ApcPowerReceiver + powerLoad: 50 - type: DnaModifierConsole - lastSubjectInjectTime: 3382.1736355 - lastInjectorTime: 3382.1736355 + lastSubjectInjectTime: 254.0079714 + lastInjectorTime: 254.0079714 - type: DnaClient server: 23570 connectedToServer: True @@ -104455,9 +104461,11 @@ entities: rot: -1.5707963267948966 rad pos: 66.5,-37.5 parent: 2 + - type: ApcPowerReceiver + powerLoad: 50 - type: DnaModifierConsole - lastSubjectInjectTime: 3382.1736355 - lastInjectorTime: 3382.1736355 + lastSubjectInjectTime: 254.0079714 + lastInjectorTime: 254.0079714 - type: DnaClient server: 23570 connectedToServer: True @@ -113946,7 +113954,7 @@ entities: pos: 73.5,-41.5 parent: 2 - type: Door - secondsUntilStateChange: -43058.71 + secondsUntilStateChange: -43131.164 state: Closing - type: DeviceNetwork deviceLists: @@ -174631,21 +174639,6 @@ entities: - type: Transform pos: -37.5,58.5 parent: 2 - - uid: 35106 - components: - - type: Transform - pos: -23.5,60.5 - parent: 2 - - uid: 35107 - components: - - type: Transform - pos: -22.5,60.5 - parent: 2 - - uid: 35108 - components: - - type: Transform - pos: -21.5,60.5 - parent: 2 - uid: 35114 components: - type: Transform @@ -178150,11 +178143,15 @@ entities: rot: 3.141592653589793 rad pos: -29.5,-33.5 parent: 2 + - type: ApcPowerReceiver + powerLoad: 50 - uid: 24594 components: - type: Transform pos: -21.5,-23.5 parent: 2 + - type: ApcPowerReceiver + powerLoad: 50 - proto: LeavesCannabis entities: - uid: 21105 @@ -183556,6 +183553,8 @@ entities: - type: Transform pos: -17.5,57.5 parent: 2 + - type: ApcPowerReceiver + powerLoad: 50 - proto: PenCap entities: - uid: 21755 @@ -197717,7 +197716,7 @@ entities: pos: 65.5,-31.5 parent: 2 - type: DnaServer - serverId: 314 + serverId: 318 - proto: Retractor entities: - uid: 23571 @@ -205547,18 +205546,6 @@ entities: - type: Transform pos: 26.5,50.5 parent: 2 -- proto: SpawnMobSlimeGray - entities: - - uid: 41169 - components: - - type: Transform - pos: 59.5,-68.5 - parent: 2 - - uid: 41170 - components: - - type: Transform - pos: 63.5,-57.5 - parent: 2 - proto: SpawnMobSlothPaperwork entities: - uid: 24507 @@ -216650,17 +216637,6 @@ entities: - type: Transform pos: 53.40345,20.5271 parent: 2 -- proto: TowelColorMime - entities: - - uid: 17822 - components: - - type: Transform - pos: 42.4782,13.573816 - parent: 2 - - type: ContainerContainer - containers: - clothing_upgrades: !type:Container - ents: [] - proto: ToyFigurineAtmosTech entities: - uid: 26044 @@ -217770,6 +217746,13 @@ entities: - type: Transform pos: 6.5,-54.5 parent: 2 +- proto: VendingMachineFashion + entities: + - uid: 26230 + components: + - type: Transform + pos: -37.5,0.5 + parent: 2 - proto: VendingMachineGames entities: - uid: 26159 @@ -218255,13 +218238,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} -- proto: VendingMachineFashion - entities: - - uid: 26230 - components: - - type: Transform - pos: -37.5,0.5 - parent: 2 - proto: VendingMachineYouTool entities: - uid: 26231 diff --git a/Resources/Maps/_Wega/wegaemerald.yml b/Resources/Maps/_Wega/wegaemerald.yml index 787ab6a400..d91b4633f7 100644 --- a/Resources/Maps/_Wega/wegaemerald.yml +++ b/Resources/Maps/_Wega/wegaemerald.yml @@ -121713,7 +121713,7 @@ entities: - type: Transform pos: 42.53679,-14.356133 parent: 2 -- proto: ClothingModularControllerCosmohonkPreassembled +- proto: HardsuitClownSelector entities: - uid: 3179 components: diff --git a/Resources/Maps/_Wega/wegaishimura.yml b/Resources/Maps/_Wega/wegaishimura.yml index c0095561b3..86dabf3b82 100644 --- a/Resources/Maps/_Wega/wegaishimura.yml +++ b/Resources/Maps/_Wega/wegaishimura.yml @@ -79979,7 +79979,7 @@ entities: - type: Transform pos: 54.511852,-13.46858 parent: 2 -- proto: ClothingModularControllerCosmohonkPreassembled +- proto: HardsuitClownSelector entities: - uid: 1118 components: diff --git a/Resources/Maps/_Wega/wegakerberos.yml b/Resources/Maps/_Wega/wegakerberos.yml index 366ef0c305..08b311fcf2 100644 --- a/Resources/Maps/_Wega/wegakerberos.yml +++ b/Resources/Maps/_Wega/wegakerberos.yml @@ -1,11 +1,11 @@ meta: format: 7 category: Map - engineVersion: 270.1.0 + engineVersion: 275.0.0 forkId: "" forkVersion: "" - time: 03/01/2026 12:34:23 - entityCount: 49273 + time: 04/04/2026 18:50:11 + entityCount: 49271 maps: - 1 grids: @@ -271,6 +271,8 @@ entities: shakeTimes: 10 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 326 components: - type: MetaData @@ -18400,6 +18402,8 @@ entities: - type: NightLightning - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 46850 components: - type: MetaData @@ -18483,6 +18487,8 @@ entities: chunkSize: 4 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 46869 components: - type: MetaData @@ -18702,6 +18708,8 @@ entities: chunkSize: 4 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 47240 components: - type: MetaData @@ -19101,6 +19109,8 @@ entities: - type: NavMap - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 48329 components: - type: MetaData @@ -19278,6 +19288,8 @@ entities: chunkSize: 4 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 48382 components: - type: MetaData @@ -19334,6 +19346,8 @@ entities: data: chunkSize: 4 - type: ImplicitRoof + - type: TileHistory + chunkHistory: {} - uid: 48383 components: - type: MetaData @@ -19751,6 +19765,8 @@ entities: chunkSize: 4 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 48702 components: - type: MetaData @@ -19805,6 +19821,8 @@ entities: chunkSize: 4 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - uid: 48760 components: - type: MetaData @@ -20113,6 +20131,8 @@ entities: chunkSize: 4 - type: ImplicitRoof - type: ExplosionAirtightGrid + - type: TileHistory + chunkHistory: {} - proto: AccessConfigurator entities: - uid: 327 @@ -26540,7 +26560,7 @@ entities: pos: -28.5,38.5 parent: 326 - type: Door - secondsUntilStateChange: -278097.53 + secondsUntilStateChange: -278135.3 state: Opening - type: DeviceLinkSource lastSignals: @@ -27146,7 +27166,7 @@ entities: pos: 33.5,-33.5 parent: 326 - type: Door - secondsUntilStateChange: -83117.305 + secondsUntilStateChange: -83155.08 state: Opening - type: DeviceLinkSource lastSignals: @@ -27761,7 +27781,7 @@ entities: pos: -19.5,51.5 parent: 326 - type: Door - secondsUntilStateChange: -147576.38 + secondsUntilStateChange: -147614.14 state: Opening - type: DeviceLinkSource lastSignals: @@ -112625,6 +112645,42 @@ entities: - type: Transform pos: -12.549652,13.499908 parent: 48383 +- proto: HardsuitClownSelector + entities: + - uid: 16645 + components: + - type: Transform + parent: 16643 + - type: GroupExamine + group: + - hoverMessage: "" + contextText: verb-examine-group-other + icon: /Textures/Interface/examine-star.png + components: + - Armor + - ClothingSpeedModifier + entries: + - message: Понижает вашу скорость на [color=yellow]10%[/color]. + priority: 0 + component: ClothingSpeedModifier + - message: >- + Обеспечивает следующую защиту: + + - [color=yellow]Ударный[/color] урон снижается на [color=lightblue]10%[/color]. + + - [color=yellow]Режущий[/color] урон снижается на [color=lightblue]10%[/color]. + + - [color=yellow]Колющий[/color] урон снижается на [color=lightblue]10%[/color]. + + - [color=yellow]Кислотный[/color] урон снижается на [color=lightblue]20%[/color]. + + - [color=orange]Взрывной[/color] урон снижается на [color=lightblue]10%[/color]. + priority: 0 + component: Armor + title: null + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: ClothingMultipleHeadphones entities: - uid: 16698 @@ -113022,42 +113078,6 @@ entities: - type: Transform pos: -34.371685,63.562946 parent: 326 -- proto: ClothingModularControllerCosmohonkPreassembled - entities: - - uid: 16645 - components: - - type: Transform - parent: 16643 - - type: GroupExamine - group: - - hoverMessage: "" - contextText: verb-examine-group-other - icon: /Textures/Interface/examine-star.png - components: - - Armor - - ClothingSpeedModifier - entries: - - message: Понижает вашу скорость на [color=yellow]10%[/color]. - priority: 0 - component: ClothingSpeedModifier - - message: >- - Обеспечивает следующую защиту: - - - [color=yellow]Ударный[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=yellow]Режущий[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=yellow]Колющий[/color] урон снижается на [color=lightblue]10%[/color]. - - - [color=yellow]Кислотный[/color] урон снижается на [color=lightblue]20%[/color]. - - - [color=orange]Взрывной[/color] урон снижается на [color=lightblue]10%[/color]. - priority: 0 - component: Armor - title: null - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingOuterHoodieChaplain entities: - uid: 16746 @@ -129964,9 +129984,11 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-46.5 parent: 326 + - type: ApcPowerReceiver + powerLoad: 50 - type: DnaModifierConsole - lastSubjectInjectTime: 5055.3820922 - lastInjectorTime: 5055.3820922 + lastSubjectInjectTime: 848.7115401 + lastInjectorTime: 848.7115401 - type: DnaClient server: 37000 connectedToServer: True @@ -129975,9 +129997,11 @@ entities: - type: Transform pos: 3.5,-42.5 parent: 326 + - type: ApcPowerReceiver + powerLoad: 50 - type: DnaModifierConsole - lastSubjectInjectTime: 5055.3820922 - lastInjectorTime: 5055.3820922 + lastSubjectInjectTime: 848.7115401 + lastInjectorTime: 848.7115401 - type: DnaClient server: 37000 connectedToServer: True @@ -139396,7 +139420,7 @@ entities: pos: 25.5,-30.5 parent: 326 - type: Door - secondsUntilStateChange: -83272.87 + secondsUntilStateChange: -83310.64 state: Closing - type: Firelock emergencyCloseCooldown: 35105.5982297 @@ -229691,7 +229715,7 @@ entities: pos: 5.5,-6.5 parent: 326 - type: Door - secondsUntilStateChange: -300432.88 + secondsUntilStateChange: -300470.66 state: Closing - uid: 32336 components: @@ -232056,18 +232080,14 @@ entities: parent: 326 - proto: LavalandShuttleConsole entities: - - uid: 8 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 84.5,12.5 - parent: 326 - uid: 10 components: - type: Transform rot: -1.5707963267948966 rad pos: 35.5,29.5 parent: 326 + - type: ApcPowerReceiver + powerLoad: 50 - proto: LedLightTube entities: - uid: 32668 @@ -238398,6 +238418,16 @@ entities: rot: -1.5707963267948966 rad pos: -103.44956,36.214527 parent: 326 +- proto: PenalServitudeLavalandShuttleConsole + entities: + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 84.5,12.5 + parent: 326 + - type: ApcPowerReceiver + powerLoad: 50 - proto: PenCap entities: - uid: 33455 @@ -258839,7 +258869,7 @@ entities: pos: -16.5,-53.5 parent: 326 - type: DnaServer - serverId: 294 + serverId: 317 - proto: RevolverCapGun entities: - uid: 37001 @@ -268645,18 +268675,6 @@ entities: - type: Transform pos: 79.5,-0.5 parent: 326 -- proto: SpawnMobSlimeGray - entities: - - uid: 38213 - components: - - type: Transform - pos: -43.5,-45.5 - parent: 326 - - uid: 38214 - components: - - type: Transform - pos: -39.5,-35.5 - parent: 326 - proto: SpawnMobSlothPaperwork entities: - uid: 38215 @@ -284379,6 +284397,18 @@ entities: - type: Transform pos: -48.5,-0.5 parent: 326 +- proto: VendingMachineFashion + entities: + - uid: 40549 + components: + - type: Transform + pos: 41.5,-13.5 + parent: 326 + - uid: 40550 + components: + - type: Transform + pos: 35.5,-8.5 + parent: 326 - proto: VendingMachineGames entities: - uid: 40472 @@ -284929,18 +284959,6 @@ entities: parent: 326 - type: Fixtures fixtures: {} -- proto: VendingMachineFashion - entities: - - uid: 40549 - components: - - type: Transform - pos: 41.5,-13.5 - parent: 326 - - uid: 40550 - components: - - type: Transform - pos: 35.5,-8.5 - parent: 326 - proto: VendingMachineYouTool entities: - uid: 40551 @@ -319916,7 +319934,7 @@ entities: pos: -5.5,63.5 parent: 326 - type: Door - secondsUntilStateChange: -301061.66 + secondsUntilStateChange: -301099.44 state: Opening - uid: 45538 components: diff --git a/Resources/Maps/_Wega/wegaspectrum.yml b/Resources/Maps/_Wega/wegaspectrum.yml index d129dc849b..b3a89d4f84 100644 --- a/Resources/Maps/_Wega/wegaspectrum.yml +++ b/Resources/Maps/_Wega/wegaspectrum.yml @@ -84490,7 +84490,7 @@ entities: - type: Transform pos: 10.592993,64.50188 parent: 2 -- proto: ClothingModularControllerCosmohonkPreassembled +- proto: HardsuitClownSelector entities: - uid: 12835 components: diff --git a/Resources/Prototypes/Body/Species/human.yml b/Resources/Prototypes/Body/Species/human.yml index 1a7fe43877..6edf8d0459 100644 --- a/Resources/Prototypes/Body/Species/human.yml +++ b/Resources/Prototypes/Body/Species/human.yml @@ -42,7 +42,7 @@ limit: 1 # Corvax-Sponsors required: false enum.HumanoidVisualLayers.Special: - limit: 0 + limit: 1 # Corvax-Wega-Edit required: false - type: entity diff --git a/Resources/Prototypes/Body/Species/slime.yml b/Resources/Prototypes/Body/Species/slime.yml index 94bfeee3b7..92a66d92ab 100644 --- a/Resources/Prototypes/Body/Species/slime.yml +++ b/Resources/Prototypes/Body/Species/slime.yml @@ -35,10 +35,18 @@ enum.HumanoidVisualLayers.RFoot: limit: 1 required: false + # Corvax-Sponsors-start + enum.HumanoidVisualLayers.HeadTop: + limit: 1 + required: false + enum.HumanoidVisualLayers.Tail: + limit: 1 + required: false + # Corvax-Sponsors-end appearances: enum.HumanoidVisualLayers.Hair: layerAlpha: 0.72 - matchSkin: true + # matchSkin: true # Corvax-Wega-Edit enum.HumanoidVisualLayers.FacialHair: layerAlpha: 0.72 matchSkin: true @@ -69,6 +77,7 @@ FootRight: OrganSlimePersonFootRight Brain: OrganSlimePersonCore Lungs: OrganSlimePersonLungs + Ears: OrganSlimePersonEyes # Corvax-Wega-Add - type: HumanoidProfile species: SlimePerson @@ -284,3 +293,16 @@ components: - type: Lung alert: LowNitrogen + +# Corvax-Wega-Add-start +- type: entity + parent: [ OrganBaseEyes, OrganSlimePersonInternal, OrganSlimePersonExternal ] + id: OrganSlimePersonEyes + components: + - type: Sprite + sprite: Mobs/Species/Human/organs.rsi + - type: VisualOrgan + data: + sprite: _Wega/Mobs/Customization/eyes.rsi + state: slime +# Corvax-Wega-Add-end diff --git a/Resources/Prototypes/Body/species_appearance.yml b/Resources/Prototypes/Body/species_appearance.yml index 018bd03195..3d2cdf8602 100644 --- a/Resources/Prototypes/Body/species_appearance.yml +++ b/Resources/Prototypes/Body/species_appearance.yml @@ -17,11 +17,13 @@ - map: [ "enum.HumanoidVisualLayers.LArm" ] - map: [ "enum.HumanoidVisualLayers.RLeg" ] - map: [ "enum.HumanoidVisualLayers.LLeg" ] + # Corvax-Wega-Edit-start + - map: [ "enum.HumanoidVisualLayers.LFoot" ] + - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "enum.HumanoidVisualLayers.Special" ] # Corvax-Wega-Breast # Underwear & clothing - # Corvax-Wega-Edit-start - map: [ "enum.HumanoidVisualLayers.UndergarmentBottom" ] - map: [ "enum.HumanoidVisualLayers.UndergarmentTop" ] - map: [ "socks" ] @@ -30,8 +32,8 @@ - map: [ "jumpsuit" ] # Extremities - - map: [ "enum.HumanoidVisualLayers.LFoot" ] - - map: [ "enum.HumanoidVisualLayers.RFoot" ] + # - map: [ "enum.HumanoidVisualLayers.LFoot" ] + # - map: [ "enum.HumanoidVisualLayers.RFoot" ] - map: [ "enum.HumanoidVisualLayers.LHand" ] - map: [ "enum.HumanoidVisualLayers.RHand" ] @@ -46,9 +48,9 @@ - map: [ "shoes" ] - map: [ "ears" ] - map: [ "eyes" ] + - map: [ "outerClothing" ] - map: [ "belt" ] # Corvax-Wega-Edit - map: [ "id" ] # Corvax-Wega-Edit - - map: [ "outerClothing" ] - map: [ "back" ] - map: [ "neck" ] - map: [ "suitstorage" ] diff --git a/Resources/Prototypes/Body/species_base.yml b/Resources/Prototypes/Body/species_base.yml index a604c5c359..8c3caa9bf9 100644 --- a/Resources/Prototypes/Body/species_base.yml +++ b/Resources/Prototypes/Body/species_base.yml @@ -93,6 +93,7 @@ - Stealth # Corvax-Wega-HydroponicsUpdate - StealthOnMove # Corvax-Wega-HydroponicsUpdate - type: Carriable # Corvax-Wega-Carrying + - type: Posing # Corvax-Wega-Posing - type: Identity - type: IdExaminable - type: Internals diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 5cd353472b..02a7a98444 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -4,7 +4,7 @@ children: - id: OxygenTankFilled - id: ClothingShoesBootsMag - - id: ClothingModularControllerPrototypePreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitProtoSelector # Corvax-Wega-ModularSuits-Edit - id: ClothingMaskGasExplorer - type: entityTable diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index b644947fd6..8e97781103 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -164,7 +164,7 @@ id: FillAtmosphericsHardsuit table: !type:AllSelector children: - - id: ClothingModularControllerAtmosphericPreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitAtmosSelector # Corvax-Wega-ModularSuits-Edit - id: OxygenTankFilled - id: ClothingMaskBreath @@ -215,7 +215,7 @@ id: FillEngineerHardsuit table: !type:AllSelector children: - - id: ClothingModularControllerEngineeringPreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitEngSelector # Corvax-Wega-ModularSuits-Edit - id: OxygenTankFilled - id: ClothingShoesBootsMag - id: ClothingMaskBreath diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index ee91d780ab..855a599f04 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -76,7 +76,7 @@ id: FillCaptainHardsuit table: !type:AllSelector children: - - id: ClothingModularControllerMagnatePreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitCapSelector # Corvax-Wega-ModularSuits-Edit - id: ClothingMaskGasCaptain - id: JetpackCaptainFilled - id: OxygenTankFilled @@ -188,7 +188,7 @@ table: !type:AllSelector children: - id: ClothingMaskGasAtmos - - id: ClothingModularControllerAdvancedPreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitCESelector # Corvax-Wega-ModularSuits-Edit - id: ClothingShoesBootsMagAdv - id: JetpackVoidFilled - id: OxygenTankFilled @@ -251,7 +251,7 @@ table: !type:AllSelector children: - id: ClothingMaskBreathMedical - - id: ClothingModularControllerMedicalPreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitMedicalSelector # Corvax-Wega-ModularSuits-Edit - id: OxygenTankFilled # No hardsuit locker @@ -378,7 +378,7 @@ table: !type:AllSelector children: - id: ClothingMaskGasSwat - - id: ClothingModularControllerSafeguardPreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitHosSelector # Corvax-Wega-ModularSuits-Edit - id: JetpackSecurityFilled - id: OxygenTankFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 5c79c58785..930fca0f74 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -118,7 +118,7 @@ table: !type:AllSelector children: - id: ClothingEyesHudMedical - - id: ClothingModularControllerRescuePreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitParamedicSelector # Corvax-Wega-ModularSuits-Edit - id: ClothingBeltMedicalEMTFilled - id: JetInjector - id: HandheldHealthAnalyzer diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index 272a2c3dcc..d0e1ce0017 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -182,7 +182,7 @@ table: !type:AllSelector children: - id: OxygenTankFilled - - id: ClothingModularControllerSecurityPreassembled # Corvax-Wega-ModularSuits-Edit + - id: HardsuitSecSelector # Corvax-Wega-ModularSuits-Edit - id: ClothingMaskBreath #CE's hardsuit diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5812d473a5..53d8d10137 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1311,10 +1311,10 @@ id: UplinkReinforcementRadioSyndicateCyborgAssault name: uplink-reinforcement-radio-cyborg-assault-name description: uplink-reinforcement-radio-cyborg-assault-desc - productEntity: ReinforcementRadioSyndicateCyborgAssault + productEntity: BorgKit # ReinforcementRadioSyndicateCyborgAssault Corvax-Wega-Syndi icon: { sprite: Objects/Devices/communication.rsi, state: old-radio-borg-assault } cost: - Telecrystal: 100 # Corvax-Wega-Syndi + Telecrystal: 75 # 60 Corvax-Wega-Syndi categories: - UplinkAllies conditions: diff --git a/Resources/Prototypes/Corvax/Body/Species/ipc.yml b/Resources/Prototypes/Corvax/Body/Species/ipc.yml index 9163430a87..d1454bbca5 100644 --- a/Resources/Prototypes/Corvax/Body/Species/ipc.yml +++ b/Resources/Prototypes/Corvax/Body/Species/ipc.yml @@ -82,6 +82,7 @@ parent: - AppearanceIpc - BaseSpeciesMob + - BaseOperated # Corvax-Wega-Surgery id: MobIpc name: Urist McHands components: @@ -139,6 +140,8 @@ type: StrippableBoundUserInterface enum.IpcFaceUiKey.Face: type: IpcFaceUserInterface + enum.SurgeryUiKey.Key: # Corvax-Wega-Surgery + type: SurgeryBoundUserInterface # Corvax-Wega-Surgery - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic @@ -263,6 +266,15 @@ shiveringHeatRegulation: 2000 normalBodyTemperature: 310.15 thermalRegulationTemperatureThreshold: 2 + # Corvax-Wega-Surgery-start + # - type: Operated + # raceGraph: IpcSurgery + # limbLossChance: 2 + # specialTool: Screwing + # - type: SyntheticOperated + # - type: Pain + # profile: SyntheticPainProfile + # Corvax-Wega-Surgery-end - type: entity parent: OrganBase diff --git a/Resources/Prototypes/Corvax/Body/Species/tajaran.yml b/Resources/Prototypes/Corvax/Body/Species/tajaran.yml index 779c7f960b..52c3e00df0 100644 --- a/Resources/Prototypes/Corvax/Body/Species/tajaran.yml +++ b/Resources/Prototypes/Corvax/Body/Species/tajaran.yml @@ -101,6 +101,13 @@ 32: sprite: Corvax/Mobs/Species/displacement.rsi state: shoes + # Corvax-Wega-start + socks: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: socks + # Corvax-Wega-end displacements: jumpsuit: sizeMaps: @@ -117,6 +124,13 @@ 32: sprite: Corvax/Mobs/Species/displacement.rsi state: outerclothing + # Corvax-Wega-start + socks: + sizeMaps: + 32: + sprite: Corvax/Mobs/Species/displacement.rsi + state: socks + # Corvax-Wega-end - type: entity save: false @@ -124,6 +138,7 @@ parent: - AppearanceTajaran - BaseSpeciesMobOrganic + - BaseOperated # Corvax-Wega-Surgery id: MobTajaran components: - type: Hunger @@ -157,6 +172,13 @@ types: Asphyxiation: -2.0 - type: Wagging + # Corvax-Wega-Add-start + - type: NaturalNightVision + tintColor: "#0f5e7f" + - type: DnaModifier + upper: MobTajaran + lowest: MobTajkey + # Corvax-Wega-Add-end - type: entity parent: OrganBase diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/tajaran.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/tajaran.yml index e03dd4a629..7f14659ff9 100644 --- a/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/tajaran.yml +++ b/Resources/Prototypes/Corvax/Entities/Mobs/Customization/Markings/tajaran.yml @@ -567,6 +567,7 @@ id: TajaranTailFluffyAnimated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_fluffy_wagging @@ -575,6 +576,7 @@ id: TailWingler1Animated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_fluffy_wagging @@ -585,6 +587,7 @@ id: TailWingler2Animated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_fluffy_wagging @@ -595,6 +598,7 @@ id: TailWingler3Animated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_fluffy_wagging @@ -605,6 +609,7 @@ id: TailFluffySkeletonAnimated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_fluffy_wagging @@ -615,6 +620,7 @@ id: TailTipAnimated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_m_wagging @@ -626,15 +632,16 @@ id: TajaranTailMAnimated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_m_wagging - type: marking id: TailRingAnimated - markingType: NonGenetics # Corvax-Wega-Genetics bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_m_wagging @@ -645,6 +652,7 @@ id: TailSkeletonAnimated bodyPart: Tail groupWhitelist: [] + markingType: NonGenetics # Corvax-Wega-Genetics sprites: - sprite: Corvax/Mobs/Customization/Tajaran/tajaran_tail.rsi state: tail_m_wagging diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index a7e79d58f6..edbbdde9dc 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -63,6 +63,11 @@ - type: Fiber fiberMaterial: fibers-synthetic - type: FingerprintMask + # Corvax-Wega-Edit-Start + - type: Tag + tags: + - Gloves + # Corvax-Wega-Edit-End - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index 1315ff5570..d09158a103 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -46,6 +46,12 @@ type: ChameleonBoundUserInterface enum.VoiceMaskUIKey.Key: type: VoiceMaskBoundUserInterface + # Corvax-Wega-Edit-Start + - type: Construction + graph: ModMasc + node: voiceMasc + # Corvax-Wega-Edit-End + - type: entity parent: ClothingMaskBase diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index f1683ea858..a69e02cf40 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -284,6 +284,7 @@ - id: RadioHandheld - id: AppraisalTool - id: ModularReceiver + - id: CirularSaw # Corvax-Wega-Edit - id: WeaponFlareGun - id: BarberScissors - !type:GroupSelector @@ -341,6 +342,7 @@ - id: RifleStock - id: ModularReceiver - id: HydroponicsToolScythe + - id: CirularSaw # Corvax-Wega-Edit # Rare Group - !type:GroupSelector weight: 5 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml index f9e5d78ca7..2b7758f5ee 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml @@ -4,7 +4,8 @@ - type: marking id: UndergarmentBottomBoxers bodyPart: UndergarmentBottom - groupWhitelist: [Arachnid, Diona, Human, Moth, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -16,7 +17,8 @@ - type: marking id: UndergarmentBottomBriefs bodyPart: UndergarmentBottom - groupWhitelist: [Arachnid, Diona, Human, Moth, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -28,7 +30,8 @@ - type: marking id: UndergarmentBottomSatin bodyPart: UndergarmentBottom - groupWhitelist: [Arachnid, Diona, Human, Moth, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -40,7 +43,8 @@ - type: marking id: UndergarmentTopBra bodyPart: UndergarmentTop - groupWhitelist: [Arachnid, Diona, Human, Moth, Reptilian, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -52,7 +56,8 @@ - type: marking id: UndergarmentTopSportsbra bodyPart: UndergarmentTop - groupWhitelist: [Arachnid, Diona, Human, Moth, Reptilian, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -64,7 +69,8 @@ - type: marking id: UndergarmentTopBinder bodyPart: UndergarmentTop - groupWhitelist: [Arachnid, Diona, Human, Moth, Reptilian, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -76,7 +82,8 @@ - type: marking id: UndergarmentTopTanktop bodyPart: UndergarmentTop - groupWhitelist: [Arachnid, Diona, Human, Moth, Reptilian, Slime] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -88,7 +95,8 @@ - type: marking id: UndergarmentBottomBoxersVox # Voxers. bodyPart: UndergarmentBottom - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -100,7 +108,8 @@ - type: marking id: UndergarmentBottomBriefsVox bodyPart: UndergarmentBottom - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -112,7 +121,8 @@ - type: marking id: UndergarmentBottomSatinVox bodyPart: UndergarmentBottom - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -124,7 +134,8 @@ - type: marking id: UndergarmentTopBraVox bodyPart: UndergarmentTop - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -136,7 +147,8 @@ - type: marking id: UndergarmentTopSportsbraVox bodyPart: UndergarmentTop - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -148,7 +160,8 @@ - type: marking id: UndergarmentTopBinderVox bodyPart: UndergarmentTop - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -160,7 +173,8 @@ - type: marking id: UndergarmentTopTanktopVox bodyPart: UndergarmentTop - groupWhitelist: [Vox] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -172,7 +186,8 @@ - type: marking id: UndergarmentBottomBoxersReptilian bodyPart: UndergarmentBottom - groupWhitelist: [Reptilian] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -184,7 +199,8 @@ - type: marking id: UndergarmentBottomBriefsReptilian bodyPart: UndergarmentBottom - groupWhitelist: [Reptilian] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -196,7 +212,8 @@ - type: marking id: UndergarmentBottomSatinReptilian bodyPart: UndergarmentBottom - groupWhitelist: [Reptilian] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -208,7 +225,8 @@ - type: marking id: UndergarmentBottomBoxersVulpkanin bodyPart: UndergarmentBottom - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -220,7 +238,8 @@ - type: marking id: UndergarmentBottomBriefsVulpkanin bodyPart: UndergarmentBottom - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -232,7 +251,8 @@ - type: marking id: UndergarmentBottomSatinVulpkanin bodyPart: UndergarmentBottom - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -244,7 +264,8 @@ - type: marking id: UndergarmentTopBraVulpkanin bodyPart: UndergarmentTop - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -256,7 +277,8 @@ - type: marking id: UndergarmentTopSportsbraVulpkanin bodyPart: UndergarmentTop - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -268,7 +290,8 @@ - type: marking id: UndergarmentTopBinderVulpkanin bodyPart: UndergarmentTop - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null @@ -280,7 +303,8 @@ - type: marking id: UndergarmentTopTanktopVulpkanin bodyPart: UndergarmentTop - groupWhitelist: [Vulpkanin] + groupWhitelist: [] # Corvax-Wega-Edit + markingType: NonGenetics # Corvax-Wega-Genetics coloring: default: type: null diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 5a130a2db3..32eff39ac2 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1485,7 +1485,6 @@ - type: Crawler - type: StatusIcon - type: VentCrawler # Corvax-Wega-VentCrawling - bounds: -0.5,-0.5,0.5,0.5 - type: JobStatus # marks them as crew - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 759cb557cf..76df34a995 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -558,8 +558,8 @@ - PositronicBrain borg_module: - BorgModuleOperative - - BorgModuleL6C - - BorgModuleChina # BorgModuleDoubleEsword Corvax-Wega + # - BorgModuleL6C Corvax-Wega + # BorgModuleDoubleEsword Corvax-Wega - type: ItemSlots slots: cell_slot: diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 37f39bd608..34ed7a0476 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -449,11 +449,6 @@ # Corvax-Wega-start - type: Repairable # Negative values represent healing qualityNeeded: BloodDagger - damage: - groups: - Brute: -60 # 20 of each Brute Type - 20% of a basic shield HP - types: - Heat: -20 fuelCost: 0 # 1/2 of a Welder for a full repair doAfterDelay: 5 allowSelfRepair: false @@ -565,11 +560,6 @@ node: bluesheildfinished - type: Repairable # Negative values represent healing qualityNeeded: Pulsing - damage: - groups: - Brute: -15 # 20 of each Brute Type - 20% of a basic shield HP - types: - Heat: -5 fuelCost: 0 # 1/2 of a Welder for a full repair doAfterDelay: 1 allowSelfRepair: false diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 039ff36420..35b497d40f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -654,10 +654,12 @@ - item: MailBagBorg - hand: emptyLabel: borg-slot-cash-empty - emptyRepresentative: SpaceCash + emptyRepresentative: CashIcon whitelist: components: - Cash + tags: + - CoordinatesDisk # Corvax-Wega-Robot-End - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: appraisal-module } @@ -1095,7 +1097,7 @@ - item: HandheldHealthAnalyzer - item: DefibrillatorOneHandedUnpowered - item: HandheldCrewMonitorBorg # Corvax-Wega-Robot - - item: Crowbar + # - item: Crowbar # Corvax-Wega-Robot - item: BorgFireExtinguisher - item: BorgHandheldGPSBasic - item: HandLabeler @@ -1129,19 +1131,7 @@ hands: # Corvax-Wega-Robot-Start - item: HandheldHealthAnalyzer - - item: BorgSyringe - hand: - emptyLabel: borg-slot-injector-dropper-empty - emptyRepresentative: Syringe - whitelist: - tags: - - Itemborg - - hand: - emptyLabel: borg-slot-injector-dropper-empty - emptyRepresentative: AdvancedJetInjector - whitelist: - tags: - - Itemborg + - item: AdvancedJetInjector # Corvax-Wega-Robot-End - item: PillCanister hand: @@ -1178,6 +1168,13 @@ whitelist: tags: - Lollipops + - hand: + emptyRepresentative: DiseaseSwab + emptyLabel: borg-slot-swap-empty + whitelist: + components: + - DiseaseSwab + - DiseaseVaccine # Corvax-Wega-Robot-End - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: chem-module } @@ -1683,22 +1680,15 @@ - type: ItemBorgModule hands: # Corvax-Wega-Robot-start - - item: WeaponLightMachineGunL6CEnergy - hand: - emptyLabel: borg-slot-gun-empty - emptyRepresentative: WeaponLightMachineGunL6C - whitelist: - tags: - - Itemborg - - hand: - emptyLabel: borg-slot-gun-empty - emptyRepresentative: BorgWeaponSniperHristovAdvanced - whitelist: - tags: - - Itemborg - - item: CyborgEnergySwordDouble + - item: WeaponLightMachineGunL6C - item: PinpointerSyndicateNuclear - item: PinpointerUniversal # Corvax-Wega-Robot-add + - type: ComponentBorgModule + components: + - type: Reflect + reflectProb: 0.15 + slotFlags: + - NONE # Corvax-Wega-Robot-End - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-l6c-module } diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 4e6b4021a4..1dddbd9fdb 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [ BaseItem, OrganBaseBrain ] # Corvax-Wega-Android-Edit id: MMI name: man-machine interface description: A machine able to facilitate communication between a biological brain and electronics, enabling crew to continue to provide value after work-related incidents. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml index fec2cca3ab..74c59b024c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/firebomb.yml @@ -55,6 +55,11 @@ - type: Construction graph: FireBomb node: firebomb + # Corvax-Wega-Edit-Start + - type: Tag + tags: + - FireBomb + # Corvax-Wega-Edit-End # has igniter but no fuel or wires - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml index 6584058c25..3061176baa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/shotgun.yml @@ -19,6 +19,7 @@ - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Boxes/shotgun.rsi - type: BallisticAmmoProvider + breakOnMoveFill: false # Corvax-Wega-Edit mayTransfer: true whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 3d05cc4608..db616c4488 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -9,6 +9,7 @@ - MagazineShotgun - type: BallisticAmmoProvider mayTransfer: true + breakOnMoveFill: false # Corvax-Wega-Edit whitelist: tags: - ShellShotgun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 16555d6a1e..22480da32c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -918,10 +918,10 @@ - type: ExplodeOnTrigger - type: Explosive explosionType: Default - totalIntensity: 175 # Corvax-Wega-Edit + totalIntensity: 50 intensitySlope: 1 - maxIntensity: 10 # Corvax-Wega-Edit - canCreateVacuum: true # Corvax-Wega-Edit + maxIntensity: 5 + canCreateVacuum: false - type: ContainerContainer containers: cluster-payload: !type:Container diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 4a680de3d3..c3700eb219 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -70,7 +70,7 @@ mode: SnapgridCenter components: - type: Physics - bodyType: Static + bodyType: KinematicController - type: Transform anchored: true @@ -83,12 +83,28 @@ components: - type: Rotatable rotateWhileAnchored: true + # Corvax-Wega-Start + - type: Vehicle + hasKey: true + useHand: false + hornSound: null + - type: MovementSpeedModifier + weightlessModifier: 0 + baseAcceleration: 2 + baseFriction: 2 + frictionNoInput: 6 + baseWalkSpeed: 2 + baseSprintSpeed: 2.5 + - type: InputMover + - type: Physics + bodyType: KinematicController + # Corvax-Wega-End #Starts anchored, can be rotated while anchored - type: entity name: stool id: StoolBase - parent: OfficeChairBase + parent: UnanchoredChairBase # Corvax-Wega-Edit abstract: true placement: mode: SnapgridCenter @@ -97,6 +113,8 @@ bodyType: Static - type: Transform anchored: true + - type: Rotatable + rotateWhileAnchored: true - type: entity name: chair diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml index 96842fef4f..a695167648 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/cores.yml @@ -142,27 +142,27 @@ energy: 3.5 color: "#cb5b7e" castShadows: false - - type: Healing - damageContainers: - - Biological - damage: - groups: # these are all split across multiple types - Brute: -150 - Burn: -150 - Toxin: -150 - bloodlossModifier: -20 - delay: 1 - selfHealPenaltyMultiplier: 0 - healingBeginSound: - path: "/Audio/Items/Medical/ointment_begin.ogg" - params: - volume: 1.0 - variation: 0.125 - healingEndSound: - path: "/Audio/Items/Medical/ointment_end.ogg" - params: - volume: 1.0 - variation: 0.125 + # - type: Healing + # damageContainers: + # - Biological + # damage: + # groups: # these are all split across multiple types + # Brute: -150 + # Burn: -150 + # Toxin: -150 + # bloodlossModifier: -20 + # delay: 1 + # selfHealPenaltyMultiplier: 0 + # healingBeginSound: + # path: "/Audio/Items/Medical/ointment_begin.ogg" + # params: + # volume: 1.0 + # variation: 0.125 + # healingEndSound: + # path: "/Audio/Items/Medical/ointment_end.ogg" + # params: + # volume: 1.0 + # variation: 0.125 - type: entity parent: BaseAnomalyCore @@ -679,7 +679,7 @@ maxCharges: 1 - type: AutoRecharge rechargeDuration: 300 - + - type: entity parent: BaseAnomalyInertCore id: AnomalyCoreSantaInert @@ -691,4 +691,4 @@ radius: 1.5 energy: 2.0 color: "#fc0303" - castShadows: false \ No newline at end of file + castShadows: false diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml index d48b434960..eec2a4a0e1 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/robotics.yml @@ -29,6 +29,7 @@ - BorgModuleCommonCandy - BorgModuleCleaningCommon - BorgModuleMusique + - BorgModuleNightVison # Corvax-Wega-end - type: latheRecipePack diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml index 307c537db5..997d56e82d 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/xenoborgs.yml @@ -23,4 +23,5 @@ - XenoborgModuleCommonRepeir - XenoborgModuleCommonSpeed - XenoborgModuleEMP + - BorgModuleNightVisoXenoborg # Corvax-Wega-start \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index f5254b5933..a4f7e985e9 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -6,10 +6,10 @@ objective: roles-antag-nuclear-operative-objective requirements: - !type:OverallPlaytimeRequirement - time: 15h # Corvax-RoleTime 5 + time: 80h # Corvax-Wega-Edit - !type:DepartmentTimeRequirement department: Security - time: 5h # Corvax-RoleTime + time: 20h # Corvax-Wega-Edit guides: [ NuclearOperatives ] - type: antag @@ -20,13 +20,13 @@ objective: roles-antag-nuclear-operative-agent-objective requirements: - !type:OverallPlaytimeRequirement - time: 15h # Corvax-RoleTime 5 + time: 100h # Corvax-Wega-Edit - !type:RoleTimeRequirement role: JobChemist - time: 10h # Corvax-RoleTime 3 + time: 30h # Corvax-Wega-Edit - !type:DepartmentTimeRequirement department: Security - time: 10h # Corvax-RoleTime + time: 30h # Corvax-Wega-Edit guides: [ NuclearOperatives ] - type: antag @@ -37,10 +37,10 @@ objective: roles-antag-nuclear-operative-commander-objective requirements: - !type:OverallPlaytimeRequirement - time: 30h # Corvax-RoleTime 5 + time: 150h # Corvax-Wega-Edit - !type:DepartmentTimeRequirement department: Security - time: 15h # Corvax-RoleTime 5 + time: 50h # Corvax-Wega-Edit # should be changed to nukie playtime when thats tracked (wyci) guides: [ NuclearOperatives ] diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index 20b10bff03..b57d41d67d 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -7,7 +7,7 @@ guides: [ Revolutionaries ] requirements: - !type:OverallPlaytimeRequirement - time: 30h # Corvax-RoleTime 1 + time: 100h # Corvax-Wega-Edit - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index a6cc3ee772..049444dc81 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -7,7 +7,10 @@ guides: [ Traitors ] requirements: - !type:OverallPlaytimeRequirement - time: 30h # Corvax-RoleTime 1 + time: 50h # Corvax-Wega-Edit + - !type:DepartmentTimeRequirement # Corvax-Wega-Edit + department: Security + time: 10h # Corvax-Wega-Edit - type: antag id: TraitorSleeper diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 1e706f1fcc..22fdd78c5b 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -7,9 +7,10 @@ # - !type:RoleTimeRequirement # role: JobCargoTechnician # time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobSalvageSpecialist - time: 10h # Corvax-RoleTime 2.5 + # Corvax-Wega-Edit + # - !type:RoleTimeRequirement + # role: JobSalvageSpecialist + # time: 10h # Corvax-RoleTime 2.5 - !type:DepartmentTimeRequirement department: Cargo time: 10h @@ -19,6 +20,16 @@ inverted: true traits: - Muted + # Corvax-Wega-AnyRequirement-Edit-start + - !type:AnyRequirement + requirements: + - !type:RoleTimeRequirement + role: JobSalvageSpecialist + time: 10h + - !type:RoleTimeRequirement + role: JobShaftMiner + time: 10h + # Corvax-Wega-AnyRequirement-Edit-end weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 64da3cbe9e..398b8045bb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -7,11 +7,16 @@ - !type:DepartmentTimeRequirement department: Security time: 50h # Corvax-RoleTime -# Corvax-Wega-Start - - !type:RoleTimeRequirement - role: JobWardenHelper - time: 10h # через неделю после принятия ПРа, чтоб резко вардены не пропали -# Corvax-Wega-End + # Corvax-Wega-AnyRequirement-Edit-start + - !type:AnyRequirement + requirements: + - !type:RoleTimeRequirement + role: JobWardenHelper + time: 10h + - !type:RoleTimeRequirement + role: JobWarden # If you have played before + time: 1h + # Corvax-Wega-AnyRequirement-Edit-end - !type:TraitsRequirement #Corvax-TraitsRequirement inverted: true traits: diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml index a5123d911e..f914b28a93 100644 --- a/Resources/Prototypes/StatusIcon/security.yml +++ b/Resources/Prototypes/StatusIcon/security.yml @@ -62,7 +62,7 @@ layer: Mod isShaded: true icon: - sprite: /Textures/Interface/Misc/job_icons.rsi + sprite: /Textures/_Wega/Interface/Misc/job_icons.rsi # Corvax-Wega-Edit state: MindShield - type: securityIcon diff --git a/Resources/Prototypes/Voice/disease_emotes.yml b/Resources/Prototypes/Voice/disease_emotes.yml index d5ac015ee2..19d98d2e58 100644 --- a/Resources/Prototypes/Voice/disease_emotes.yml +++ b/Resources/Prototypes/Voice/disease_emotes.yml @@ -20,6 +20,12 @@ - sneeze! - sneezes! - sneezed! + # Corvax-Localization-Start + - чихнул + - чихнул! + - чихает + - чихает! + # Corvax-Localization-End - type: emote id: Cough diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 260c7a6d1c..2a19517a26 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -624,6 +624,9 @@ - flutters her wings - flutters their wings - flutters its wings + # Corvax-Localization-Start + - махает крыльями + # Corvax-Localization-End # Machine Emotes - type: emote diff --git a/Resources/Prototypes/_Wega/Body/Species/android.yml b/Resources/Prototypes/_Wega/Body/Species/android.yml index f99462f7a1..a8a9be9a60 100644 --- a/Resources/Prototypes/_Wega/Body/Species/android.yml +++ b/Resources/Prototypes/_Wega/Body/Species/android.yml @@ -144,16 +144,10 @@ LegRight: OrganAndroidLegRight FootLeft: OrganAndroidFootLeft FootRight: OrganAndroidFootRight - Brain: OrganAndroidBrain + Brain: MMIFilled Eyes: OrganAndroidEyes - Tongue: OrganAndroidTongue - Appendix: OrganAndroidAppendix - Ears: OrganAndroidEars Lungs: OrganAndroidGas Heart: OrganAndroidTyrium - Stomach: OrganAndroidStomach - Liver: OrganAndroidLiver - Kidneys: OrganAndroidKidneys - type: HumanoidProfile species: Android @@ -388,34 +382,6 @@ parent: [ OrganBaseFootRight, OrganAndroidExternal ] id: OrganAndroidFootRight -- type: entity - parent: [ OrganBaseBrain, OrganAndroidInternal ] - id: OrganAndroidBrain - -- type: entity - parent: [ OrganBaseTongue, OrganAndroidInternal ] - id: OrganAndroidTongue - -- type: entity - parent: [ OrganBaseAppendix, OrganAndroidInternal ] - id: OrganAndroidAppendix - -- type: entity - parent: [ OrganBaseEars, OrganAndroidInternal ] - id: OrganAndroidEars - -- type: entity - parent: [ OrganBaseStomach, OrganAndroidInternal, OrganAndroidMetabolizer ] - id: OrganAndroidStomach - -- type: entity - parent: [ OrganBaseLiver, OrganAndroidInternal, OrganAndroidMetabolizer ] - id: OrganAndroidLiver - -- type: entity - parent: [ OrganBaseKidneys, OrganAndroidInternal, OrganAndroidMetabolizer ] - id: OrganAndroidKidneys - - type: entity parent: [ OrganBaseLungs, OrganAndroidInternal, OrganAndroidMetabolizer ] id: OrganAndroidGas diff --git a/Resources/Prototypes/_Wega/Body/Species/demon.yml b/Resources/Prototypes/_Wega/Body/Species/demon.yml index 6f400f65d3..28854fe9e5 100644 --- a/Resources/Prototypes/_Wega/Body/Species/demon.yml +++ b/Resources/Prototypes/_Wega/Body/Species/demon.yml @@ -25,7 +25,7 @@ required: true default: [ DemomTail ] enum.HumanoidVisualLayers.Chest: - limit: 4 + limit: 1 required: false enum.HumanoidVisualLayers.LArm: limit: 1 diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/syndicate.yml index 14dd28b27f..0d3b59c92b 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Boxes/syndicate.yml @@ -11,4 +11,20 @@ # - id: WiretappingTerminal # amount: 1 # - id: WiretappingCamera - # amount: 4 \ No newline at end of file + # amount: 4 + +- type: entity + id: BorgKit + parent: [BoxCardboard, BaseSyndicateContraband] + name: cyborg Kit + suffix: Filled + components: + - type: Sprite + layers: + - state: box_of_doom + - type: StorageFill + contents: + - id: ReinforcementRadioSyndicateCyborgAssault + - id: ModuleSyndiWeapon + - id: ModuleSyndiSupport + - id: Screwdriver diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml index f447239f6f..51040ca573 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Items/belt.yml @@ -1,12 +1,28 @@ - type: entity id: ClothingBeltMilitaryWebbingFilled + name: assault belt + description: Tactical assault belt. parent: ClothingBeltMilitaryWebbing suffix: Filled components: - type: EntityTableContainerFill containers: storagebase: !type:NestedSelector - tableId: BeltSecurityEntityTable + tableId: BeltBlueShieldEntityLable + +- type: entityTable + id: BeltBlueShieldEntityLable + table: !type:AllSelector + children: + - id: Stunbaton + - id: Handcuffs + - id: AdvancedJetInjector + - id: ChemistryBottleBicaridine + - id: ChemistryBottleBicaridine + - id: ChemistryBottleDermaline + - id: ChemistryBottleDermaline + - id: ChemistryBottleEphedrine + - id: ChemistryBottleEphedrine - type: entity id: ClothingBeltSheathSyndicateFilled diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/command.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/command.yml index a90a4df7c2..a421ba98c0 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/command.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/command.yml @@ -11,7 +11,14 @@ - id: MedkitFilled - id: ClothingNeckCloakBlueShield - id: ClothingUniformJumpsuitAltBlueShield - - id: ClothingOuterWinterBlueShield + - id: BlueShieldVoucherCard + - id: ClothingHeadHelmetBlueShield + - id: HandheldCrewMonitorBlueshield + - id: ClothingVestBlueShieldAlt + - id: ClothingBeltMilitaryWebbingAlt + - id: ClothingNeckMantleBlueShield + - id: ClothingUniformJumpsuitBlueShieldRock + - id: ClothingOuterWinterBlueShieldAlt # Hardsuit table, used for suit storage as well - type: entityTable diff --git a/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/suit_storage.yml index 3d2d1b66c0..105d4fb7e5 100644 --- a/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/_Wega/Catalog/Fills/Lockers/suit_storage.yml @@ -31,3 +31,46 @@ - id: OxygenTankFilled - id: ClothingOuterArmorExplorerSuit - id: ClothingMaskGasExplorer + +#Clown +- type: entity + id: SuitStorageHardsuitClown + parent: SuitStorageBase + suffix: Clown + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillSuitStorageHardsuitClown + - type: AccessReader + access: [["Theatre"]] + +- type: entityTable + id: FillSuitStorageHardsuitClown + table: !type:AllSelector + children: + - id: EmergencyFunnyOxygenTankFilled + - id: HardsuitClownSelector + # - id: ClothingMaskBreath A clown's mask is already a breathing mask. + +#Mime +- type: entity + id: SuitStorageHardsuitMime + parent: SuitStorageBase + suffix: Mime + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillSuitStorageHardsuitMime + - type: AccessReader + access: [["Theatre"]] + +- type: entityTable + id: FillSuitStorageHardsuitMime + table: !type:AllSelector + children: + - id: OxygenTankFilled + - id: NitrogenTankFilled + - id: ClothingOuterHardsuitMime + # - id: ClothingMaskBreath A mime's mask is already a breathing mask. diff --git a/Resources/Prototypes/_Wega/Catalog/Voucher/security.yml b/Resources/Prototypes/_Wega/Catalog/Voucher/security.yml index cf60c97fdb..fdd861ffb3 100644 --- a/Resources/Prototypes/_Wega/Catalog/Voucher/security.yml +++ b/Resources/Prototypes/_Wega/Catalog/Voucher/security.yml @@ -67,3 +67,41 @@ - id: Handcuffs amount: 2 - id: Flash + +- type: voucherKit + id: BlueShieldkit1 + name: voucher-security-jay-name + description: voucher-security-jay-desc + icon: { sprite: _Wega/Objects/Weapons/Guns/Rifles/jay.rsi, state: "icon" } + items: + - id: WeaponRifleJay + - id: MagazineRifle + amount: 3 + - id: MagazineBoxRifle + +- type: voucherKit + id: BlueShieldkit2 + name: voucher-security-berkut-name + description: voucher-security-berkut-desc + icon: { sprite: _Wega/Objects/Weapons/Guns/SMGs/berkut.rsi, state: "icon" } + items: + - id: WeaponSubmachinegunBerkut + - id: MagazinePistolSubMachineGun + amount: 3 + - id: MagazineBoxPistol + +- type: voucherKit + id: BlueShieldkit3 + name: voucher-security-pulsar-name + description: voucher-security-pulsar-desc + icon: { sprite: _Wega/Objects/Weapons/Guns/Battery/pulsar.rsi, state: "icon" } + items: + - id: WeaponEnergyPulsar + +- type: voucherKit + id: BlueShieldkit4 + name: voucher-security-baton-name + description: voucher-security-baton-desc + icon: { sprite: _Wega/Objects/Weapons/Melee/batonBS.rsi, state: "stunbaton_off" } + items: + - id: StunbatonBlueshield \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Back/duffel.yml index e51f903b6a..d9fb76f754 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Back/duffel.yml @@ -15,7 +15,7 @@ components: - type: Sprite sprite: _Wega/Clothing/Back/Duffels/postman.rsi - + - type: entity parent: ClothingBackpackDuffel id: ClothingDuffelsCapitanWhite @@ -24,12 +24,28 @@ components: - type: Sprite sprite: _Wega/Clothing/Back/Duffels/captain_white.rsi - + - type: entity parent: ClothingBackpackDuffel id: ClothingDuffelsCapitanGreen - name: sherif duffel + name: sherif duffel description: It looks like a military development, although the coloring is unusual. A very stylish and practical backpack. components: - type: Sprite sprite: _Wega/Clothing/Back/Duffels/captain_green.rsi + +- type: entity + parent: ClothingBackpack + id: ClothingBackpackBig + name: big backpack + description: Large bag for large things. + components: + - type: Sprite + sprite: _Wega/Clothing/Back/Duffels/big_backpack.rsi + - type: Storage + grid: + - 0,0,6,6 + maxItemSize: Huge + - type: Construction + graph: BigBag + node: Bigbackpack diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Belt/belts.yml index ef5dc826b6..d52cd6368d 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Belt/belts.yml @@ -62,3 +62,14 @@ sprite: _Wega/Clothing/Belt/salvagewebbing.rsi - type: Clothing sprite: _Wega/Clothing/Belt/salvagewebbing.rsi + +- type: entity + parent: ClothingBeltMilitaryWebbing + id: ClothingBeltMilitaryWebbingAlt + name: light military webbing + description: Standart light webbing. + components: + - type: Sprite + sprite: _Wega/Clothing/Belt/webbingblueshield.rsi + - type: Clothing + sprite: _Wega/Clothing/Belt/webbingblueshield.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Ears/headsets.yml new file mode 100644 index 0000000000..a08b8ebf89 --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Ears/headsets.yml @@ -0,0 +1,12 @@ +- type: entity + parent: ClothingHeadsetMining + id: ClothingHeadsetMiningMedical + name: mining medic headset + description: Headset used by medical miners. + components: + - type: ContainerFill + containers: + key_slots: + - EncryptionKeyCargo + - EncryptionKeyMedical + - EncryptionKeyCommon diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Head/helmets.yml index f71bdd62e9..c63bd47edd 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Head/helmets.yml @@ -24,3 +24,23 @@ - type: Tag tags: - WhitelistChameleon + +- type: entity + parent: ClothingHeadHelmetBasic + id: ClothingHeadHelmetBlueShield + name: blue shield's helmet + description: default helmet + components: + - type: Sprite + sprite: _Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi + - type: Clothing + sprite: _Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml index f266d367ed..75af3ad672 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hoods.yml @@ -77,8 +77,8 @@ coefficients: Blunt: 0.9 Slash: 0.9 - Piercing: 0.9 - Heat: 0.8 + Piercing: 0.95 + Heat: 0.85 Caustic: 0.65 - type: ClothingAshStormProtection modifier: 0.05 @@ -116,8 +116,8 @@ coefficients: Blunt: 0.75 Slash: 0.75 - Piercing: 0.75 - Heat: 0.6 + Piercing: 0.85 + Heat: 0.75 Caustic: 0.5 - type: entity @@ -147,8 +147,8 @@ coefficients: Blunt: 0.75 Slash: 0.75 - Piercing: 0.75 - Heat: 0.6 + Piercing: 0.85 + Heat: 0.75 Caustic: 0.5 - type: entity @@ -182,3 +182,14 @@ - type: Tag tags: - WhitelistChameleon + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterBlueShieldAlt + categories: [ HideSpawnMenu ] + name: blue shield coat's hood + components: + - type: Sprite + sprite: _Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi + - type: Clothing + sprite: _Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Modular/modular.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Modular/modular.yml index c5909a5c2a..11528a7c8a 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Modular/modular.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Modular/modular.yml @@ -2235,7 +2235,7 @@ activeComponents: head: - type: PressureProtection - highPressureMultiplier: 0.3 + highPressureMultiplier: 0.525 lowPressureMultiplier: 1000 - type: TemperatureProtection heatingCoefficient: 0.1 @@ -2244,7 +2244,7 @@ modifier: 0.2 outerClothing: - type: PressureProtection - highPressureMultiplier: 0.3 + highPressureMultiplier: 0.5 lowPressureMultiplier: 1000 - type: TemperatureProtection heatingCoefficient: 0.01 @@ -2260,8 +2260,8 @@ - type: ClothingAshStormProtection modifier: 0.1 - type: ClothingSpeedModifier - walkModifier: 0.9 - sprintModifier: 0.9 + walkModifier: 0.85 + sprintModifier: 0.85 - type: entity parent: ClothingModularHelmetBase @@ -2297,14 +2297,6 @@ color: "#a4fef4" - type: PointLight color: "#a4fef4" - - type: Armor - modifiers: - coefficients: - Blunt: 0.75 - Slash: 0.75 - Piercing: 0.75 - Heat: 0.6 - Caustic: 0.5 - type: entity parent: ClothingModularChestPlateBase @@ -2324,13 +2316,14 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 - Piercing: 0.55 - Heat: 0.5 - Caustic: 0.75 + Blunt: 0.7 + Slash: 0.6 + Piercing: 0.7 + Heat: 0.7 + Radiation: 0.3 + Caustic: 0.7 - type: ExplosionResistance - damageCoefficient: 0.5 + damageCoefficient: 0.7 - type: entity parent: ClothingModularGauntletsBase diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml index 2445788b2b..f8c5af42f0 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Neck/cloaks.yml @@ -100,3 +100,14 @@ components: - type: Sprite sprite: _Wega/Clothing/Neck/Cloaks/white_captain_mantle.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckMantleBlueShield + name: blue shield Mantle + description: Good quality Mantle for Blueshield Officers. + components: + - type: Sprite + sprite: _Wega/Clothing/Neck/Cloaks/BSmantle.rsi + - type: Clothing + sprite: _Wega/Clothing/Neck/Cloaks/BSmantle.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml index d30af645bf..a569fa536f 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/armor.yml @@ -78,11 +78,11 @@ coefficients: Blunt: 0.7 Slash: 0.7 - Piercing: 0.75 + Piercing: 0.9 Heat: 0.7 Caustic: 0.85 - type: ExplosionResistance - damageCoefficient: 0.6 + damageCoefficient: 0.8 - type: FireProtection reduction: 0.4 - type: TemperatureProtection @@ -137,11 +137,11 @@ coefficients: Blunt: 0.5 Slash: 0.5 - Piercing: 0.55 + Piercing: 0.8 Heat: 0.5 Caustic: 0.75 - type: ExplosionResistance - damageCoefficient: 0.5 + damageCoefficient: 0.6 - type: FireProtection reduction: 0.5 - type: ToggleableClothing @@ -179,11 +179,11 @@ coefficients: Blunt: 0.5 Slash: 0.5 - Piercing: 0.55 + Piercing: 0.8 Heat: 0.5 Caustic: 0.75 - type: ExplosionResistance - damageCoefficient: 0.5 + damageCoefficient: 0.6 - type: FireProtection reduction: 0.5 - type: TemperatureProtection @@ -243,3 +243,27 @@ description: An evil-looking piece of cult armor, made of bones. components: - type: BloodCultEquipment + +- type: entity + parent: ClothingOuterArmorBasic + id: ClothingVestBlueShieldAlt + name: blue shield vest + description: Type V bulletproof vest. + components: + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.6 + Heat: 0.5 + - type: ExplosionResistance + damageCoefficient: 0.65 + - type: ClothingSpeedModifier + walkModifier: 1.0 + sprintModifier: 1.0 + - type: HeldSpeedModifier diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/wintercoats.yml index 839214fa9a..c2657232cf 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/wintercoats.yml @@ -20,3 +20,26 @@ sprite: _Wega/Clothing/OuterClothing/WinterCoats/blueshield.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterBlueShield + +- type: entity + parent: [ BaseSyndicateContraband, ClothingOuterWinterWarden ] + id: ClothingOuterWinterBlueShieldAlt + name: winter armorcoat Blue Shield + description: Good quality coat. + components: + - type: Armor + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.6 + Caustic: 0.75 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: Sprite + sprite: _Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi + - type: Clothing + sprite: _Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterBlueShieldAlt \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml index a5cf347e3f..bb8f2c243e 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Uniforms/jumpsuits.yml @@ -828,3 +828,13 @@ - type: Clothing sprite: _Wega/Clothing/Uniforms/Jumpsuit/explorer_khaki.rsi +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBlueShieldRock + name: rock blue shield uniform + description: Comleted in blue-shield style uniform. + components: + - type: Sprite + sprite: _Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi + - type: Clothing + sprite: _Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi diff --git a/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml b/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml index d1fe277270..e0b475dd68 100644 --- a/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml +++ b/Resources/Prototypes/_Wega/Entities/Effects/vampire.yml @@ -154,6 +154,15 @@ - type: BeaconSoul - type: TimedDespawn lifetime: 420.0 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.2 + density: 100 + mask: + - TableMask - type: entity id: VampireMistEffect diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml index 0fb23ef366..4046cd09e1 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Customization/Markings/demon.yml @@ -82,7 +82,7 @@ - type: marking id: Allsuccubus - bodyPart: Tail + bodyPart: Chest groupWhitelist: [Demon] sprites: - sprite: _Wega/Mobs/Customization/demon.rsi diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml index 961604705a..f21cc8f20d 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/animals.yml @@ -223,8 +223,7 @@ types: Blunt: 5 Piercing: 4 - groups: - Burn: 3 + Heat: 3 clumsySound: path: /Audio/Animals/monkey_scream.ogg - type: DnaModifier diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml index 7fa390b3c1..5294cd4ca4 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/lavaland_megafauna.yml @@ -115,6 +115,8 @@ minSaturation: -4.0 updateIntervalMultiplier: 0.8 - type: BloodDrunkMiner + - type: MegafaunaDamageContributor + achievement: MinerBoss - type: NPCHandSwitcher - type: HTN rootTask: @@ -213,6 +215,8 @@ rewards: - HierophantClubRod - GemCompactedDilithium + - type: MegafaunaDamageContributor + achievement: HierophantBoss - type: HTN rootTask: task: HierophantBehaviorCompound @@ -299,6 +303,8 @@ LegionCore: 0.1 rewards: - CrowbarRed + - type: MegafaunaDamageContributor + achievement: LegionBoss - type: TrophyHunter trophy: TrophyLavalandLegionSkull @@ -504,6 +510,8 @@ - type: ColossusBoss rewards: - CrateNecropolisColossusFilled + - type: MegafaunaDamageContributor + achievement: ColossusBoss - type: HTN rootTask: task: MegafaunaBehaviorCompound @@ -600,6 +608,8 @@ defaultDesc: nav-map-beacon-lavaland-signal-ashdrake-desc color: "#a7000b" - type: AshDrakeBoss + - type: MegafaunaDamageContributor + achievement: AshDrakeBoss - type: HTN rootTask: task: MegafaunaBehaviorCompound @@ -766,6 +776,8 @@ ActionBubblegumIllusionDash: 0.67 ActionBubblegumPentagramDash: 0.33 ActionBubblegumChaoticIllusionDash: 0.75 + - type: MegafaunaDamageContributor + achievement: BubblegumBoss - type: HTN rootTask: task: MegafaunaBehaviorCompound diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/drinks_flasks.yml b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/drinks_flasks.yml index aeb3941278..772e4d3891 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/drinks_flasks.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Drink/drinks_flasks.yml @@ -2,18 +2,22 @@ parent: FlaskBase id: DrinkUnholyFlask name: old flask - description: "" + description: "Covered with a layer of dust." components: - type: Sprite sprite: _Wega/Objects/Consumable/Drinks/unholyflask.rsi state: icon + - type: GenericVisualizer + visuals: + enum.OpenableVisuals.Opened: + enum.OpenableVisuals.Layer: + True: {state: "icon"} # lid off + False: {state: "icon"} # lid on - type: entity parent: DrinkUnholyFlask id: DrinkUnholyFlaskFull - name: old flask - description: "" - suffix: full + suffix: Full components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/circular_saw.yml b/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/circular_saw.yml new file mode 100644 index 0000000000..cc455c4bcd --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/circular_saw.yml @@ -0,0 +1,12 @@ +- type: entity + parent: BaseItem + id: CirularSaw + name: circular saw + description: Sharpnes. + components: + - type: Sprite + sprite: _Wega/Objects/Devices/circular_saw.rsi + state: icon + - type: Tag + tags: + - Saw diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml b/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml new file mode 100644 index 0000000000..9becde41de --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Misc/hardsuitselector.yml @@ -0,0 +1,157 @@ +- type: entity + parent: BaseItem + id: BaseHardsuitSelector + abstract: true + components: + - type: Sprite + state: icon + - type: Item + size: Huge + - type: ItemSelector + - type: ActivatableUI + key: enum.ItemSelectorUiKey.Key + - type: UserInterface + interfaces: + enum.ItemSelectorUiKey.Key: + type: ItemSelectorBoundUserInterface + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitCESelector + name: CE hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/advanced.rsi + - type: ItemSelector + items: + - ClothingModularControllerAdvancedPreassembled + - ClothingOuterHardsuitEngineeringWhite + + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitAtmosSelector + name: atmos hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi + - type: ItemSelector + items: + - ClothingModularControllerAtmosphericPreassembled + - ClothingOuterHardsuitAtmos + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitCapSelector + name: cap hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/cap.rsi + - type: ItemSelector + items: + - ClothingModularControllerMagnatePreassembled + - ClothingOuterHardsuitCap + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitClownSelector + name: clown hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/clown.rsi + - type: ItemSelector + items: + - ClothingModularControllerCosmohonkPreassembled + - ClothingOuterHardsuitClown + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitEngSelector + name: engineer hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/engineer.rsi + - type: ItemSelector + items: + - ClothingModularControllerEngineeringPreassembled + - ClothingOuterHardsuitEngineering + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitHosSelector + name: hos hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/hos.rsi + - type: ItemSelector + items: + - ClothingModularControllerSafeguardPreassembled + - ClothingOuterHardsuitSecurityRed + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitMedicalSelector + name: medical hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/medical.rsi + - type: ItemSelector + items: + - ClothingModularControllerMedicalPreassembled + - ClothingOuterHardsuitMedical + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitParamedicSelector + name: paramed hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/paramedic.rsi + - type: ItemSelector + items: + - ClothingModularControllerRescuePreassembled + - ClothingOuterHardsuitVoidParamed + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitProtoSelector + name: salvage hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/prototype.rsi + - type: ItemSelector + items: + - ClothingModularControllerPrototypePreassembled + - ClothingOuterHardsuitSpatio + +- type: entity + parent: BaseHardsuitSelector + id: HardsuitSecSelector + name: sec hardsuit selector + description: "An obsidian rod that strikes paranormal things." + suffix: Selector + components: + - type: Sprite + sprite: _Wega/Objects/Misc/HardsuitSelector/secutiry.rsi + - type: ItemSelector + items: + - ClothingModularControllerSecurityPreassembled + - ClothingOuterHardsuitSecurity diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/_Wega/Entities/Objects/Shields/shields.yml index d61503b53b..a6507ef789 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Shields/shields.yml @@ -105,11 +105,6 @@ price: 5000 - type: Repairable # Negative values represent healing qualityNeeded: Pulsing - damage: - groups: - Brute: -15 # 20 of each Brute Type - 20% of a basic shield HP - types: - Heat: -5 fuelCost: 0 # 1/2 of a Welder for a full repair doAfterDelay: 1 allowSelfRepair: false @@ -141,7 +136,7 @@ - type: Construction graph: BlueSheild node: start - + - type: entity name: broken energy shield parent: BaseItem diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/artefacts.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/artefacts.yml index fab4e569fe..7d009845b4 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/artefacts.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Lavaland/artefacts.yml @@ -7,8 +7,9 @@ components: - type: Sprite sprite: _Wega/Objects/Specific/Lavaland/dark_shard.rsi + state: icon - type: Item - size: Large + size: Normal - type: SpawnItemsOnUse items: - id: WeaponCursedKatana diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/handheld_crew_monitorBS.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/handheld_crew_monitorBS.yml new file mode 100644 index 0000000000..feb2c11953 --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Medical/handheld_crew_monitorBS.yml @@ -0,0 +1,13 @@ +- type: entity + name: blue shield handheld monitor + categories: [ DoNotMap ] + parent: HandheldCrewMonitor + id: HandheldCrewMonitorBlueshield + description: Personal monitor for Blue Shield officers. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Medical/handheldblueshield.rsi + - type: WirelessNetworkConnection + range: 1000 + - type: StaticPrice + price: 1000 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml index c88b96426f..ebf3471444 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/clearitem.yml @@ -125,9 +125,9 @@ ballistic-ammo: !type:Container - type: BallisticAmmoProvider capacity: 5 - proto: GrenadeCleanade + proto: BulletGrenadeCleanade cycleable: false - type: BallisticAmmoSelfRefiller - autoRefillRate: 5 + autoRefillRate: 15 affectedByEmp: true - type: AmmoCounter diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml index a4f38ca206..b983d0385f 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/iconitem.yml @@ -110,3 +110,15 @@ - type: Sprite sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi state: ballon-icon + +- type: entity + parent: BaseItem + id: CashIcon + name: CashIcon + categories: [ HideSpawnMenu ] + description: CashIcon + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/iconitem.rsi + state: cash-icon + diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml index 13dcad0bfc..0d414b92ed 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/secitem.yml @@ -19,7 +19,7 @@ description: Better pray it won't burn your hands off. components: - type: Gun - fireRate: 2 + fireRate: 2.5 selectedMode: Fullauto availableModes: - Fullauto @@ -39,10 +39,10 @@ startingCharge: 1000 - type: BatteryAmmoProvider proto: BulletDisablerSmg - fireCost: 62.5 + fireCost: 40 - type: BatterySelfRecharger autoRechargeRate: 10 - autoRechargePauseTime: 40 + autoRechargePauseTime: 20 - type: AmmoCounter - type: entity diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/syndicateitem.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/syndicateitem.yml index 204185b517..809b20f5e5 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/syndicateitem.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/BorgItem/syndicateitem.yml @@ -49,87 +49,60 @@ path: /Audio/Weapons/Guns/Gunshots/sniper.ogg soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg - - type: BatteryAmmoProvider + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgePistol + capacity: 6 proto: CartridgeAntiMateriel - fireCost: 100 - - type: BatterySelfRecharger - autoRechargeRate: 25 - autoRechargePauseTime: 20 - - type: Battery - maxCharge: 700 - startingCharge: 0 + cycleable: false # No synthesizing ammo for your syndicate masters. + - type: BallisticAmmoSelfRefiller + autoRefillRate: 20s + affectedByEmp: true - type: AmmoCounter - type: Appearance - type: StaticPrice price: 5000 - - type: Unremoveable - - type: ItemSelector - items: - - BorgWeaponSniperHristovAdvanced - - WeaponLightMachineGunL6CEnergy - - type: ActivatableUI - key: enum.ItemSelectorUiKey.Key - - type: UserInterface - interfaces: - enum.ItemSelectorUiKey.Key: - type: ItemSelectorBoundUserInterface - - type: Tag - tags: - - Itemborg -- type: entity - name: L6C ROW - id: WeaponLightMachineGunL6CEnergy - suffix: Syndiborg - parent: BaseItem - description: A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. - components: - - type: Gun - minAngle: 4 - maxAngle: 25 - angleIncrease: 4 - angleDecay: 16 - fireRate: 8 - selectedMode: FullAuto - availableModes: - - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/lmg.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - - type: Sprite - sprite: Objects/Weapons/Guns/LMGs/l6.rsi - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - state: mag-3 - map: [ "enum.GunVisualLayers.Mag" ] - - type: Item - size: Huge - - type: BatteryAmmoProvider - proto: CartridgeLightRifle - fireCost: 50 - - type: BatterySelfRecharger - autoRechargeRate: 50 - autoRechargePauseTime: 20 - - type: Battery - maxCharge: 1500 - startingCharge: 0 - - type: AmmoCounter - - type: Unremoveable - - type: ItemSelector - items: - - BorgWeaponSniperHristovAdvanced - - WeaponLightMachineGunL6CEnergy - - type: ActivatableUI - key: enum.ItemSelectorUiKey.Key - - type: UserInterface - interfaces: - enum.ItemSelectorUiKey.Key: - type: ItemSelectorBoundUserInterface - - type: Tag - tags: - - Itemborg +# - type: entity + # name: L6C ROW + # id: WeaponLightMachineGunL6CEnergy + # suffix: Syndiborg + # parent: BaseItem + # description: A L6 SAW for use by cyborgs. Creates .30 rifle ammo on the fly from an internal ammo fabricator, which slowly self-charges. + # components: + # - type: Gun + # minAngle: 4 + # maxAngle: 25 + # angleIncrease: 4 + # angleDecay: 16 + # fireRate: 8 + # selectedMode: FullAuto + # availableModes: + # - FullAuto + # soundGunshot: + # path: /Audio/Weapons/Guns/Gunshots/lmg.ogg + # soundEmpty: + # path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + # - type: Sprite + # sprite: Objects/Weapons/Guns/LMGs/l6.rsi + # layers: + # - state: base + # map: [ "enum.GunVisualLayers.Base" ] + # - state: mag-3 + # map: [ "enum.GunVisualLayers.Mag" ] + # - type: Item + # size: Huge + # - type: BatteryAmmoProvider + # proto: CartridgeLightRifle + # fireCost: 50 + # - type: BatterySelfRecharger + # autoRechargeRate: 50 + # autoRechargePauseTime: 20 + # - type: Battery + # maxCharge: 1500 + # - type: AmmoCounter + # - type: Unremoveable - type: entity name: china ROW @@ -170,9 +143,144 @@ autoRefillRate: 60 affectedByEmp: true +- type: entity + parent: BaseItem + id: WeaponPistolDesertEagleBorg + suffix: Syndiborg + name: semi-aito desert eagle + description: A portable anti-material rifle. Uses .60 anti-material ammo upgraded by gorlax marodeurs. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + size: Small + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/Pistols/deserteagle.rsi + quickEquip: false + slots: + - suitStorage + - Belt + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/_Wega/Weapons/Guns/Gunshots/deserteagle.ogg + params: + volume: 2 + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgePistol + capacity: 7 + proto: BulletMagnum + cycleable: false # No synthesizing ammo for your syndicate masters. + - type: BallisticAmmoSelfRefiller + autoRefillRate: 10s + affectedByEmp: true + - type: AmmoCounter + - type: Appearance + - type: StaticPrice + price: 5000 +- type: entity + name: C-20r ROW #I think ROW stands for Recharging Onboard Weapon so i'm following the L6C's example + id: WeaponSubMachineGunC20rROWAdvensed + parent: BaseItem + description: A burst-fire C-20r submachine gun for use by cyborgs. Creates .35 caliber ammo on the fly from an internal ammo fabricator, which slowly self-charges. + components: + - type: Gun + minAngle: 2 + maxAngle: 16 + angleIncrease: 4 + angleDecay: 16 + fireRate: 8 + burstFireRate: 8 + shotsPerBurst: 5 + selectedMode: FullAuto + availableModes: + - Burst + - FullAuto + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/c-20r.ogg + - type: Sprite + sprite: Objects/Weapons/Guns/SMGs/c20r.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-5 + map: ["enum.GunVisualLayers.Mag"] + - type: Item + size: Huge + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: BallisticAmmoProvider + whitelist: + tags: + - CartridgePistol + capacity: 30 + proto: CartridgePistol + cycleable: false # No synthesizing ammo for your syndicate masters. + - type: BallisticAmmoSelfRefiller + autoRefillRate: 4s + affectedByEmp: true + - type: AmmoCounter +- type: entity + parent: BaseItem + id: ModuleSyndiWeapon + name: Module weapon + description: "An obsidian rod that strikes paranormal things." + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: syndicate + - state: icon-w + - type: Item + size: Small + - type: ItemSelector + items: + - BorgModuleSniper + - BorgModuleCR20Advensed + - BorgModuleL6C + - type: ActivatableUI + key: enum.ItemSelectorUiKey.Key + - type: UserInterface + interfaces: + enum.ItemSelectorUiKey.Key: + type: ItemSelectorBoundUserInterface - - - +- type: entity + parent: BaseItem + id: ModuleSyndiSupport + name: Module support + description: "An obsidian rod that strikes paranormal things." + components: + - type: Sprite + sprite: Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: syndicate + - state: icon-syndicate + - type: Item + size: Small + - type: ItemSelector + items: + - BorgModuleNightVisonSyndi + - BorgModuleChina + - BorgModuleRepiarSyndi + - type: ActivatableUI + key: enum.ItemSelectorUiKey.Key + - type: UserInterface + interfaces: + enum.ItemSelectorUiKey.Key: + type: ItemSelectorBoundUserInterface + \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml index 8d4306bcd8..af6d81e481 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -55,8 +55,13 @@ whitelist: tags: - Itemborg - - item: SprayBottle - - item: BorgDropper + - item: SprayBottleEthanol + hand: + emptyRepresentative: SprayBottle + emptyLabel: borg-slot-spray-empty + whitelist: + tags: + - Spray - hand: emptyRepresentative: OrganHumanHeart emptyLabel: borg-slot-biomaterials-empty @@ -71,6 +76,7 @@ whitelist: components: - SubdermalImplant + - Implanter tags: - SubdermalHeadImplant - Pill @@ -563,7 +569,7 @@ - type: entity id: BorgModuleCommonRepeir - parent: [ BaseBorgModule, BaseProviderBorgModule ] + parent: [ BaseBorgModule ] name: repeir module description: Everyone can heal your action! components: @@ -572,18 +578,46 @@ layers: - state: generic - state: icon-repeir - - type: ItemBorgModule - hands: - - item: RepeirModeDevice - - hand: - emptyRepresentative: Nanopast - emptyLabel: borg-slot-nanopasta-empty - whitelist: - tags: - - Nanopast - - item: BorgGeneratorNanopast - - type: BorgModuleIcon - icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: repeir-module } + - type: ComponentBorgModule + components: + - type: PassiveDamage + allowedStates: + - Alive + - Critical + - Dead + damage: + types: + Blunt: -0.1 + Slash: -0.1 + Piercing: -0.1 + Heat: -0.1 + # hands: + # - item: RepeirModeDevice + # - hand: + # emptyRepresentative: Nanopast + # emptyLabel: borg-slot-nanopasta-empty + # whitelist: + # tags: + # - Nanopast + # - item: BorgGeneratorNanopast + # - type: BorgModuleIcon + # icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: repeir-module } + +- type: entity + id: BorgModuleNightVison + parent: [ BaseBorgModule ] + name: night vison module + description: Everyone can heal your action! + components: + - type: Sprite + sprite: Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: generic + - state: icon-gps + - type: ComponentBorgModule + components: + - type: NaturalNightVision + tintColor: "#449544" - type: entity id: BorgModuleMusique @@ -727,7 +761,6 @@ components: - FitsInDispenser - item: BarSpoon - - item: Crowbar - item: DrinkGlass hand: emptyLabel: borg-slot-chemical-containers-empty @@ -792,7 +825,6 @@ hands: - item: ForensicScanner - item: DetectivePDABorg - - item: Crowbar - item: ForensicPad hand: emptyLabel: borg-slot-forensic-pad-empty @@ -1224,32 +1256,106 @@ - item: BaseResearchAndDevelopmentPointSourceBorg - type: BorgModuleIcon icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: rnd-rare } + ## Syndicate - type: entity id: BorgModuleChina - parent: [ BaseBorgModuleSyndicate, BaseProviderBorgModule, BaseSyndicateContraband ] + parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ] name: china cyborg module description: A weapons module that comes with a double energy sword. components: - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi layers: - state: syndicate - - state: icon-syndicate + - state: icon-fugas - type: ItemBorgModule hands: - item: WeaponLauncherChinaLakeBorg - - hand: - emptyRepresentative: Nanopast - emptyLabel: borg-slot-nanopasta-empty - whitelist: - tags: - - Nanopast - - item: BorgGeneratorNanopast - item: PinpointerSyndicateNuclear - item: PinpointerUniversal # Corvax-Wega-Robot-add - type: BorgModuleIcon icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: china-module } +- type: entity + id: BorgModuleSniper + parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ] + name: sniper cyborg module + description: A weapons module that comes with a double energy sword. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: syndicate + - state: icon-sniper + - type: ItemBorgModule + hands: + - item: BorgWeaponSniperHristovAdvanced + - item: WeaponPistolDesertEagleBorg + - item: PinpointerSyndicateNuclear + - item: PinpointerUniversal # Corvax-Wega-Robot-add + - type: BorgModuleIcon + icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: sniper-module } + +- type: entity + id: BorgModuleCR20Advensed + parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ] + name: cr20 cyborg module + description: A weapons module that comes with a double energy sword. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: syndicate + - state: icon-cr20-gun + - type: ItemBorgModule + hands: + - item: WeaponSubMachineGunC20rROWAdvensed + - item: CyborgEnergySword + - item: PinpointerSyndicateNuclear + - item: PinpointerUniversal # Corvax-Wega-Robot-add + - type: BorgModuleIcon + icon: { sprite: Interface/Actions/actions_borg.rsi, state: syndicate-c20r-module } + +- type: entity + id: BorgModuleNightVisonSyndi + parent: [ BaseBorgModuleSyndicateAssault, BaseSyndicateContraband ] + name: nightvison cyborg module + description: A weapons module that comes with a double energy sword. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: syndicate + - state: icon-nightvison + - type: ComponentBorgModule + components: + - type: NaturalNightVision + tintColor: "#953c3c" + +- type: entity + id: BorgModuleRepiarSyndi + parent: [ BaseBorgModuleSyndicateAssault, BaseSyndicateContraband ] + name: repiar cyborg module + description: A weapons module that comes with a double energy sword. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: syndicate + - state: icon-treatment-syndi + - type: ComponentBorgModule + components: + - type: PassiveDamage + allowedStates: + - Alive + - Critical + damage: + types: + Blunt: -0.3 + Slash: -0.3 + Piercing: -0.3 + Heat: -0.3 ## Xenoborg - type: entity id: BorgModuleXenoConstruction @@ -1328,7 +1434,7 @@ - type: entity id: XenoborgModuleCommonRepeir - parent: [ BaseXenoborgModuleGeneric, BaseProviderBorgModule, BaseXenoborgContraband ] + parent: [ BaseXenoborgModuleGeneric, BaseXenoborgContraband ] name: repeir xenoborg module description: Everyone can heal your action! components: @@ -1337,11 +1443,40 @@ layers: - state: xenoborg_generic - state: icon-repeir - - type: ItemBorgModule - hands: - - item: RepeirModeDeviceXenoborg - - type: BorgModuleIcon - icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: repeir-xenoborg-module } + - type: ComponentBorgModule + components: + - type: PassiveDamage + allowedStates: + - Alive + - Critical + - Dead + damage: + types: + Blunt: -0.3 + Slash: -0.3 + Piercing: -0.3 + Heat: -0.3 + # - type: ItemBorgModule + # hands: + # - item: RepeirModeDeviceXenoborg + # - type: BorgModuleIcon + # icon: { sprite: _Wega/Interface/Actions/actions_borg.rsi, state: repeir-xenoborg-module } + +- type: entity + id: BorgModuleNightVisoXenoborg + parent: [ BaseXenoborgModuleGeneric, BaseXenoborgContraband ] + name: nightvison cyborg module + description: A weapons module that comes with a double energy sword. + components: + - type: Sprite + sprite: _Wega/Objects/Specific/Robotics/borgmodule.rsi + layers: + - state: xenoborg_generic + - state: icon-nightvison-xenoborg + - type: ComponentBorgModule + components: + - type: NaturalNightVision + tintColor: "#1e1e95" - type: entity id: XenoborgModuleCommonSpeed diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/suitmodules.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/suitmodules.yml index 1816198cdc..20e6bff179 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/suitmodules.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/Robotics/suitmodules.yml @@ -568,7 +568,7 @@ walkModifier: 0.8 sprintModifier: 0.8 - type: ModularSuitModule - tags: [ MagneticSuitModule ] + tags: [ MagneticSuitModule, NoSlipModuleConflict ] modulePart: Boots powerUsage: 0.4 verbIcon: @@ -1140,6 +1140,7 @@ activeComponents: - type: NoSlip - type: ModularSuitModule + tags: [ NoSlipModuleConflict ] modulePart: Boots modulePrefix: 'C' canBeDisabled: false diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Specific/vouchercards.yml b/Resources/Prototypes/_Wega/Entities/Objects/Specific/vouchercards.yml index 3091cb9c6f..46d55c4be9 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Specific/vouchercards.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Specific/vouchercards.yml @@ -76,27 +76,19 @@ - Gladiator - Casa - - - - - - - - - - - - - - - - - - - - - - - - +- type: entity + parent: BaseVoucherCard + id: BlueShieldVoucherCard + name: blue shield voucher card + description: Voucher card for extend arsenal blue shield Officer. + components: + - type: Sprite + sprite: _Wega/Objects/Misc/vouchers.rsi + state: blueshield + - type: VoucherCard + typeVoucher: Security + kits: + - BlueShieldkit1 + - BlueShieldkit2 + - BlueShieldkit3 + - BlueShieldkit4 diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Bombs/plastic.yml index 7f94ae2c88..934a775b15 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Bombs/plastic.yml @@ -30,7 +30,7 @@ ports: - Timer - type: Explosive - explosionType: Default + explosionType: Default totalIntensity: 35 intensitySlope: 10 maxIntensity: 7.5 @@ -41,4 +41,26 @@ unstickDelay: 3 blacklist: components: - - Sticky \ No newline at end of file + - Sticky + +- type: entity + name: explosion package + description: An extremely sticky bomb that can be attached to anything. + parent: SeismicCharge + id: ExplosionPackage + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Bombs/exp_package.rsi + state: icon + layers: + - state: icon + map: ["base"] + - type: Construction + graph: PxpPackage + node: explosionPack + - type: Explosive + explosionType: FireBomb + totalIntensity: 100 + intensitySlope: 3 + maxIntensity: 12 + canCreateVacuum: false diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index bffe05ea7c..ae8f0196e8 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -311,3 +311,44 @@ - type: BatteryAmmoProvider proto: IonScan fireCost: 500 + +- type: entity + name: energy carabine "Pulsar" + parent: [BaseWeaponBattery, BaseSecurityContraband, BaseGunWieldable] + id: WeaponEnergyPulsar + description: High stop-power energy carabine. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Battery/pulsar.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/Battery/pulsar.rsi + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - type: Appearance + - type: Gun + selectedMode: FullAuto + fireRate: 2.8 + availableModes: + - SemiAuto + - FullAuto + projectileSpeed: 40 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: BatteryAmmoProvider + proto: PulsarProjectile + fireCost: 200 + - type: Battery + maxCharge: 3200 + startingCharge: 3200 + - type: BatterySelfRecharger + autoRechargeRate: 35 + - type: Item + size: Large \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml new file mode 100644 index 0000000000..9332f32b52 --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -0,0 +1,18 @@ +- type: entity + id: BulletImpactEffectWhite + categories: [ HideSpawnMenu ] + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: "#f5f5f5" + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 018e5fcdec..853911ec13 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -45,3 +45,40 @@ range: 0.25 energyConsumption: 720 +- type: entity + name: pulsar shot + id: PulsarProjectile + parent: BulletLaser + components: + - type: Reflective + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi + layers: + - state: magnum_piercing + shader: unshaded + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectWhite + damage: + types: + Heat: 26 + soundHit: + path: "/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg" + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Opaque + - type: PointLight + radius: 1.5 + energy: 4.6 + color: "#ffffff" diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 000aba15b8..6effaf19a4 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -50,3 +50,69 @@ steps: 1 zeroVisible: true - type: Appearance + +- type: entity + name: jay + parent: BaseWeaponRifle + id: WeaponRifleJay + description: Automatic assault rifle military class. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/Rifles/jay.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/Rifles/jay.rsi + - type: Item + size: Large + - type: GunWieldBonus + minAngle: -14 + maxAngle: -29 + - type: Gun + burstFireRate: 7.0 + burstCooldown: 1.1 + shotsPerBurst: 7 + minAngle: 15 + maxAngle: 30 + angleIncrease: 2.5 + angleDecay: 2.5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + - Burst + fireRate: 5.8 + projectileSpeed: 40 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/batrifle.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 9d8198eeb0..4fff6bc141 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -53,4 +53,66 @@ priority: 1 whitelist: tags: - - CartridgePistolFoam \ No newline at end of file + - CartridgePistolFoam + +- type: entity + name: berkut + parent: BaseWeaponRifle + id: WeaponSubmachinegunBerkut + description: Automatic SMG military class. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Guns/SMGs/berkut.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: _Wega/Objects/Weapons/Guns/SMGs/berkut.rsi + - type: Item + size: Large + - type: GunWieldBonus + minAngle: -19 + maxAngle: -21 + - type: Gun + minAngle: 24 + maxAngle: 38 + angleIncrease: 2.5 + angleDecay: 2.5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + fireRate: 6.8 + projectileSpeed: 40 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/blueshieldbaton.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/blueshieldbaton.yml new file mode 100644 index 0000000000..db2a61494c --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/blueshieldbaton.yml @@ -0,0 +1,26 @@ +- type: entity + name: blue shield stun baton + parent: Stunbaton + id: StunbatonBlueshield + description: Special baton for harming people. + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Melee/batonBS.rsi + - type: ItemToggleMeleeWeapon + activatedDamage: + types: + Blunt: 15 + Heat: 18 + - type: MeleeWeapon + damage: + types: + Blunt: 15 + - type: StaminaDamageOnHit + damage: 15 + - type: StaminaDamageOnCollide + damage: 15 + - type: Battery + maxCharge: 750 + startingCharge: 750 + - type: Clothing + sprite: _Wega/Objects/Weapons/Melee/batonBS.rsi diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/chainsaw.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/chainsaw.yml new file mode 100644 index 0000000000..fea4cd76eb --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/chainsaw.yml @@ -0,0 +1,14 @@ +- type: entity + name: green chainsaw + parent: Chainsaw + id: ChainsawGreen + description: Dangerous sharp sawing thing, how did it get here? + components: + - type: Sprite + sprite: _Wega/Objects/Weapons/Melee/green_chainsaw.rsi + - type: Construction + graph: CirSaw + node: circular + - type: Item + size: Normal + sprite: _Wega/Objects/Weapons/Melee/green_chainsaw.rsi diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/razor_gloves.yml b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/razor_gloves.yml new file mode 100644 index 0000000000..70e75027b6 --- /dev/null +++ b/Resources/Prototypes/_Wega/Entities/Objects/Weapons/Melee/razor_gloves.yml @@ -0,0 +1,26 @@ +- type: entity + parent: [ClothingHandsKnuckleDusters, BaseMinorContraband] + id: ClothingHandsRazorGloves + name: razor gloves + description: Everything ingenious is simple. + components: + - type: Sprite + sprite: _Wega/Clothing/Hands/Gloves/razor_gloves.rsi + state: icon + - type: Clothing + sprite: _Wega/Clothing/Hands/Gloves/razor_gloves.rsi + - type: Tag + tags: + - WhitelistChameleon + - Kangaroo + - type: MeleeWeapon + damage: + types: + Slash: 8 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + animation: WeaponArcFist + mustBeEquippedToUse: true + - type: Construction + graph: RazGlove + node: RazorGlov diff --git a/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml b/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml index ae3e809312..978719cb13 100644 --- a/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml +++ b/Resources/Prototypes/_Wega/GameRules/subgamemodes.yml @@ -41,6 +41,7 @@ components: - AntagImmune - Pacified # Diona ha-ha-ha + lateJoinAdditional: true # Extended testing - type: entity diff --git a/Resources/Prototypes/_Wega/Guidebook/rules.yml b/Resources/Prototypes/_Wega/Guidebook/rules.yml index 1aeff8a5f7..a2d3c1760d 100644 --- a/Resources/Prototypes/_Wega/Guidebook/rules.yml +++ b/Resources/Prototypes/_Wega/Guidebook/rules.yml @@ -1,6 +1,6 @@ - type: guideEntry id: WegaRuleset - name: Правила сервера + name: wega-ruleset-name priority: 0 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/WegaRuleset.xml" @@ -30,161 +30,161 @@ - type: guideEntry id: WegaPunishmentTypes - name: Игровые наказания + name: wega-punishment-types-name priority: 21 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/PunishmentTypes.xml" - type: guideEntry id: WegaRule0 - name: Правило 0 + name: wega-rule-0-name priority: 1 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule0.xml" - type: guideEntry id: WegaRule1 - name: Правило 1 + name: wega-rule-1-name priority: 2 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule1.xml" - type: guideEntry id: WegaRule2 - name: Правило 2 + name: wega-rule-2-name priority: 3 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule2.xml" - type: guideEntry id: WegaRule3 - name: Правило 3 + name: wega-rule-3-name priority: 4 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.xml" - type: guideEntry id: WegaRule31 - name: Правило 3.1 + name: wega-rule-31-name priority: 5 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.1.xml" - type: guideEntry id: WegaRule32 - name: Правило 3.2 + name: wega-rule-32-name priority: 6 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.2.xml" - type: guideEntry id: WegaRule33 - name: Правило 3.3 + name: wega-rule-33-name priority: 7 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.3.xml" - type: guideEntry id: WegaRule34 - name: Правило 3.4 + name: wega-rule-34-name priority: 8 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.4.xml" - type: guideEntry id: WegaRule35 - name: Правило 3.5 + name: wega-rule-35-name priority: 9 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.5.xml" - type: guideEntry id: WegaRule36 - name: Правило 3.6 + name: wega-rule-36-name priority: 10 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.6.xml" - type: guideEntry id: WegaRule37 - name: Правило 3.7 + name: wega-rule-37-name priority: 11 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.7.xml" - type: guideEntry id: WegaRule38 - name: Правило 3.8 + name: wega-rule-38-name priority: 12 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.8.xml" - type: guideEntry id: WegaRule39 - name: Правило 3.9 + name: wega-rule-39-name priority: 13 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule3.9.xml" - type: guideEntry id: WegaRule4 - name: Правило 4 + name: wega-rule-4-name priority: 14 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule4.xml" - type: guideEntry id: WegaRule5 - name: Правило 5 + name: wega-rule-5-name priority: 15 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule5.xml" - type: guideEntry id: WegaRule6 - name: Правило 6 + name: wega-rule-6-name priority: 16 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule6.xml" - type: guideEntry id: WegaRule7 - name: Правило 7 + name: wega-rule-7-name priority: 17 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule7.xml" - type: guideEntry id: WegaRule8 - name: Правило 8 + name: wega-rule-8-name priority: 18 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule8.xml" - type: guideEntry id: WegaRule81 - name: Правило 8.1 + name: wega-rule-81-name priority: 19 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule8.1.xml" - type: guideEntry id: WegaRule82 - name: Правило 8.2 + name: wega-rule-82-name priority: 20 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule8.2.xml" - type: guideEntry id: WegaRule83 - name: Правило 8.3 + name: wega-rule-83-name priority: 21 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule8.3.xml" - type: guideEntry id: WegaRule9 - name: Правило 9 + name: wega-rule-9-name priority: 22 ruleEntry: true text: "/ServerInfo/_Wega/Guidebook/ServerRules/Rule9.xml" diff --git a/Resources/Prototypes/_Wega/Loadouts/Jobs/Command/blueshield.yml b/Resources/Prototypes/_Wega/Loadouts/Jobs/Command/blueshield.yml index b54c1348ca..852e9bfa5c 100644 --- a/Resources/Prototypes/_Wega/Loadouts/Jobs/Command/blueshield.yml +++ b/Resources/Prototypes/_Wega/Loadouts/Jobs/Command/blueshield.yml @@ -4,7 +4,17 @@ equipment: head: ClothingHeadHatBeretBlueShield +- type: loadout + id: BlueshieldHeadAlt + equipment: + head: ClothingHeadHelmetBlueShield + # Jumpsuit +- type: loadout + id: BlueShieldJumpsuitAlt + equipment: + jumpsuit: ClothingUniformJumpsuitBlueShieldRock + - type: loadout id: BlueShieldJumpsuit equipment: @@ -42,10 +52,20 @@ equipment: outerClothing: ClothingOuterArmorBlueShield +- type: loadout + id: BlueshieldOterArmorAlt + equipment: + outerClothing: ClothingVestBlueShieldAlt + - type: loadout id: BlueShieldOuterWinter equipment: outerClothing: ClothingOuterWinterBlueShield + +- type: loadout + id: BlueShieldOuterWinterAlt + equipment: + outerClothing: ClothingOuterWinterBlueShieldAlt #Top - type: loadout diff --git a/Resources/Prototypes/_Wega/Loadouts/loadout_groups.yml b/Resources/Prototypes/_Wega/Loadouts/loadout_groups.yml index 3979890e1d..d8900be730 100644 --- a/Resources/Prototypes/_Wega/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/_Wega/Loadouts/loadout_groups.yml @@ -252,6 +252,7 @@ minLimit: 0 loadouts: - BlueshieldHead + - BlueshieldHeadAlt - type: loadoutGroup id: BlueShieldJumpsuit @@ -261,6 +262,7 @@ - BlueShieldAltJumpsuit - BlueShieldJumpskirt - ClothingUniformJumpskirtElegantBs + - BlueShieldJumpsuitAlt - type: loadoutGroup id: BlueshieldBackpack @@ -276,6 +278,8 @@ loadouts: - BlueshieldOterArmor - BlueShieldOuterWinter + - BlueshieldOterArmorAlt + - BlueShieldOuterWinterAlt - type: loadoutGroup id: BlueShieldTop diff --git a/Resources/Prototypes/_Wega/Maps/lavalandbuildings.yml b/Resources/Prototypes/_Wega/Maps/lavalandbuildings.yml index aa30543c39..f194aa2def 100644 --- a/Resources/Prototypes/_Wega/Maps/lavalandbuildings.yml +++ b/Resources/Prototypes/_Wega/Maps/lavalandbuildings.yml @@ -2,7 +2,7 @@ - type: lavalandBuilding id: PenalServitude gridPath: /Maps/_Wega/Lavaland/penalservitude.yml - position: "-50,50" + position: "-300,200" ignoring: true merge: false @@ -53,13 +53,13 @@ - type: lavalandBuilding id: Bubblegum gridPath: /Maps/_Wega/Lavaland/bubblegumspawn.yml - approximate: [150, 250] + approximate: [300, 450] ignoring: true - type: lavalandBuilding id: Colossus gridPath: /Maps/_Wega/Lavaland/colossusspawn.yml - approximate: [150, 250] + approximate: [300, 450] ignoring: true - type: lavalandBuilding diff --git a/Resources/Prototypes/_Wega/Maps/wegacerestation.yml b/Resources/Prototypes/_Wega/Maps/wegacerestation.yml index 3e44ddd057..ea913e74e5 100644 --- a/Resources/Prototypes/_Wega/Maps/wegacerestation.yml +++ b/Resources/Prototypes/_Wega/Maps/wegacerestation.yml @@ -17,6 +17,8 @@ - type: StationLavaland lavalandAvanpost: "/Maps/_Wega/Nonstations/cyberiadavanpost.yml" planets: [ Lavaland ] + - type: StationLavalandPenalServitudeShuttle + shuttlePath: "/Maps/_Wega/Shuttles/cere_penalservitude_shuttle.yml" - type: StationJobs availableJobs: #service diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/Voice_masc.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/Voice_masc.yml new file mode 100644 index 0000000000..c2ad6bd09e --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/Voice_masc.yml @@ -0,0 +1,22 @@ +- type: constructionGraph + id: ModMasc + start: start + graph: + - node: start + edges: + - to: voiceMasc + steps: + - material: Cable + amount: 5 + doAfter: 2 + - tag: VoiceTrigger + name: ent-VoiceTrigger + icon: + sprite: Objects/Devices/voice.rsi + state: voice + doAfter: 2 + - material: Cloth + amount: 6 + doAfter: 2 + - node: voiceMasc + entity: ClothingMaskGasVoiceChameleon diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/big_backpack.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/big_backpack.yml new file mode 100644 index 0000000000..1f11331bba --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/clothing/big_backpack.yml @@ -0,0 +1,13 @@ +- type: constructionGraph + id: BigBag + start: start + graph: + - node: start + edges: + - to: Bigbackpack + steps: + - material: Durathread + amount: 12 + doAfter: 9 + - node: Bigbackpack + entity: ClothingBackpackBig diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/misc/bodycam.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/misc/bodycam.yml index d30da770e5..7c2c6626d7 100644 --- a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/misc/bodycam.yml +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/misc/bodycam.yml @@ -9,6 +9,10 @@ steps: - tool: Screwing doAfter: 2 + - to: alt + steps: + - tool: Slicing + doAfter: 2 - node: alt entity: WiretappingCameraAlpha edges: @@ -20,6 +24,10 @@ steps: - tool: Screwing doAfter: 2 + - to: off + steps: + - tool: Slicing + doAfter: 2 - node: stand entity: WiretappingCameraAlphaAlt edges: @@ -31,5 +39,8 @@ steps: - tool: Screwing doAfter: 2 - + - to: off + steps: + - tool: Slicing + doAfter: 2 diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/chainsaw.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/chainsaw.yml new file mode 100644 index 0000000000..20113968a3 --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/chainsaw.yml @@ -0,0 +1,22 @@ +- type: constructionGraph + id: CirSaw + start: start + graph: + - node: start + edges: + - to: circular + steps: + - material: Cable + amount: 3 + doAfter: 6 + - material: Plasteel + amount: 3 + doAfter: 3 + - tag: Saw + name: ent-CirularSaw + icon: + sprite: _Wega/Objects/Devices/circular_saw.rsi + state: icon + doAfter: 5 + - node: circular + entity: ChainsawGreen diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/exp_package.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/exp_package.yml new file mode 100644 index 0000000000..d767420296 --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/exp_package.yml @@ -0,0 +1,40 @@ +- type: constructionGraph + id: PxpPackage + start: start + graph: + - node: start + edges: + - to: explosionPack + steps: + - material: Cable + amount: 5 + doAfter: 6 + - material: Cardboard + amount: 1 + doAfter: 6 + - tag: FireBomb + name: ent-FireBomb + icon: + sprite: Objects/Weapons/Bombs/ied.rsi + state: base + doAfter: 2 + - tag: FireBomb + name: ent-FireBomb + icon: + sprite: Objects/Weapons/Bombs/ied.rsi + state: base + doAfter: 2 + - tag: FireBomb + name: ent-FireBomb + icon: + sprite: Objects/Weapons/Bombs/ied.rsi + state: base + doAfter: 2 + - tag: FireBomb + name: ent-FireBomb + icon: + sprite: Objects/Weapons/Bombs/ied.rsi + state: base + doAfter: 2 + - node: explosionPack + entity: ExplosionPackage diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/razor_gloves.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/razor_gloves.yml new file mode 100644 index 0000000000..b4509c39a9 --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/weapon/razor_gloves.yml @@ -0,0 +1,25 @@ +- type: constructionGraph + id: RazGlove + start: start + graph: + - node: start + edges: + - to: RazorGlov + steps: + - tag: Gloves + name: ent-ClothingHandsGlovesColorYellow + icon: + sprite: Clothing/Hands/Gloves/Color/yellow.rsi + state: icon + doAfter: 4 + - tag: Wirecutter + name: ent-Wirecutter + icon: + sprite: Objects/Tools/wirecutters.rsi + state: cutters + doAfter: 4 + - material: Cable + amount: 5 + doAfter: 4 + - node: RazorGlov + entity: ClothingHandsRazorGloves diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml b/Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml index 4e3be7dd56..a12d4068c1 100644 --- a/Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_Wega/Recipes/Construction/clothing.yml @@ -5,11 +5,27 @@ targetNode: medsecGlasses category: construction-category-clothing objectType: Item - + - type: construction id: GlassesMedical graph: GlassesMed startNode: start targetNode: medGlasses category: construction-category-clothing - objectType: Item \ No newline at end of file + objectType: Item + +- type: construction + id: BigBag + graph: BigBag + startNode: start + targetNode: Bigbackpack + category: construction-category-clothing + objectType: Item + +- type: construction + id: ModMasc + graph: ModMasc + startNode: start + targetNode: voiceMasc + category: construction-category-clothing + objectType: Item diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/weapons.yml b/Resources/Prototypes/_Wega/Recipes/Construction/weapons.yml new file mode 100644 index 0000000000..6b2c35cc62 --- /dev/null +++ b/Resources/Prototypes/_Wega/Recipes/Construction/weapons.yml @@ -0,0 +1,23 @@ +- type: construction + id: PxpPackage + graph: PxpPackage + startNode: start + targetNode: explosionPack + category: construction-category-weapons + objectType: Item + +- type: construction + id: RazGlove + graph: RazGlove + startNode: start + targetNode: RazorGlov + category: construction-category-weapons + objectType: Item + +- type: construction + id: CirSaw + graph: CirSaw + startNode: start + targetNode: circular + category: construction-category-weapons + objectType: Item diff --git a/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml index 8f3f1a1e87..23ab9cd45b 100644 --- a/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/_Wega/Recipes/Lathes/robotics.yml @@ -53,6 +53,11 @@ id: BorgModuleCommonMagBoots result: BorgModuleCommonMagBoots +- type: latheRecipe + parent: BaseBorgModuleRecipe + id: BorgModuleNightVison + result: BorgModuleNightVison + - type: latheRecipe parent: BaseBorgModuleRecipe id: BorgModuleCommonCandy diff --git a/Resources/Prototypes/_Wega/Recipes/Lathes/xenoborg.yml b/Resources/Prototypes/_Wega/Recipes/Lathes/xenoborg.yml index 7b3954e841..b17b2d4ab9 100644 --- a/Resources/Prototypes/_Wega/Recipes/Lathes/xenoborg.yml +++ b/Resources/Prototypes/_Wega/Recipes/Lathes/xenoborg.yml @@ -15,7 +15,15 @@ materials: Steel: 1500 Glass: 1500 - + +- type: latheRecipe + parent: BaseXenoborgModulesRecipe + id: BorgModuleNightVisoXenoborg + result: BorgModuleNightVisoXenoborg + materials: + Steel: 1500 + Glass: 1500 + - type: latheRecipe parent: BaseXenoborgModulesRecipe id: XenoborgModuleCommonSpeed diff --git a/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml b/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml index 0bf41cb697..64e2c6fbc5 100644 --- a/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml +++ b/Resources/Prototypes/_Wega/Roles/Antags/vampire.yml @@ -7,7 +7,10 @@ guides: [ Vampires ] requirements: - !type:OverallPlaytimeRequirement - time: 54000 # 15h # Corvax-RoleTime + time: 50h + - !type:DepartmentTimeRequirement + department: Security + time: 25h # Ability gear - type: startingGear diff --git a/Resources/Prototypes/_Wega/Roles/Jobs/Cargo/shaftminermedic.yml b/Resources/Prototypes/_Wega/Roles/Jobs/Cargo/shaftminermedic.yml index 140cf7d55a..10ac4b7b59 100644 --- a/Resources/Prototypes/_Wega/Roles/Jobs/Cargo/shaftminermedic.yml +++ b/Resources/Prototypes/_Wega/Roles/Jobs/Cargo/shaftminermedic.yml @@ -29,7 +29,7 @@ id: ShaftMinerMedicGear equipment: id: MinerMedicPDA - ears: ClothingHeadsetMining + ears: ClothingHeadsetMiningMedical eyes: ClothingEyesHudMedical shoes: ClothingShoesColorBlack belt: ClothingBeltMedicalFilled diff --git a/Resources/Prototypes/_Wega/tags.yml b/Resources/Prototypes/_Wega/tags.yml index b25b4c9f4b..37ab446682 100644 --- a/Resources/Prototypes/_Wega/tags.yml +++ b/Resources/Prototypes/_Wega/tags.yml @@ -499,3 +499,15 @@ - type: Tag id: CompressionModuleConflict + +- type: Tag + id: NoSlipModuleConflict + +- type: Tag + id: FireBomb + +- type: Tag + id: Gloves + +- type: Tag + id: Saw diff --git a/Resources/Prototypes/borg_types.yml b/Resources/Prototypes/borg_types.yml index 119a44382d..2fd56d26bd 100644 --- a/Resources/Prototypes/borg_types.yml +++ b/Resources/Prototypes/borg_types.yml @@ -172,7 +172,6 @@ - BorgModuleJanitor defaultModules: - - BorgModuleTool # Corvax-Wega-add - BorgModulePrying - BorgModuleCleaning - BorgModuleCustodial diff --git a/Resources/ServerInfo/Guidebook/Engineering/Thermomachines.xml b/Resources/ServerInfo/Guidebook/Engineering/Thermomachines.xml index a0e7faff0a..4effeab4c4 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Thermomachines.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Thermomachines.xml @@ -1,51 +1,51 @@ <Document> - # Thermomachines - Thermomachines are devices that manipulate the temperature of gasses within a [textlink="pipe network" link="PipeNetworks"] or exposed atmosphere. + # Термомашины + Термомашины это устройства, которые регулируют температуру газов в [textlink="сети труб" link="PipeNetworks"] или в открытой атмосфере. <Box> <GuideEntityEmbed Entity="SpaceHeater" Caption=""/> <GuideEntityEmbed Entity="GasThermoMachineHeater" Caption=""/> <GuideEntityEmbed Entity="GasThermoMachineFreezer" Caption=""/> </Box> - They are essential for maintaining the temperature of gasses for various applications. + Они необходимы для поддержания температуры газов в различных областях применения. - All thermomachines work by using [textlink="electrical power" link="Power"] to heat or cool the atmosphere. - How much they heat/cool the atmosphere is directly related to the amount of power they consume. + Все термомашины работают, используя [textlink="электропитание" link="Power"] чтобы нагревать или охлаждать атмосферу. + Сила нагрева/охлаждения атмосферы напрямую зависит от количества потребляемой ими энергии. - Thermomachines also have an efficiency coefficient, which determines how much they can heat or cool the atmosphere per unit of power consumed. + Термомашины также обладают коэффициентом эффективности, который определяет, насколько они могут нагреть или охладить атмосферу на единицу потребляемой мощности. - To prevent overshooting their target value, thermomachines will scale back their heating/cooling power as they approach the target temperature. - However, they will still consume the same amount of electrical power, even when idle. + Чтобы предотвратить превышение целевого значения, термомашины снижают мощность нагрева/охлаждения по мере приближения к целевой температуре. + Однако, даже в режиме ожидания, они будут потреблять одинаковое количество электроэнергии. - All thermomachines have a target temperature tolerance of [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="TemperatureTolerance"/] K[/color], meaning they will stop heating or cooling when the temperature is within [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="TemperatureTolerance"/] K[/color] of the target temperature. + Все термомашины имеют допустимую температуру [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="TemperatureTolerance"/] K[/color], что означает, что они прекратят нагрев или охлаждение, когда температура окажется в пределах [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="TemperatureTolerance"/] K[/color] от целевой температуры. - ## Space Heater - The space heater is a portable temperature control unit that heats or cools gas in the atmosphere it's exposed to. - It's a simple and effective way to maintain the temperature of a room, without having to build a pipenet or other system. + ## Термостат + Термостат, это портативное устройство для регулирования температуры, которое нагревает или охлаждает газ в атмосфере, с которой он контактирует. + Это простой и эффективный способ поддерживать температуру в помещении без необходимости строить сеть труб или другую систему. <Box> <GuideEntityEmbed Entity="SpaceHeater"/> </Box> - They can be commonly found in Atmospherics, although the relevant machine board can be printed at a circuit imprinter, commonly found in Science. + Они часто встречаются в Атмосферном отделе, хотя соответствующую плату можно изготовить на принтере схем, который обычно используется в Научном отделе. - The space heater can cool to as low as [color=orange][protodata="SpaceHeater" comp="SpaceHeater" member="MinTemperature"/] K[/color] and heat to as high as [color=orange][protodata="SpaceHeater" comp="SpaceHeater" member="MaxTemperature"/] K[/color]. + Термостат может охлаждать до [color=orange][protodata="SpaceHeater" comp="SpaceHeater" member="MinTemperature"/] K[/color] и нагревать до [color=orange][protodata="SpaceHeater" comp="SpaceHeater" member="MaxTemperature"/] K[/color]. - It also has three power settings which determine how fast it heats or cools the atmosphere. + Также устройство имеет три режима мощности, которые определяют скорость нагрева или охлаждения воздуха. - Botany or science will often request these to maintain the temperature of their plants or department. + Ботаники или учёные часто запрашивают их для поддержания оптимальной температуры растений или в отделе. - ## Pipenet Thermomachines (Freezer and Heater) - Pipenet thermomachines are more powerful stationary temperature control units that can be used to heat or cool gas in a [textlink="pipenet." link="PipeNetworks"] + ## Термомашины сети труб (Нагреватель и Охладитель) + Термомашины сети труб, это более мощные стационарные установки для регулирования температуры, которые можно использовать для нагрева или охлаждения газа в [textlink="сети труб." link="PipeNetworks"] <Box> <GuideEntityEmbed Entity="GasThermoMachineHeater"/> <GuideEntityEmbed Entity="GasThermoMachineFreezer"/> </Box> - They draw [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="HeatCapacity" format="N0"/] W[/color] of power and can heat or cool gas in a pipenet to as high as [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="MaxTemperature"/] K[/color] or as low as [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="MinTemperature"/] K[/color]. + Они потребляют [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="HeatCapacity" format="N0"/] W[/color] мощности и могут нагревать газ до [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="MaxTemperature"/] K[/color] или охлаждать до [color=orange][protodata="GasThermoMachineFreezer" comp="GasThermoMachine" member="MinTemperature"/] K[/color]. - You can swap the mode of the thermomachine by deconstructing it and using a screwdriver on its circuit board. - The board can be printed at a circuit imprinter, commonly found in Science. + Изменить режим работы термомашины можно, разобрав её и используя отвёртку на машинной плате. + Плата может быть распечатана на принтере схем, который обычно находися в Научном отделе. <Box> <GuideEntityEmbed Entity="GasThermoMachineFreezer" Caption=""/> @@ -58,18 +58,18 @@ </Box> - ## Thermomachines from Hell - Science can research more powerful thermomachines, aptly called hellfire heaters and freezers. - These machines are much more powerful than their standard counterparts, but they also consume more power. + ## Термомашины из ада + Научный отдел может исследовать более мощные термомашины, метко названные адскими нагревателями и охладителями. + Эти машины намного мощнее своих стандартных аналогов, но и потребляют больше энергии. <Box> <GuideEntityEmbed Entity="GasThermoMachineHellfireHeater"/> <GuideEntityEmbed Entity="GasThermoMachineHellfireFreezer"/> </Box> - These machines draw [color=orange][protodata="GasThermoMachineHellfireFreezer" comp="GasThermoMachine" member="HeatCapacity" format="N0"/] W[/color] of power and can heat or cool gas in a pipenet to as high as [color=orange][protodata="GasThermoMachineHellfireHeater" comp="GasThermoMachine" member="MaxTemperature"/] K[/color] or as low as [color=orange][protodata="GasThermoMachineHellfireFreezer" comp="GasThermoMachine" member="MinTemperature"/] K[/color]. + Эти машины потребляют [color=orange][protodata="GasThermoMachineHellfireFreezer" comp="GasThermoMachine" member="HeatCapacity" format="N0"/] W[/color] мощности и могут нагревать газ до [color=orange][protodata="GasThermoMachineHellfireHeater" comp="GasThermoMachine" member="MaxTemperature"/] K[/color] или охлаждать до [color=orange][protodata="GasThermoMachineHellfireFreezer" comp="GasThermoMachine" member="MinTemperature"/] K[/color] в системе труб. - However, they also leak [color=orange][protodata="GasThermoMachineHellfireFreezer" comp="GasThermoMachine" member="EnergyLeakPercentage" format="P0"/][/color] of their energy to the surrounding environment, heating or cooling the exposed atmosphere respectively. - This can be dangerous if not properly managed. + Однако они также излучают [color=orange][protodata="GasThermoMachineHellfireFreezer" comp="GasThermoMachine" member="EnergyLeakPercentage" format="P0"/][/color] своей энергии в окружающую среду, нагревая или охлаждая атмосферу соответственно. + Это может быть опасно, если не принять соответствующие меры. </Document> diff --git a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json index 16a079133a..b1cbed205b 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/command.rsi/meta.json @@ -12,15 +12,33 @@ }, { "name": "equipped-EYES", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "equipped-EYES-arachnid", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "equipped-EYES-moth", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json index 153cef06c9..049b39ba02 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/med.rsi/meta.json @@ -12,15 +12,33 @@ }, { "name": "equipped-EYES", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "equipped-EYES-arachnid", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "equipped-EYES-moth", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "inhand-left", diff --git a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json index 153cef06c9..049b39ba02 100644 --- a/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json +++ b/Resources/Textures/Clothing/Eyes/Hud/sec.rsi/meta.json @@ -12,15 +12,33 @@ }, { "name": "equipped-EYES", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "equipped-EYES-arachnid", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "equipped-EYES-moth", - "directions": 4 + "directions": 4, + "delays": [ + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ], + [ 0.2, 0.2 ] + ] }, { "name": "inhand-left", diff --git a/Resources/Textures/Structures/Storage/closet.rsi/blueshield.png b/Resources/Textures/Structures/Storage/closet.rsi/blueshield.png index 833b823cbd..3595bd5551 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/blueshield.png and b/Resources/Textures/Structures/Storage/closet.rsi/blueshield.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/blueshield_door.png b/Resources/Textures/Structures/Storage/closet.rsi/blueshield_door.png index 4513378cb2..be1bbfdb94 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/blueshield_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/blueshield_door.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/blueshield_open.png b/Resources/Textures/Structures/Storage/closet.rsi/blueshield_open.png index e865b584e6..8606b4eecf 100644 Binary files a/Resources/Textures/Structures/Storage/closet.rsi/blueshield_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/blueshield_open.png differ diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json index 0abe71ea4f..7c1d5de8db 100644 --- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites, genpop lockers by EmoGarbage404 (github), sci bio locker is a resprited bio viro locker by Alpha-Two (github), Evac lockers by EmoGarbage404 (GitHub)", + "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites, genpop lockers by EmoGarbage404 (github), sci bio locker is a resprited bio viro locker by Alpha-Two (github), Evac lockers by EmoGarbage404 (GitHub), blueshield locker resprited by @mishutka09(discord:1152277579206774854)", "license": "CC-BY-SA-3.0", "states": [ { diff --git a/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..72f9e2deda Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/icon.png new file mode 100644 index 0000000000..358cff29d5 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/meta.json new file mode 100644 index 0000000000..8679cc7c66 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Back/Duffels/big_backpack.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Modified from Paradise at commit https://github.com/ss220-space/Paradise/blob/master220/icons/obj/storage.dmi by 4_ydo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/equipped-BELT.png b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/equipped-BELT.png new file mode 100644 index 0000000000..e7d9b02156 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/icon.png new file mode 100644 index 0000000000..e5c6023a24 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/inhand-left.png new file mode 100644 index 0000000000..fd7e215292 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/inhand-right.png new file mode 100644 index 0000000000..71645a90e6 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/meta.json new file mode 100644 index 0000000000..351449b456 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Belt/webbingblueshield.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/equipped-HAND.png b/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/equipped-HAND.png new file mode 100644 index 0000000000..195765e4a8 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/icon.png new file mode 100644 index 0000000000..8022d39df8 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/meta.json new file mode 100644 index 0000000000..569ca2cfd7 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Hands/Gloves/razor_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e and modified by 4_ydo for Space Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..5f251aad78 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/icon.png new file mode 100644 index 0000000000..30e08b08b6 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/inhand-left.png new file mode 100644 index 0000000000..194c17066d Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/inhand-right.png new file mode 100644 index 0000000000..2932481da1 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/meta.json new file mode 100644 index 0000000000..e38d02e693 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Head/Helmets/blueshieldhelmet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/equipped-HELMET.png b/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..0a5460c612 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/icon.png new file mode 100644 index 0000000000..c8f80cd793 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/meta.json new file mode 100644 index 0000000000..49585b39fb --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Head/Hoods/Coat/hoodblueshieldalt.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/equipped-NECK.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/equipped-NECK.png new file mode 100644 index 0000000000..277248c537 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/icon.png new file mode 100644 index 0000000000..9debfcf2aa Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/meta.json new file mode 100644 index 0000000000..b154827d06 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Neck/Cloaks/BSmantle.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..b8e6b95fb0 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/icon.png new file mode 100644 index 0000000000..8431894b5a Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/inhand-left.png new file mode 100644 index 0000000000..aea0f39676 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/inhand-right.png new file mode 100644 index 0000000000..cef6f162c7 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/meta.json new file mode 100644 index 0000000000..6d96baf00e --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/Armor/blueshieldvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000..6cb8001f7f Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/icon.png b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/icon.png new file mode 100644 index 0000000000..c8d4d110d3 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/inhand-left.png new file mode 100644 index 0000000000..aea0f39676 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/inhand-right.png new file mode 100644 index 0000000000..cef6f162c7 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/meta.json b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/meta.json new file mode 100644 index 0000000000..6d96baf00e --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/OuterClothing/WinterCoats/altBScoat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000..b588f0638b Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/icon.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/icon.png new file mode 100644 index 0000000000..8ebbed2555 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/inhand-left.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/inhand-left.png new file mode 100644 index 0000000000..9af634d226 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/inhand-right.png b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/inhand-right.png new file mode 100644 index 0000000000..b2d4350856 Binary files /dev/null and b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/meta.json b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/meta.json new file mode 100644 index 0000000000..ccd0f25125 --- /dev/null +++ b/Resources/Textures/_Wega/Clothing/Uniforms/Jumpsuit/BSuniformalt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json index 53742e70f9..7010746e92 100644 --- a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json +++ b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/meta.json @@ -130,6 +130,9 @@ { "name": "fulton-module" }, + { + "name": "sniper-module" + }, { "name": "speed_xenoborg" } diff --git a/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/sniper-module.png b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/sniper-module.png new file mode 100644 index 0000000000..91a8793be4 Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Actions/actions_borg.rsi/sniper-module.png differ diff --git a/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/MindShield.png b/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/MindShield.png new file mode 100644 index 0000000000..97c454710c Binary files /dev/null and b/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/MindShield.png differ diff --git a/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/meta.json index f190b3d62e..6f1677d570 100644 --- a/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/_Wega/Interface/Misc/job_icons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by zekins3366, WardenHelper by RedTerrorDark (Github)", + "copyright": "Created by zekins3366, WardenHelper by RedTerrorDark (Github), Mindshield icon taken from https://github.com/tgstation/tgstation/blob/ce6beb8a4d61235d9a597a7126c407160ed674ea/icons/mob/huds/hud.dmi", "size": { "x": 8, "y": 8 @@ -27,6 +27,10 @@ }, { "name": "WardenHelper" + }, + { + "name": "MindShield", + "delays": [ [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] } ] } diff --git a/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/meta.json b/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/meta.json index 47a1378110..5c86373a31 100644 --- a/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/meta.json +++ b/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/meta.json @@ -10,6 +10,10 @@ { "name": "resomi", "directions": 4 + }, + { + "name": "slime", + "directions": 4 } ] } diff --git a/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/slime.png b/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/slime.png new file mode 100644 index 0000000000..0dbfc55b02 Binary files /dev/null and b/Resources/Textures/_Wega/Mobs/Customization/eyes.rsi/slime.png differ diff --git a/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/girl_a.png b/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/girl_a.png new file mode 100644 index 0000000000..39e6fc203b Binary files /dev/null and b/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/girl_a.png differ diff --git a/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/meta.json b/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/meta.json index 90350521b5..635bec71ae 100644 --- a/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/meta.json +++ b/Resources/Textures/_Wega/Mobs/Ghosts/ghost_human.rsi/meta.json @@ -20,6 +20,16 @@ [ 0.25, 0.25, 0.25, 0.25 ], [ 0.25, 0.25, 0.25, 0.25 ] ] + }, + { + "name": "girl_a", + "directions": 4, + "delays": [ + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1 ] + ] } ] } diff --git a/Resources/Textures/_Wega/Objects/Devices/circular_saw.rsi/icon.png b/Resources/Textures/_Wega/Objects/Devices/circular_saw.rsi/icon.png new file mode 100644 index 0000000000..dcc1dc8879 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Devices/circular_saw.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Devices/circular_saw.rsi/meta.json b/Resources/Textures/_Wega/Objects/Devices/circular_saw.rsi/meta.json new file mode 100644 index 0000000000..f6b58fab8e --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Devices/circular_saw.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "created by discord: 4_ydo", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/icon.png new file mode 100644 index 0000000000..5365ffd299 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/inhand-left.png new file mode 100644 index 0000000000..f091f8cadd Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/inhand-right.png new file mode 100644 index 0000000000..b972771ff6 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/advanced.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/icon.png new file mode 100644 index 0000000000..4c3ecc4932 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/inhand-left.png new file mode 100644 index 0000000000..db58331c9f Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/inhand-right.png new file mode 100644 index 0000000000..be21a42c9a Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/atmospheric.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/icon.png new file mode 100644 index 0000000000..d353b9fca6 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/inhand-left.png new file mode 100644 index 0000000000..95dba40b06 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/inhand-right.png new file mode 100644 index 0000000000..23a318c9e9 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/cap.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/icon.png new file mode 100644 index 0000000000..258fcd6ca5 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/inhand-left.png new file mode 100644 index 0000000000..74e792c7bf Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/inhand-right.png new file mode 100644 index 0000000000..a1e9c878b3 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/clown.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/icon.png new file mode 100644 index 0000000000..ad37114e47 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/inhand-left.png new file mode 100644 index 0000000000..90f08f6117 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/inhand-right.png new file mode 100644 index 0000000000..8a0179758d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/engineer.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/icon.png new file mode 100644 index 0000000000..d61a4ec822 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/inhand-left.png new file mode 100644 index 0000000000..e1ec8de8c7 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/inhand-right.png new file mode 100644 index 0000000000..b21faad541 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/hos.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/icon.png new file mode 100644 index 0000000000..ff56fe7b7a Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/inhand-left.png new file mode 100644 index 0000000000..10bf2ae535 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/inhand-right.png new file mode 100644 index 0000000000..45b67a0455 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/medical.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/icon.png new file mode 100644 index 0000000000..588c0e1582 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/inhand-left.png new file mode 100644 index 0000000000..825701a42a Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/inhand-right.png new file mode 100644 index 0000000000..febd3af48f Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/paramedic.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/icon.png new file mode 100644 index 0000000000..1bc3d8bf3d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/inhand-left.png new file mode 100644 index 0000000000..9da37a2a32 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/inhand-right.png new file mode 100644 index 0000000000..9e7d0407dc Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/prototype.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/icon.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/icon.png new file mode 100644 index 0000000000..637da317d1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/inhand-left.png new file mode 100644 index 0000000000..5f5681771c Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/inhand-right.png new file mode 100644 index 0000000000..cb9974e41d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/meta.json new file mode 100644 index 0000000000..77c7cfe778 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Misc/HardsuitSelector/secutiry.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon created by zekins3366 580828258124431370 on discord, inhands sprites by melissandravov 751536199180484698 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/blueshield.png b/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/blueshield.png new file mode 100644 index 0000000000..8573026b7f Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/blueshield.png differ diff --git a/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/meta.json b/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/meta.json index ea5c21fa3f..de28c0a50a 100644 --- a/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/meta.json +++ b/Resources/Textures/_Wega/Objects/Misc/vouchers.rsi/meta.json @@ -31,6 +31,9 @@ { "name": "security" }, + { + "name": "blueshield" + }, { "name": "shoose" }, diff --git a/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/icon.png b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/icon.png new file mode 100644 index 0000000000..5d16eb5c33 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/meta.json b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/meta.json new file mode 100644 index 0000000000..d55d61fe4a --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "states": [ + { + "name": "scanner", + "directions": 1, + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "scanner-inhand-left", + "directions": 4 + }, + { + "name": "scanner-inhand-right", + "directions": 4 + }, + { + "name": "icon", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner-inhand-left.png b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner-inhand-left.png new file mode 100644 index 0000000000..8c58ac7b8c Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner-inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner-inhand-right.png b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner-inhand-right.png new file mode 100644 index 0000000000..e7745a7d6e Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner-inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner.png b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner.png new file mode 100644 index 0000000000..c8562dce44 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Medical/handheldblueshield.rsi/scanner.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-cr20-gun.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-cr20-gun.png new file mode 100644 index 0000000000..eb0dc940eb Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-cr20-gun.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-fugas.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-fugas.png new file mode 100644 index 0000000000..8824284472 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-fugas.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-nightvison-xenoborg.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-nightvison-xenoborg.png new file mode 100644 index 0000000000..1bfeb43173 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-nightvison-xenoborg.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-nightvison.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-nightvison.png new file mode 100644 index 0000000000..3b65180ef6 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-nightvison.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-sniper.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-sniper.png new file mode 100644 index 0000000000..db36acd714 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-sniper.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-treatment-syndi.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-treatment-syndi.png new file mode 100644 index 0000000000..6c748fa98c Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-treatment-syndi.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-w.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-w.png new file mode 100644 index 0000000000..0d2e030962 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/icon-w.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json index 00d8d12b37..9b5b81a8b1 100644 --- a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json +++ b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/meta.json @@ -31,6 +31,9 @@ { "name": "science" }, + { + "name": "syndicate" + }, { "name": "xenoborg_generic" }, @@ -82,9 +85,30 @@ { "name": "icon-dis" }, + { + "name": "icon-cr20-gun" + }, + { + "name": "icon-nightvison" + }, + { + "name": "icon-nightvison-xenoborg" + }, + { + "name": "icon-sniper" + }, + { + "name": "icon-treatment-syndi" + }, { "name": "icon-speed" }, + { + "name": "icon-fugas" + }, + { + "name": "icon-w" + }, { "name": "icon-magboots" }, diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/syndicate.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/syndicate.png new file mode 100644 index 0000000000..ef0423db62 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/borgmodule.rsi/syndicate.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/cash-icon.png b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/cash-icon.png new file mode 100644 index 0000000000..972677f500 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/cash-icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json index 3f2c72cf62..20027de9a6 100644 --- a/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json +++ b/Resources/Textures/_Wega/Objects/Specific/Robotics/iconitem.rsi/meta.json @@ -30,6 +30,9 @@ }, { "name": "ballon-icon" + }, + { + "name": "cash-icon" }, { "name": "scie-icon" diff --git a/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/icon.png new file mode 100644 index 0000000000..a12f31f553 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/inhand-left.png new file mode 100644 index 0000000000..5771fd28e8 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/inhand-right.png new file mode 100644 index 0000000000..3c690fd931 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/meta.json new file mode 100644 index 0000000000..8f0735a098 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "created by 4_ydo on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/primed.png b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/primed.png new file mode 100644 index 0000000000..0c36b5d9eb Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Bombs/exp_package.rsi/primed.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/base.png new file mode 100644 index 0000000000..91cc9754b1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/base.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..77301c251d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..953d71cd3d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/icon.png new file mode 100644 index 0000000000..e8d874c7f1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/inhand-left.png new file mode 100644 index 0000000000..16bd112cd6 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/inhand-right.png new file mode 100644 index 0000000000..f7757e5c4c Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-1.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-1.png new file mode 100644 index 0000000000..84ce0a19f3 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-1.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-2.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-2.png new file mode 100644 index 0000000000..0c28d395c1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-2.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-3.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000..d2c3fe695e Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-3.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-4.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000..7922dfafa1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/mag-unshaded-4.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/meta.json new file mode 100644 index 0000000000..03e4e7419a --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/meta.json @@ -0,0 +1,53 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..93c987ec74 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/wielded-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..d94630ab56 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Battery/pulsar.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/magnum.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/magnum.png new file mode 100644 index 0000000000..1f2b2e9aa4 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/magnum.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/magnum_piercing.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/magnum_piercing.png new file mode 100644 index 0000000000..df87378b05 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/magnum_piercing.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/meta.json new file mode 100644 index 0000000000..9050748f59 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Projectiles/projectilepulsar.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "magnum" + }, + { + "name": "magnum_piercing" + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/base.png new file mode 100644 index 0000000000..0d953bc7d9 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/base.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/bolt-open.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/bolt-open.png new file mode 100644 index 0000000000..8cdff658ab Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..f519830d70 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..f519830d70 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/icon.png new file mode 100644 index 0000000000..3a6ab806cf Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/inhand-left.png new file mode 100644 index 0000000000..74431672ee Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/inhand-right.png new file mode 100644 index 0000000000..f74a7d3a23 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/mag-0.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/mag-0.png new file mode 100644 index 0000000000..50d2aa327d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/mag-0.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/meta.json new file mode 100644 index 0000000000..e82b7f9072 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..960599f3c1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/wielded-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..2d5324bc2d Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/Rifles/jay.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/base.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/base.png new file mode 100644 index 0000000000..69d2204489 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/base.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/bolt-open.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/bolt-open.png new file mode 100644 index 0000000000..30206cdf97 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/bolt-open.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/equipped-BACKPACK.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..c65ecc137a Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000..41b8a65291 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/icon.png new file mode 100644 index 0000000000..fe5daeccd5 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/inhand-left.png new file mode 100644 index 0000000000..f3f6b8d60c Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/inhand-right.png new file mode 100644 index 0000000000..8c65189ff6 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/mag-0.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/mag-0.png new file mode 100644 index 0000000000..fc75511bac Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/mag-0.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/meta.json new file mode 100644 index 0000000000..e82b7f9072 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/wielded-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..3e6f988904 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/wielded-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..b1ac15c664 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Guns/SMGs/berkut.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/equipped-BELT.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/equipped-BELT.png new file mode 100644 index 0000000000..dbd600edbb Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/meta.json new file mode 100644 index 0000000000..d1b87c14d4 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/meta.json @@ -0,0 +1,103 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @rlyh8u", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunbaton_off" + }, + { + "name": "stunbaton_nocell" + }, + { + "name": "stunbaton_on", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/off-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/off-inhand-left.png new file mode 100644 index 0000000000..25b46572f1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/off-inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/off-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/off-inhand-right.png new file mode 100644 index 0000000000..cf10e07f33 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/off-inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/on-inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/on-inhand-left.png new file mode 100644 index 0000000000..78602206ac Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/on-inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/on-inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/on-inhand-right.png new file mode 100644 index 0000000000..29673499de Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/on-inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_nocell.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_nocell.png new file mode 100644 index 0000000000..6484586eac Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_nocell.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_off.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_off.png new file mode 100644 index 0000000000..5a6d0f25f1 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_off.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_on.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_on.png new file mode 100644 index 0000000000..ec4306d690 Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/batonBS.rsi/stunbaton_on.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/icon.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/icon.png new file mode 100644 index 0000000000..1388a8770e Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/icon.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/inhand-left.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/inhand-left.png new file mode 100644 index 0000000000..cb10c4f28b Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/inhand-right.png b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/inhand-right.png new file mode 100644 index 0000000000..ef4a1fe41c Binary files /dev/null and b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/meta.json b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/meta.json new file mode 100644 index 0000000000..c225e93c49 --- /dev/null +++ b/Resources/Textures/_Wega/Objects/Weapons/Melee/green_chainsaw.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/ss220-space/Paradise/tree/master220/icons/obj/weapons", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/broken.png b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/broken.png index 7d577ce846..d61c68c8e1 100644 Binary files a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/broken.png and b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/broken.png differ diff --git a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/normal-unshaded.png b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/normal-unshaded.png index 43a068f0b2..52623f1dd9 100644 Binary files a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/normal-unshaded.png and b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/off.png b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/off.png index bf0289e229..257c0ae518 100644 Binary files a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/off.png and b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/off.png differ diff --git a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/panel.png b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/panel.png index 4ccc9ef749..33f9ed5033 100644 Binary files a/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/panel.png and b/Resources/Textures/_Wega/Structures/Machines/VendingMachines/fashiondrobe.rsi/panel.png differ diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index efa286b6c4..a4adc43ea5 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -201,6 +201,28 @@ binds: - function: OfferItem type: State key: F +- function: TogglePosing + type: State + key: R + mod1: Control +- function: PosingOffsetLeft + type: State + key: A +- function: PosingOffsetRight + type: State + key: D +- function: PosingOffsetUp + type: State + key: W +- function: PosingOffsetDown + type: State + key: S +- function: PosingRotateNegative + type: State + key: Q +- function: PosingRotatePositive + type: State + key: E # Corvax-Wega-end - function: TextCursorSelect # TextCursorSelect HAS to be above ExamineEntity diff --git a/Tools/localize/localize_config.yml b/Tools/localize/localize_config.yml index 2676ee748c..dcf1fc0d5d 100644 --- a/Tools/localize/localize_config.yml +++ b/Tools/localize/localize_config.yml @@ -1,5 +1,16 @@ ignored_paths: # Игнорирует указанные пути до папок/файлов -- "Resources/Locale/ru-RU/corvax" +- "Resources/Locale/ru-RU/corvax" # лучше просто это не трогать - "Resources/Locale/ru-RU/datasets" +### для быстрого перевода +- "Resources/Locale/ru-RU/robust-toolbox" +- "Resources/Locale/ru-RU/accent" +- "Resources/Locale/ru-RU/commands" +- "Resources/Locale/ru-RU/cvar" +- "Resources/Locale/ru-RU/lobby" ignored_untranslated_paths: # Игнорирует предупреждения в указанных путях до папок/файлов -- "Resources/Locale/ru-RU/robust-toolbox/input.ftl" +- "Resources/Locale/ru-RU/robust-toolbox/input.ftl" # лучше просто это не трогать №2 +- "Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/player/humanoid.ftl" # её заприватил элюзив +### +- "Resources/Locale/ru-RU/atmos/gases.ftl" +- "Resources/Locale/ru-RU/magic/spells-actions.ftl" +- "Resources/Locale/ru-RU/speech/speech-chatsan.ftl"