diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 92ab746ed06..a8d5ed19189 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ contact_links: - name: Предложение - url: https://discord.com/invite/CPacm3dfrA + url: https://discord.gg/CuWu6kSznf #A-13 about: Свои предложения можете оставлять в соответствующем канале Discord. - name: Сообщить об уязвимости - url: https://discord.com/invite/CPacm3dfrA + url: https://discord.gg/CuWu6kSznf #A-13 about: Пожалуйста, сообщайте о серьезных эксплойтах и уязвимостях безопасности lemird (634710558364663819) или 13lackhawk (236910741146304515) в Discord. diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml deleted file mode 100644 index 9207ccb13ec..00000000000 --- a/.github/workflows/conflict-labeler.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Check Merge Conflicts - -on: - push: - branches: - - master-andromeda #A-13 Actions fix - pull_request_target: - -jobs: - Label: - if: github.actor != 'IanComradeBot' - runs-on: ubuntu-latest - steps: - - name: Check for Merge Conflicts - uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 - with: - dirtyLabel: "Merge Conflict" #A-13 Actions fix - repoToken: "${{ secrets.GITHUB_TOKEN }}" #A-13 Actions fix - commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs index a55a99c9a23..202492c7479 100644 --- a/Content.Client/Launcher/LauncherConnectingGui.xaml.cs +++ b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs @@ -47,7 +47,7 @@ public LauncherConnectingGui(LauncherConnecting state, IRobustRandom random, ChangeLoginTip(); ReconnectButton.OnPressed += ReconnectButtonPressed; RetryButton.OnPressed += ReconnectButtonPressed; - DiscordButton.OnPressed += _ => IoCManager.Resolve().OpenUri("https://discord.gg/CPacm3dfrA"); // A-13 + DiscordButton.OnPressed += _ => IoCManager.Resolve().OpenUri("https://discord.gg/CuWu6kSznf"); // A-13 ExitButton.OnPressed += _ => _state.Exit(); var addr = state.Address; diff --git a/Content.Docfx/index.md b/Content.Docfx/index.md index 7291f49e258..c769f6f96ab 100644 --- a/Content.Docfx/index.md +++ b/Content.Docfx/index.md @@ -6,4 +6,4 @@ ## Links -[Website](https://spacestation14.io/) | [Discord](https://discord.gg/t2jac3p) | [Forum](https://forum.spacestation14.io/) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.io/about/nightlies/) \ No newline at end of file +[Website](https://spacestation14.io/) | [Discord](https://discord.gg/CuWu6kSznf) | [Forum](https://forum.spacestation14.io/) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Standalone Download](https://spacestation14.io/about/nightlies/) \ No newline at end of file diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index 371755dcef4..585b5aed782 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -19,12 +19,13 @@ using Robust.Shared.Toolshed; using Robust.Shared.Toolshed.Errors; using Robust.Shared.Utility; - +using Content.Server.Andromeda.AdministrationNotifications.GameTicking; //A-13 AdminNotifications namespace Content.Server.Administration.Managers { public sealed partial class AdminManager : IAdminManager, IPostInjectInit, IConGroupControllerImplementation { + [Dependency] private readonly IEntityManager _entityManager = default!; //A-13 AdminNotifications [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IServerDbManager _dbManager = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; @@ -342,7 +343,7 @@ private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e) } else if (e.NewStatus == SessionStatus.Disconnected) { - if (_admins.Remove(e.Session, out var reg ) && _cfg.GetCVar(CCVars.AdminAnnounceLogout)) + if (_admins.TryGetValue(e.Session, out var reg ) && _cfg.GetCVar(CCVars.AdminAnnounceLogout)) //A-13 AdminNotifications { if (reg.Data.Stealth) { @@ -355,6 +356,12 @@ private void PlayerStatusChanged(object? sender, SessionStatusEventArgs e) _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-logout-message", ("name", e.Session.Name))); } + //A-13 AdminNotifications start + var logoutEvent = new AdminLoggedOutEvent(e.Session); + _entityManager.EventBus.RaiseEvent(EventSource.Local, logoutEvent); + + _admins.Remove(e.Session); + //A-13 AdminNotifications end } } } @@ -398,6 +405,10 @@ private async void LoginAdminMaybe(ICommonSession session) _chat.SendAdminAnnouncement(Loc.GetString("admin-manager-admin-login-message", ("name", session.Name))); } + //A-13 AdminNotifications start + var loginEvent = new AdminLoggedInEvent(session); + _entityManager.EventBus.RaiseEvent(EventSource.Local, loginEvent); + //A-13 AdminNotifications end } SendPermsChangedEvent(session); diff --git a/Content.Server/Administration/Systems/AdminNotifySystem.cs b/Content.Server/Administration/Systems/AdminNotifySystem.cs index 453b6124316..5a749971995 100644 --- a/Content.Server/Administration/Systems/AdminNotifySystem.cs +++ b/Content.Server/Administration/Systems/AdminNotifySystem.cs @@ -8,6 +8,9 @@ using Robust.Shared.Audio.Systems; using Content.Server.Administration; using Content.Server.Administration.Managers; +using Content.Server.Guardian; //A-13 Fix AdminNotifySystem +using Content.Server.GameTicking.Rules.Components; //A-13 Fix AdminNotifySystem +using System.Linq; //A-13 Fix AdminNotifySystem namespace Content.Server.Administration.Systems; @@ -30,6 +33,14 @@ private void OnMobStateChanged(MobStateChangedEvent ev) if (!TryComp(ev.Target, out ActorComponent? actorComponent)) return; + //A-13 Fix AdminNotifySystem start + if (!HasComp(ev.Target)) + return; + + if (EntityQuery().Any()) + return; + //A-13 Fix AdminNotifySystem end + if (actorComponent.PlayerSession.AttachedEntity == null || ev.NewMobState == MobState.Alive) return; diff --git a/Content.Server/Andromeda/AdministrationNotifications/AdminNotificationsSystem.cs b/Content.Server/Andromeda/AdministrationNotifications/AdminNotificationsSystem.cs new file mode 100644 index 00000000000..fc8b6404afd --- /dev/null +++ b/Content.Server/Andromeda/AdministrationNotifications/AdminNotificationsSystem.cs @@ -0,0 +1,82 @@ +using Content.Shared.Administration; +using Robust.Shared; +using Robust.Shared.Configuration; +using Robust.Shared.Player; +using System.Net.Http; +using System.Text.Json; +using System.Text; +using Content.Server.Discord; +using Content.Shared.CCVar; +using Content.Shared.Andromeda.CCVar; +using Content.Server.Andromeda.AdministrationNotifications.GameTicking; + +namespace Content.Server.Andromeda.AdministrationNotifications +{ + + public sealed class AdminNotificationsSystem : EntitySystem + { + [Dependency] private readonly IConfigurationManager _config = default!; + private ISawmill _sawmill = default!; + private readonly HttpClient _httpClient = new(); + private string _webhookUrl = String.Empty; + private int _adminCount = 0; + + public override void Initialize() + { + _sawmill = Logger.GetSawmill("admin_notifications"); + SubscribeLocalEvent(OnAdminLoggedIn); + SubscribeLocalEvent(OnAdminLoggedOut); + _config.OnValueChanged(AndromedaCCVars.DiscordAdminWebhook, value => _webhookUrl = value, true); + } + + private async void SendDiscordMessage(WebhookPayload payload) + { + var request = await _httpClient.PostAsync(_webhookUrl, + new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json")); + + _sawmill.Debug($"Вебхук Discord в формате json: {JsonSerializer.Serialize(payload)}"); + + var content = await request.Content.ReadAsStringAsync(); + if (!request.IsSuccessStatusCode) + { + _sawmill.Error($"Discord вернул неверный код статуса при публикации сообщения: {request.StatusCode}\nResponse: {content}"); + return; + } + } + + private void OnAdminLoggedIn(AdminLoggedInEvent e) + { + _adminCount++; + SendAdminStatusUpdate(e.Session, "вошёл", 0x00FF00); + } + + private void OnAdminLoggedOut(AdminLoggedOutEvent e) + { + _adminCount--; + SendAdminStatusUpdate(e.Session, "вышел", 0xFF0000); + } + + private void SendAdminStatusUpdate(ICommonSession session, string action, int color) + { + if (String.IsNullOrEmpty(_webhookUrl)) + return; + + var message = $"{session.Name} {action}. Всего администраторов онлайн: {_adminCount}"; + + var payload = new WebhookPayload + { + Username = "Отчёт входов админов", + Embeds = new List + { + new() + { + Description = message, + Color = color, + }, + }, + }; + + SendDiscordMessage(payload); + } + } +} \ No newline at end of file diff --git a/Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedEvent.cs b/Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedEvent.cs new file mode 100644 index 00000000000..2f197cd61f1 --- /dev/null +++ b/Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedEvent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.Player; + +namespace Content.Server.Andromeda.AdministrationNotifications.GameTicking; + +public sealed class AdminLoggedInEvent : EntityEventArgs +{ + public ICommonSession Session { get; } + + public AdminLoggedInEvent(ICommonSession session) + { + Session = session; + } +} \ No newline at end of file diff --git a/Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedOutEvent.cs b/Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedOutEvent.cs new file mode 100644 index 00000000000..1710beba018 --- /dev/null +++ b/Content.Server/Andromeda/AdministrationNotifications/GameTicking/AdminLoggedOutEvent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.Player; + +namespace Content.Server.Andromeda.AdministrationNotifications.GameTicking; + +public sealed class AdminLoggedOutEvent : EntityEventArgs +{ + public ICommonSession Session { get; } + + public AdminLoggedOutEvent(ICommonSession session) + { + Session = session; + } +} \ No newline at end of file diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 84f578e5b17..ecce76620d1 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -17,9 +17,9 @@ using System.Linq; using Content.Shared.Chat; using Robust.Shared.Enums; -using Content.Server.Corvax.Sponsors; //A-13 -using Content.Server.Andromeda.Roles; //A-13 -using Robust.Server.Player; //A-13 +using Content.Server.Corvax.Sponsors; //A-13 SponsorAntag +using Content.Server.Andromeda.Roles; //A-13 SponsorAntag +using Robust.Server.Player; //A-13 SponsorAntag namespace Content.Server.Antag; @@ -30,8 +30,8 @@ public sealed class AntagSelectionSystem : GameRuleSystem [Dependency] private readonly JobSystem _jobs = default!; [Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly SharedRoleSystem _roleSystem = default!; - [Dependency] private readonly SponsorsManager _sponsorsManager = default!; //A-13 - [Dependency] private readonly IPlayerManager _playerSystem = default!; //A-13 + [Dependency] private readonly SponsorsManager _sponsorsManager = default!; //A-13 SponsorAntag + [Dependency] private readonly IPlayerManager _playerSystem = default!; //A-13 SponsorAntag #region Eligible Player Selection /// @@ -57,7 +57,17 @@ public List GetEligiblePlayers(IEnumerable playerSess foreach (var player in playerSessions) { if (IsPlayerEligible(player, antagPrototype, includeAllJobs, acceptableAntags, ignorePreferences, allowNonHumanoids, customExcludeCondition)) + { + //A-13 No Thief-Agents system v5 start + if (player.AttachedEntity.HasValue && HasComp(player.AttachedEntity.Value)) + { + Log.Warning($"[AntagSelectionSystem] Игрок {player.Name} пропущен для избежания дублирования."); + continue; + } + //A-13 No Thief-Agents system v5 end + eligiblePlayers.Add(player.AttachedEntity!.Value); + } } return eligiblePlayers; @@ -198,6 +208,7 @@ public int CalculateAntagCount(int playerCount, int playersPerAntag, int maxAnta /// Up to the specified count of elements from all provided lists public List ChooseAntags(int count, params List[] eligiblePlayerLists) { + Log.Info($"[AntagSelectionSystem] Вход в ChooseAntags(1)"); //A-13 SponsorAntag var chosenPlayers = new List(); foreach (var playerList in eligiblePlayerLists) { @@ -217,15 +228,40 @@ public List ChooseAntags(int count, params List[] eligible return chosenPlayers; } /// - /// Helper method to choose antags from a list + /// Helper method to choose antags from a list, giving priority to sponsored players. /// /// List of eligible players /// How many to choose /// Up to the specified count of elements from the provided list public List ChooseAntags(int count, List eligiblePlayers) { + Log.Info($"[AntagSelectionSystem] Вход в ChooseAntags(2)"); //A-13 SponsorAntag var chosenPlayers = new List(); + //A-13 SponsorAntag start + var sponsorPrefList = new List(); + foreach (var player in eligiblePlayers) + { + if (_playerSystem.TryGetSessionByEntity(player, out var session) && + //Используйте "session.UserId" для тестов, закомментировав часть кода "_sponsorsManager": + //session.UserId == new Guid("{ВАШ UserId}")) + _sponsorsManager.TryGetInfo(session.UserId, out var sponsorData) && sponsorData.ExtraSlots >= 7) + { + sponsorPrefList.Add(player); + Log.Info($"[AntagSelectionSystem] Игрок с именем {session.Name} добавлен в список спонсорских кандидатов на роль антагониста."); + } + } + + while (sponsorPrefList.Count > 0 && count > 0) + { + var player = RobustRandom.PickAndTake(sponsorPrefList); + eligiblePlayers.Remove(player); + chosenPlayers.Add(player); + count--; + Log.Info($"[AntagSelectionSystem] Игрок {player} выбран как спонсорский антагонист. Оставшееся количество мест: {count}"); + } + //A-13 SponsorAntag end + for (var i = 0; i < count; i++) { if (eligiblePlayers.Count == 0) @@ -245,6 +281,7 @@ public List ChooseAntags(int count, List eligiblePlayers) /// Up to the specified count of elements from all provided lists public List ChooseAntags(int count, params List[] eligiblePlayerLists) { + Log.Info($"[AntagSelectionSystem] Вход в ChooseAntagsICommonSession(1)"); //A-13 SponsorAntag var chosenPlayers = new List(); foreach (var playerList in eligiblePlayerLists) { @@ -254,37 +291,6 @@ public List ChooseAntags(int count, params List[ playerList.Remove(chosenPlayer); } - // A-13 SponsorAntag start - /* - var sponsorPrefList = new List(); - var allPlayers = _playerSystem.Sessions.ToList(); - foreach (var player in allPlayers) - { - // A-13 Use this for tests only - //if (player.UserId == new Guid("{c48a881f-25c0-4ea6-8489-1aaba1831ce3}")) - if (_sponsorsManager.TryGetInfo(player.UserId, out var sponsor) && sponsor.ExtraSlots >= 7) //Checker - { - Logger.InfoS("SPONSOR", "Selected a sponsor antag!1"); - sponsorPrefList.Add(player); - } - } - - while (sponsorPrefList.Count > 0 && count > 0) - { - var player = RobustRandom.PickAndTake(sponsorPrefList); - playerList.Remove(player); - chosenPlayers.Add(player); - count -= 1; - Logger.InfoS("SPONSOR", "Selected a sponsor antag!"); - } - // If we have reached the desired number of players, exit the loop - //if (chosenPlayers.Count >= count) - //{ - // break; - //} - // A-13 SponsorAntag end - */ - //If we have reached the desired number of players, skip if (chosenPlayers.Count >= count) continue; @@ -302,15 +308,43 @@ public List ChooseAntags(int count, params List[ /// Up to the specified count of elements from the provided list public List ChooseAntags(int count, List eligiblePlayers) { + Log.Info($"[AntagSelectionSystem] Вход в ChooseAntagsICommonSession(2)"); //A-13 SponsorAntag var chosenPlayers = new List(); - for (int i = 0; i < count; i++) + //A-13 SponsorAntag start + var sponsorPrefList = new List(); + foreach (var player in eligiblePlayers) { - if (eligiblePlayers.Count == 0) - break; + //Используйте "player.UserId" для тестов, закомментировав часть кода "_sponsorsManager": + //if (player.UserId == new Guid("{ВАШ UserId}")) + if (_sponsorsManager.TryGetInfo(player.UserId, out var sponsorData) && sponsorData.ExtraSlots >= 7) + { + Log.Info($"[AntagSelectionSystem] Игрок {player} прошёл проверку на спонсорство."); + sponsorPrefList.Add(player); + } + else + { + Log.Warning($"[AntagSelectionSystem] Игрок {player} не прошёл проверку на спонсорство или его уровень слишком маленький."); + } + } - chosenPlayers.Add(RobustRandom.PickAndTake(eligiblePlayers)); + while (sponsorPrefList.Count > 0 && count > 0) + { + var player = RobustRandom.PickAndTake(sponsorPrefList); + eligiblePlayers.Remove(player); + chosenPlayers.Add(player); + count--; + Log.Info($"[AntagSelectionSystem] Игрок {player} выбран как спонсорский антаг."); + } + + while (sponsorPrefList.Count <= 0 && eligiblePlayers.Count > 0 && count > 0) + { + var player = RobustRandom.PickAndTake(eligiblePlayers); + chosenPlayers.Add(player); + count--; + Log.Info($"[AntagSelectionSystem] Игрок {player} выбран как НЕ спонсорский антаг."); } + // A-13 SponsorAntag end return chosenPlayers; } diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index d33e6f3bef7..c693820c0bb 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -95,13 +95,6 @@ public override void Update(float frameTime) } comp.RiftAccumulator += frameTime; - - // Delete it, naughty dragon! - if (comp.RiftAccumulator >= comp.RiftMaxAccumulator) - { - Roar(uid, comp); - QueueDel(uid); - } } } diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index 1eb031430f7..8524e37761a 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -19,12 +19,10 @@ using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Utility; -using System.Linq; -using Content.Shared.Database; -using Robust.Shared.Asynchronous; using Content.Server.Voting.Managers; using Content.Shared.Voting; using Content.Shared.CCVar; +using System.Text.RegularExpressions; //A-13 AnnonceRoundUpdate namespace Content.Server.GameTicking { @@ -310,7 +308,6 @@ public void EndRound(string text = "") RunLevel = GameRunLevel.PostRound; ShowRoundEndScoreboard(text); - SendRoundEndDiscordMessage(); } public void ShowRoundEndScoreboard(string text = "") @@ -411,9 +408,36 @@ public void ShowRoundEndScoreboard(string text = "") _replayRoundPlayerInfo = listOfPlayerInfoFinal; _replayRoundText = roundEndText; + var roundEndSummary = GenerateRoundEndSummary(gamemodeTitle, roundEndText, listOfPlayerInfoFinal); //A-13 AnnonceRoundUpdate + SendRoundEndDiscordMessage(roundEndSummary); //A-13 AnnonceRoundUpdate + } + + //A-13 AnnonceRoundUpdate start + private string ConvertBBCodeToMarkdown(string text) + { + text = Regex.Replace(text, @"\[.*?\]", "**"); + + return text; } - private async void SendRoundEndDiscordMessage() + private string GenerateRoundEndSummary(string gamemodeTitle, string roundEndText, RoundEndMessageEvent.RoundEndPlayerInfo[] playerInfoArray) + { + var roundEndTextMarkdown = ConvertBBCodeToMarkdown(roundEndText); + var stringBuilder = new System.Text.StringBuilder(); + stringBuilder.AppendLine($"**Режим**: {gamemodeTitle}\n"); + stringBuilder.AppendLine($"**Информация**: {roundEndTextMarkdown}\n"); + stringBuilder.AppendLine($"**Игроки**:\n"); + + foreach (var playerInfo in playerInfoArray) + { + stringBuilder.AppendLine($"*{playerInfo.PlayerOOCName}* '**{playerInfo.PlayerICName}**' в роли: {playerInfo.Role}"); + } + + return stringBuilder.ToString(); + } + //A-13 AnnonceRoundUpdate end + + private async void SendRoundEndDiscordMessage(string roundEndSummary) //A-13 AnnonceRoundUpdate { try { @@ -421,13 +445,12 @@ private async void SendRoundEndDiscordMessage() return; var duration = RoundDuration(); - var content = Loc.GetString("discord-round-notifications-end", - ("id", RoundId), - ("hours", Math.Truncate(duration.TotalHours)), - ("minutes", duration.Minutes), - ("seconds", duration.Seconds)); + //A-13 AnnonceRoundUpdate start + var content = $"**Раунд завершен!**\n" + + $"**Продолжительность**: {Math.Truncate(duration.TotalHours)} часов {duration.Minutes} минут {duration.Seconds} секунд\n" + + $"{roundEndSummary}"; var payload = new WebhookPayload { Content = content }; - + //A-13 AnnonceRoundUpdate end await _discord.CreateMessage(_webhookIdentifier.Value, payload); if (DiscordRoundEndRole == null) diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs index c7ccffa4f8c..de526b5621f 100644 --- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs @@ -38,7 +38,6 @@ using Content.Shared.Roles; using Content.Shared.Store; using Content.Shared.Tag; -using Content.Shared.Zombies; using Robust.Server.Player; using Robust.Shared.Configuration; using Robust.Shared.Map; @@ -47,7 +46,6 @@ using Robust.Shared.Random; using Robust.Shared.Utility; using System.Linq; -using Content.Server.Corvax.Sponsors; // Andromeda SponsorAntag namespace Content.Server.GameTicking.Rules; @@ -73,7 +71,6 @@ public sealed class NukeopsRuleSystem : GameRuleSystem [Dependency] private readonly StoreSystem _store = default!; [Dependency] private readonly TagSystem _tag = default!; [Dependency] private readonly AntagSelectionSystem _antagSelection = default!; - [Dependency] private readonly SponsorsManager _sponsors = default!; // A-13 private ISawmill _sawmill = default!; @@ -207,7 +204,7 @@ private void OnRoundEndText(RoundEndTextAppendEvent ev) } } - ev.AddLine(Loc.GetString("nukeops-list-start")); + //ev.AddLine(Loc.GetString("nukeops-list-start")); var nukiesQuery = EntityQueryEnumerator(); while (nukiesQuery.MoveNext(out var nukeopsUid, out _, out var mindContainer)) @@ -458,7 +455,7 @@ private void DistributeExtraTc(NukeopsRuleComponent nukieRule) if (Transform(uid).MapID != Transform(nukieRule.NukieOutpost.Value).MapID) // Will receive bonus TC only on their start outpost continue; - _store.TryAddCurrency(new () { { TelecrystalCurrencyPrototype, nukieRule.WarTCAmountPerNukie } }, uid, component); + _store.TryAddCurrency(new() { { TelecrystalCurrencyPrototype, nukieRule.WarTCAmountPerNukie } }, uid, component); var msg = Loc.GetString("store-currency-war-boost-given", ("target", uid)); _popupSystem.PopupEntity(msg, uid); diff --git a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs index 0ba1cb0f7d7..33cc5f081f8 100644 --- a/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/ThiefRuleSystem.cs @@ -91,10 +91,8 @@ public void MakeThief(EntityUid thief, ThiefRuleComponent thiefRule, bool addPac EnsureComp(thief); } - // A-13 No Thief-Agents system v5 - EnsureComp(thief); - // A-13 No Thief-Agents system v5 - + EnsureComp(thief); //A-13 No Thief-Agents system v5 + //Generate objectives GenerateObjectives(mindId, mind, thiefRule); diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index a1257f39e6f..76ba167cd31 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -40,7 +40,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem [Dependency] private readonly SharedJobSystem _jobs = default!; [Dependency] private readonly ObjectivesSystem _objectives = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SponsorsManager _sponsors = default!; // A-13 SponsorAntag + [Dependency] private readonly SponsorsManager _sponsorsManager = default!; // A-13 SponsorAntag private int PlayersPerTraitor => _cfg.GetCVar(CCVars.TraitorPlayersPerTraitor); private int MaxTraitors => _cfg.GetCVar(CCVars.TraitorMaxTraitors); @@ -113,7 +113,6 @@ private void DoTraitorStart(TraitorRuleComponent component) return; var traitorsToSelect = _antagSelection.CalculateAntagCount(_playerManager.PlayerCount, PlayersPerTraitor, MaxTraitors); - var selectedTraitors = _antagSelection.ChooseAntags(traitorsToSelect, eligiblePlayers); MakeTraitor(selectedTraitors, component); @@ -260,7 +259,9 @@ private void HandleLatejoin(PlayerSpawnCompleteEvent ev) chance = 1; // A-13 SponsorAntag start - if (_sponsors.TryGetInfo(ev.Player.UserId, out var sponsor) && sponsor.ExtraSlots == 7) // Cringe check until Tehnox update our service + // Замените проверку на эту, если необходимо сделать тесты, соответственно изменив "Ваш UserId": + //if (ev.Player.UserId == new Guid("{Ваш UserId}")) + if (_sponsorsManager.TryGetInfo(ev.Player.UserId, out var sponsor) && sponsor.ExtraSlots == 7) chance = 1; // A-13 SponsorAntag end diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs index 8c1366786a2..ae45c722cca 100644 --- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs +++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs @@ -63,10 +63,10 @@ public sealed partial class EmergencyShuttleSystem /// private float _authorizeTime; - private float _AndromedaEmergency60 = 60; // Andromeda Emergency - private float _AndromedaEmergency30 = 30; // Andromeda Emergency - private float trashcheck60 = 0; // Andromeda Emergency - private float trashcheck30 = 0; // Andromeda Emergency + private float _andromedaEmergency60 = 60; // Andromeda Emergency + private float _andromedaEmergency30 = 30; // Andromeda Emergency + private float _trashcheck60 = 0; // Andromeda Emergency + private float _trashcheck30 = 0; // Andromeda Emergency private CancellationTokenSource? _roundEndCancelToken; @@ -160,34 +160,29 @@ private void UpdateEmergencyConsole(float frameTime) if (!EarlyLaunchAuthorized) AnnounceLaunch(); } - - // Andromeda Emergency - if (!_launchedShuttles && _consoleAccumulator <= _AndromedaEmergency60 && trashcheck60 == 0) + // Andromeda Emergency start + if (!_launchedShuttles && !_announced && _consoleAccumulator <= _andromedaEmergency60 && _trashcheck60 == 0) { - if (_announced == false) - { - _chatSystem.DispatchGlobalAnnouncement( - Loc.GetString("emergency-shuttle-andromeda-60", ("AndromedaEmergency60", $"{_AndromedaEmergency60:0}")), - playSound: false, - colorOverride: DangerColor); - _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true); - trashcheck60++; - } + _chatSystem.DispatchGlobalAnnouncement( + Loc.GetString("emergency-shuttle-andromeda-60", ("AndromedaEmergency60", $"{_andromedaEmergency60:0}")), + playSound: false, + colorOverride: DangerColor); + _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true); + _trashcheck60++; } - - // Andromeda Emergency - if (!_launchedShuttles && _consoleAccumulator <= _AndromedaEmergency30 && trashcheck30 == 0) + if (!_launchedShuttles && _consoleAccumulator <= _andromedaEmergency30 && _trashcheck30 == 0) { if (_announced == false) { _chatSystem.DispatchGlobalAnnouncement( - Loc.GetString("emergency-shuttle-andromeda-30", ("AndromedaEmergency30", $"{_AndromedaEmergency30:0}")), + Loc.GetString("emergency-shuttle-andromeda-30", ("AndromedaEmergency30", $"{_andromedaEmergency30:0}")), playSound: false, colorOverride: DangerColor); _audio.PlayGlobal("/Audio/Announcements/announce.ogg", Filter.Broadcast(), recordReplay: true); - trashcheck30++; + _trashcheck30++; } } + // Andromeda Emergency end // Imminent departure if (!_launchedShuttles && _consoleAccumulator <= ShuttleSystem.DefaultStartupTime) @@ -357,8 +352,8 @@ private void CleanupEmergencyConsole() ShuttlesLeft = false; _launchedShuttles = false; _consoleAccumulator = float.MinValue; - trashcheck60 = 0; // Andromeda Emergency - trashcheck30 = 0; // Andromeda Emergency + _trashcheck60 = 0; // Andromeda Emergency + _trashcheck30 = 0; // Andromeda Emergency EarlyLaunchAuthorized = false; EmergencyShuttleArrived = false; TransitTime = MinimumTransitTime + (MaximumTransitTime - MinimumTransitTime) * _random.NextFloat(); diff --git a/Content.Shared/Andromeda/CCVar/CCVars.cs b/Content.Shared/Andromeda/CCVar/CCVars.cs index 6580f5deec7..c315f08586b 100644 --- a/Content.Shared/Andromeda/CCVar/CCVars.cs +++ b/Content.Shared/Andromeda/CCVar/CCVars.cs @@ -27,5 +27,8 @@ public sealed class AndromedaCCVars : CVars /// public static readonly CVarDef DiscordBanWebhook = CVarDef.Create("discord.ban_webhook", string.Empty, CVar.SERVERONLY); + + public static readonly CVarDef DiscordAdminWebhook = + CVarDef.Create("discord.admin_webhook", string.Empty, CVar.SERVERONLY); } } diff --git a/README.md b/README.md index 946cc582c4c..29faa49acbc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Space Station 14 это ремейк SS13, который работает на ## Ссылки -[Наш Discord](https://discord.com/invite/CPacm3dfrA) | [Наша Вики](https://bit.ly/ss14andromeda13_wiki) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Клиент без Steam](https://spacestation14.io/about/nightlies/) | [Основной репозиторий](https://github.com/space-wizards/space-station-14) +[Наш Discord](https://discord.gg/CuWu6kSznf) | [Наша Вики](https://bit.ly/ss14andromeda13_wiki) | [Steam](https://store.steampowered.com/app/1255460/Space_Station_14/) | [Клиент без Steam](https://spacestation14.io/about/nightlies/) | [Основной репозиторий](https://github.com/space-wizards/space-station-14) ## Документация @@ -14,7 +14,7 @@ Space Station 14 это ремейк SS13, который работает на ## Контрибьют -Мы рады принять вклад от любого человека. Заходите в [Discord](https://discord.gg/CPacm3dfrA), если хотите помочь. Там же можно сообщить о баге или проблеме. +Мы рады принять вклад от любого человека. Заходите в [Discord](https://discord.gg/CuWu6kSznf), если хотите помочь. Там же можно сообщить о баге или проблеме. ## Сборка diff --git a/Resources/Locale/ru-RU/connection-messages.ftl b/Resources/Locale/ru-RU/connection-messages.ftl index 3d16e23e347..353c4f1b1df 100644 --- a/Resources/Locale/ru-RU/connection-messages.ftl +++ b/Resources/Locale/ru-RU/connection-messages.ftl @@ -9,7 +9,7 @@ whitelist-playercount-invalid = *[other] -> и ниже { $max } игроков, так что, возможно, вы сможете присоединиться позже. } } -whitelist-not-whitelisted-rp = Вас нет в вайтлисте. Чтобы попасть в вайтлист, посетите наш Discord (ссылку можно найти по адресу https://discord.station14.ru). +whitelist-not-whitelisted-rp = Вас нет в вайтлисте. Чтобы попасть в вайтлист, посетите наш Discord (ссылку можно найти по адресу https://discord.gg/CuWu6kSznf). cmd-whitelistadd-desc = Добавить игрока в вайтлист сервера. cmd-whitelistadd-help = Использование: whitelistadd cmd-whitelistadd-existing = { $username } уже находится в вайтлисте! diff --git a/Resources/Maps/Dungeon/experiment.yml b/Resources/Maps/Dungeon/experiment.yml index 27b522ab6a5..5a8b36736df 100644 --- a/Resources/Maps/Dungeon/experiment.yml +++ b/Resources/Maps/Dungeon/experiment.yml @@ -2417,6 +2417,14 @@ entities: - type: Transform pos: 33.5,16.5 parent: 1653 +- proto: BananiumHorn + entities: + - uid: 1196 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.236242,15.010303 + parent: 1653 - proto: Barricade entities: - uid: 665 @@ -6359,6 +6367,13 @@ entities: - type: Transform pos: 4.5678988,24.535187 parent: 1653 +- proto: CognizineChemistryBottle + entities: + - uid: 1599 + components: + - type: Transform + pos: 20.341743,44.56282 + parent: 1653 - proto: ComfyChair entities: - uid: 774 @@ -6530,6 +6545,13 @@ entities: - type: Transform pos: 16.668823,9.400122 parent: 1653 +- proto: DeathRattleImplanter + entities: + - uid: 1383 + components: + - type: Transform + pos: 24.491978,15.392013 + parent: 1653 - proto: DisposalTrunk entities: - uid: 1436 @@ -6930,6 +6952,18 @@ entities: - type: Transform pos: 36.5,38.5 parent: 1653 +- proto: FoodAmbrosiaDeus + entities: + - uid: 713 + components: + - type: Transform + pos: 15.483121,8.567106 + parent: 1653 + - uid: 729 + components: + - type: Transform + pos: 15.498746,9.582731 + parent: 1653 - proto: FoodBanana entities: - uid: 1189 @@ -6947,13 +6981,6 @@ entities: - type: Transform pos: 21.644592,15.498887 parent: 1653 -- proto: FoodSoupMonkey - entities: - - uid: 1196 - components: - - type: Transform - pos: 19.514566,14.517001 - parent: 1653 - proto: FoodTinBeans entities: - uid: 732 @@ -7184,11 +7211,6 @@ entities: - type: Transform pos: 13.5,47.5 parent: 1653 - - uid: 542 - components: - - type: Transform - pos: 11.5,47.5 - parent: 1653 - uid: 1013 components: - type: Transform @@ -7214,6 +7236,13 @@ entities: - type: Transform pos: 33.5,9.5 parent: 1653 +- proto: GeneratorRTGDamaged + entities: + - uid: 619 + components: + - type: Transform + pos: 11.5,47.5 + parent: 1653 - proto: Girder entities: - uid: 671 @@ -7350,6 +7379,11 @@ entities: - type: Transform pos: 19.503967,13.342637 parent: 1653 + - uid: 1538 + components: + - type: Transform + pos: 11.46905,12.475278 + parent: 1653 - proto: LandMineModular entities: - uid: 1121 @@ -7388,33 +7422,6 @@ entities: - type: Transform pos: 16.496948,9.603247 parent: 1653 -- proto: LifeweedLeaves - entities: - - uid: 1379 - components: - - type: Transform - pos: 15.455196,8.634497 - parent: 1653 - - uid: 1380 - components: - - type: Transform - pos: 15.455196,8.634497 - parent: 1653 - - uid: 1383 - components: - - type: Transform - pos: 15.455196,8.634497 - parent: 1653 - - uid: 1384 - components: - - type: Transform - pos: 15.455196,8.634497 - parent: 1653 - - uid: 1472 - components: - - type: Transform - pos: 15.455196,8.634497 - parent: 1653 - proto: LockerElectricalSuppliesFilled entities: - uid: 1533 @@ -7522,6 +7529,13 @@ entities: - type: Transform pos: 30.5,0.5 parent: 1653 +- proto: MaterialBananium + entities: + - uid: 1384 + components: + - type: Transform + pos: 17.564367,14.588428 + parent: 1653 - proto: MaterialBiomass entities: - uid: 1534 @@ -7652,6 +7666,13 @@ entities: - type: Transform pos: 27.480967,22.500828 parent: 1653 +- proto: MuteToxinChemistryBottle + entities: + - uid: 1637 + components: + - type: Transform + pos: 20.716743,44.547195 + parent: 1653 - proto: NitrousOxideCanister entities: - uid: 834 @@ -7740,6 +7761,18 @@ entities: - type: Transform pos: 34.5,36.5 parent: 1653 + - uid: 1536 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,14.5 + parent: 1653 + - uid: 1537 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,14.5 + parent: 1653 - proto: PlasmaTankFilled entities: - uid: 1473 @@ -7761,18 +7794,6 @@ entities: - type: Transform pos: 28.542555,0.5099404 parent: 1653 -- proto: PlushieSpaceLizard - entities: - - uid: 713 - components: - - type: Transform - pos: 10.508222,14.448289 - parent: 1653 - - uid: 820 - components: - - type: Transform - pos: 12.476972,14.557664 - parent: 1653 - proto: PortableGeneratorPacman entities: - uid: 1528 @@ -8467,6 +8488,14 @@ entities: - type: Transform pos: 20.5,46.5 parent: 1653 +- proto: ProtolatheHyperConvectionMachineCircuitboard + entities: + - uid: 1539 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.4207904,46.51901 + parent: 1653 - proto: Rack entities: - uid: 659 @@ -8738,6 +8767,14 @@ entities: - type: Transform pos: 42.607162,12.70194 parent: 1653 +- proto: ResearchAndDevelopmentServerMachineCircuitboard + entities: + - uid: 1535 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.550611,14.347406 + parent: 1653 - proto: ResearchDisk entities: - uid: 1625 @@ -8776,13 +8813,6 @@ entities: - type: Transform pos: 10.533063,27.58727 parent: 1653 -- proto: RPED - entities: - - uid: 1646 - components: - - type: Transform - pos: 32.49994,15.5244 - parent: 1653 - proto: SalvageCanisterSpawner entities: - uid: 493 @@ -8912,6 +8942,13 @@ entities: - type: DeviceLinkSink links: - 583 +- proto: ShuttleGunPerforatorCircuitboard + entities: + - uid: 1379 + components: + - type: Transform + pos: 12.581861,14.738031 + parent: 1653 - proto: SignalButton entities: - uid: 583 @@ -9118,6 +9155,13 @@ entities: - type: Transform pos: 30.5,8.5 parent: 1653 +- proto: SpawnMechHonker + entities: + - uid: 542 + components: + - type: Transform + pos: 19.5,15.5 + parent: 1653 - proto: SprayBottleSpaceCleaner entities: - uid: 720 @@ -9127,15 +9171,23 @@ entities: parent: 1653 - proto: SprayBottleWater entities: - - uid: 1169 + - uid: 1573 components: - type: Transform - pos: 17.482958,14.735751 + pos: 30.7552,12.830012 parent: 1653 - - uid: 1573 +- proto: StatueBananiumClown + entities: + - uid: 820 components: - type: Transform - pos: 30.7552,12.830012 + pos: 18.5,15.5 + parent: 1653 + - uid: 1169 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,15.5 parent: 1653 - proto: Stool entities: @@ -9785,6 +9837,12 @@ entities: - type: Transform pos: 18.5,44.5 parent: 1653 + - uid: 1472 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,44.5 + parent: 1653 - proto: TableWood entities: - uid: 666 @@ -9936,11 +9994,6 @@ entities: parent: 1653 - proto: UnfinishedMachineFrame entities: - - uid: 619 - components: - - type: Transform - pos: 20.5,44.5 - parent: 1653 - uid: 1341 components: - type: Transform @@ -9970,13 +10023,6 @@ entities: - type: Transform pos: 24.538218,15.750836 parent: 1653 -- proto: VehicleJanicartDestroyed - entities: - - uid: 729 - components: - - type: Transform - pos: 6.5,25.5 - parent: 1653 - proto: VendingMachineCigs entities: - uid: 928 @@ -10430,6 +10476,13 @@ entities: - type: Transform pos: 7.5,3.5 parent: 1653 +- proto: WeaponTeslaGun + entities: + - uid: 1380 + components: + - type: Transform + pos: 10.547531,14.588428 + parent: 1653 - proto: Welder entities: - uid: 663 diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml index 8885dce4323..0e5a1304932 100644 --- a/Resources/Maps/Dungeon/lava_brig.yml +++ b/Resources/Maps/Dungeon/lava_brig.yml @@ -120,6 +120,18 @@ entities: chunkCollection: version: 2 nodes: + - node: + cleanable: True + color: '#DA8BC9FF' + id: 6 + decals: + 2140: 32.757034,36.035404 + - node: + cleanable: True + color: '#DA8BC9FF' + id: 9 + decals: + 2141: 33.11641,36.066654 - node: color: '#52B4E996' id: BotGreyscale @@ -2763,11 +2775,6 @@ entities: parent: 588 - proto: BannerSecurity entities: - - uid: 553 - components: - - type: Transform - pos: 30.5,8.5 - parent: 588 - uid: 1619 components: - type: Transform @@ -3133,6 +3140,14 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,48.5 parent: 588 +- proto: BikeHornImplanter + entities: + - uid: 1070 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 30.706156,27.687836 + parent: 588 - proto: BlastDoor entities: - uid: 1600 @@ -3171,13 +3186,6 @@ entities: - type: Transform pos: 24.420084,44.539436 parent: 588 -- proto: BookSecurity - entities: - - uid: 522 - components: - - type: Transform - pos: 32.41844,8.400207 - parent: 588 - proto: BoxFolderBlack entities: - uid: 365 @@ -7249,19 +7257,19 @@ entities: - type: Transform pos: 21.5,43.5 parent: 588 -- proto: ClothingBeltChampion +- proto: ClothingEyesGlassesMeson entities: - - uid: 1236 + - uid: 1108 components: - type: Transform - pos: 10.581136,39.53631 + pos: 25.666832,30.643515 parent: 588 -- proto: ClothingEyesGlassesMeson +- proto: ClothingEyesVision entities: - - uid: 1108 + - uid: 1010 components: - type: Transform - pos: 25.666832,30.643515 + pos: 32.515953,8.591039 parent: 588 - proto: ClothingHandsGlovesNitrile entities: @@ -7270,12 +7278,19 @@ entities: - type: Transform pos: 10.432637,44.476112 parent: 588 -- proto: ClothingHeadBandRed +- proto: ClothingHeadHatCatEarsRobot + entities: + - uid: 997 + components: + - type: Transform + pos: 12.630659,39.81972 + parent: 588 +- proto: ClothingHeadHatCueball entities: - - uid: 1295 + - uid: 602 components: - type: Transform - pos: 12.571781,39.694115 + pos: 12.630659,39.147846 parent: 588 - proto: ClothingHeadHatFedoraBrown entities: @@ -7324,6 +7339,13 @@ entities: - type: Transform pos: 34.666565,24.66942 parent: 588 +- proto: ClothingNeckCloakFire + entities: + - uid: 522 + components: + - type: Transform + pos: 24.470768,48.61274 + parent: 588 - proto: ClothingNeckLawyerbadge entities: - uid: 326 @@ -7352,6 +7374,14 @@ entities: - type: Transform pos: 13.396446,12.479115 parent: 588 +- proto: ClothingOuterHardsuitLing + entities: + - uid: 1069 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.593026,43.40013 + parent: 588 - proto: ClothingOuterRobesJudge entities: - uid: 370 @@ -7373,6 +7403,27 @@ entities: - type: Transform pos: 18.586912,0.70824456 parent: 588 +- proto: ClothingUnderwearBottomElegantpanties + entities: + - uid: 603 + components: + - type: Transform + pos: 34.54426,35.285404 + parent: 588 +- proto: ClothingUnderwearWarmbra + entities: + - uid: 968 + components: + - type: Transform + pos: 34.77266,35.73853 + parent: 588 +- proto: ClothingUnderwearWarmstockings + entities: + - uid: 604 + components: + - type: Transform + pos: 34.14766,35.785404 + parent: 588 - proto: ClothingUniformJumpskirtColorMaroon entities: - uid: 1714 @@ -7387,6 +7438,13 @@ entities: - type: Transform pos: 10.645364,44.67479 parent: 588 +- proto: ClothingUniformJumpsuitRedGalaxy + entities: + - uid: 399 + components: + - type: Transform + pos: 10.370498,39.60772 + parent: 588 - proto: ClusterBangFull entities: - uid: 599 @@ -7534,6 +7592,21 @@ entities: - type: Transform pos: 14.5,47.5 parent: 588 +- proto: DeathRattleImplanter + entities: + - uid: 376 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5045595,42.48262 + parent: 588 +- proto: DeathweedLeaves + entities: + - uid: 1022 + components: + - type: Transform + pos: 31.504587,19.578388 + parent: 588 - proto: DebugSMES entities: - uid: 971 @@ -7589,6 +7662,17 @@ entities: - type: Transform pos: 22.5,38.5 parent: 588 + - type: DisposalUnit + nextFlush: 0 + recentlyEjected: + - invalid + - type: ContainerContainer + containers: + disposals: !type:Container + showEnts: False + occludes: True + ents: + - 511 - proto: DonkpocketBoxSpawner entities: - uid: 526 @@ -8437,13 +8521,6 @@ entities: - type: Transform pos: 30.547388,48.16116 parent: 588 -- proto: FoodBurgerMime - entities: - - uid: 399 - components: - - type: Transform - pos: 10.958169,39.64943 - parent: 588 - proto: FoodPlateSmallPlastic entities: - uid: 529 @@ -8729,6 +8806,11 @@ entities: - type: Transform pos: 8.5,27.5 parent: 588 + - uid: 553 + components: + - type: Transform + pos: 12.5,42.5 + parent: 588 - uid: 949 components: - type: Transform @@ -8791,11 +8873,6 @@ entities: - type: Transform pos: 14.5,34.5 parent: 588 - - uid: 1467 - components: - - type: Transform - pos: 12.5,42.5 - parent: 588 - uid: 1469 components: - type: Transform @@ -8957,6 +9034,18 @@ entities: rot: -1.5707963267948966 rad pos: 10.765976,19.912766 parent: 588 +- proto: LemonKa + entities: + - uid: 1011 + components: + - type: Transform + pos: 31.504587,21.594013 + parent: 588 + - uid: 1028 + components: + - type: Transform + pos: 30.550373,44.61888 + parent: 588 - proto: Lighter entities: - uid: 1220 @@ -9242,6 +9331,23 @@ entities: - type: Transform pos: 25.484175,4.4865713 parent: 588 +- proto: PillAphrodisiac + entities: + - uid: 1030 + components: + - type: Transform + pos: 14.327401,43.83763 + parent: 588 + - uid: 1032 + components: + - type: Transform + pos: 14.468026,43.665756 + parent: 588 + - uid: 1035 + components: + - type: Transform + pos: 14.749276,43.822006 + parent: 588 - proto: PillCanister entities: - uid: 1481 @@ -9261,6 +9367,29 @@ entities: - type: Transform pos: 14.537998,42.878975 parent: 588 +- proto: PlasmaReinforcedWindowDirectional + entities: + - uid: 375 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 28.5,8.5 + parent: 588 +- proto: PlushieGirl + entities: + - uid: 950 + components: + - type: Transform + pos: 11.667373,39.717094 + parent: 588 +- proto: PlushieLemirdSchoolGirl + entities: + - uid: 1068 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.561776,43.49388 + parent: 588 - proto: PlushieNuke entities: - uid: 1850 @@ -9268,6 +9397,13 @@ entities: - type: Transform pos: 22.519993,28.594225 parent: 588 +- proto: PlushieRD + entities: + - uid: 954 + components: + - type: Transform + pos: 12.042373,39.67022 + parent: 588 - proto: PortableFlasher entities: - uid: 1234 @@ -11011,6 +11147,13 @@ entities: rot: 3.141592653589793 rad pos: 13.5,42.5 parent: 588 +- proto: SlipperyBlob + entities: + - uid: 1029 + components: + - type: Transform + pos: 29.503498,42.540756 + parent: 588 - proto: SMESBasic entities: - uid: 46 @@ -11038,44 +11181,20 @@ entities: - type: Transform pos: 20.5,46.5 parent: 588 -- proto: SoapSyndie +- proto: SoapOmega entities: - - uid: 1856 + - uid: 511 components: - type: Transform - pos: 10.4890785,27.46785 - parent: 588 -- proto: SpaceCash100 + parent: 1288 + - type: Physics + canCollide: False +- proto: SoapSyndie entities: - - uid: 1243 - components: - - type: Transform - pos: 11.887424,39.621456 - parent: 588 - - uid: 1244 - components: - - type: Transform - pos: 11.759636,39.479546 - parent: 588 - - uid: 1296 - components: - - type: Transform - pos: 12.100407,39.465355 - parent: 588 - - uid: 1297 - components: - - type: Transform - pos: 12.100407,39.80594 - parent: 588 - - uid: 1298 - components: - - type: Transform - pos: 11.688642,39.720795 - parent: 588 - - uid: 1299 + - uid: 1856 components: - type: Transform - pos: 11.4330635,39.57888 + pos: 10.4890785,27.46785 parent: 588 - proto: Spear entities: @@ -11084,13 +11203,6 @@ entities: - type: Transform pos: 24.466219,48.441994 parent: 588 -- proto: SpeedLoaderMagnum - entities: - - uid: 950 - components: - - type: Transform - pos: 28.703945,8.421182 - parent: 588 - proto: StasisBed entities: - uid: 1425 @@ -12354,6 +12466,13 @@ entities: - type: Transform pos: 22.543945,6.5464144 parent: 588 +- proto: WeaponLauncherRocket + entities: + - uid: 988 + components: + - type: Transform + pos: 28.378227,8.50717 + parent: 588 - proto: WeaponShotgunKammerer entities: - uid: 583 @@ -12361,6 +12480,14 @@ entities: - type: Transform pos: 26.57963,35.4414 parent: 588 +- proto: WeaponTurretHostile + entities: + - uid: 265 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 30.5,8.5 + parent: 588 - proto: WindoorAssemblySecure entities: - uid: 696 diff --git a/Resources/Maps/Dungeon/mineshaft.yml b/Resources/Maps/Dungeon/mineshaft.yml index 898b7e8ff20..aaeaa5ca4ba 100644 --- a/Resources/Maps/Dungeon/mineshaft.yml +++ b/Resources/Maps/Dungeon/mineshaft.yml @@ -270,11 +270,46 @@ entities: 51: 30,10 52: 31,6 53: 30,1 + - node: + cleanable: True + angle: 3.141592653589793 rad + color: '#B02E26FF' + id: arrow + decals: + 59: 40.020077,20.738033 + 60: 40.00445,21.472408 + - node: + cleanable: True + angle: 4.71238898038469 rad + color: '#B02E26FF' + id: arrow + decals: + 61: 35.9107,18.003658 - node: color: '#FFFFFFFF' id: bushsnowb3 decals: 26: 26,30 + - node: + cleanable: True + color: '#F9FFFEFF' + id: splatter + decals: + 56: 26.353344,7.308707 + - node: + cleanable: True + angle: 1.2042771838760873 rad + color: '#F9FFFEFF' + id: splatter + decals: + 57: 25.212719,8.261832 + - node: + cleanable: True + angle: 2.792526803190927 rad + color: '#F9FFFEFF' + id: splatter + decals: + 58: 27.868969,6.902457 - proto: AirlockMiningLocked entities: - uid: 5 @@ -375,6 +410,21 @@ entities: rot: 3.141592653589793 rad pos: 29.510723,32.467716 parent: 2 +- proto: BananiumHorn + entities: + - uid: 1142 + components: + - type: Transform + parent: 1141 + - type: Physics + canCollide: False +- proto: Barricade + entities: + - uid: 1131 + components: + - type: Transform + pos: 44.5,6.5 + parent: 2 - proto: BarricadeBlock entities: - uid: 596 @@ -1661,6 +1711,27 @@ entities: - type: Transform pos: 16.5,13.5 parent: 2 +- proto: ClothingEyesVision + entities: + - uid: 1115 + components: + - type: Transform + pos: 9.499234,27.330418 + parent: 2 +- proto: ClothingHeadHatBeretCargo + entities: + - uid: 1114 + components: + - type: Transform + pos: 9.467984,27.78656 + parent: 2 +- proto: ClothingHeadHatBeretHoSSponsor + entities: + - uid: 1121 + components: + - type: Transform + pos: 31.4973,9.57698 + parent: 2 - proto: ClothingHeadHatCardborg entities: - uid: 834 @@ -1701,6 +1772,49 @@ entities: - type: Transform pos: 13.46296,18.77332 parent: 2 +- proto: ClothingOuterCoatSpaceAsshole + entities: + - uid: 1141 + components: + - type: Transform + pos: 13.780073,29.34053 + parent: 2 + - type: Storage + storedItems: + 1142: + position: 0,0 + _rotation: South + 1143: + position: 1,0 + _rotation: South + 1144: + position: 2,0 + _rotation: South + 1145: + position: 2,1 + _rotation: South + - type: ContainerContainer + containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 1142 + - 1143 + - 1144 + - 1145 +- proto: ClothingOuterHardsuitCargoElite + entities: + - uid: 1112 + components: + - type: Transform + pos: 2.3011904,24.51147 + parent: 2 + - uid: 1113 + components: + - type: Transform + pos: 2.7543154,24.51147 + parent: 2 - proto: ClothingOuterHardsuitSalvage entities: - uid: 933 @@ -1709,6 +1823,35 @@ entities: rot: -1.5707963267948966 rad pos: 46.62351,4.5918055 parent: 2 + - type: GroupExamine + group: + - hoverMessage: "" + contextText: verb-examine-group-other + icon: /Textures/Interface/examine-star.png + components: + - Armor + - ClothingSpeedModifier + entries: + - message: Понижает вашу скорость на [color=yellow]25%[/color]. + priority: 0 + component: ClothingSpeedModifier + - message: >- + Обеспечивает следующую защиту: + + - [color=yellow]Ударный[/color] урон снижается на [color=lightblue]30%[/color]. + + - [color=yellow]Режущий[/color] урон снижается на [color=lightblue]30%[/color]. + + - [color=yellow]Колющий[/color] урон снижается на [color=lightblue]50%[/color]. + + - [color=yellow]Радиационный[/color] урон снижается на [color=lightblue]70%[/color]. + + - [color=yellow]Кислотный[/color] урон снижается на [color=lightblue]30%[/color]. + + - [color=orange]Взрывной[/color] урон снижается на [color=lightblue]70%[/color]. + priority: 0 + component: Armor + title: null - proto: ClothingOuterRobesCult entities: - uid: 172 @@ -1733,6 +1876,76 @@ entities: - type: Transform pos: 27.4423,6.4601035 parent: 2 +- proto: ClothingUnderwearBottomPantiesCap + entities: + - uid: 1144 + components: + - type: Transform + parent: 1141 + - type: Physics + canCollide: False +- proto: ClothingUnderwearBottomPantiesDeathSquadSponsor + entities: + - uid: 1137 + components: + - type: Transform + pos: 40.80426,18.144676 + parent: 2 +- proto: ClothingUnderwearBottomPantiesLace + entities: + - uid: 1118 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 25.794317,27.614994 + parent: 2 + - uid: 1145 + components: + - type: Transform + parent: 1141 + - type: Physics + canCollide: False +- proto: ClothingUnderwearBottomPantiesThong + entities: + - uid: 1116 + components: + - type: Transform + pos: 26.481817,29.31812 + parent: 2 +- proto: ClothingUnderwearTopDeathBraSponsor + entities: + - uid: 1138 + components: + - type: Transform + pos: 40.24176,18.800926 + parent: 2 +- proto: ClothingUnderwearToplaceBra + entities: + - uid: 1117 + components: + - type: Transform + pos: 24.513067,28.552494 + parent: 2 +- proto: ClothingUnderwearTopNekoBra + entities: + - uid: 1119 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.809942,29.864994 + parent: 2 +- proto: ClothingUniformJumpsuitCargoExpert + entities: + - uid: 1110 + components: + - type: Transform + pos: 0.25431538,30.620846 + parent: 2 + - uid: 1111 + components: + - type: Transform + pos: 0.7230654,30.620846 + parent: 2 - proto: ClothingUniformJumpsuitGladiator entities: - uid: 614 @@ -1746,6 +1959,13 @@ entities: rot: -1.5707963267948966 rad pos: 17.363964,27.571035 parent: 2 +- proto: ClothingUniformReallyBlackSuitSkirt + entities: + - uid: 1120 + components: + - type: Transform + pos: 32.01392,9.557047 + parent: 2 - proto: ConveyorBelt entities: - uid: 6 @@ -2815,17 +3035,17 @@ entities: - type: Transform pos: 29.534237,13.61823 parent: 2 -- proto: FoodMeatBearCooked +- proto: FoodMealBearsteak entities: - - uid: 612 + - uid: 581 components: - type: Transform - pos: 17.658442,29.564983 + pos: 17.676374,29.36359 parent: 2 - - uid: 634 + - uid: 612 components: - type: Transform - pos: 17.526375,29.71021 + pos: 17.317,29.722965 parent: 2 - proto: FoodMeatRatdoubleKebab entities: @@ -3312,6 +3532,13 @@ entities: - type: Transform pos: 40.5,7.5 parent: 2 +- proto: MaterialBananium + entities: + - uid: 1135 + components: + - type: Transform + pos: 39.486477,7.576422 + parent: 2 - proto: MaterialBananium1 entities: - uid: 966 @@ -3336,6 +3563,13 @@ entities: - type: Transform pos: 13.508261,21.99531 parent: 2 +- proto: MedipenEpinephrine + entities: + - uid: 1109 + components: + - type: Transform + pos: 45.50594,13.571283 + parent: 2 - proto: MedkitAdvancedFilled entities: - uid: 455 @@ -3534,6 +3768,62 @@ entities: - type: Transform pos: 29.876812,28.272526 parent: 2 +- proto: PillAphrodisiac + entities: + - uid: 1123 + components: + - type: Transform + pos: 27.460474,7.761832 + parent: 2 + - uid: 1124 + components: + - type: Transform + pos: 26.554224,8.496207 + parent: 2 + - uid: 1125 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 26.476099,8.136832 + parent: 2 + - uid: 1126 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 27.694849,7.621207 + parent: 2 + - uid: 1127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.226099,7.558707 + parent: 2 + - uid: 1128 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 27.069849,7.246207 + parent: 2 + - uid: 1129 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.210474,7.996207 + parent: 2 + - uid: 1130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 26.647974,8.699332 + parent: 2 +- proto: PlushieLemirdSchoolGirl + entities: + - uid: 1122 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 27.525152,8.652457 + parent: 2 - proto: PlushieSlime entities: - uid: 1025 @@ -4470,6 +4760,21 @@ entities: - type: Transform pos: 9.759932,33.75102 parent: 2 +- proto: Sledgehammer + entities: + - uid: 1146 + components: + - type: Transform + pos: 14.467573,29.512405 + parent: 2 +- proto: SoapOmega + entities: + - uid: 1143 + components: + - type: Transform + parent: 1141 + - type: Physics + canCollide: False - proto: SpearBone entities: - uid: 643 @@ -5612,11 +5917,6 @@ entities: - type: Transform pos: 34.5,24.5 parent: 2 - - uid: 581 - components: - - type: Transform - pos: 40.5,18.5 - parent: 2 - uid: 582 components: - type: Transform @@ -6044,6 +6344,13 @@ entities: - type: Transform pos: 38.5,34.5 parent: 2 +- proto: WeaponBehonkerLaser + entities: + - uid: 1134 + components: + - type: Transform + pos: 38.486477,6.685797 + parent: 2 - proto: WeaponPistolCHIMP entities: - uid: 617 @@ -6058,6 +6365,46 @@ entities: - type: Transform pos: 4.461401,13.497713 parent: 2 +- proto: WeaponSniperBarrettM82 + entities: + - uid: 634 + components: + - type: Transform + pos: 40.53566,18.522858 + parent: 2 +- proto: WeaponTurretXeno + entities: + - uid: 1132 + components: + - type: Transform + pos: 45.5,9.5 + parent: 2 + - uid: 1133 + components: + - type: Transform + pos: 37.5,10.5 + parent: 2 + - uid: 1136 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 39.5,6.5 + parent: 2 + - uid: 1139 + components: + - type: Transform + pos: 14.5,26.5 + parent: 2 + - uid: 1140 + components: + - type: Transform + pos: 13.5,30.5 + parent: 2 + - uid: 1147 + components: + - type: Transform + pos: 12.5,25.5 + parent: 2 - proto: WeldingFuelTankFull entities: - uid: 833 diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml index 1211d7a6642..f9b909172da 100644 --- a/Resources/Maps/Dungeon/snowy_labs.yml +++ b/Resources/Maps/Dungeon/snowy_labs.yml @@ -156,2715 +156,2715 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 231: 40,39 - 326: 10,35 - 483: 17,25 - 484: 17,26 - 485: 17,27 + 176: 40,39 + 271: 10,35 + 428: 17,25 + 429: 17,26 + 430: 17,27 - node: color: '#FFFFFFFF' id: Arrows decals: - 941: 41,14 + 780: 41,14 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 232: 46,39 - 327: 0,35 + 177: 46,39 + 272: 0,35 - node: color: '#FFFFFFFF' id: Bot decals: - 480: 16,25 - 481: 16,26 - 482: 16,27 - 508: 5,6 - 509: 5,7 - 510: 0,6 - 511: 0,7 - 512: 7,10 - 513: 8,10 - 514: 9,10 - 1009: 3,14 + 425: 16,25 + 426: 16,26 + 427: 16,27 + 453: 5,6 + 454: 5,7 + 455: 0,6 + 456: 0,7 + 457: 7,10 + 458: 8,10 + 459: 9,10 + 848: 3,14 - node: cleanable: True color: '#FFFFFFFF' id: BotLeft decals: - 471: 14,42 + 416: 14,42 - node: color: '#8BDA8EB4' id: Box decals: - 1339: 45,12 + 1164: 45,12 - node: color: '#8BDA8EFF' id: Box decals: - 1633: 51,14 + 1432: 51,14 - node: color: '#8BDABA6F' id: BrickCornerOverlayNE decals: - 1202: 22,10 + 1027: 22,10 - node: color: '#8BDABA6F' id: BrickCornerOverlayNW decals: - 1201: 12,10 + 1026: 12,10 - node: color: '#8BDABA6F' id: BrickCornerOverlaySE decals: - 1196: 22,6 + 1021: 22,6 - node: color: '#8BDABA6F' id: BrickCornerOverlaySW decals: - 1197: 12,6 + 1022: 12,6 - node: color: '#8BDABA6F' id: BrickLineOverlayE decals: - 1212: 22,9 - 1213: 22,8 - 1214: 22,7 + 1037: 22,9 + 1038: 22,8 + 1039: 22,7 - node: color: '#8BDB9B85' id: BrickLineOverlayE decals: - 1386: 18,4 - 1387: 18,2 - 1388: 18,1 - 1389: 18,0 + 1211: 18,4 + 1212: 18,2 + 1213: 18,1 + 1214: 18,0 - node: color: '#8BDABA6F' id: BrickLineOverlayN decals: - 1203: 13,10 - 1204: 14,10 - 1205: 15,10 - 1206: 16,10 - 1207: 17,10 - 1208: 18,10 - 1209: 19,10 - 1210: 20,10 - 1211: 21,10 + 1028: 13,10 + 1029: 14,10 + 1030: 15,10 + 1031: 16,10 + 1032: 17,10 + 1033: 18,10 + 1034: 19,10 + 1035: 20,10 + 1036: 21,10 - node: color: '#8BDABA6F' id: BrickLineOverlayS decals: - 1187: 13,6 - 1188: 14,6 - 1189: 15,6 - 1190: 16,6 - 1191: 17,6 - 1192: 18,6 - 1193: 19,6 - 1194: 20,6 - 1195: 21,6 + 1012: 13,6 + 1013: 14,6 + 1014: 15,6 + 1015: 16,6 + 1016: 17,6 + 1017: 18,6 + 1018: 19,6 + 1019: 20,6 + 1020: 21,6 - node: color: '#8BDABA6F' id: BrickLineOverlayW decals: - 1198: 12,7 - 1199: 12,8 - 1200: 12,9 + 1023: 12,7 + 1024: 12,8 + 1025: 12,9 - node: color: '#8BDB9B85' id: BrickLineOverlayW decals: - 1382: 34,2 - 1383: 34,1 - 1384: 34,0 - 1385: 34,4 + 1207: 34,2 + 1208: 34,1 + 1209: 34,0 + 1210: 34,4 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerNe decals: - 1611: 30,24 - 1634: 54,16 - 1746: 38,16 + 1410: 30,24 + 1433: 54,16 + 1538: 38,16 - node: color: '#D381C996' id: BrickTileSteelCornerNe decals: - 618: 14,16 - 805: 22,10 + 563: 14,16 + 672: 22,10 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: - 1631: 34,27 + 1430: 34,27 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerNw decals: - 1613: 28,24 - 1637: 48,16 - 1745: 32,16 + 1412: 28,24 + 1436: 48,16 + 1537: 32,16 - node: color: '#D381C996' id: BrickTileSteelCornerNw decals: - 619: 8,16 - 806: 12,10 + 564: 8,16 + 673: 12,10 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: - 1629: 32,27 + 1428: 32,27 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerSe decals: - 1616: 30,28 - 1635: 54,12 - 1747: 38,12 + 1415: 30,28 + 1434: 54,12 + 1539: 38,12 - node: color: '#D381C996' id: BrickTileSteelCornerSe decals: - 804: 22,6 + 671: 22,6 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: - 1627: 34,25 + 1426: 34,25 - node: color: '#8BDA8EFF' id: BrickTileSteelCornerSw decals: - 1614: 28,28 - 1636: 48,12 - 1744: 32,12 + 1413: 28,28 + 1435: 48,12 + 1536: 32,12 - node: color: '#D381C996' id: BrickTileSteelCornerSw decals: - 803: 12,6 + 670: 12,6 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 1626: 32,25 + 1425: 32,25 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN decals: - 537: 1,7 - 538: 4,7 + 482: 1,7 + 483: 4,7 - node: color: '#8BDA8EFF' id: BrickTileSteelLineE decals: - 1646: 54,15 - 1647: 54,14 - 1648: 54,13 - 1748: 38,13 - 1749: 38,14 - 1750: 38,15 + 1445: 54,15 + 1446: 54,14 + 1447: 54,13 + 1540: 38,13 + 1541: 38,14 + 1542: 38,15 - node: color: '#D381C996' id: BrickTileSteelLineE decals: - 797: 22,7 - 798: 22,8 - 799: 22,9 + 664: 22,7 + 665: 22,8 + 666: 22,9 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 539: 4,6 - 540: 1,6 - 1561: 36,9 - 1563: 41,9 - 1567: 41,7 - 1568: 36,7 - 1601: 25,24 - 1602: 25,25 - 1603: 25,26 - 1604: 25,27 - 1605: 25,28 - 1632: 34,26 + 484: 4,6 + 485: 1,6 + 1360: 36,9 + 1362: 41,9 + 1366: 41,7 + 1367: 36,7 + 1400: 25,24 + 1401: 25,25 + 1402: 25,26 + 1403: 25,27 + 1404: 25,28 + 1431: 34,26 - node: color: '#8BDA8EFF' id: BrickTileSteelLineN decals: - 1612: 29,24 - 1641: 49,16 - 1642: 50,16 - 1643: 51,16 - 1644: 52,16 - 1645: 53,16 - 1751: 37,16 - 1752: 36,16 - 1753: 35,16 - 1754: 34,16 - 1755: 33,16 + 1411: 29,24 + 1440: 49,16 + 1441: 50,16 + 1442: 51,16 + 1443: 52,16 + 1444: 53,16 + 1543: 37,16 + 1544: 36,16 + 1545: 35,16 + 1546: 34,16 + 1547: 33,16 - node: color: '#D381C996' id: BrickTileSteelLineN decals: - 613: 11,16 - 614: 10,16 - 615: 9,16 - 616: 12,16 - 617: 13,16 - 788: 21,10 - 789: 20,10 - 790: 18,10 - 791: 19,10 - 792: 17,10 - 793: 16,10 - 794: 15,10 - 795: 13,10 - 796: 14,10 + 558: 11,16 + 559: 10,16 + 560: 9,16 + 561: 12,16 + 562: 13,16 + 655: 21,10 + 656: 20,10 + 657: 18,10 + 658: 19,10 + 659: 17,10 + 660: 16,10 + 661: 15,10 + 662: 13,10 + 663: 14,10 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 807: 21,6 - 808: 20,6 - 809: 19,6 - 810: 17,6 - 811: 18,6 - 812: 16,6 - 813: 15,6 - 814: 14,6 - 815: 13,6 - 1585: 37,8 - 1586: 38,8 - 1587: 39,8 - 1588: 40,8 - 1589: 42,8 - 1590: 43,8 - 1591: 44,8 - 1592: 45,8 - 1593: 45,6 - 1594: 44,6 - 1595: 43,6 - 1596: 42,6 - 1597: 40,6 - 1598: 39,6 - 1599: 38,6 - 1600: 37,6 - 1630: 33,27 + 674: 21,6 + 675: 20,6 + 676: 19,6 + 677: 17,6 + 678: 18,6 + 679: 16,6 + 680: 15,6 + 681: 14,6 + 682: 13,6 + 1384: 37,8 + 1385: 38,8 + 1386: 39,8 + 1387: 40,8 + 1388: 42,8 + 1389: 43,8 + 1390: 44,8 + 1391: 45,8 + 1392: 45,6 + 1393: 44,6 + 1394: 43,6 + 1395: 42,6 + 1396: 40,6 + 1397: 39,6 + 1398: 38,6 + 1399: 37,6 + 1429: 33,27 - node: color: '#8BDA8EFF' id: BrickTileSteelLineS decals: - 1615: 29,28 - 1649: 53,12 - 1650: 52,12 - 1651: 51,12 - 1652: 50,12 - 1653: 49,12 - 1756: 33,12 - 1757: 34,12 - 1758: 35,12 - 1759: 36,12 - 1760: 37,12 + 1414: 29,28 + 1448: 53,12 + 1449: 52,12 + 1450: 51,12 + 1451: 50,12 + 1452: 49,12 + 1548: 33,12 + 1549: 34,12 + 1550: 35,12 + 1551: 36,12 + 1552: 37,12 - node: color: '#D381C996' id: BrickTileSteelLineS decals: - 779: 21,6 - 780: 20,6 - 781: 18,6 - 782: 19,6 - 783: 17,6 - 784: 16,6 - 785: 15,6 - 786: 14,6 - 787: 13,6 + 646: 21,6 + 647: 20,6 + 648: 18,6 + 649: 19,6 + 650: 17,6 + 651: 16,6 + 652: 15,6 + 653: 14,6 + 654: 13,6 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 816: 21,10 - 817: 20,10 - 818: 19,10 - 819: 18,10 - 820: 17,10 - 821: 16,10 - 822: 15,10 - 823: 14,10 - 824: 13,10 - 1569: 37,8 - 1570: 38,8 - 1571: 39,8 - 1572: 40,8 - 1573: 42,8 - 1574: 43,8 - 1575: 44,8 - 1576: 45,8 - 1577: 45,10 - 1578: 44,10 - 1579: 43,10 - 1580: 42,10 - 1581: 40,10 - 1582: 39,10 - 1583: 38,10 - 1584: 37,10 - 1625: 33,25 + 683: 21,10 + 684: 20,10 + 685: 19,10 + 686: 18,10 + 687: 17,10 + 688: 16,10 + 689: 15,10 + 690: 14,10 + 691: 13,10 + 1368: 37,8 + 1369: 38,8 + 1370: 39,8 + 1371: 40,8 + 1372: 42,8 + 1373: 43,8 + 1374: 44,8 + 1375: 45,8 + 1376: 45,10 + 1377: 44,10 + 1378: 43,10 + 1379: 42,10 + 1380: 40,10 + 1381: 39,10 + 1382: 38,10 + 1383: 37,10 + 1424: 33,25 - node: color: '#8BDA8EFF' id: BrickTileSteelLineW decals: - 1638: 48,13 - 1639: 48,14 - 1640: 48,15 - 1739: 32,15 - 1740: 32,14 - 1741: 32,14 - 1742: 32,12 - 1743: 32,13 + 1437: 48,13 + 1438: 48,14 + 1439: 48,15 + 1531: 32,15 + 1532: 32,14 + 1533: 32,14 + 1534: 32,12 + 1535: 32,13 - node: color: '#D381C996' id: BrickTileSteelLineW decals: - 610: 8,13 - 611: 8,14 - 612: 8,15 - 800: 12,7 - 801: 12,8 - 802: 12,9 + 555: 8,13 + 556: 8,14 + 557: 8,15 + 667: 12,7 + 668: 12,8 + 669: 12,9 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 541: 4,6 - 542: 1,6 - 1562: 41,9 - 1564: 46,9 - 1565: 46,7 - 1566: 41,7 - 1606: 25,24 - 1607: 25,25 - 1608: 25,26 - 1609: 25,27 - 1610: 25,28 - 1628: 32,26 + 486: 4,6 + 487: 1,6 + 1361: 41,9 + 1363: 46,9 + 1364: 46,7 + 1365: 41,7 + 1405: 25,24 + 1406: 25,25 + 1407: 25,26 + 1408: 25,27 + 1409: 25,28 + 1427: 32,26 - node: color: '#8BDA8EB4' id: BrickTileWhiteBox decals: - 1320: 32,20 + 1145: 32,20 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerNe decals: - 1313: 34,22 - 1324: 33,21 + 1138: 34,22 + 1149: 33,21 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerNe decals: - 1025: 14,16 - 1543: 46,10 - 1617: 30,27 - 1672: 15,4 - 1673: 16,3 - 1836: 6,48 + 864: 14,16 + 1342: 46,10 + 1416: 30,27 + 1469: 15,4 + 1470: 16,3 + 1597: 6,48 - node: color: '#EFB34196' id: BrickTileWhiteCornerNe decals: - 1008: 6,28 + 847: 6,28 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 58: 6,40 - 75: 14,40 - 109: 22,40 - 154: 30,40 - 155: 46,40 - 299: 10,36 - 339: 22,36 - 375: 33,36 - 420: 26,32 - 648: 38,4 - 651: 54,4 + 10: 6,40 + 27: 14,40 + 54: 22,40 + 99: 30,40 + 100: 46,40 + 244: 10,36 + 284: 22,36 + 320: 33,36 + 365: 26,32 + 593: 38,4 + 596: 54,4 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerNw decals: - 1307: 30,22 - 1323: 31,21 - 1332: 0,16 + 1132: 30,22 + 1148: 31,21 + 1157: 0,16 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerNw decals: - 1031: 8,16 - 1533: 36,10 - 1618: 28,27 - 1656: 1,4 - 1657: 0,3 - 1835: 0,48 + 870: 8,16 + 1332: 36,10 + 1417: 28,27 + 1453: 1,4 + 1454: 0,3 + 1596: 0,48 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw decals: - 570: 24,22 - 999: 4,28 + 515: 24,22 + 838: 4,28 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 61: 0,40 - 76: 8,40 - 108: 16,40 - 151: 40,40 - 152: 32,40 - 153: 24,40 - 301: 0,36 - 338: 12,36 - 374: 25,36 - 419: 18,32 - 646: 52,4 - 647: 36,4 + 13: 0,40 + 28: 8,40 + 53: 16,40 + 96: 40,40 + 97: 32,40 + 98: 24,40 + 246: 0,36 + 283: 12,36 + 319: 25,36 + 364: 18,32 + 591: 52,4 + 592: 36,4 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerSe decals: - 1312: 34,18 - 1326: 33,19 + 1137: 34,18 + 1151: 33,19 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerSe decals: - 1021: 14,12 - 1547: 46,6 - 1620: 30,25 - 1674: 16,1 - 1675: 15,0 - 1838: 6,42 + 860: 14,12 + 1346: 46,6 + 1419: 30,25 + 1471: 16,1 + 1472: 15,0 + 1599: 6,42 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 1004: 6,24 + 843: 6,24 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 59: 6,38 - 74: 14,38 - 107: 22,38 - 149: 30,38 - 150: 46,38 - 298: 10,34 - 344: 22,34 - 373: 33,34 - 421: 26,30 - 644: 38,0 - 645: 54,0 - 696: 46,0 + 11: 6,38 + 26: 14,38 + 52: 22,38 + 94: 30,38 + 95: 46,38 + 243: 10,34 + 289: 22,34 + 318: 33,34 + 366: 26,30 + 589: 38,0 + 590: 54,0 + 641: 46,0 - node: color: '#8BDA8EB4' id: BrickTileWhiteCornerSw decals: - 1311: 30,18 - 1322: 31,19 - 1336: 0,12 + 1136: 30,18 + 1147: 31,19 + 1161: 0,12 - node: color: '#8BDA8EFF' id: BrickTileWhiteCornerSw decals: - 1035: 8,12 - 1557: 36,6 - 1621: 28,25 - 1677: 1,0 - 1678: 0,1 - 1837: 0,42 + 874: 8,12 + 1356: 36,6 + 1420: 28,25 + 1473: 1,0 + 1474: 0,1 + 1598: 0,42 - node: color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 574: 24,18 - 1003: 4,24 + 519: 24,18 + 842: 4,24 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 60: 0,38 - 77: 8,38 - 110: 16,38 - 156: 40,38 - 157: 32,38 - 158: 24,38 - 300: 0,34 - 345: 12,34 - 376: 25,34 - 422: 18,30 - 649: 36,0 - 650: 52,0 - 697: 44,0 + 12: 0,38 + 29: 8,38 + 55: 16,38 + 101: 40,38 + 102: 32,38 + 103: 24,38 + 245: 0,34 + 290: 12,34 + 321: 25,34 + 367: 18,30 + 594: 36,0 + 595: 52,0 + 642: 44,0 - node: color: '#8BDABAFF' id: BrickTileWhiteEndE decals: - 1072: 9,39 - 1092: 26,39 + 911: 9,39 + 931: 26,39 - node: color: '#D381C996' id: BrickTileWhiteEndE decals: - 102: 9,39 + 47: 9,39 - node: color: '#8BDABAFF' id: BrickTileWhiteEndW decals: - 1073: 13,39 - 1093: 28,39 + 912: 13,39 + 932: 28,39 - node: color: '#D381C996' id: BrickTileWhiteEndW decals: - 101: 13,39 - 185: 28,39 + 46: 13,39 + 130: 28,39 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerNe decals: - 1884: 0,42 + 1644: 0,42 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerNe decals: - 1290: 21,21 - 1300: 9,21 + 1115: 21,21 + 1125: 9,21 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerNe decals: - 1681: 15,3 + 1477: 15,3 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerNe decals: - 1068: 9,38 - 1097: 25,39 + 907: 9,38 + 936: 25,39 - node: color: '#9FED5896' id: BrickTileWhiteInnerNe decals: - 1015: 1,12 + 854: 1,12 - node: color: '#D381C996' id: BrickTileWhiteInnerNe decals: - 106: 9,38 - 188: 25,39 - 193: 25,38 - 562: 21,21 + 51: 9,38 + 133: 25,39 + 138: 25,38 + 507: 21,21 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerNe decals: - 1734: 32,14 - 1735: 32,12 + 1526: 32,14 + 1527: 32,12 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNe decals: - 695: 38,2 + 640: 38,2 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerNw decals: - 1883: 6,42 + 1643: 6,42 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerNw decals: - 1291: 19,21 - 1301: 7,21 + 1116: 19,21 + 1126: 7,21 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerNw decals: - 1658: 1,3 + 1455: 1,3 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerNw decals: - 1067: 13,38 - 1096: 29,39 + 906: 13,38 + 935: 29,39 - node: color: '#D381C996' id: BrickTileWhiteInnerNw decals: - 105: 13,38 - 189: 29,39 - 192: 29,38 - 561: 19,21 + 50: 13,38 + 134: 29,39 + 137: 29,38 + 506: 19,21 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerNw decals: - 1732: 38,12 - 1733: 38,14 + 1524: 38,12 + 1525: 38,14 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNw decals: - 694: 52,2 + 639: 52,2 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerSe decals: - 1882: 0,48 + 1642: 0,48 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerSe decals: - 1289: 21,19 - 1303: 9,19 + 1114: 21,19 + 1128: 9,19 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerSe decals: - 1680: 15,1 + 1476: 15,1 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerSe decals: - 1071: 9,40 - 1095: 25,39 + 910: 9,40 + 934: 25,39 - node: color: '#D381C996' id: BrickTileWhiteInnerSe decals: - 104: 9,40 - 187: 25,39 - 191: 25,40 - 563: 21,19 + 49: 9,40 + 132: 25,39 + 136: 25,40 + 508: 21,19 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerSe decals: - 1728: 32,16 - 1729: 32,14 + 1520: 32,16 + 1521: 32,14 - node: color: '#8BDA8E88' id: BrickTileWhiteInnerSw decals: - 1881: 6,48 + 1641: 6,48 - node: color: '#8BDA8EB4' id: BrickTileWhiteInnerSw decals: - 1302: 7,19 + 1127: 7,19 - node: color: '#8BDA8EFF' id: BrickTileWhiteInnerSw decals: - 1679: 1,1 + 1475: 1,1 - node: color: '#8BDABAFF' id: BrickTileWhiteInnerSw decals: - 1066: 13,40 - 1094: 29,39 + 905: 13,40 + 933: 29,39 - node: color: '#D381C996' id: BrickTileWhiteInnerSw decals: - 103: 13,40 - 186: 29,39 - 190: 29,40 + 48: 13,40 + 131: 29,39 + 135: 29,40 - node: color: '#D4D4D4FF' id: BrickTileWhiteInnerSw decals: - 1730: 38,16 - 1731: 38,14 + 1522: 38,16 + 1523: 38,14 - node: color: '#8BDA8E88' id: BrickTileWhiteLineE decals: - 1860: 0,47 - 1861: 0,46 - 1862: 0,45 - 1863: 0,44 - 1864: 0,43 + 1621: 0,47 + 1622: 0,46 + 1623: 0,45 + 1624: 0,44 + 1625: 0,43 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineE decals: - 1283: 21,22 - 1284: 21,18 - 1297: 9,18 - 1299: 9,22 - 1314: 34,21 - 1315: 34,20 - 1316: 34,19 - 1327: 33,20 + 1108: 21,22 + 1109: 21,18 + 1122: 9,18 + 1124: 9,22 + 1139: 34,21 + 1140: 34,20 + 1141: 34,19 + 1152: 33,20 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineE decals: - 1022: 14,13 - 1023: 14,14 - 1024: 14,15 - 1544: 46,9 - 1545: 46,8 - 1546: 46,7 - 1619: 30,26 - 1682: 16,2 - 1855: 6,47 - 1856: 6,46 - 1857: 6,45 - 1858: 6,44 - 1859: 6,43 + 861: 14,13 + 862: 14,14 + 863: 14,15 + 1343: 46,9 + 1344: 46,8 + 1345: 46,7 + 1418: 30,26 + 1478: 16,2 + 1616: 6,47 + 1617: 6,46 + 1618: 6,45 + 1619: 6,44 + 1620: 6,43 - node: color: '#9FED5896' id: BrickTileWhiteLineE decals: - 1010: 1,13 - 1011: 1,14 - 1012: 1,15 + 849: 1,13 + 850: 1,14 + 851: 1,15 - node: color: '#D381C996' id: BrickTileWhiteLineE decals: - 555: 21,22 - 556: 21,18 - 865: 18,0 - 866: 18,1 - 867: 18,2 - 868: 18,4 + 500: 21,22 + 501: 21,18 + 732: 18,0 + 733: 18,1 + 734: 18,2 + 735: 18,4 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineE decals: - 1712: 32,13 - 1714: 32,15 + 1504: 32,13 + 1506: 32,15 - node: color: '#EFB34196' id: BrickTileWhiteLineE decals: - 564: 28,19 - 565: 28,20 - 566: 28,21 - 1005: 6,25 - 1006: 6,26 - 1007: 6,27 + 509: 28,19 + 510: 28,20 + 511: 28,21 + 844: 6,25 + 845: 6,26 + 846: 6,27 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 72: 6,39 - 87: 14,39 - 116: 22,39 - 178: 30,39 - 179: 38,39 - 180: 46,39 - 302: 10,35 - 347: 22,35 - 377: 33,35 - 430: 26,31 - 655: 38,1 - 656: 38,3 - 657: 54,1 - 658: 54,2 - 659: 54,3 - 699: 46,1 - 1771: 7,19 - 1772: 7,21 - 1774: 6,20 + 24: 6,39 + 39: 14,39 + 61: 22,39 + 123: 30,39 + 124: 38,39 + 125: 46,39 + 247: 10,35 + 292: 22,35 + 322: 33,35 + 375: 26,31 + 600: 38,1 + 601: 38,3 + 602: 54,1 + 603: 54,2 + 604: 54,3 + 644: 46,1 + 1563: 7,19 + 1564: 7,21 + 1566: 6,20 - node: color: '#8BDA8E88' id: BrickTileWhiteLineN decals: - 1865: 1,42 - 1866: 2,42 - 1867: 3,42 - 1868: 4,42 - 1869: 5,42 + 1626: 1,42 + 1627: 2,42 + 1628: 3,42 + 1629: 4,42 + 1630: 5,42 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineN decals: - 1285: 18,21 - 1286: 22,21 - 1292: 6,21 - 1298: 10,21 - 1304: 31,22 - 1305: 32,22 - 1306: 33,22 - 1325: 32,21 - 1333: 1,16 - 1334: 4,16 - 1335: 5,16 + 1110: 18,21 + 1111: 22,21 + 1117: 6,21 + 1123: 10,21 + 1129: 31,22 + 1130: 32,22 + 1131: 33,22 + 1150: 32,21 + 1158: 1,16 + 1159: 4,16 + 1160: 5,16 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineN decals: - 1026: 13,16 - 1027: 12,16 - 1028: 11,16 - 1029: 10,16 - 1030: 9,16 - 1534: 37,10 - 1535: 38,10 - 1536: 39,10 - 1537: 40,10 - 1538: 41,10 - 1539: 42,10 - 1540: 43,10 - 1541: 44,10 - 1542: 45,10 - 1659: 2,4 - 1660: 3,4 - 1661: 4,4 - 1662: 5,4 - 1663: 6,4 - 1664: 7,4 - 1665: 8,4 - 1666: 9,4 - 1667: 10,4 - 1668: 11,4 - 1669: 12,4 - 1670: 13,4 - 1671: 14,4 - 1850: 1,48 - 1851: 2,48 - 1852: 3,48 - 1853: 4,48 - 1854: 5,48 + 865: 13,16 + 866: 12,16 + 867: 11,16 + 868: 10,16 + 869: 9,16 + 1333: 37,10 + 1334: 38,10 + 1335: 39,10 + 1336: 40,10 + 1337: 41,10 + 1338: 42,10 + 1339: 43,10 + 1340: 44,10 + 1341: 45,10 + 1456: 2,4 + 1457: 3,4 + 1458: 4,4 + 1459: 5,4 + 1460: 6,4 + 1461: 7,4 + 1462: 8,4 + 1463: 9,4 + 1464: 10,4 + 1465: 11,4 + 1466: 12,4 + 1467: 13,4 + 1468: 14,4 + 1611: 1,48 + 1612: 2,48 + 1613: 3,48 + 1614: 4,48 + 1615: 5,48 - node: color: '#8BDABAFF' id: BrickTileWhiteLineN decals: - 1061: 11,38 - 1062: 12,38 - 1069: 10,38 + 900: 11,38 + 901: 12,38 + 908: 10,38 - node: color: '#9FED5896' id: BrickTileWhiteLineN decals: - 841: 21,6 - 842: 19,6 - 843: 13,6 - 844: 15,6 - 1014: 2,12 + 708: 21,6 + 709: 19,6 + 710: 13,6 + 711: 15,6 + 853: 2,12 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 96: 12,38 - 97: 11,38 - 348: 21,34 - 349: 20,34 - 350: 19,34 - 351: 13,34 - 553: 18,21 - 554: 22,21 + 41: 12,38 + 42: 11,38 + 293: 21,34 + 294: 20,34 + 295: 19,34 + 296: 13,34 + 498: 18,21 + 499: 22,21 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineN decals: - 1702: 34,12 - 1703: 35,12 - 1704: 36,12 - 1708: 33,12 - 1709: 37,12 - 1716: 37,14 - 1717: 36,14 - 1718: 36,14 - 1719: 34,14 - 1720: 35,14 - 1721: 33,14 + 1494: 34,12 + 1495: 35,12 + 1496: 36,12 + 1500: 33,12 + 1501: 37,12 + 1508: 37,14 + 1509: 36,14 + 1510: 36,14 + 1511: 34,14 + 1512: 35,14 + 1513: 33,14 - node: color: '#EFB34196' id: BrickTileWhiteLineN decals: - 567: 27,22 - 568: 26,22 - 569: 25,22 - 890: 31,9 - 891: 32,9 - 896: 27,9 - 897: 26,9 + 512: 27,22 + 513: 26,22 + 514: 25,22 + 757: 31,9 + 758: 32,9 + 763: 27,9 + 764: 26,9 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 62: 1,40 - 63: 2,40 - 64: 5,40 - 65: 4,40 - 66: 3,40 - 78: 9,40 - 79: 10,40 - 80: 11,40 - 81: 12,40 - 82: 13,40 - 118: 17,40 - 119: 19,40 - 120: 18,40 - 121: 20,40 - 122: 21,40 - 159: 29,40 - 160: 35,40 - 161: 36,40 - 162: 41,40 - 163: 42,40 - 164: 43,40 - 165: 44,40 - 166: 45,40 - 184: 25,40 - 286: 9,36 - 287: 8,36 - 288: 7,36 - 289: 3,36 - 290: 1,36 - 291: 2,36 - 334: 14,36 - 335: 13,36 - 336: 20,36 - 337: 21,36 - 386: 26,36 - 387: 27,36 - 388: 28,36 - 389: 29,36 - 390: 30,36 - 391: 31,36 - 392: 32,36 - 412: 25,32 - 413: 24,32 - 414: 23,32 - 415: 22,32 - 416: 21,32 - 417: 20,32 - 418: 19,32 - 652: 53,4 - 653: 37,4 - 684: 51,2 - 685: 50,2 - 686: 48,2 - 687: 47,2 - 688: 46,2 - 689: 44,2 - 690: 42,2 - 691: 43,2 - 692: 40,2 - 693: 39,2 - 1102: 29,40 - 1103: 25,40 - 1770: 8,18 - 1775: 7,19 - 1776: 9,19 + 14: 1,40 + 15: 2,40 + 16: 5,40 + 17: 4,40 + 18: 3,40 + 30: 9,40 + 31: 10,40 + 32: 11,40 + 33: 12,40 + 34: 13,40 + 63: 17,40 + 64: 19,40 + 65: 18,40 + 66: 20,40 + 67: 21,40 + 104: 29,40 + 105: 35,40 + 106: 36,40 + 107: 41,40 + 108: 42,40 + 109: 43,40 + 110: 44,40 + 111: 45,40 + 129: 25,40 + 231: 9,36 + 232: 8,36 + 233: 7,36 + 234: 3,36 + 235: 1,36 + 236: 2,36 + 279: 14,36 + 280: 13,36 + 281: 20,36 + 282: 21,36 + 331: 26,36 + 332: 27,36 + 333: 28,36 + 334: 29,36 + 335: 30,36 + 336: 31,36 + 337: 32,36 + 357: 25,32 + 358: 24,32 + 359: 23,32 + 360: 22,32 + 361: 21,32 + 362: 20,32 + 363: 19,32 + 597: 53,4 + 598: 37,4 + 629: 51,2 + 630: 50,2 + 631: 48,2 + 632: 47,2 + 633: 46,2 + 634: 44,2 + 635: 42,2 + 636: 43,2 + 637: 40,2 + 638: 39,2 + 941: 29,40 + 942: 25,40 + 1562: 8,18 + 1567: 7,19 + 1568: 9,19 - node: color: '#8BDA8E88' id: BrickTileWhiteLineS decals: - 1875: 5,48 - 1876: 4,48 - 1877: 3,48 - 1878: 2,48 - 1880: 1,48 + 1636: 5,48 + 1637: 4,48 + 1638: 3,48 + 1639: 2,48 + 1640: 1,48 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineS decals: - 1287: 22,19 - 1288: 18,19 - 1295: 6,19 - 1296: 10,19 - 1317: 33,18 - 1318: 32,18 - 1319: 31,18 - 1321: 32,19 - 1337: 1,12 - 1338: 2,12 + 1112: 22,19 + 1113: 18,19 + 1120: 6,19 + 1121: 10,19 + 1142: 33,18 + 1143: 32,18 + 1144: 31,18 + 1146: 32,19 + 1162: 1,12 + 1163: 2,12 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineS decals: - 1016: 10,12 - 1017: 11,12 - 1018: 12,12 - 1019: 13,12 - 1020: 9,12 - 1548: 45,6 - 1549: 44,6 - 1550: 43,6 - 1551: 42,6 - 1552: 41,6 - 1553: 40,6 - 1554: 39,6 - 1555: 38,6 - 1556: 37,6 - 1683: 14,0 - 1684: 13,0 - 1685: 12,0 - 1686: 11,0 - 1687: 10,0 - 1688: 9,0 - 1689: 7,0 - 1690: 7,0 - 1691: 8,0 - 1692: 6,0 - 1693: 5,0 - 1694: 4,0 - 1695: 3,0 - 1696: 2,0 - 1839: 1,42 - 1840: 2,42 - 1841: 4,42 - 1842: 4,42 - 1843: 3,42 - 1844: 5,42 + 855: 10,12 + 856: 11,12 + 857: 12,12 + 858: 13,12 + 859: 9,12 + 1347: 45,6 + 1348: 44,6 + 1349: 43,6 + 1350: 42,6 + 1351: 41,6 + 1352: 40,6 + 1353: 39,6 + 1354: 38,6 + 1355: 37,6 + 1479: 14,0 + 1480: 13,0 + 1481: 12,0 + 1482: 11,0 + 1483: 10,0 + 1484: 9,0 + 1485: 7,0 + 1486: 7,0 + 1487: 8,0 + 1488: 6,0 + 1489: 5,0 + 1490: 4,0 + 1491: 3,0 + 1492: 2,0 + 1600: 1,42 + 1601: 2,42 + 1602: 4,42 + 1603: 4,42 + 1604: 3,42 + 1605: 5,42 - node: color: '#8BDABAFF' id: BrickTileWhiteLineS decals: - 1063: 10,40 - 1064: 11,40 - 1065: 12,40 + 902: 10,40 + 903: 11,40 + 904: 12,40 - node: color: '#9FED5896' id: BrickTileWhiteLineS decals: - 837: 21,10 - 838: 19,10 - 839: 15,10 - 840: 13,10 - 1013: 4,16 + 704: 21,10 + 705: 19,10 + 706: 15,10 + 707: 13,10 + 852: 4,16 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 98: 12,40 - 99: 11,40 - 100: 10,40 - 352: 21,36 - 353: 20,36 - 354: 14,36 - 355: 13,36 - 557: 22,19 - 558: 18,19 + 43: 12,40 + 44: 11,40 + 45: 10,40 + 297: 21,36 + 298: 20,36 + 299: 14,36 + 300: 13,36 + 502: 22,19 + 503: 18,19 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineS decals: - 1705: 34,14 - 1706: 35,14 - 1707: 36,14 - 1710: 37,14 - 1711: 33,14 - 1722: 33,16 - 1723: 34,16 - 1724: 34,16 - 1725: 35,16 - 1726: 36,16 - 1727: 37,16 + 1497: 34,14 + 1498: 35,14 + 1499: 36,14 + 1502: 37,14 + 1503: 33,14 + 1514: 33,16 + 1515: 34,16 + 1516: 34,16 + 1517: 35,16 + 1518: 36,16 + 1519: 37,16 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 575: 25,18 - 576: 26,18 - 577: 27,18 - 892: 32,7 - 893: 31,7 - 894: 27,7 - 895: 26,7 + 520: 25,18 + 521: 26,18 + 522: 27,18 + 759: 32,7 + 760: 31,7 + 761: 27,7 + 762: 26,7 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 67: 5,38 - 68: 4,38 - 69: 3,38 - 70: 2,38 - 71: 1,38 - 83: 13,38 - 84: 12,38 - 85: 11,38 - 86: 9,38 - 111: 21,38 - 112: 20,38 - 113: 19,38 - 114: 18,38 - 115: 17,38 - 167: 45,38 - 168: 44,38 - 169: 43,38 - 170: 42,38 - 171: 41,38 - 172: 37,38 - 173: 34,38 - 174: 35,38 - 175: 33,38 - 176: 29,38 - 177: 25,38 - 292: 9,34 - 293: 7,34 - 294: 8,34 - 295: 3,34 - 296: 2,34 - 297: 1,34 - 340: 21,34 - 341: 20,34 - 342: 19,34 - 343: 13,34 - 379: 26,34 - 380: 27,34 - 381: 28,34 - 382: 29,34 - 383: 30,34 - 384: 31,34 - 385: 32,34 - 423: 19,30 - 424: 20,30 - 425: 21,30 - 426: 22,30 - 427: 23,30 - 428: 24,30 - 429: 25,30 - 654: 37,0 - 660: 53,0 - 698: 45,0 - 1070: 10,38 - 1104: 25,38 - 1105: 29,38 - 1773: 7,21 - 1779: 9,21 - 1780: 8,22 + 19: 5,38 + 20: 4,38 + 21: 3,38 + 22: 2,38 + 23: 1,38 + 35: 13,38 + 36: 12,38 + 37: 11,38 + 38: 9,38 + 56: 21,38 + 57: 20,38 + 58: 19,38 + 59: 18,38 + 60: 17,38 + 112: 45,38 + 113: 44,38 + 114: 43,38 + 115: 42,38 + 116: 41,38 + 117: 37,38 + 118: 34,38 + 119: 35,38 + 120: 33,38 + 121: 29,38 + 122: 25,38 + 237: 9,34 + 238: 7,34 + 239: 8,34 + 240: 3,34 + 241: 2,34 + 242: 1,34 + 285: 21,34 + 286: 20,34 + 287: 19,34 + 288: 13,34 + 324: 26,34 + 325: 27,34 + 326: 28,34 + 327: 29,34 + 328: 30,34 + 329: 31,34 + 330: 32,34 + 368: 19,30 + 369: 20,30 + 370: 21,30 + 371: 22,30 + 372: 23,30 + 373: 24,30 + 374: 25,30 + 599: 37,0 + 605: 53,0 + 643: 45,0 + 909: 10,38 + 943: 25,38 + 944: 29,38 + 1565: 7,21 + 1571: 9,21 + 1572: 8,22 - node: color: '#8BDA8E88' id: BrickTileWhiteLineW decals: - 1870: 6,43 - 1871: 6,44 - 1872: 6,45 - 1873: 6,46 - 1874: 6,47 + 1631: 6,43 + 1632: 6,44 + 1633: 6,45 + 1634: 6,46 + 1635: 6,47 - node: color: '#8BDA8EB4' id: BrickTileWhiteLineW decals: - 1281: 19,18 - 1282: 19,22 - 1293: 7,22 - 1294: 7,18 - 1308: 30,21 - 1309: 30,20 - 1310: 30,19 - 1328: 31,20 - 1329: 0,13 - 1330: 0,14 - 1331: 0,15 + 1106: 19,18 + 1107: 19,22 + 1118: 7,22 + 1119: 7,18 + 1133: 30,21 + 1134: 30,20 + 1135: 30,19 + 1153: 31,20 + 1154: 0,13 + 1155: 0,14 + 1156: 0,15 - node: color: '#8BDA8EFF' id: BrickTileWhiteLineW decals: - 1032: 8,14 - 1033: 8,15 - 1034: 8,13 - 1558: 36,7 - 1559: 36,8 - 1560: 36,9 - 1622: 28,26 - 1697: 0,2 - 1736: 32,14 - 1737: 32,13 - 1738: 32,15 - 1845: 0,43 - 1846: 0,44 - 1847: 0,45 - 1848: 0,46 - 1849: 0,47 + 871: 8,14 + 872: 8,15 + 873: 8,13 + 1357: 36,7 + 1358: 36,8 + 1359: 36,9 + 1421: 28,26 + 1493: 0,2 + 1528: 32,14 + 1529: 32,13 + 1530: 32,15 + 1606: 0,43 + 1607: 0,44 + 1608: 0,45 + 1609: 0,46 + 1610: 0,47 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: - 559: 19,18 - 560: 19,22 - 869: 34,0 - 870: 34,1 - 871: 34,2 - 872: 34,4 + 504: 19,18 + 505: 19,22 + 736: 34,0 + 737: 34,1 + 738: 34,2 + 739: 34,4 - node: color: '#D4D4D4FF' id: BrickTileWhiteLineW decals: - 1713: 38,13 - 1715: 38,15 + 1505: 38,13 + 1507: 38,15 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 571: 24,21 - 572: 24,20 - 573: 24,19 - 1000: 4,27 - 1001: 4,26 - 1002: 4,25 + 516: 24,21 + 517: 24,20 + 518: 24,19 + 839: 4,27 + 840: 4,26 + 841: 4,25 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 73: 0,39 - 88: 8,39 - 117: 16,39 - 181: 40,39 - 182: 32,39 - 183: 24,39 - 303: 0,35 - 346: 12,35 - 378: 25,35 - 431: 18,31 - 661: 52,1 - 662: 52,3 - 663: 36,1 - 664: 36,2 - 665: 36,3 - 700: 44,1 - 1777: 9,19 - 1778: 10,20 - 1781: 9,21 + 25: 0,39 + 40: 8,39 + 62: 16,39 + 126: 40,39 + 127: 32,39 + 128: 24,39 + 248: 0,35 + 291: 12,35 + 323: 25,35 + 376: 18,31 + 606: 52,1 + 607: 52,3 + 608: 36,1 + 609: 36,2 + 610: 36,3 + 645: 44,1 + 1569: 9,19 + 1570: 10,20 + 1573: 9,21 - node: cleanable: True color: '#FFFFFFFF' id: Caution decals: - 470: 11,42 + 415: 11,42 - node: color: '#8BDABAFF' id: CheckerNESW decals: - 1074: 17,39 - 1075: 18,39 - 1076: 19,39 - 1077: 20,39 - 1078: 21,39 - 1250: 20,20 - 1251: 21,20 - 1252: 20,21 - 1253: 20,19 - 1254: 19,20 + 913: 17,39 + 914: 18,39 + 915: 19,39 + 916: 20,39 + 917: 21,39 + 1075: 20,20 + 1076: 21,20 + 1077: 20,21 + 1078: 20,19 + 1079: 19,20 - node: color: '#D381C996' id: CheckerNESW decals: - 123: 17,39 - 124: 18,39 - 125: 19,39 - 126: 20,39 - 127: 21,39 - 393: 31,35 - 394: 30,35 - 395: 29,35 - 396: 28,35 - 397: 27,35 - 547: 19,20 - 548: 20,21 - 549: 20,20 - 550: 21,20 - 551: 20,19 + 68: 17,39 + 69: 18,39 + 70: 19,39 + 71: 20,39 + 72: 21,39 + 338: 31,35 + 339: 30,35 + 340: 29,35 + 341: 28,35 + 342: 27,35 + 492: 19,20 + 493: 20,21 + 494: 20,20 + 495: 21,20 + 496: 20,19 - node: color: '#EFB34196' id: CheckerNESW decals: - 237: 8,48 + 182: 8,48 - node: color: '#8BDABAFF' id: CheckerNWSE decals: - 1046: 3,39 - 1047: 2,39 - 1048: 1,39 - 1049: 4,39 - 1050: 5,39 - 1115: 45,39 - 1116: 44,39 - 1117: 43,39 - 1118: 42,39 - 1119: 41,39 + 885: 3,39 + 886: 2,39 + 887: 1,39 + 888: 4,39 + 889: 5,39 + 954: 45,39 + 955: 44,39 + 956: 43,39 + 957: 42,39 + 958: 41,39 - node: color: '#D381C996' id: CheckerNWSE decals: - 216: 45,39 - 217: 44,39 - 218: 43,39 - 219: 42,39 - 220: 41,39 - 304: 1,35 - 305: 2,35 - 306: 3,35 - 307: 7,35 - 308: 8,35 - 309: 9,35 - 451: 16,30 - 452: 16,31 - 453: 16,32 - 454: 15,32 - 455: 15,31 - 456: 15,30 - 457: 14,30 - 458: 14,31 - 459: 14,32 - 666: 37,1 - 667: 37,2 - 668: 37,3 - 669: 53,1 - 670: 53,2 - 671: 53,3 + 161: 45,39 + 162: 44,39 + 163: 43,39 + 164: 42,39 + 165: 41,39 + 249: 1,35 + 250: 2,35 + 251: 3,35 + 252: 7,35 + 253: 8,35 + 254: 9,35 + 396: 16,30 + 397: 16,31 + 398: 16,32 + 399: 15,32 + 400: 15,31 + 401: 15,30 + 402: 14,30 + 403: 14,31 + 404: 14,32 + 611: 37,1 + 612: 37,2 + 613: 37,3 + 614: 53,1 + 615: 53,2 + 616: 53,3 - node: color: '#EFB34196' id: CheckerNWSE decals: - 238: 14,48 - 993: 5,27 - 994: 5,26 - 995: 5,25 + 183: 14,48 + 832: 5,27 + 833: 5,26 + 834: 5,25 - node: color: '#FFFFFFFF' id: Delivery decals: - 266: 13,47 - 267: 11,47 - 268: 9,47 - 269: 12,43 - 270: 11,43 - 271: 10,43 - 486: 4,22 - 487: 3,22 - 601: 11,13 - 859: 24,2 - 860: 20,2 - 886: 33,7 - 887: 33,9 - 888: 25,7 - 889: 25,9 - 938: 40,16 - 939: 41,15 - 940: 43,16 + 211: 13,47 + 212: 11,47 + 213: 9,47 + 214: 12,43 + 215: 11,43 + 216: 10,43 + 431: 4,22 + 432: 3,22 + 546: 11,13 + 726: 24,2 + 727: 20,2 + 753: 33,7 + 754: 33,9 + 755: 25,7 + 756: 25,9 + 777: 40,16 + 778: 41,15 + 779: 43,16 - node: color: '#8BDB9BFF' id: DeliveryGreyscale decals: - 1531: 34,35 - 1532: 24,35 + 1330: 34,35 + 1331: 24,35 - node: color: '#79DA8EA1' id: DiagonalCheckerBOverlay decals: - 964: 20,24 - 965: 20,25 - 966: 20,26 - 967: 20,27 - 968: 20,28 - 969: 21,28 - 970: 22,28 - 971: 21,27 - 972: 21,26 - 973: 21,25 - 974: 21,24 - 975: 22,24 + 803: 20,24 + 804: 20,25 + 805: 20,26 + 806: 20,27 + 807: 20,28 + 808: 21,28 + 809: 22,28 + 810: 21,27 + 811: 21,26 + 812: 21,25 + 813: 21,24 + 814: 22,24 - node: color: '#FFFFFFFF' id: Dirt decals: - 1159: 16,48 - 1160: 16,48 - 1161: 17,48 - 1162: 16,47 - 1163: 16,46 - 1164: 16,45 - 1165: 17,44 - 1166: 17,42 - 1167: 19,42 - 1168: 21,42 - 1169: 21,47 - 1170: 21,47 - 1171: 21,47 + 984: 16,48 + 985: 16,48 + 986: 17,48 + 987: 16,47 + 988: 16,46 + 989: 16,45 + 990: 17,44 + 991: 17,42 + 992: 19,42 + 993: 21,42 + 994: 21,47 + 995: 21,47 + 996: 21,47 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 211: 38,38 - 212: 38,40 - 213: 37,40 - 214: 34,40 - 215: 36,38 - 368: 15,34 - 369: 19,35 - 370: 17,35 - 371: 16,34 - 372: 18,36 - 934: 44,12 - 935: 44,15 - 936: 42,16 - 937: 46,14 + 156: 38,38 + 157: 38,40 + 158: 37,40 + 159: 34,40 + 160: 36,38 + 313: 15,34 + 314: 19,35 + 315: 17,35 + 316: 16,34 + 317: 18,36 + 773: 44,12 + 774: 44,15 + 775: 42,16 + 776: 46,14 - node: color: '#FFFFFFFF' id: DirtLight decals: - 1172: 20,47 - 1173: 20,47 - 1174: 16,48 - 1175: 16,46 - 1176: 16,45 + 997: 20,47 + 998: 20,47 + 999: 16,48 + 1000: 16,46 + 1001: 16,45 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 138: 17,38 - 139: 17,39 - 140: 18,39 - 141: 21,38 - 143: 16,40 - 144: 20,39 - 145: 13,38 - 146: 8,40 - 147: 6,39 - 148: 22,40 - 203: 29,39 - 204: 29,40 - 205: 24,39 - 206: 30,38 - 207: 33,39 - 208: 37,39 - 209: 37,38 - 210: 38,39 - 273: 10,44 - 274: 9,45 - 275: 8,46 - 276: 8,47 - 277: 13,48 - 278: 14,44 - 279: 13,42 - 281: 10,42 - 283: 8,44 - 284: 13,45 - 356: 22,35 - 357: 22,34 - 358: 21,34 - 359: 12,36 - 360: 13,36 - 361: 12,35 - 362: 13,34 - 364: 12,34 - 365: 19,34 - 366: 15,34 - 367: 19,35 - 448: 8,31 - 449: 10,32 - 450: 11,32 - 460: 15,31 - 461: 16,30 - 462: 14,31 - 463: 15,32 - 464: 19,31 - 465: 20,30 - 466: 21,30 - 467: 24,30 - 468: 26,31 - 469: 8,28 - 584: 21,18 - 585: 22,19 - 586: 21,19 - 587: 19,18 - 588: 18,21 - 589: 25,18 - 590: 24,19 - 591: 28,20 - 592: 26,22 - 593: 14,22 - 594: 15,18 - 595: 16,20 - 596: 4,20 - 597: 2,22 - 598: 2,18 - 599: 0,21 - 600: 0,19 - 903: 30,15 - 905: 28,15 - 906: 27,14 - 928: 33,12 + 83: 17,38 + 84: 17,39 + 85: 18,39 + 86: 21,38 + 88: 16,40 + 89: 20,39 + 90: 13,38 + 91: 8,40 + 92: 6,39 + 93: 22,40 + 148: 29,39 + 149: 29,40 + 150: 24,39 + 151: 30,38 + 152: 33,39 + 153: 37,39 + 154: 37,38 + 155: 38,39 + 218: 10,44 + 219: 9,45 + 220: 8,46 + 221: 8,47 + 222: 13,48 + 223: 14,44 + 224: 13,42 + 226: 10,42 + 228: 8,44 + 229: 13,45 + 301: 22,35 + 302: 22,34 + 303: 21,34 + 304: 12,36 + 305: 13,36 + 306: 12,35 + 307: 13,34 + 309: 12,34 + 310: 19,34 + 311: 15,34 + 312: 19,35 + 393: 8,31 + 394: 10,32 + 395: 11,32 + 405: 15,31 + 406: 16,30 + 407: 14,31 + 408: 15,32 + 409: 19,31 + 410: 20,30 + 411: 21,30 + 412: 24,30 + 413: 26,31 + 414: 8,28 + 529: 21,18 + 530: 22,19 + 531: 21,19 + 532: 19,18 + 533: 18,21 + 534: 25,18 + 535: 24,19 + 536: 28,20 + 537: 26,22 + 538: 14,22 + 539: 15,18 + 540: 16,20 + 541: 4,20 + 542: 2,22 + 543: 2,18 + 544: 0,21 + 545: 0,19 + 769: 30,15 + 770: 28,15 + 771: 27,14 + 772: 33,12 - node: color: '#FFFFFFFF' id: DirtMedium decals: - 1177: 16,42 - 1178: 16,42 - 1179: 18,42 - 1180: 20,43 - 1181: 22,44 - 1182: 18,48 - 1183: 22,47 - 1184: 16,45 - 1185: 19,42 - 1186: 20,43 + 1002: 16,42 + 1003: 16,42 + 1004: 18,42 + 1005: 20,43 + 1006: 22,44 + 1007: 18,48 + 1008: 22,47 + 1009: 16,45 + 1010: 19,42 + 1011: 20,43 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 142: 17,39 - 280: 11,42 - 282: 8,45 - 363: 12,35 + 87: 17,39 + 225: 11,42 + 227: 8,45 + 308: 12,35 - node: color: '#8BDABA82' id: FullTileOverlayGreyscale decals: - 1089: 27,38 - 1090: 27,39 - 1091: 27,40 + 928: 27,38 + 929: 27,39 + 930: 27,40 - node: color: '#8BDABAFF' id: FullTileOverlayGreyscale decals: - 1106: 33,39 - 1107: 36,39 - 1108: 37,39 + 945: 33,39 + 946: 36,39 + 947: 37,39 - node: color: '#9FED5896' id: FullTileOverlayGreyscale decals: - 825: 21,7 - 826: 21,8 - 827: 21,9 - 828: 19,7 - 829: 19,8 - 830: 19,9 - 831: 15,7 - 832: 15,8 - 833: 15,9 - 834: 13,7 - 835: 13,8 - 836: 13,9 + 692: 21,7 + 693: 21,8 + 694: 21,9 + 695: 19,7 + 696: 19,8 + 697: 19,9 + 698: 15,7 + 699: 15,8 + 700: 15,9 + 701: 13,7 + 702: 13,8 + 703: 13,9 - node: color: '#D381C996' id: FullTileOverlayGreyscale decals: - 194: 36,39 - 195: 33,39 - 196: 37,39 + 139: 36,39 + 140: 33,39 + 141: 37,39 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 900: 28,16 - 901: 29,16 - 1219: 27,16 - 1220: 26,16 - 1221: 25,16 + 766: 28,16 + 767: 29,16 + 1044: 27,16 + 1045: 26,16 + 1046: 25,16 - node: color: '#8BDA8E9B' id: HalfTileOverlayGreyscale decals: - 1367: 30,2 - 1368: 29,2 - 1369: 31,2 - 1370: 27,2 - 1371: 26,2 - 1372: 22,2 - 1373: 33,2 + 1192: 30,2 + 1193: 29,2 + 1194: 31,2 + 1195: 27,2 + 1196: 26,2 + 1197: 22,2 + 1198: 33,2 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale decals: - 1272: 13,22 - 1273: 15,22 - 1274: 14,22 + 1097: 13,22 + 1098: 15,22 + 1099: 14,22 - node: color: '#8BDA8EFF' id: HalfTileOverlayGreyscale decals: - 1356: 24,4 - 1357: 23,4 - 1358: 22,4 - 1359: 21,4 - 1360: 20,4 - 1361: 27,4 - 1362: 28,4 - 1363: 29,4 - 1364: 30,4 - 1365: 31,4 - 1366: 32,4 + 1181: 24,4 + 1182: 23,4 + 1183: 22,4 + 1184: 21,4 + 1185: 20,4 + 1186: 27,4 + 1187: 28,4 + 1188: 29,4 + 1189: 30,4 + 1190: 31,4 + 1191: 32,4 - node: color: '#8BDABAFF' id: HalfTileOverlayGreyscale decals: - 1109: 33,38 - 1110: 34,38 - 1111: 35,38 - 1114: 37,38 + 948: 33,38 + 949: 34,38 + 950: 35,38 + 953: 37,38 - node: color: '#8BDB8E99' id: HalfTileOverlayGreyscale decals: - 1374: 25,4 - 1375: 25,4 + 1199: 25,4 + 1200: 25,4 - node: color: '#D381C996' id: HalfTileOverlayGreyscale decals: - 199: 37,38 - 200: 35,38 - 201: 34,38 - 202: 33,38 - 496: 13,22 - 497: 14,22 - 498: 15,22 - 875: 27,4 - 876: 28,4 - 877: 24,4 - 878: 29,4 - 879: 30,4 - 880: 31,4 - 881: 32,4 - 882: 23,4 - 883: 22,4 - 884: 21,4 - 885: 20,4 + 144: 37,38 + 145: 35,38 + 146: 34,38 + 147: 33,38 + 441: 13,22 + 442: 14,22 + 443: 15,22 + 742: 27,4 + 743: 28,4 + 744: 24,4 + 745: 29,4 + 746: 30,4 + 747: 31,4 + 748: 32,4 + 749: 23,4 + 750: 22,4 + 751: 21,4 + 752: 20,4 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 1217: 29,12 - 1218: 28,12 + 1042: 29,12 + 1043: 28,12 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale180 decals: - 1275: 15,18 - 1276: 14,18 - 1277: 13,18 + 1100: 15,18 + 1101: 14,18 + 1102: 13,18 - node: color: '#8BDA8EFF' id: HalfTileOverlayGreyscale180 decals: - 1341: 19,3 - 1342: 20,3 - 1343: 21,3 - 1344: 22,3 - 1345: 24,3 - 1346: 23,3 - 1347: 25,3 - 1348: 26,3 - 1349: 27,3 - 1350: 28,3 - 1351: 29,3 - 1352: 30,3 - 1353: 31,3 - 1354: 32,3 - 1355: 33,3 + 1166: 19,3 + 1167: 20,3 + 1168: 21,3 + 1169: 22,3 + 1170: 24,3 + 1171: 23,3 + 1172: 25,3 + 1173: 26,3 + 1174: 27,3 + 1175: 28,3 + 1176: 29,3 + 1177: 30,3 + 1178: 31,3 + 1179: 32,3 + 1180: 33,3 - node: color: '#8BDABAFF' id: HalfTileOverlayGreyscale180 decals: - 1112: 35,40 - 1113: 36,40 + 951: 35,40 + 952: 36,40 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 decals: - 197: 36,40 - 198: 35,40 - 493: 13,18 - 494: 14,18 - 495: 15,18 - 845: 19,3 - 846: 20,3 - 847: 21,3 - 848: 22,3 - 849: 23,3 - 850: 24,3 - 851: 26,3 - 852: 25,3 - 853: 28,3 - 854: 29,3 - 855: 30,3 - 856: 31,3 - 857: 32,3 - 858: 33,3 - 1340: 27,3 + 142: 36,40 + 143: 35,40 + 438: 13,18 + 439: 14,18 + 440: 15,18 + 712: 19,3 + 713: 20,3 + 714: 21,3 + 715: 22,3 + 716: 23,3 + 717: 24,3 + 718: 26,3 + 719: 25,3 + 720: 28,3 + 721: 29,3 + 722: 30,3 + 723: 31,3 + 724: 32,3 + 725: 33,3 + 1165: 27,3 - node: color: '#4B709CFF' id: HalfTileOverlayGreyscale270 decals: - 1261: 15,20 + 1086: 15,20 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: - 1222: 24,15 + 1047: 24,15 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale270 decals: - 1269: 12,19 - 1270: 12,20 - 1271: 12,21 + 1094: 12,19 + 1095: 12,20 + 1096: 12,21 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 decals: - 502: 12,19 - 503: 12,20 - 504: 12,21 + 447: 12,19 + 448: 12,20 + 449: 12,21 - node: color: '#4B709CFF' id: HalfTileOverlayGreyscale90 decals: - 1256: 13,20 + 1081: 13,20 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 902: 30,15 - 1215: 30,14 - 1216: 30,13 + 768: 30,15 + 1040: 30,14 + 1041: 30,13 - node: color: '#8BDA8EB4' id: HalfTileOverlayGreyscale90 decals: - 1266: 16,19 - 1267: 16,20 - 1268: 16,21 + 1091: 16,19 + 1092: 16,20 + 1093: 16,21 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 decals: - 499: 16,19 - 500: 16,20 - 501: 16,21 + 444: 16,19 + 445: 16,20 + 446: 16,21 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerNe decals: - 954: 13,28 + 793: 13,28 - node: color: '#D381C996' id: MiniTileWhiteCornerNe decals: - 474: 13,28 + 419: 13,28 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerNw decals: - 955: 12,28 + 794: 12,28 - node: color: '#D381C996' id: MiniTileWhiteCornerNw decals: - 475: 12,28 + 420: 12,28 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerSe decals: - 950: 13,24 + 789: 13,24 - node: color: '#D381C996' id: MiniTileWhiteCornerSe decals: - 479: 13,24 + 424: 13,24 - node: color: '#8BDA8EFF' id: MiniTileWhiteCornerSw decals: - 958: 12,24 + 797: 12,24 - node: color: '#D381C996' id: MiniTileWhiteCornerSw decals: - 478: 12,24 + 423: 12,24 - node: color: '#8BDA8EFF' id: MiniTileWhiteLineE decals: - 949: 13,24 - 951: 13,25 - 952: 13,25 - 953: 13,26 + 788: 13,24 + 790: 13,25 + 791: 13,25 + 792: 13,26 - node: color: '#8BDABAFF' id: MiniTileWhiteLineE decals: - 1098: 25,38 - 1100: 25,40 + 937: 25,38 + 939: 25,40 - node: color: '#D381C996' id: MiniTileWhiteLineE decals: - 472: 13,25 - 473: 13,26 + 417: 13,25 + 418: 13,26 - node: color: '#8BDA8EFF' id: MiniTileWhiteLineW decals: - 956: 12,27 - 957: 12,25 + 795: 12,27 + 796: 12,25 - node: color: '#8BDABAFF' id: MiniTileWhiteLineW decals: - 1099: 29,38 - 1101: 29,40 + 938: 29,38 + 940: 29,40 - node: color: '#D381C996' id: MiniTileWhiteLineW decals: - 476: 12,27 - 477: 12,25 + 421: 12,27 + 422: 12,25 - node: color: '#79DA8E6F' id: MonoOverlay decals: - 959: 14,24 - 960: 14,25 - 961: 14,26 - 962: 14,27 - 963: 14,28 + 798: 14,24 + 799: 14,25 + 800: 14,26 + 801: 14,27 + 802: 14,28 - node: color: '#8BDB9BFF' id: MonoOverlay decals: - 1474: 4,34 - 1475: 4,36 - 1476: 6,36 - 1477: 6,34 + 1273: 4,34 + 1274: 4,36 + 1275: 6,36 + 1276: 6,34 - node: color: '#D381C996' id: MonoOverlay decals: - 322: 4,34 - 323: 6,34 - 324: 4,36 - 325: 6,36 + 267: 4,34 + 268: 6,34 + 269: 4,36 + 270: 6,36 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale decals: - 1260: 15,19 - 1262: 14,20 + 1085: 15,19 + 1087: 14,20 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale decals: - 1056: 1,38 - 1057: 2,38 - 1058: 3,38 - 1059: 4,38 - 1060: 5,38 - 1120: 41,38 - 1121: 42,38 - 1122: 42,38 - 1123: 43,38 - 1124: 44,38 - 1125: 45,38 - 1131: 8,44 - 1132: 8,45 - 1133: 8,46 - 1134: 8,47 - 1135: 8,48 - 1136: 9,48 - 1137: 10,48 - 1226: 16,16 - 1227: 17,16 - 1228: 18,16 - 1229: 19,16 - 1230: 20,16 - 1231: 21,16 - 1232: 22,16 - 1233: 16,15 - 1234: 16,14 - 1235: 16,13 - 1236: 16,12 + 895: 1,38 + 896: 2,38 + 897: 3,38 + 898: 4,38 + 899: 5,38 + 959: 41,38 + 960: 42,38 + 961: 42,38 + 962: 43,38 + 963: 44,38 + 964: 45,38 + 970: 8,44 + 971: 8,45 + 972: 8,46 + 973: 8,47 + 974: 8,48 + 975: 9,48 + 976: 10,48 + 1051: 16,16 + 1052: 17,16 + 1053: 18,16 + 1054: 19,16 + 1055: 20,16 + 1056: 21,16 + 1057: 22,16 + 1058: 16,15 + 1059: 16,14 + 1060: 16,13 + 1061: 16,12 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale decals: - 1422: 53,1 - 1423: 53,2 - 1424: 53,3 - 1425: 54,3 - 1426: 54,2 - 1427: 54,1 - 1428: 38,2 - 1429: 38,1 - 1430: 38,3 - 1431: 37,3 - 1432: 37,2 - 1433: 37,1 - 1465: 16,32 - 1466: 16,31 - 1467: 16,30 - 1468: 15,30 - 1469: 15,31 - 1470: 15,32 - 1471: 14,32 - 1472: 14,31 - 1473: 14,30 - 1478: 1,35 - 1479: 2,35 - 1480: 3,35 - 1481: 3,34 - 1482: 2,34 - 1483: 1,34 - 1484: 7,34 - 1485: 7,35 - 1486: 8,35 - 1487: 8,34 - 1488: 9,34 - 1489: 9,35 + 1221: 53,1 + 1222: 53,2 + 1223: 53,3 + 1224: 54,3 + 1225: 54,2 + 1226: 54,1 + 1227: 38,2 + 1228: 38,1 + 1229: 38,3 + 1230: 37,3 + 1231: 37,2 + 1232: 37,1 + 1264: 16,32 + 1265: 16,31 + 1266: 16,30 + 1267: 15,30 + 1268: 15,31 + 1269: 15,32 + 1270: 14,32 + 1271: 14,31 + 1272: 14,30 + 1277: 1,35 + 1278: 2,35 + 1279: 3,35 + 1280: 3,34 + 1281: 2,34 + 1282: 1,34 + 1283: 7,34 + 1284: 7,35 + 1285: 8,35 + 1286: 8,34 + 1287: 9,34 + 1288: 9,35 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale decals: - 1813: 4,45 - 1816: 4,44 - 1817: 4,46 - 1820: 3,45 - 1826: 2,46 + 1574: 4,45 + 1577: 4,44 + 1578: 4,46 + 1581: 3,45 + 1587: 2,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale decals: - 53: 5,38 - 54: 4,38 - 55: 3,38 - 56: 2,38 - 57: 1,38 - 221: 45,38 - 222: 44,38 - 223: 43,38 - 224: 42,38 - 225: 41,38 - 247: 8,44 - 248: 8,45 - 249: 8,46 - 250: 8,47 - 251: 8,48 - 252: 9,48 - 253: 10,48 - 316: 9,34 - 317: 8,34 - 318: 7,34 - 319: 3,34 - 320: 2,34 - 321: 1,34 - 627: 22,16 - 628: 21,16 - 629: 20,16 - 630: 19,16 - 631: 18,16 - 632: 17,16 - 633: 16,16 - 634: 16,15 - 635: 16,14 - 636: 16,13 - 637: 16,12 - 672: 38,1 - 673: 38,3 - 679: 54,1 - 680: 54,2 - 681: 54,3 - 682: 38,2 + 5: 5,38 + 6: 4,38 + 7: 3,38 + 8: 2,38 + 9: 1,38 + 166: 45,38 + 167: 44,38 + 168: 43,38 + 169: 42,38 + 170: 41,38 + 192: 8,44 + 193: 8,45 + 194: 8,46 + 195: 8,47 + 196: 8,48 + 197: 9,48 + 198: 10,48 + 261: 9,34 + 262: 8,34 + 263: 7,34 + 264: 3,34 + 265: 2,34 + 266: 1,34 + 572: 22,16 + 573: 21,16 + 574: 20,16 + 575: 19,16 + 576: 18,16 + 577: 17,16 + 578: 16,16 + 579: 16,15 + 580: 16,14 + 581: 16,13 + 582: 16,12 + 617: 38,1 + 618: 38,3 + 624: 54,1 + 625: 54,2 + 626: 54,3 + 627: 38,2 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale decals: - 245: 13,48 - 246: 12,48 + 190: 13,48 + 191: 12,48 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale180 decals: - 1258: 13,21 - 1263: 14,20 + 1083: 13,21 + 1088: 14,20 - node: color: '#8BDA8E5D' id: QuarterTileOverlayGreyscale180 decals: - 1833: 4,44 - 1834: 2,44 + 1594: 4,44 + 1595: 2,44 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale180 decals: - 1051: 5,40 - 1052: 4,40 - 1053: 3,40 - 1054: 2,40 - 1055: 1,40 - 1126: 45,40 - 1127: 44,40 - 1128: 43,40 - 1129: 42,40 - 1130: 41,40 - 1237: 16,12 - 1238: 17,12 - 1239: 18,12 - 1240: 19,12 - 1241: 20,12 - 1242: 21,12 - 1243: 22,12 - 1244: 22,13 - 1245: 22,14 - 1246: 22,15 - 1247: 22,16 + 890: 5,40 + 891: 4,40 + 892: 3,40 + 893: 2,40 + 894: 1,40 + 965: 45,40 + 966: 44,40 + 967: 43,40 + 968: 42,40 + 969: 41,40 + 1062: 16,12 + 1063: 17,12 + 1064: 18,12 + 1065: 19,12 + 1066: 20,12 + 1067: 21,12 + 1068: 22,12 + 1069: 22,13 + 1070: 22,14 + 1071: 22,15 + 1072: 22,16 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale180 decals: - 1416: 52,2 - 1417: 52,1 - 1418: 52,3 - 1419: 53,3 - 1420: 53,2 - 1421: 53,1 - 1434: 37,3 - 1435: 36,3 - 1436: 36,2 - 1437: 37,2 - 1438: 37,1 - 1439: 36,1 - 1440: 18,32 - 1441: 19,32 - 1442: 20,32 - 1443: 21,32 - 1444: 22,32 - 1445: 24,32 - 1446: 23,32 - 1447: 25,32 - 1456: 14,30 - 1457: 14,31 - 1458: 14,32 - 1459: 15,32 - 1460: 15,31 - 1461: 15,30 - 1462: 16,30 - 1463: 16,31 - 1464: 16,32 - 1490: 7,35 - 1491: 8,35 - 1492: 9,35 - 1493: 9,36 - 1494: 8,36 - 1495: 7,36 - 1496: 3,36 - 1497: 2,36 - 1498: 1,36 - 1499: 1,35 - 1500: 2,35 - 1501: 3,35 + 1215: 52,2 + 1216: 52,1 + 1217: 52,3 + 1218: 53,3 + 1219: 53,2 + 1220: 53,1 + 1233: 37,3 + 1234: 36,3 + 1235: 36,2 + 1236: 37,2 + 1237: 37,1 + 1238: 36,1 + 1239: 18,32 + 1240: 19,32 + 1241: 20,32 + 1242: 21,32 + 1243: 22,32 + 1244: 24,32 + 1245: 23,32 + 1246: 25,32 + 1255: 14,30 + 1256: 14,31 + 1257: 14,32 + 1258: 15,32 + 1259: 15,31 + 1260: 15,30 + 1261: 16,30 + 1262: 16,31 + 1263: 16,32 + 1289: 7,35 + 1290: 8,35 + 1291: 9,35 + 1292: 9,36 + 1293: 8,36 + 1294: 7,36 + 1295: 3,36 + 1296: 2,36 + 1297: 1,36 + 1298: 1,35 + 1299: 2,35 + 1300: 3,35 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale180 decals: - 1821: 3,45 - 1824: 2,45 - 1825: 2,46 + 1582: 3,45 + 1585: 2,45 + 1586: 2,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale180 decals: - 48: 5,40 - 49: 4,40 - 50: 3,40 - 51: 2,40 - 52: 1,40 - 226: 41,40 - 227: 42,40 - 228: 43,40 - 229: 44,40 - 230: 45,40 - 310: 9,36 - 311: 8,36 - 312: 7,36 - 313: 3,36 - 314: 2,36 - 315: 1,36 - 432: 25,32 - 433: 24,32 - 434: 23,32 - 435: 22,32 - 436: 21,32 - 437: 20,32 - 438: 19,32 - 439: 18,32 - 622: 22,12 - 623: 22,13 - 624: 22,14 - 625: 22,15 - 626: 22,16 - 638: 16,12 - 639: 17,12 - 640: 18,12 - 641: 19,12 - 642: 20,12 - 643: 21,12 - 674: 36,1 - 675: 36,2 - 676: 36,3 - 677: 52,1 - 678: 52,3 - 683: 52,2 + 0: 5,40 + 1: 4,40 + 2: 3,40 + 3: 2,40 + 4: 1,40 + 171: 41,40 + 172: 42,40 + 173: 43,40 + 174: 44,40 + 175: 45,40 + 255: 9,36 + 256: 8,36 + 257: 7,36 + 258: 3,36 + 259: 2,36 + 260: 1,36 + 377: 25,32 + 378: 24,32 + 379: 23,32 + 380: 22,32 + 381: 21,32 + 382: 20,32 + 383: 19,32 + 384: 18,32 + 567: 22,12 + 568: 22,13 + 569: 22,14 + 570: 22,15 + 571: 22,16 + 583: 16,12 + 584: 17,12 + 585: 18,12 + 586: 19,12 + 587: 20,12 + 588: 21,12 + 619: 36,1 + 620: 36,2 + 621: 36,3 + 622: 52,1 + 623: 52,3 + 628: 52,2 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale180 decals: - 239: 14,44 - 240: 14,45 - 241: 14,46 - 242: 14,47 + 184: 14,44 + 185: 14,45 + 186: 14,46 + 187: 14,47 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale270 decals: - 1259: 15,21 - 1264: 16,21 + 1084: 15,21 + 1089: 16,21 - node: color: '#8BDA8E5D' id: QuarterTileOverlayGreyscale270 decals: - 1830: 2,46 - 1831: 4,44 - 1832: 3,45 + 1591: 2,46 + 1592: 4,44 + 1593: 3,45 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale270 decals: - 1084: 21,40 - 1085: 20,40 - 1086: 18,40 - 1087: 19,40 - 1088: 17,40 - 1248: 20,19 - 1249: 19,20 - 1255: 21,21 + 923: 21,40 + 924: 20,40 + 925: 18,40 + 926: 19,40 + 927: 17,40 + 1073: 20,19 + 1074: 19,20 + 1080: 21,21 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale270 decals: - 1509: 32,35 - 1510: 31,35 - 1511: 30,35 - 1512: 29,35 - 1513: 28,35 - 1514: 27,35 - 1515: 26,36 - 1516: 26,36 - 1517: 27,36 - 1518: 28,36 - 1519: 29,36 - 1520: 30,36 - 1521: 31,36 - 1528: 32,36 - 1529: 26,35 + 1308: 32,35 + 1309: 31,35 + 1310: 30,35 + 1311: 29,35 + 1312: 28,35 + 1313: 27,35 + 1314: 26,36 + 1315: 26,36 + 1316: 27,36 + 1317: 28,36 + 1318: 29,36 + 1319: 30,36 + 1320: 31,36 + 1327: 32,36 + 1328: 26,35 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale270 decals: - 1814: 4,45 - 1818: 4,46 - 1828: 3,46 + 1575: 4,45 + 1579: 4,46 + 1589: 3,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 decals: - 128: 17,40 - 129: 18,40 - 130: 19,40 - 131: 20,40 - 132: 21,40 - 398: 32,35 - 405: 27,36 - 406: 28,36 - 407: 29,36 - 408: 30,36 - 409: 31,36 - 411: 26,36 - 552: 21,21 + 73: 17,40 + 74: 18,40 + 75: 19,40 + 76: 20,40 + 77: 21,40 + 343: 32,35 + 350: 27,36 + 351: 28,36 + 352: 29,36 + 353: 30,36 + 354: 31,36 + 356: 26,36 + 497: 21,21 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 decals: - 233: 8,44 - 234: 8,45 - 235: 8,46 - 236: 8,47 + 178: 8,44 + 179: 8,45 + 180: 8,46 + 181: 8,47 - node: color: '#4B709CFF' id: QuarterTileOverlayGreyscale90 decals: - 1257: 13,19 - 1265: 12,19 + 1082: 13,19 + 1090: 12,19 - node: color: '#79DA8EA1' id: QuarterTileOverlayGreyscale90 decals: - 976: 18,24 - 977: 18,25 - 978: 18,26 - 979: 18,27 - 980: 18,28 + 815: 18,24 + 816: 18,25 + 817: 18,26 + 818: 18,27 + 819: 18,28 - node: color: '#8BDA8E5D' id: QuarterTileOverlayGreyscale90 decals: - 1829: 3,44 + 1590: 3,44 - node: color: '#8BDABAFF' id: QuarterTileOverlayGreyscale90 decals: - 1079: 17,38 - 1080: 18,38 - 1081: 19,38 - 1082: 20,38 - 1083: 21,38 - 1138: 12,48 - 1139: 13,48 - 1140: 14,48 - 1141: 14,47 - 1142: 14,46 - 1143: 14,45 - 1144: 14,44 + 918: 17,38 + 919: 18,38 + 920: 19,38 + 921: 20,38 + 922: 21,38 + 977: 12,48 + 978: 13,48 + 979: 14,48 + 980: 14,47 + 981: 14,46 + 982: 14,45 + 983: 14,44 - node: color: '#8BDB9BFF' id: QuarterTileOverlayGreyscale90 decals: - 1448: 18,30 - 1449: 19,30 - 1450: 20,30 - 1451: 22,30 - 1452: 21,30 - 1453: 23,30 - 1454: 24,30 - 1455: 25,30 - 1502: 26,35 - 1503: 27,35 - 1504: 28,35 - 1505: 30,35 - 1506: 29,35 - 1507: 31,35 - 1508: 32,35 - 1522: 32,34 - 1523: 31,34 - 1524: 30,34 - 1525: 29,34 - 1526: 28,34 - 1527: 27,34 - 1530: 26,34 + 1247: 18,30 + 1248: 19,30 + 1249: 20,30 + 1250: 22,30 + 1251: 21,30 + 1252: 23,30 + 1253: 24,30 + 1254: 25,30 + 1301: 26,35 + 1302: 27,35 + 1303: 28,35 + 1304: 30,35 + 1305: 29,35 + 1306: 31,35 + 1307: 32,35 + 1321: 32,34 + 1322: 31,34 + 1323: 30,34 + 1324: 29,34 + 1325: 28,34 + 1326: 27,34 + 1329: 26,34 - node: color: '#9EDA8E28' id: QuarterTileOverlayGreyscale90 decals: - 1815: 4,44 - 1819: 3,45 - 1822: 2,45 - 1823: 2,44 - 1827: 2,46 + 1576: 4,44 + 1580: 3,45 + 1583: 2,45 + 1584: 2,44 + 1588: 2,46 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 decals: - 133: 21,38 - 134: 20,38 - 135: 19,38 - 136: 18,38 - 137: 17,38 - 254: 14,44 - 255: 14,45 - 256: 14,46 - 257: 14,47 - 258: 14,48 - 259: 13,48 - 260: 12,48 - 399: 26,35 - 400: 31,34 - 401: 30,34 - 402: 29,34 - 403: 28,34 - 404: 27,34 - 410: 32,34 - 440: 18,30 - 441: 19,30 - 442: 20,30 - 443: 21,30 - 444: 22,30 - 445: 23,30 - 446: 24,30 - 447: 25,30 + 78: 21,38 + 79: 20,38 + 80: 19,38 + 81: 18,38 + 82: 17,38 + 199: 14,44 + 200: 14,45 + 201: 14,46 + 202: 14,47 + 203: 14,48 + 204: 13,48 + 205: 12,48 + 344: 26,35 + 345: 31,34 + 346: 30,34 + 347: 29,34 + 348: 28,34 + 349: 27,34 + 355: 32,34 + 385: 18,30 + 386: 19,30 + 387: 20,30 + 388: 21,30 + 389: 22,30 + 390: 23,30 + 391: 24,30 + 392: 25,30 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 decals: - 243: 9,48 - 244: 10,48 + 188: 9,48 + 189: 10,48 - node: color: '#FFFFFFFF' id: Rock01 decals: - 543: 22,18 + 488: 22,18 - node: color: '#FFFFFFFF' id: Rock03 decals: - 544: 18,18 + 489: 18,18 - node: color: '#FFFFFFFF' id: Rock04 decals: - 546: 18,22 + 491: 18,22 - node: color: '#FFFFFFFF' id: Rock05 decals: - 545: 22,22 + 490: 22,22 - node: color: '#FFFFFFFF' id: StandClear decals: - 272: 11,44 + 217: 11,44 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 1223: 24,16 + 1048: 24,16 - node: color: '#8BDA8EB4' id: ThreeQuarterTileOverlayGreyscale decals: - 1279: 12,22 + 1104: 12,22 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale decals: - 507: 12,22 + 452: 12,22 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1224: 30,12 + 1049: 30,12 - node: color: '#8BDA8EB4' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1280: 16,18 + 1105: 16,18 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 505: 16,18 + 450: 16,18 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 899: 30,16 + 765: 30,16 - node: color: '#8BDA8EB4' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1278: 16,22 + 1103: 16,22 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 506: 16,22 + 451: 16,22 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleNE decals: - 984: 2,28 + 823: 2,28 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleNW decals: - 986: 0,28 + 825: 0,28 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleSE decals: - 987: 2,24 + 826: 2,24 - node: color: '#79DA8EFF' id: WarnCornerGreyscaleSW decals: - 989: 0,24 + 828: 0,24 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 861: 21,2 - 862: 25,2 + 728: 21,2 + 729: 25,2 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 863: 23,2 - 864: 19,2 + 730: 23,2 + 731: 19,2 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 490: 2,20 + 435: 2,20 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 1037: 8,12 + 876: 8,12 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 1036: 14,12 + 875: 14,12 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 621: 8,16 + 566: 8,16 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 620: 14,16 + 565: 14,16 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 331: 6,34 - 332: 6,35 - 333: 6,36 - 607: 8,13 - 608: 8,14 - 609: 8,15 + 276: 6,34 + 277: 6,35 + 278: 6,36 + 552: 8,13 + 553: 8,14 + 554: 8,15 - node: color: '#79DA8EFF' id: WarnLineGreyscaleE decals: - 981: 2,25 - 982: 2,26 - 983: 2,27 + 820: 2,25 + 821: 2,26 + 822: 2,27 - node: color: '#8BDB8E99' id: WarnLineGreyscaleE decals: - 1378: 18,3 - 1379: 18,3 + 1203: 18,3 + 1204: 18,3 - node: color: '#8BDB8EFF' id: WarnLineGreyscaleE decals: - 1380: 18,3 + 1205: 18,3 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 874: 18,3 + 741: 18,3 - node: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 1225: 27,15 + 1050: 27,15 - node: color: '#79DA8EFF' id: WarnLineGreyscaleN decals: - 985: 1,28 + 824: 1,28 - node: color: '#8BDA8EFF' id: WarnLineGreyscaleN decals: - 1624: 29,27 + 1423: 29,27 - node: color: '#8BDB8E99' id: WarnLineGreyscaleN decals: - 1376: 26,4 - 1377: 26,4 + 1201: 26,4 + 1202: 26,4 - node: color: '#DABC8BFF' id: WarnLineGreyscaleN decals: - 996: 5,28 + 835: 5,28 - node: color: '#79DA8EFF' id: WarnLineGreyscaleS decals: - 988: 1,24 + 827: 1,24 - node: color: '#8BDA8EFF' id: WarnLineGreyscaleS decals: - 1623: 29,25 + 1422: 29,25 - node: color: '#DABC8BFF' id: WarnLineGreyscaleS decals: - 997: 5,24 - 998: 5,24 + 836: 5,24 + 837: 5,24 - node: color: '#79DA8EFF' id: WarnLineGreyscaleW decals: - 990: 0,25 - 991: 0,26 - 992: 0,27 + 829: 0,25 + 830: 0,26 + 831: 0,27 - node: color: '#8BDB8EFF' id: WarnLineGreyscaleW decals: - 1381: 34,3 + 1206: 34,3 - node: color: '#D381C996' id: WarnLineGreyscaleW decals: - 873: 34,3 + 740: 34,3 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 264: 12,47 - 265: 10,47 - 488: 4,20 - 489: 3,20 - 581: 27,22 - 582: 26,22 - 583: 25,22 - 602: 13,16 - 603: 11,16 - 604: 12,16 - 605: 10,16 - 606: 9,16 + 209: 12,47 + 210: 10,47 + 433: 4,20 + 434: 3,20 + 526: 27,22 + 527: 26,22 + 528: 25,22 + 547: 13,16 + 548: 11,16 + 549: 12,16 + 550: 10,16 + 551: 9,16 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 328: 4,34 - 329: 4,36 - 330: 4,35 - 491: 2,21 - 492: 2,22 - 1043: 14,13 - 1044: 14,14 - 1045: 14,15 + 273: 4,34 + 274: 4,36 + 275: 4,35 + 436: 2,21 + 437: 2,22 + 882: 14,13 + 883: 14,14 + 884: 14,15 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 261: 12,44 - 262: 11,44 - 263: 10,44 - 578: 27,18 - 579: 26,18 - 580: 25,18 - 942: 45,13 - 943: 46,13 - 944: 44,13 - 945: 43,13 - 946: 42,13 - 947: 41,13 - 948: 40,13 - 1038: 9,12 - 1039: 10,12 - 1040: 11,12 - 1041: 12,12 - 1042: 13,12 + 206: 12,44 + 207: 11,44 + 208: 10,44 + 523: 27,18 + 524: 26,18 + 525: 25,18 + 781: 45,13 + 782: 46,13 + 783: 44,13 + 784: 43,13 + 785: 42,13 + 786: 41,13 + 787: 40,13 + 877: 9,12 + 878: 10,12 + 879: 11,12 + 880: 12,12 + 881: 13,12 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 518: 10,9 + 463: 10,9 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 517: 1,9 + 462: 1,9 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 515: 10,8 + 460: 10,8 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 516: 1,8 + 461: 1,8 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 519: 9,9 - 520: 8,9 - 521: 7,9 - 522: 6,9 - 523: 5,9 - 524: 4,9 - 525: 3,9 - 526: 2,9 + 464: 9,9 + 465: 8,9 + 466: 7,9 + 467: 6,9 + 468: 5,9 + 469: 4,9 + 470: 3,9 + 471: 2,9 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 527: 10,8 - 528: 9,8 - 529: 8,8 - 530: 7,8 - 531: 6,8 - 532: 5,8 - 533: 4,8 - 534: 3,8 - 535: 2,8 - 536: 1,8 + 472: 10,8 + 473: 9,8 + 474: 8,8 + 475: 7,8 + 476: 6,8 + 477: 5,8 + 478: 4,8 + 479: 3,8 + 480: 2,8 + 481: 1,8 - node: color: '#FFFFFFFF' id: bushsnowa1 decals: - 1768: 34.098167,13.033111 + 1560: 34.098167,13.033111 - node: color: '#FFFFFFFF' id: bushsnowb1 decals: - 1769: 35.707542,12.970611 + 1561: 35.707542,12.970611 - node: color: '#FFFFFFFF' id: chevron decals: - 285: 11,48 + 230: 11,48 - node: color: '#FFFFFFFF' id: grasssnow decals: - 1885: 10.225454,38.990788 - 1886: 11.037954,39.022038 - 1887: 11.834829,39.022038 + 1645: 10.225454,38.990788 + 1646: 11.037954,39.022038 + 1647: 11.834829,39.022038 - node: color: '#FFFFFFFF' id: grasssnow02 decals: - 1762: 34.973167,13.060861 + 1554: 34.973167,13.060861 - node: color: '#FFFFFFFF' id: grasssnow10 decals: - 1761: 34.004417,13.045236 - 1763: 35.316917,13.060861 - 1764: 36.035667,13.029611 - 1765: 34.535667,12.998361 - 1766: 36.129417,13.076486 - 1767: 34.238792,13.076486 - 1888: 10.491079,38.975163 - 1889: 11.600454,38.959538 - 1890: 11.006704,39.178288 + 1553: 34.004417,13.045236 + 1555: 35.316917,13.060861 + 1556: 36.035667,13.029611 + 1557: 34.535667,12.998361 + 1558: 36.129417,13.076486 + 1559: 34.238792,13.076486 + 1648: 10.491079,38.975163 + 1649: 11.600454,38.959538 + 1650: 11.006704,39.178288 - type: RadiationGridResistance - type: LoadedMap - type: SpreaderGrid @@ -2919,6 +2919,13 @@ entities: - type: Transform pos: 16.516748,9.567207 parent: 1653 +- proto: AmbrosiaDeusSeeds + entities: + - uid: 804 + components: + - type: Transform + pos: 16.427309,8.719635 + parent: 1653 - proto: AmbrosiaVulgarisSeeds entities: - uid: 1380 @@ -3245,13 +3252,6 @@ entities: - type: Transform pos: 8.531214,35.590054 parent: 1653 -- proto: CabbageSeeds - entities: - - uid: 1381 - components: - - type: Transform - pos: 16.501123,8.739082 - parent: 1653 - proto: CableApcExtension entities: - uid: 1 @@ -6405,13 +6405,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,7.5 parent: 1653 -- proto: CarrotSeeds - entities: - - uid: 1382 - components: - - type: Transform - pos: 16.641748,8.598457 - parent: 1653 - proto: Catwalk entities: - uid: 560 @@ -7081,6 +7074,23 @@ entities: - type: Transform pos: 12.423744,24.51739 parent: 1653 +- proto: ClothingNeckBANCloak + entities: + - uid: 2244 + components: + - type: Transform + pos: 12.724419,14.649719 + parent: 1653 +- proto: ClothingNeckCloakBotanistCloak + entities: + - uid: 1999 + components: + - type: Transform + pos: 12.333794,14.634094 + parent: 1653 + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} - proto: ClothingOuterApronBotanist entities: - uid: 656 @@ -7278,6 +7288,17 @@ entities: - type: Transform pos: 22.5,27.5 parent: 1653 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 1382 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: CrateHydroponicsTools entities: - uid: 1958 @@ -7442,6 +7463,30 @@ entities: - type: Transform pos: 3.5640259,43.59188 parent: 1653 +- proto: DeathNettle + entities: + - uid: 2216 + components: + - type: Transform + pos: 42.386814,9.552584 + parent: 1653 +- proto: DeathweedLeaves + entities: + - uid: 2218 + components: + - type: Transform + pos: 21.477472,8.54776 + parent: 1653 + - uid: 2239 + components: + - type: Transform + pos: 44.52744,9.663662 + parent: 1653 + - uid: 2240 + components: + - type: Transform + pos: 39.49619,7.710537 + parent: 1653 - proto: DisposalTrunk entities: - uid: 1436 @@ -7554,20 +7599,6 @@ entities: - type: Transform pos: 22.57765,4.50994 parent: 1653 -- proto: EggplantSeeds - entities: - - uid: 1384 - components: - - type: Transform - pos: 16.626123,7.6609573 - parent: 1653 -- proto: EggySeeds - entities: - - uid: 1383 - components: - - type: Transform - pos: 16.422998,7.8484573 - parent: 1653 - proto: EmergencyLight entities: - uid: 1605 @@ -7690,11 +7721,6 @@ entities: parent: 1653 - proto: FoodBerries entities: - - uid: 804 - components: - - type: Transform - pos: 12.556688,14.57218 - parent: 1653 - uid: 805 components: - type: MetaData @@ -7702,6 +7728,33 @@ entities: - type: Transform pos: 10.525438,14.587805 parent: 1653 +- proto: FoodChilly + entities: + - uid: 2220 + components: + - type: Transform + pos: 26.173592,28.69489 + parent: 1653 + - uid: 2221 + components: + - type: Transform + pos: 26.454842,28.72614 + parent: 1653 + - uid: 2222 + components: + - type: Transform + pos: 24.392342,27.679264 + parent: 1653 + - uid: 2223 + components: + - type: Transform + pos: 26.486092,24.72614 + parent: 1653 + - uid: 2224 + components: + - type: Transform + pos: 26.220467,24.75739 + parent: 1653 - proto: FoodCondimentBottleColdsauce entities: - uid: 1841 @@ -7716,6 +7769,13 @@ entities: - type: Transform pos: 3.4733143,14.462859 parent: 1653 +- proto: FoodLaughinPeaPod + entities: + - uid: 2219 + components: + - type: Transform + pos: 21.487938,14.505449 + parent: 1653 - proto: FoodPotato entities: - uid: 1396 @@ -10649,6 +10709,73 @@ entities: - type: Transform pos: 21.9839,4.619315 parent: 1653 +- proto: LaughinPeaSeeds + entities: + - uid: 1383 + components: + - type: Transform + pos: 16.724184,7.5008845 + parent: 1653 +- proto: LeavesCannabis + entities: + - uid: 2236 + components: + - type: Transform + pos: 43.495575,7.6334863 + parent: 1653 + - uid: 2237 + components: + - type: Transform + pos: 42.495575,7.6334863 + parent: 1653 + - uid: 2238 + components: + - type: Transform + pos: 45.526825,9.617861 + parent: 1653 + - uid: 2241 + components: + - type: Transform + pos: 40.46494,7.710537 + parent: 1653 + - uid: 2242 + components: + - type: Transform + pos: 39.46494,9.663662 + parent: 1653 + - uid: 2243 + components: + - type: Transform + pos: 43.480564,9.663662 + parent: 1653 +- proto: LemonKa + entities: + - uid: 1382 + components: + - type: Transform + parent: 161 + - type: Physics + canCollide: False + - type: InsideEntityStorage + - uid: 2217 + components: + - type: Transform + pos: 15.5301695,9.594635 + parent: 1653 +- proto: LemoonSeeds + entities: + - uid: 1384 + components: + - type: Transform + pos: 16.396059,7.7821345 + parent: 1653 +- proto: LifeweedLeaves + entities: + - uid: 2235 + components: + - type: Transform + pos: 45.495575,7.6334863 + parent: 1653 - proto: LightTree05 entities: - uid: 125 @@ -10826,19 +10953,64 @@ entities: - type: Transform pos: 27.480967,22.500828 parent: 1653 -- proto: NettleSeeds +- proto: OrangeSeeds entities: - - uid: 1999 + - uid: 819 components: - type: Transform - pos: 42.384377,9.279519 + pos: 1.4881809,27.512886 parent: 1653 -- proto: OrangeSeeds +- proto: OvergrownWeed entities: - - uid: 819 + - uid: 2225 components: - type: Transform - pos: 1.4881809,27.512886 + pos: 31.5,19.5 + parent: 1653 + - uid: 2226 + components: + - type: Transform + pos: 33.5,21.5 + parent: 1653 + - uid: 2227 + components: + - type: Transform + pos: 31.5,18.5 + parent: 1653 + - uid: 2228 + components: + - type: Transform + pos: 32.5,18.5 + parent: 1653 + - uid: 2229 + components: + - type: Transform + pos: 32.5,21.5 + parent: 1653 + - uid: 2230 + components: + - type: Transform + pos: 32.5,22.5 + parent: 1653 + - uid: 2231 + components: + - type: Transform + pos: 31.5,22.5 + parent: 1653 + - uid: 2232 + components: + - type: Transform + pos: 34.5,21.5 + parent: 1653 + - uid: 2233 + components: + - type: Transform + pos: 34.5,20.5 + parent: 1653 + - uid: 2234 + components: + - type: Transform + pos: 30.5,20.5 parent: 1653 - proto: Paper entities: @@ -12311,6 +12483,13 @@ entities: - type: Transform pos: 30.5,8.5 parent: 1653 +- proto: SpacemansTrumpetSeeds + entities: + - uid: 1381 + components: + - type: Transform + pos: 16.677309,8.39151 + parent: 1653 - proto: SteelBench entities: - uid: 2113 diff --git a/Resources/Prototypes/Andromeda/Catalog/Loadout/sponsor.yml b/Resources/Prototypes/Andromeda/Catalog/Loadout/sponsor.yml index ecbc57ee824..5c20b2ac206 100644 --- a/Resources/Prototypes/Andromeda/Catalog/Loadout/sponsor.yml +++ b/Resources/Prototypes/Andromeda/Catalog/Loadout/sponsor.yml @@ -1444,6 +1444,16 @@ entity: ClothingUnderwearSocksFishnettights sponsorOnly: true +- type: loadout + id: ClothingUnderwearWarmbraLoadout + entity: ClothingUnderwearWarmbra + sponsorOnly: true + +- type: loadout + id: ClothingUnderwearWarmstockingsLoadout + entity: ClothingUnderwearWarmstockings + sponsorOnly: true + #solevoitoropiga - type: loadout id: ClothingUnderwearBottomPantiesDeathSquadSponsorLoadout @@ -1455,6 +1465,16 @@ entity: ClothingUnderwearTopDeathBraSponsor sponsorOnly: true +- type: loadout + id: ClothingShoesSchoolWhiteLoadout + entity: ClothingShoesSchoolWhite + sponsorOnly: true + +- type: loadout + id: ClothingUniformJumpskirtSchoolLoadout + entity: ClothingUniformJumpskirtSchool + sponsorOnly: true + #Kivchik - type: loadout id: ClothingEyesSalesmanLoadout diff --git a/Resources/Prototypes/Andromeda/Lemird Prototype's/balaclava.yml b/Resources/Prototypes/Andromeda/Lemird Prototype's/balaclava.yml new file mode 100644 index 00000000000..eb22ebd5e8c --- /dev/null +++ b/Resources/Prototypes/Andromeda/Lemird Prototype's/balaclava.yml @@ -0,0 +1,16 @@ +- type: entity + parent: ClothingMaskPullableBase + id: ClothingMaskBalaclava + name: балаклава + description: Головной убор закрывающий голову, лоб и лицо, оставляя небольшую прорезь для глаз и рта. + suffix: Андромеда + components: + - type: Sprite + sprite: Andromeda/Lemird/balaclava.rsi + - type: Clothing + sprite: Andromeda/Lemird/balaclava.rsi + - type: IngestionBlocker + - type: IdentityBlocker + - type: Tag + tags: + - WhitelistChameleon \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/Lemird Prototype's/wedding.yml b/Resources/Prototypes/Andromeda/Lemird Prototype's/wedding.yml new file mode 100644 index 00000000000..eb02b222e8c --- /dev/null +++ b/Resources/Prototypes/Andromeda/Lemird Prototype's/wedding.yml @@ -0,0 +1,91 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatWeddingVeill + name: cвадебный венок + description: Красивый венок, созданный для роскошных свадеб. + components: + - type: Sprite + sprite: Andromeda/Clothing/Head/weddingveil.rsi + - type: Clothing + sprite: Andromeda/Clothing/Head/weddingveil.rsi + + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtWeddingDress + name: платье невесты + description: Роскошное платье невесты, она всегда должна выглядеть прекрасно. + components: + - type: Sprite + sprite: Andromeda/Clothing/Uniforms/weddingdress.rsi + - type: Clothing + sprite: Andromeda/Clothing/Uniforms/weddingdress.rsi + + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesWeddingShoes + name: свадебные туфельки + description: Прекрасная обувь, что прекрасно подчёркивает походку невесты. + components: + - type: Sprite + sprite: Andromeda/Clothing/Shoes/weddingshoes.rsi + - type: Clothing + sprite: Andromeda/Clothing/Shoes/weddingshoes.rsi + + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformWeddingtuxedo + name: свадебный смокинг + description: Не верится, что нужно надеть именно вам, верно? + components: + - type: Sprite + sprite: Andromeda/Clothing/Uniforms/weddingtuxedo.rsi + - type: Clothing + sprite: Andromeda/Clothing/Uniforms/weddingtuxedo.rsi + + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesWeddingGlaceups + name: свадебные туфли + description: На самом деле универсальны, но с костюмом смотрятся лучше. + components: + - type: Sprite + sprite: Andromeda/Clothing/Shoes/weddinglaceups.rsi + - type: Clothing + sprite: Andromeda/Clothing/Shoes/weddinglaceups.rsi + + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsWeddingRing + name: обручальное кольцо + description: Главное не уронить в важный момент, или потерять палец. + components: + - type: Sprite + sprite: Andromeda/Clothing/Hands/weddingring.rsi + - type: Clothing + sprite: Andromeda/Clothing/Hands/weddingring.rsi + - type: FingerprintMask + + +- type: entity + parent: BaseItem + id: Bouquet + name: букет + description: Стоит дарить это даме чаще. + components: + - type: Sharp + - type: Sprite + sprite: Andromeda/Objects/Weapons/bouquet.rsi + state: icon + - type: MeleeWeapon + damage: + types: + Slash: 1 + - type: Item + size: Small + sprite: Objects/Weapons/Melee/bouquet.rsi + - type: DisarmMalus \ No newline at end of file diff --git a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml index 94c30b30089..a3bd659b630 100644 --- a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml +++ b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/MrProperMobs.yml @@ -753,6 +753,7 @@ - key: enum.RadarConsoleUiKey.Key toggleAction: ActionAGhostShowRadar - type: RadarConsole + followEntity: true - type: NpcFactionMember factions: - SimpleHostile @@ -838,10 +839,10 @@ damageCap: 89 damage: types: - Poison: -0.05 + Poison: -0.90 groups: - Brute: -0.05 - Burn: -0.05 + Brute: -0.90 + Burn: -0.90 - type: SlowOnDamage speedModifierThresholds: 100: 0.7 @@ -924,6 +925,7 @@ - key: enum.RadarConsoleUiKey.Key toggleAction: ActionAGhostShowRadar - type: RadarConsole + followEntity: true - type: NpcFactionMember factions: - SimpleHostile @@ -982,10 +984,10 @@ damageCap: 89 damage: types: - Poison: -0.05 + Poison: -0.55 groups: - Brute: -0.05 - Burn: -0.05 + Brute: -0.55 + Burn: -0.55 - type: Gun fireRate: 0.5 useKey: false diff --git a/Resources/Prototypes/Andromeda/NIKforest's Prototypes/olivie.yml b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/olivie.yml new file mode 100644 index 00000000000..74400c145d2 --- /dev/null +++ b/Resources/Prototypes/Andromeda/NIKforest's Prototypes/olivie.yml @@ -0,0 +1,50 @@ +- type: entity + name: cалат оливье + parent: FoodBowlBase + id: FoodSaladOlivie + description: Традиционное салатное блюдо в русской кухне. + suffix: Андромеда + components: + - type: FlavorProfile + flavors: + - carrot + - potatoes + - egg + - meaty + - type: Sprite + sprite: Andromeda/NIKforest/olivie.rsi + layers: + - state: bowl + - state: olivie + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 5 + - type: Tag + tags: + - Fruit + - Soup + - Meat + +- type: microwaveMealRecipe + id: RecipeOlivieSalad + name: olivie salad recipe + result: FoodSaladOlivie + time: 5 + reagents: + Mayo: 5 + Egg: 12 + TableSalt: 5 + Blackpepper: 5 + solids: + FoodBowlBig: 1 + FoodPotato: 2 + FoodCarrot: 2 + FoodMeat: 1 + FoodPeaPod: 2 + FoodOnionSlice: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml index 5058092a220..c55361daacd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml @@ -18,12 +18,12 @@ ClothingMaskPlague: 1 ClothingHeadsetService: 2 ClothingHandsWeddingRing: 2 # A-13 - bouquet: 1 # A-13 ClothingHeadHatWeddingVeill: 2 # A-13 ClothingUniformJumpskirtWeddingDress: 2 # A-13 ClothingShoesWeddingShoes: 2 # A-13 ClothingUniformWeddingtuxedo: 2 # A-13 ClothingShoesWeddingGlaceups: 2 # A-13 + Bouquet: 1 # A-13 BoxCandle: 2 BoxCandleSmall: 2 Urn: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml index 8e1f6a1c3ac..b6220e952d6 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/syndiedrobe.yml @@ -15,6 +15,7 @@ ClothingNeckScarfStripedSyndieGreen: 2 ClothingNeckScarfStripedSyndieRed: 2 ClothingShoesBootsWinterSyndicate: 2 + ClothingMaskBalaclava: 2 #A-13 Balaclava emaggedInventory: ClothingOuterCoatSyndieCapArmored: 1 diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index f70d8351609..42e69e125de 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -11,8 +11,9 @@ - Cluster - Packed # - CorvaxAvrite + - Train - Marathon - - CorvaxOutpost +# - CorvaxOutpost - Meta # - CorvaxDelta - Fland @@ -22,4 +23,3 @@ - Atlas - Saltern # - Reach -# - Train <- return after station anchoring PR is finished and merged diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index dd01c440c0d..420dd1fd07e 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -73,7 +73,6 @@ TechnologyDiskStealCollectionObjective: 1 #rnd FigurineStealCollectionObjective: 0.3 #service IDCardsStealCollectionObjective: 1 - CannabisStealCollectionObjective: 1 LAMPStealCollectionObjective: 2 #only for moth - type: weightedRandom diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index ab1858d0c57..96eac39a3b9 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -87,12 +87,12 @@ objectType: Item - type: construction - name: ducky slippers + name: тапки-уточки #A-13 Translation id: ClothingShoeSlippersDuck graph: ClothingShoeSlippersDuck startNode: start targetNode: shoes category: construction-category-clothing - description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child. + description: Удобные, но преследуемые призраками уток, которых вы кормили хлебом в детстве #A-13 Translation icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon } objectType: Item diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index 0b5b91f485e..a90579025f0 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -51,13 +51,13 @@ - !type:TileNotBlocked - type: construction - name: brass chair + name: латунный стул #A-13 Translation id: ChairBrass graph: Seat startNode: start targetNode: chairBrass category: construction-category-furniture - description: You sit in this. Either by will or force. + description: Вы сидите на этом. Будь то добровольно или принужденно. #A-13 Translation icon: sprite: Structures/Furniture/chairs.rsi state: brass_chair @@ -169,23 +169,22 @@ conditions: - !type:TileNotBlocked -# A-13 anti nabeg -#- type: construction -# name: ritual chair -# id: ChairRitual -# graph: RitualSeat -# startNode: start -# targetNode: chairRitual -# category: construction-category-furniture -# description: A strangely carved chair. -# icon: -# sprite: Structures/Furniture/chairs.rsi -# state: ritual -# objectType: Structure -# placementMode: SnapgridCenter -# canBuildInImpassable: false -# conditions: -# - !type:TileNotBlocked +- type: construction + name: ритуальный стул #A-13 Translation + id: ChairRitual + graph: RitualSeat + startNode: start + targetNode: chairRitual + category: construction-category-furniture + description: Стул странной резьбы. #A-13 Translation + icon: + sprite: Structures/Furniture/chairs.rsi + state: ritual + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked - type: construction name: складной стул #A-13 Translation @@ -222,13 +221,13 @@ - !type:TileNotBlocked - type: construction - name: wooden bench + name: деревянная скамейка #A-13 Translation id: ChairWoodBench graph: Seat startNode: start targetNode: chairWoodBench category: construction-category-furniture - description: Did you get a splinter? Well, at least it’s eco friendly. + description: Получили занозу? По крайней мере, она экологически чистая. #A-13 Translation icon: sprite: Structures/Furniture/chairs.rsi state: wooden-bench @@ -359,13 +358,13 @@ - !type:TileNotBlocked - type: construction - name: brass table + name: латунный стол #A-13 Translation id: TableBrass graph: Table startNode: start targetNode: TableBrass category: construction-category-furniture - description: A shiny, corrosion resistant brass table. Steampunk! + description: Блестящий, устойчивый к коррозии стол из латуни. Стимпанк! #A-13 Translation icon: sprite: Structures/Furniture/Tables/brass.rsi state: full @@ -410,13 +409,13 @@ - !type:TileNotBlocked - type: construction - name: fancy black table + name: красивый чёрный стол #A-13 Translation id: TableFancyBlack graph: Table startNode: start targetNode: TableFancyBlack category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/black.rsi state: full @@ -427,13 +426,13 @@ - !type:TileNotBlocked - type: construction - name: fancy blue table + name: красивый синий стол #A-13 Translation id: TableFancyBlue graph: Table startNode: start targetNode: TableFancyBlue category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/blue.rsi state: full @@ -444,13 +443,13 @@ - !type:TileNotBlocked - type: construction - name: fancy cyan table + name: красивый голубой стол #A-13 Translation id: TableFancyCyan graph: Table startNode: start targetNode: TableFancyCyan category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/cyan.rsi state: full @@ -461,13 +460,13 @@ - !type:TileNotBlocked - type: construction - name: fancy green table + name: красивый зеленый стол #A-13 Translation id: TableFancyGreen graph: Table startNode: start targetNode: TableFancyGreen category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/green.rsi state: full @@ -478,13 +477,13 @@ - !type:TileNotBlocked - type: construction - name: fancy orange table + name: красивый оранжевый стол #A-13 Translation id: TableFancyOrange graph: Table startNode: start targetNode: TableFancyOrange category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/orange.rsi state: full @@ -495,13 +494,13 @@ - !type:TileNotBlocked - type: construction - name: fancy purple table + name: красивый фиолетовый стол #A-13 Translation id: TableFancyPurple graph: Table startNode: start targetNode: TableFancyPurple category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/purple.rsi state: full @@ -512,13 +511,13 @@ - !type:TileNotBlocked - type: construction - name: fancy pink table + name: красивый розовый стол #A-13 Translation id: TableFancyPink graph: Table startNode: start targetNode: TableFancyPink category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/pink.rsi state: full @@ -529,13 +528,13 @@ - !type:TileNotBlocked - type: construction - name: fancy red table + name: красивый красный стол #A-13 Translation id: TableFancyRed graph: Table startNode: start targetNode: TableFancyRed category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/red.rsi state: full @@ -546,13 +545,13 @@ - !type:TileNotBlocked - type: construction - name: fancy white table + name: красивый белый стол #A-13 Translation id: TableFancyWhite graph: Table startNode: start targetNode: TableFancyWhite category: construction-category-furniture - description: A table covered with a beautiful cloth. + description: Стол, накрытый красивой скатертью. #A-13 Translation icon: sprite: Structures/Furniture/Tables/Fancy/white.rsi state: full @@ -736,8 +735,8 @@ - type: construction id: CurtainsBlack - name: black curtains - description: Hides what others shouldn't see. + name: чёрные шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsBlack @@ -751,8 +750,8 @@ - type: construction id: CurtainsBlue - name: blue curtains - description: Hides what others shouldn't see. + name: синие шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsBlue @@ -766,8 +765,8 @@ - type: construction id: CurtainsCyan - name: cyan curtains - description: Hides what others shouldn't see. + name: голубые шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsCyan @@ -781,8 +780,8 @@ - type: construction id: CurtainsGreen - name: green curtains - description: Hides what others shouldn't see. + name: зелёные шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsGreen @@ -796,8 +795,8 @@ - type: construction id: CurtainsOrange - name: orange curtains - description: Hides what others shouldn't see. + name: оранжевые шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsOrange @@ -811,8 +810,8 @@ - type: construction id: CurtainsPink - name: pink curtains - description: Hides what others shouldn't see. + name: розовые шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsPink @@ -826,8 +825,8 @@ - type: construction id: CurtainsPurple - name: purple curtains - description: Hides what others shouldn't see. + name: фиолетовые шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsPurple @@ -841,8 +840,8 @@ - type: construction id: CurtainsRed - name: red curtains - description: Hides what others shouldn't see. + name: красные шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsRed @@ -856,8 +855,8 @@ - type: construction id: CurtainsWhite - name: white curtains - description: Hides what others shouldn't see. + name: белые шторы #A-13 Translation + description: Скрывает то, что другие не должны видеть. #A-13 Translation graph: Curtains startNode: start targetNode: CurtainsWhite diff --git a/Resources/Prototypes/Recipes/Construction/machines.yml b/Resources/Prototypes/Recipes/Construction/machines.yml index d310f809ee7..70aa14e2702 100644 --- a/Resources/Prototypes/Recipes/Construction/machines.yml +++ b/Resources/Prototypes/Recipes/Construction/machines.yml @@ -13,7 +13,7 @@ state: 4 - type: construction - name: маркас машины #A-13 Translation + name: каркас машины #A-13 Translation description: Машина в стадии строительства. Нужно больше запчастей. #A-13 Translation id: MachineFrame graph: Machine diff --git a/Resources/Prototypes/Recipes/Construction/materials.yml b/Resources/Prototypes/Recipes/Construction/materials.yml index 2640ebb73cb..ab0d2361c65 100644 --- a/Resources/Prototypes/Recipes/Construction/materials.yml +++ b/Resources/Prototypes/Recipes/Construction/materials.yml @@ -21,8 +21,8 @@ objectType: Item - type: construction - name: clockwork glass - description: A brass-reinforced sheet of glass. + name: заводное стекло #A-13 Translation + description: Лист стекла, армированный латунью. #A-13 Translation id: SheetClockworkGlass graph: Glass startNode: start @@ -53,28 +53,6 @@ icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass } objectType: Item -- type: construction - name: reinforced plasma glass - description: A reinforced sheet of translucent plasma. - id: SheetRPGlass0 - graph: Glass - startNode: start - targetNode: SheetRPGlass0 - category: construction-category-materials - icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass } - objectType: Item - -- type: construction - name: reinforced plasma glass - description: A reinforced sheet of translucent plasma. - id: SheetRPGlass1 - graph: Glass - startNode: start - targetNode: SheetRPGlass1 - category: construction-category-materials - icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rpglass } - objectType: Item - - type: construction name: дюраткань #A-13 Translation id: MaterialDurathread @@ -106,26 +84,4 @@ targetNode: SheetRUGlass category: construction-category-materials icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass } - objectType: Item - -- type: construction - name: reinforced uranium glass - description: A reinforced sheet of uranium glass. - id: SheetRUGlass0 - graph: Glass - startNode: start - targetNode: SheetRUGlass0 - category: construction-category-materials - icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass } - objectType: Item - -- type: construction - name: reinforced uranium glass - description: A reinforced sheet of uranium glass. - id: SheetRUGlass1 - graph: Glass - startNode: start - targetNode: SheetRUGlass1 - category: construction-category-materials - icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: ruglass } objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Construction/structures.yml b/Resources/Prototypes/Recipes/Construction/structures.yml index ffc8d2f4d7d..1c4bc7d6d4c 100644 --- a/Resources/Prototypes/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/Recipes/Construction/structures.yml @@ -35,13 +35,13 @@ - !type:TileNotBlocked - type: construction - name: wall gear + name: каркас-шестерня #A-13 Translation id: ClockworkGirder graph: ClockworkGirder startNode: start targetNode: clockGirder category: construction-category-structures - description: A large gear with mounting brackets for additional plating. + description: Большой редуктор с кронштейнами для крепления дополнительной обшивки. #A-13 Translation icon: sprite: /Textures/Structures/Walls/clock.rsi state: wall_gear @@ -89,13 +89,13 @@ - !type:TileNotBlocked - type: construction - name: clock wall + name: заводная стена #A-13 Translation id: WallClock graph: ClockworkGirder startNode: start targetNode: clockworkWall category: construction-category-structures - description: Keeps the air in and the greytide out. + description: Удерживает воздух внутри, а ассистентов снаружи #A-13 Translation icon: sprite: Structures/Walls/clock.rsi state: full @@ -323,13 +323,13 @@ canRotate: false - type: construction - name: clockwork grille + name: заводная решетка #A-13 Translation id: ClockGrille graph: ClockGrille startNode: start targetNode: clockGrille category: construction-category-structures - description: A flimsy framework of iron rods assembled in traditional ratvarian fashion. + description: Хлипкий каркас из железных прутьев, собранный традиционным ратварианским способом. #A-13 Translation conditions: - !type:TileNotBlocked failIfSpace: false @@ -358,13 +358,13 @@ placementMode: SnapgridCenter - type: construction - name: diagonal clockwork grille + name: диагональная заводная решетка #A-13 Translation id: ClockworkGrilleDiagonal graph: GrilleDiagonal startNode: start targetNode: clockworkGrilleDiagonal category: construction-category-structures - description: A flimsy framework of iron rods assembled in traditional ratvarian fashion. + description: Хлипкий каркас из железных прутьев, собранный традиционным ратварианским способом. #A-13 Translation conditions: - !type:TileNotBlocked failIfSpace: false @@ -468,13 +468,13 @@ canRotate: false - type: construction - name: clockwork window + name: заводное окно #A-13 Translation id: ClockworkWindow graph: Window startNode: start targetNode: clockworkWindow category: construction-category-structures - description: Clear and tough, with a golden tint. + description: Чистое и крепкое, с золотистым оттенком. #A-13 Translation canBuildInImpassable: true conditions: - !type:EmptyOrWindowValidInTile @@ -487,13 +487,13 @@ canRotate: false - type: construction - name: diagonal clockwork window + name: диагональное заводное окно #A-13 Translation id: ClockworkWindowDiagonal graph: WindowDiagonal startNode: start targetNode: clockworkWindowDiagonal category: construction-category-structures - description: Clear and tough, with a golden tint. + description: Чистое и крепкое, с золотистым оттенком. #A-13 Translation canBuildInImpassable: true conditions: - !type:EmptyOrWindowValidInTile @@ -634,13 +634,13 @@ placementMode: SnapgridCenter - type: construction - name: directional clockwork window + name: направленное заводное окно #A-13 Translation id: WindowClockworkDirectional graph: WindowDirectional startNode: start targetNode: windowClockworkDirectional category: construction-category-structures - description: Clear and tough, with a golden tint. + description: Чистое и крепкое, с золотистым оттенком. #A-13 Translation canBuildInImpassable: true conditions: - !type:EmptyOrWindowValidInTile @@ -1071,13 +1071,13 @@ #Wooden fence high - type: construction - name: wooden high fence + name: прямой высокий деревянный забор #A-13 Translation id: FenceWood graph: FenceWood startNode: start targetNode: straight category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: straight @@ -1088,13 +1088,13 @@ - !type:TileNotBlocked - type: construction - name: wooden high fence end + name: конец высокого деревянного забора #A-13 Translation id: FenceWoodEnd graph: FenceWood startNode: start targetNode: end category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: end @@ -1105,13 +1105,13 @@ - !type:TileNotBlocked - type: construction - name: wooden high fence corner + name: угол высокого деревянного забора #A-13 Translation id: FenceWoodCorner graph: FenceWood startNode: start targetNode: corner category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: corner @@ -1122,13 +1122,13 @@ - !type:TileNotBlocked - type: construction - name: wooden high fence t-junction + name: Т-образный высокий деревянный забор #A-13 Translation id: FenceWoodTJunction graph: FenceWood startNode: start targetNode: tjunction category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: tjunction @@ -1139,13 +1139,13 @@ - !type:TileNotBlocked - type: construction - name: wooden high fence gate + name: ворота высокого деревянного забора #A-13 Translation id: FenceWoodGate graph: FenceWood startNode: start targetNode: gate category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: door_closed @@ -1157,13 +1157,13 @@ #Wooden fence small - type: construction - name: wooden small fence + name: прямой маленький деревянный забор #A-13 Translation id: FenceWoodSmall graph: FenceWood startNode: start targetNode: straight_small category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: straight_small @@ -1174,13 +1174,13 @@ - !type:TileNotBlocked - type: construction - name: wooden small fence end + name: конец маленького деревянного забора #A-13 Translation id: FenceWoodEndSmall graph: FenceWood startNode: start targetNode: end_small category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: end_small @@ -1191,13 +1191,13 @@ - !type:TileNotBlocked - type: construction - name: wooden small fence corner + name: угол маленького деревянного забора #A-13 Translation id: FenceWoodCornerSmall graph: FenceWood startNode: start targetNode: corner_small category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: corner_small @@ -1208,13 +1208,13 @@ - !type:TileNotBlocked - type: construction - name: wooden small fence t-junction + name: Т-образный маленький деревянный забор #A-13 Translation id: FenceWoodTJunctionSmall graph: FenceWood startNode: start targetNode: tjunction_small category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: tjunction_small @@ -1225,13 +1225,13 @@ - !type:TileNotBlocked - type: construction - name: wooden small fence gate + name: ворота маленького деревянного забора #A-13 Translation id: FenceWoodGateSmall graph: FenceWood startNode: start targetNode: gate_small category: construction-category-structures - description: Part of a wooden fence meant to cordon off areas. + description: Часть деревянного забора, предназначенного для ограждения территории. #A-13 Translation icon: sprite: Structures/Walls/wooden_fence.rsi state: door_closed_small @@ -1277,13 +1277,13 @@ - !type:TileNotBlocked - type: construction - name: pinion airlock + name: заводной шлюз #A-13 Translation id: PinionAirlock graph: PinionAirlock startNode: start targetNode: airlock category: construction-category-structures - description: It opens, it closes, and maybe crushes you. + description: Он стеклянный, открывается и закрывается, возможно раздавит вас. #A-13 Translation icon: sprite: Structures/Doors/Airlocks/Standard/clockwork_pinion.rsi state: assembly @@ -1294,13 +1294,13 @@ - !type:TileNotBlocked - type: construction - name: glass pinion airlock + name: заводной стеклянный шлюз #A-13 Translation id: PinionAirlockGlass graph: PinionAirlock startNode: start targetNode: glassAirlock category: construction-category-structures - description: It opens, it closes, and maybe crushes you. + description: Он стеклянный, открывается и закрывается, возможно раздавит вас. #A-13 Translation icon: sprite: Structures/Doors/Airlocks/Glass/clockwork_pinion.rsi state: assembly @@ -1381,13 +1381,13 @@ - !type:TileNotBlocked - type: construction - name: clockwork windoor + name: раздвижное заводное окно #A-13 Translation id: ClockworkWindoor graph: Windoor startNode: start targetNode: windoorClockwork category: construction-category-structures - description: It opens, it closes, and you can see through it! This one looks tough. + description: Оно открывается, оно закрывается, и вы можете видеть сквозь него! Выглядит прочно. #A-13 Translation icon: sprite: Structures/Doors/Windoors/clockwork_windoor.rsi state: closed diff --git a/Resources/Prototypes/Recipes/Construction/weapons.yml b/Resources/Prototypes/Recipes/Construction/weapons.yml index bc259efc3ee..02e20d419f3 100644 --- a/Resources/Prototypes/Recipes/Construction/weapons.yml +++ b/Resources/Prototypes/Recipes/Construction/weapons.yml @@ -1,22 +1,22 @@ - type: construction - name: grey bladed flatcap + name: серая плоская кепка с лезвиями #A-13 Translation id: BladedFlatcapGrey graph: BladedFlatcapGrey startNode: start targetNode: icon category: construction-category-weapons - description: An inconspicuous hat with glass shards sewn into the brim. + description: Неприметная шляпа с вшитыми в неё осколками стекла. #A-13 Translation icon: { sprite: Clothing/Head/Hats/greyflatcap.rsi, state: icon } objectType: Item - type: construction - name: brown bladed flatcap + name: коричневая плоская кепка с лезвием #A-13 Translation id: BladedFlatcapBrown graph: BladedFlatcapBrown startNode: start targetNode: icon category: construction-category-weapons - description: An inconspicuous hat with glass shards sewn into the brim. + description: Неприметная шляпа с вшитыми в неё осколками стекла. #A-13 Translation icon: { sprite: Clothing/Head/Hats/brownflatcap.rsi, state: icon } objectType: Item diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 10d2b10d21f..adbd820e80b 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -164,14 +164,14 @@ state: icon - type: construction - name: improvised shotgun shell + name: импровизированный патрон для дробовика #A-13 Translation id: ShellShotgunImprovised graph: ImprovisedShotgunShellGraph startNode: start targetNode: shell category: construction-category-weapons objectType: Item - description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a Barn + description: Самодельный патрон для дробовика, стреляющий болезненными стеклянными осколками. Распространение настолько велико, что не может поразить широкую сторону сарая. #A-13 Translation icon: sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi state: improvised @@ -229,14 +229,14 @@ objectType: Item - type: construction - name: pipe bomb + name: самодельная бомба #A-13 Translation id: pipebomb graph: PipeBomb startNode: start targetNode: pipebomb category: construction-category-weapons objectType: Item - description: An improvised explosive made from pipes and wire. + description: Самодельное взрывчатое вещество, сделанное из труб и проволоки. #A-13 Translation icon: sprite: Objects/Weapons/Bombs/pipebomb.rsi state: icon \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/tallbox.yml b/Resources/Prototypes/Recipes/Crafting/tallbox.yml index e6ff401da70..d69650f0d31 100644 --- a/Resources/Prototypes/Recipes/Crafting/tallbox.yml +++ b/Resources/Prototypes/Recipes/Crafting/tallbox.yml @@ -11,23 +11,23 @@ - type: construction id: ClosetSteelSecure - name: secure closet + name: безопасный шкаф #A-13 Translation graph: ClosetSteelSecure startNode: start targetNode: done category: construction-category-storage - description: A tall steel box that can be locked. + description: Высокий стальной ящик, который можно запереть. #A-13 Translation icon: { sprite: Structures/Storage/closet.rsi, state: secure_icon } objectType: Structure - type: construction id: ClosetWall - name: wall closet + name: настенный шкаф #A-13 Translation graph: ClosetWall startNode: start targetNode: done category: construction-category-storage - description: A standard-issue Nanotrasen storage unit, now on walls. + description: Стандартное хранилище Nanotrasen, теперь на стене. #A-13 Translation icon: { sprite: Structures/Storage/wall_locker.rsi, state: generic_icon } objectType: Structure placementMode: SnapgridCenter diff --git a/Resources/Prototypes/Recipes/Crafting/tiles.yml b/Resources/Prototypes/Recipes/Crafting/tiles.yml index d6a98f8cb29..56aceacdec0 100644 --- a/Resources/Prototypes/Recipes/Crafting/tiles.yml +++ b/Resources/Prototypes/Recipes/Crafting/tiles.yml @@ -23,24 +23,24 @@ objectType: Item - type: construction - name: filled brass plate + name: заполненная латунная пластина id: TileBrassFilled graph: TilesBrass startNode: start targetNode: filledPlate category: construction-category-tiles - description: "Four pieces of brass station flooring, only compatible with brass plating." + description: "Четыре куска латунного напольного покрытия станции, совместимого только с латунным покрытием." icon: { sprite: Objects/Tiles/tile.rsi, state: brass-filled } objectType: Item - type: construction - name: smooth brass plate + name: гладкая латунная пластина #A-13 Translation id: TileBrassReebe graph: TilesBrass startNode: start targetNode: reebe category: construction-category-tiles - description: "Four pieces of smooth brass station flooring, only compatible with brass plating." + description: "Четыре куска гладкого латунного пола станции, совместимого только с латунным покрытием." #A-13 Translation icon: { sprite: Objects/Tiles/tile.rsi, state: reebe } objectType: Item diff --git a/Resources/Prototypes/secret_weights.yml b/Resources/Prototypes/secret_weights.yml index ef9b9655ff9..a69f6e1c4a9 100644 --- a/Resources/Prototypes/secret_weights.yml +++ b/Resources/Prototypes/secret_weights.yml @@ -2,7 +2,7 @@ id: Secret weights: Nukeops: 0.2 - Traitor: 0.8 + Traitor: 0.85 Zombie: 0.01 - Extended: 0.1 # A-13 + Extended: 0.05 # A-13 Survival: 0.1 diff --git a/Resources/Textures/Andromeda/Lemird/balaclava.rsi/equipped-MASK.png b/Resources/Textures/Andromeda/Lemird/balaclava.rsi/equipped-MASK.png new file mode 100644 index 00000000000..50ced28f4d8 Binary files /dev/null and b/Resources/Textures/Andromeda/Lemird/balaclava.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/Andromeda/Lemird/balaclava.rsi/icon.png b/Resources/Textures/Andromeda/Lemird/balaclava.rsi/icon.png new file mode 100644 index 00000000000..54252a0c1d8 Binary files /dev/null and b/Resources/Textures/Andromeda/Lemird/balaclava.rsi/icon.png differ diff --git a/Resources/Textures/Andromeda/Lemird/balaclava.rsi/meta.json b/Resources/Textures/Andromeda/Lemird/balaclava.rsi/meta.json new file mode 100644 index 00000000000..bb63d8bb530 --- /dev/null +++ b/Resources/Textures/Andromeda/Lemird/balaclava.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "By Lemird", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Andromeda/NIKforest/olivie.rsi/bowl.png b/Resources/Textures/Andromeda/NIKforest/olivie.rsi/bowl.png new file mode 100644 index 00000000000..fae393d4a23 Binary files /dev/null and b/Resources/Textures/Andromeda/NIKforest/olivie.rsi/bowl.png differ diff --git a/Resources/Textures/Andromeda/NIKforest/olivie.rsi/meta.json b/Resources/Textures/Andromeda/NIKforest/olivie.rsi/meta.json new file mode 100644 index 00000000000..5f2668d5dd0 --- /dev/null +++ b/Resources/Textures/Andromeda/NIKforest/olivie.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa. Fills created by potato1234_x", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bowl" + }, + { + "name": "olivie" + } + ] +} diff --git a/Resources/Textures/Andromeda/NIKforest/olivie.rsi/olivie.png b/Resources/Textures/Andromeda/NIKforest/olivie.rsi/olivie.png new file mode 100644 index 00000000000..4d8267bbb37 Binary files /dev/null and b/Resources/Textures/Andromeda/NIKforest/olivie.rsi/olivie.png differ diff --git a/SECURITY.md b/SECURITY.md index 09134999826..143e8f54854 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,7 +1,7 @@ # Reporting a security vulnerability You can report a security vulnerability via Discord. -If you want to contact us via Discord, you can join [our server](https://discord.gg/CPacm3dfrA) -and then **confidentially** send a message to the user with the role `@Host` or `@Principal Developer`. +If you want to contact us via Discord, you can join [our server](https://discord.gg/CuWu6kSznf) +and then **confidentially** send a message to the user with the role `@Host` or `@Principal Developer`. Or you can write personally in private messages to `lemird` or `13lackhawk`. In any case, **do not publicly disclose information about the vulnerability.** \ No newline at end of file